441 files changed, 84291 insertions, 69182 deletions

diff --git a/ABOUT-NLS b/ABOUT-NLS
new file mode 100644
index 0000000..b1de1b6
--- /dev/null
+++ b/ABOUT-NLS
@@ -0,0 +1,1282 @@
+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 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,
+itself available at your nearest GNU archive site.  But you do _not_
+need to install GNU `gettext' prior to configuring, installing or using
+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 on translations can contact the appropriate team.
+
+1.1 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'.
+
+   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.  Installers may use special
+options at configuration time for changing the default behaviour.  The
+command:
+
+     ./configure --disable-nls
+
+will _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' library
+and will decide to use it.  If not, you may have to to use the
+`--with-libintl-prefix' option to tell `configure' where to look for it.
+
+   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
+together with the package.  However, the environment variable `LINGUAS'
+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.
+
+1.2 Using This Package
+======================
+
+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.  If you happen to have the `LC_ALL' or some other
+`LC_xxx' environment variables set, you should unset them before
+setting `LANG', otherwise the setting of `LANG' will not have the
+desired effect.  Here `LL' is an ISO 639 two-letter language code, and
+`CC' is an ISO 3166 two-letter country code.  For example, let's
+suppose that you speak German and live in Germany.  At the shell
+prompt, merely execute `setenv LANG de_DE' (in `csh'),
+`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
+This can be done from your `.login' or `.profile' file, once and for
+all.
+
+   You might think that the country code specification is redundant.
+But in fact, some languages have dialects in different countries.  For
+example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
+country code serves to distinguish the dialects.
+
+   The locale naming convention of `LL_CC', with `LL' denoting the
+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 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
+understand other languages, you can set up a priority list of languages.
+This is done through a different environment variable, called
+`LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LANG'
+for the purpose of message handling, but you still need to have `LANG'
+set to the primary language; this is required by other parts of the
+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.
+
+1.3 Translating Teams
+=====================
+
+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
+teams can be found at the Free Translation Project's homepage,
+`http://translationproject.org/', in the "Teams" area.
+
+   If you'd like to volunteer to _work_ at translating messages, you
+should become a member of the translating team for your own language.
+The subscribing address is _not_ the same as the list itself, it has
+`-request' appended.  For example, speakers of Swedish can send a
+message to `sv-request@li.org', having this message body:
+
+     subscribe
+
+   Keep in mind that team members are expected to participate
+_actively_ in translations, or at solving translational difficulties,
+rather than merely lurking around.  If your team does not exist yet and
+you want to start one, or if you are unsure about what to do or how to
+get started, please write to `coordinator@translationproject.org' 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 skills are praised more than
+programming skills, here.
+
+1.4 Available Packages
+======================
+
+Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of June
+2010.  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       af am an ar as ast az be be@latin bg bn_IN bs ca
+                        +--------------------------------------------------+
+     a2ps               |                       []                      [] |
+     aegis              |                                                  |
+     ant-phone          |                                                  |
+     anubis             |                                                  |
+     aspell             |                []                             [] |
+     bash               |                                                  |
+     bfd                |                                                  |
+     bibshelf           |                []                                |
+     binutils           |                                                  |
+     bison              |                                                  |
+     bison-runtime      |                []                                |
+     bluez-pin          | []             []                                |
+     bombono-dvd        |                                                  |
+     buzztard           |                                                  |
+     cflow              |                                                  |
+     clisp              |                                                  |
+     coreutils          |                                   []          [] |
+     cpio               |                                                  |
+     cppi               |                                                  |
+     cpplib             |                                               [] |
+     cryptsetup         |                                                  |
+     dfarc              |                                                  |
+     dialog             |                             []                [] |
+     dico               |                                                  |
+     diffutils          |                                               [] |
+     dink               |                                                  |
+     doodle             |                                                  |
+     e2fsprogs          |                                               [] |
+     enscript           |                                               [] |
+     exif               |                                                  |
+     fetchmail          |                                               [] |
+     findutils          |                                   []             |
+     flex               |                                               [] |
+     freedink           |                                                  |
+     gas                |                                                  |
+     gawk               |                []                             [] |
+     gcal               |                                               [] |
+     gcc                |                                                  |
+     gettext-examples   | []             []                 []          [] |
+     gettext-runtime    |                                   []          [] |
+     gettext-tools      |                                   []          [] |
+     gip                |                                   []             |
+     gjay               |                                                  |
+     gliv               |                                   []             |
+     glunarclock        |                []                 []             |
+     gnubiff            |                                                  |
+     gnucash            |                                               [] |
+     gnuedu             |                                                  |
+     gnulib             |                                                  |
+     gnunet             |                                                  |
+     gnunet-gtk         |                                                  |
+     gnutls             |                                                  |
+     gold               |                                                  |
+     gpe-aerial         |                                                  |
+     gpe-beam           |                                                  |
+     gpe-bluetooth      |                                                  |
+     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               |                                                  |
+     grub               |                []                             [] |
+     gsasl              |                                                  |
+     gss                |                                                  |
+     gst-plugins-bad    |                                   []             |
+     gst-plugins-base   |                                   []             |
+     gst-plugins-good   |                                   []             |
+     gst-plugins-ugly   |                                   []             |
+     gstreamer          | []                                []          [] |
+     gtick              |                                                  |
+     gtkam              |                       []                         |
+     gtkorphan          |                                   []             |
+     gtkspell           | []             []     []                         |
+     gutenprint         |                                                  |
+     hello              |                                   []             |
+     help2man           |                                                  |
+     hylafax            |                                                  |
+     idutils            |                                                  |
+     indent             |                                   []          [] |
+     iso_15924          |                                                  |
+     iso_3166           | []          []        []          []  []   [] [] |
+     iso_3166_2         |                                                  |
+     iso_4217           |                                                  |
+     iso_639            |             [] []     []              []         |
+     iso_639_3          |                                                  |
+     jwhois             |                                                  |
+     kbd                |                                                  |
+     keytouch           |                                               [] |
+     keytouch-editor    |                                                  |
+     keytouch-keyboa... |                                               [] |
+     klavaro            |          []                                      |
+     latrine            |                                                  |
+     ld                 |                                   []             |
+     leafpad            |                                   []          [] |
+     libc               |                                   []          [] |
+     libexif            |                       ()                         |
+     libextractor       |                                                  |
+     libgnutls          |                                                  |
+     libgpewidget       |                                                  |
+     libgpg-error       |                                                  |
+     libgphoto2         |                                                  |
+     libgphoto2_port    |                                                  |
+     libgsasl           |                                                  |
+     libiconv           |                                   []             |
+     libidn             |                                                  |
+     lifelines          |                                                  |
+     liferea            |                             []                [] |
+     lilypond           |                                                  |
+     linkdr             |          []                                      |
+     lordsawar          |                                                  |
+     lprng              |                                                  |
+     lynx               |                                               [] |
+     m4                 |                                                  |
+     mailfromd          |                                                  |
+     mailutils          |                                                  |
+     make               |                                                  |
+     man-db             |                                                  |
+     man-db-manpages    |                                                  |
+     minicom            |                                                  |
+     mkisofs            |                                                  |
+     myserver           |                                                  |
+     nano               |                                   []          [] |
+     opcodes            |                                                  |
+     parted             |                                                  |
+     pies               |                                                  |
+     popt               |                                                  |
+     psmisc             |                                                  |
+     pspp               |                                               [] |
+     pwdutils           |                                                  |
+     radius             |                                               [] |
+     recode             |                       []                      [] |
+     rosegarden         |                                                  |
+     rpm                |                                                  |
+     rush               |                                                  |
+     sarg               |                                                  |
+     screem             |                                                  |
+     scrollkeeper       |                    [] []                      [] |
+     sed                |                []                             [] |
+     sharutils          |                                   []          [] |
+     shishi             |                                                  |
+     skencil            |                                                  |
+     solfege            |                                                  |
+     solfege-manual     |                                                  |
+     soundtracker       |                                                  |
+     sp                 |                                                  |
+     sysstat            |                                                  |
+     tar                |                                   []             |
+     texinfo            |                                                  |
+     tin                |                                                  |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                                                  |
+     util-linux-ng      |                                               [] |
+     vice               |                                                  |
+     vmm                |                                                  |
+     vorbis-tools       |                                                  |
+     wastesedge         |                                                  |
+     wdiff              |                                                  |
+     wget               |                       []                      [] |
+     wyslij-po          |                                                  |
+     xchat              |                []     []          []          [] |
+     xdg-user-dirs      | []    []    [] []     []    []    []  []      [] |
+     xkeyboard-config   |                                   []          [] |
+                        +--------------------------------------------------+
+                          af am an ar as ast az be be@latin bg bn_IN bs ca
+                           6  0  1  2  3 19   1 10     3    28   3    1 38
+
+                          crh cs da  de  el en en_GB en_ZA eo es et eu fa
+                        +-------------------------------------------------+
+     a2ps               |     [] []  []  []     []            [] []       |
+     aegis              |        []  []                       []          |
+     ant-phone          |        []  ()                                   |
+     anubis             |        []  []                                   |
+     aspell             |     [] []  []         []            []          |
+     bash               |     []                           [] []          |
+     bfd                |                                     []          |
+     bibshelf           |        []  []                       []          |
+     binutils           |                                     []          |
+     bison              |            []  []                               |
+     bison-runtime      |        []  []  []                      []       |
+     bluez-pin          |     [] []  []  []                [] []          |
+     bombono-dvd        |        []                                       |
+     buzztard           |     [] []  []                                   |
+     cflow              |        []  []                                   |
+     clisp              |        []  []     []                []          |
+     coreutils          |     [] []  []                          []       |
+     cpio               |                                                 |
+     cppi               |                                                 |
+     cpplib             |        []  []                       []          |
+     cryptsetup         |            []                                   |
+     dfarc              |        []  []                       []          |
+     dialog             |        []  []                    [] []    []    |
+     dico               |                                                 |
+     diffutils          |     [] []  []  []                [] []          |
+     dink               |        []  []                       []          |
+     doodle             |            []                                   |
+     e2fsprogs          |     []     []                       []          |
+     enscript           |        []  []         []                        |
+     exif               |     () []  []                                   |
+     fetchmail          |     [] []  ()  []     []            []          |
+     findutils          |     [] []  []                                   |
+     flex               |            []                       []          |
+     freedink           |        []  []                       []          |
+     gas                |                                     []          |
+     gawk               |        []  []                       []          |
+     gcal               |                                     []          |
+     gcc                |            []                       []          |
+     gettext-examples   |            []  []                [] []          |
+     gettext-runtime    |        []  []                    [] []          |
+     gettext-tools      |            []                       []    []    |
+     gip                |        []  []                       []    []    |
+     gjay               |            []                                   |
+     gliv               |     [] []  []                                   |
+     glunarclock        |        []  []                                   |
+     gnubiff            |            ()                                   |
+     gnucash            |     []     ()  ()     ()            ()          |
+     gnuedu             |        []                           []          |
+     gnulib             |            []                       []          |
+     gnunet             |                                                 |
+     gnunet-gtk         |        []                                       |
+     gnutls             |     []     []                                   |
+     gold               |                                     []          |
+     gpe-aerial         |     [] []  []                       []          |
+     gpe-beam           |     [] []  []                       []          |
+     gpe-bluetooth      |        []  []                                   |
+     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               |     []                                          |
+     grub               |        []  []                                   |
+     gsasl              |            []                                   |
+     gss                |                                                 |
+     gst-plugins-bad    |     [] []  []                       []    []    |
+     gst-plugins-base   |     [] []  []                       []    []    |
+     gst-plugins-good   |     [] []  []  []                   []    []    |
+     gst-plugins-ugly   |     [] []  []  []                   []    []    |
+     gstreamer          |     [] []  []                       []    []    |
+     gtick              |        []  ()                    []             |
+     gtkam              |     [] []  ()                    [] []          |
+     gtkorphan          |     [] []  []                    []             |
+     gtkspell           |     [] []  []  []                [] []    []    |
+     gutenprint         |        []  []         []                        |
+     hello              |        []  []                    [] []          |
+     help2man           |            []                                   |
+     hylafax            |            []                       []          |
+     idutils            |        []  []                                   |
+     indent             |     [] []  []                    [] [] [] []    |
+     iso_15924          |        []      ()                [] []          |
+     iso_3166           | []  [] []  []  ()                [] [] [] ()    |
+     iso_3166_2         |                ()                               |
+     iso_4217           |     [] []  []  ()                   [] []       |
+     iso_639            | []  [] []  []  ()                [] []          |
+     iso_639_3          | []                                              |
+     jwhois             |                                     []          |
+     kbd                |     [] []  []  []                   []          |
+     keytouch           |        []  []                                   |
+     keytouch-editor    |        []  []                                   |
+     keytouch-keyboa... |        []                                       |
+     klavaro            |     [] []  []                    []             |
+     latrine            |        []  ()                                   |
+     ld                 |        []                           []          |
+     leafpad            |     [] []  []  []                   []    []    |
+     libc               |     [] []  []                       []          |
+     libexif            |        []  []         ()                        |
+     libextractor       |                                                 |
+     libgnutls          |     []                                          |
+     libgpewidget       |        []  []                                   |
+     libgpg-error       |     []     []                                   |
+     libgphoto2         |        []  ()                                   |
+     libgphoto2_port    |        []  ()                             []    |
+     libgsasl           |                                                 |
+     libiconv           |     [] []  []                    []    []       |
+     libidn             |     []     []                    []             |
+     lifelines          |        []  ()                                   |
+     liferea            |     []     []  []                   []    []    |
+     lilypond           |     []     []                       []          |
+     linkdr             |        []  []                       []          |
+     lordsawar          |        []                                       |
+     lprng              |                                                 |
+     lynx               |     [] []  []                          []       |
+     m4                 |     [] []  []  []                               |
+     mailfromd          |                                                 |
+     mailutils          |                                     []          |
+     make               |        []  []                       []          |
+     man-db             |                                                 |
+     man-db-manpages    |                                                 |
+     minicom            |     [] []  []                       []          |
+     mkisofs            |                                                 |
+     myserver           |                                                 |
+     nano               |            []                       []    []    |
+     opcodes            |            []                       []          |
+     parted             |     []     []                                   |
+     pies               |                                                 |
+     popt               |     [] []  []                    [] []          |
+     psmisc             |     []     []                             []    |
+     pspp               |                                     []          |
+     pwdutils           |        []                                       |
+     radius             |                                     []          |
+     recode             |     [] []  []  []                [] []          |
+     rosegarden         |     ()     ()                       ()          |
+     rpm                |        []  []                       []          |
+     rush               |                                                 |
+     sarg               |                                                 |
+     screem             |                                                 |
+     scrollkeeper       |     [] []  []         []            []          |
+     sed                |     []     []  []                [] [] []       |
+     sharutils          |        []  []                       [] []       |
+     shishi             |                                                 |
+     skencil            |        []  ()                       []          |
+     solfege            |            []                    []    []       |
+     solfege-manual     |                                  []    []       |
+     soundtracker       |        []  []                       []          |
+     sp                 |            []                                   |
+     sysstat            |        []  []                             []    |
+     tar                |     []     []                          [] []    |
+     texinfo            |            []                    [] []          |
+     tin                |            []                          []       |
+     unicode-han-tra... |                                                 |
+     unicode-transla... |                                                 |
+     util-linux-ng      |     [] []  []                       []          |
+     vice               |        ()  ()                                   |
+     vmm                |            []                                   |
+     vorbis-tools       |     []                           []             |
+     wastesedge         |        []                                       |
+     wdiff              |            []                       []          |
+     wget               |     []     []                          []       |
+     wyslij-po          |                                                 |
+     xchat              |     []     []  []                   [] []       |
+     xdg-user-dirs      | []  [] []  []  []                [] [] [] []    |
+     xkeyboard-config   | []  [] []  []                    [] []          |
+                        +-------------------------------------------------+
+                          crh cs da  de  el en en_GB en_ZA eo es et eu fa
+                           5  64 105 117 18  1   8     0   28 89 18 19  0
+
+                          fi  fr  ga gl gu he hi hr hu hy id  is it ja ka kn
+                        +----------------------------------------------------+
+     a2ps               | []  []                          []        []       |
+     aegis              |     []                                 []          |
+     ant-phone          |     []                                 []          |
+     anubis             | []  []                          []     []          |
+     aspell             |     []  []                      []     []          |
+     bash               | []  []                          []        []       |
+     bfd                | []  []                          []                 |
+     bibshelf           | []  []  []                      []     []          |
+     binutils           | []  []                          []                 |
+     bison              | []  []  []                      []                 |
+     bison-runtime      | []  []  []                      []     [] []       |
+     bluez-pin          | []  []  []                [] [] []  []    []       |
+     bombono-dvd        | []                                                 |
+     buzztard           |                                 []                 |
+     cflow              | []      []                      []                 |
+     clisp              |     []                                             |
+     coreutils          |     []  []                []    []     []          |
+     cpio               | []  []  []                      []                 |
+     cppi               | []  []                                             |
+     cpplib             | []  []                          []                 |
+     cryptsetup         |     []                          []     []          |
+     dfarc              | []  []                                 []          |
+     dialog             |     []  [] []                   []  [] [] []       |
+     dico               |                                                    |
+     diffutils          | []  []  [] []    []       []    []     [] []       |
+     dink               |     []                                             |
+     doodle             |         []                             []          |
+     e2fsprogs          |     []                          []                 |
+     enscript           |     []  []             []       []                 |
+     exif               | []  []                          []  [] [] []       |
+     fetchmail          |     []                          []     [] []       |
+     findutils          | []  []  []                []    []     []          |
+     flex               | []  []  []                                         |
+     freedink           | []  []                          []                 |
+     gas                |     []                          []                 |
+     gawk               |     []  []       []             []     () []       |
+     gcal               |     []                                             |
+     gcc                |                                 []                 |
+     gettext-examples   | []  []  []                []    []     [] []       |
+     gettext-runtime    | []  []  []                      []     [] []       |
+     gettext-tools      |     []                          []     [] []       |
+     gip                | []  []  [] []                   []        []       |
+     gjay               | []                                                 |
+     gliv               | []  ()                                             |
+     glunarclock        | []      []                []    []                 |
+     gnubiff            |     ()                          []     ()          |
+     gnucash            | ()  ()           ()       ()           () []       |
+     gnuedu             |     []                                 []          |
+     gnulib             | []  []  []                []           [] []       |
+     gnunet             |                                                    |
+     gnunet-gtk         |     []                                             |
+     gnutls             |     []                                 []          |
+     gold               | []                              []                 |
+     gpe-aerial         | []  []                          []                 |
+     gpe-beam           | []  []                          []        []       |
+     gpe-bluetooth      | []                              []     [] []       |
+     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               | []                                     []          |
+     grub               | []                        []    []     []          |
+     gsasl              | []  []  []                      []     []          |
+     gss                | []  []  []                      []     []          |
+     gst-plugins-bad    | []  []                    []    []     [] []       |
+     gst-plugins-base   | []  []                    []    []     [] []       |
+     gst-plugins-good   | []  []                    []    []     [] []       |
+     gst-plugins-ugly   | []  []                    []    []     [] []       |
+     gstreamer          | []  []                    []    []     []          |
+     gtick              | []  []  []                      []     []          |
+     gtkam              |     []                    []    []     [] []       |
+     gtkorphan          |     []                          []     []          |
+     gtkspell           | []  []  [] []             [] [] []     [] []       |
+     gutenprint         | []  []                    []           []          |
+     hello              | []      []                      []                 |
+     help2man           | []  []                                             |
+     hylafax            |                                 []                 |
+     idutils            | []  []  []                []    []     []          |
+     indent             | []  []  [] []             []    []     [] []       |
+     iso_15924          | []  ()                          []     []          |
+     iso_3166           | []  ()  [] [] [] [] [] [] []    []     [] []       |
+     iso_3166_2         |     ()                    []    []     []          |
+     iso_4217           | []  ()                    []    []     [] []       |
+     iso_639            | []  ()  []    []          []    []     [] []    [] |
+     iso_639_3          |     ()                                 []       [] |
+     jwhois             | []  []                    []    []     []          |
+     kbd                |     []                          []                 |
+     keytouch           | []  []  []                []    []     []          |
+     keytouch-editor    | []      []                []    []     []          |
+     keytouch-keyboa... | []      []                []    []     []          |
+     klavaro            |            []             []                       |
+     latrine            | []                              []     []          |
+     ld                 | []  []  []                      []                 |
+     leafpad            | []  []  []       []       []    []     [] ()       |
+     libc               | []  []     []                   []        []       |
+     libexif            |                                        []          |
+     libextractor       |                                                    |
+     libgnutls          |     []                                 []          |
+     libgpewidget       | []      []                      []        []       |
+     libgpg-error       |     []                                 []          |
+     libgphoto2         |     []                                 [] []       |
+     libgphoto2_port    |     []                                 [] []       |
+     libgsasl           | []  []  []                      []     []          |
+     libiconv           | []  []  []                      []     [] []       |
+     libidn             | []  []                          []     []          |
+     lifelines          |     ()                                             |
+     liferea            |     []                    []           [] []       |
+     lilypond           | []  []                                             |
+     linkdr             | []               []    [] []           []          |
+     lordsawar          |                                                    |
+     lprng              |                                 []                 |
+     lynx               |     []                    []    []     [] []       |
+     m4                 | []  []  [] []                   []        []       |
+     mailfromd          |                                                    |
+     mailutils          |     []                          []                 |
+     make               | []  []  [] []    []    []       []     [] []       |
+     man-db             |                                 []     []          |
+     man-db-manpages    |                                 []                 |
+     minicom            | []  []                    []    []        []       |
+     mkisofs            | []  []                          []     []          |
+     myserver           |                                                    |
+     nano               | []  []  [] []             []           []          |
+     opcodes            | []  []  []                      []                 |
+     parted             |     []                          []     [] []       |
+     pies               |                                                    |
+     popt               | []  []  [] []             []    []  [] [] []       |
+     psmisc             | []  []                          []                 |
+     pspp               |                                                    |
+     pwdutils           |     []                          []                 |
+     radius             |     []                          []                 |
+     recode             | []  []  [] []    []       []    []     []          |
+     rosegarden         | ()  ()                          ()     () ()       |
+     rpm                |                                 []        []       |
+     rush               |                                                    |
+     sarg               |     []                                             |
+     screem             |                                        [] []       |
+     scrollkeeper       | []                        []    []     []          |
+     sed                | []  []  [] []             []    []     [] []       |
+     sharutils          | []  []  []                []    []     [] []       |
+     shishi             |     []                                             |
+     skencil            |     []                                             |
+     solfege            | []  []     []                          []          |
+     solfege-manual     |     []     []                                      |
+     soundtracker       |     []                                 []          |
+     sp                 |     []                                    ()       |
+     sysstat            | []  []                          []     [] []       |
+     tar                | []  []  []                []    []     [] []       |
+     texinfo            |     []                          []     [] []       |
+     tin                |     []                                             |
+     unicode-han-tra... |                                                    |
+     unicode-transla... |     []  []                                         |
+     util-linux-ng      | []  []                    []    []     [] []       |
+     vice               |     ()                    ()           ()          |
+     vmm                |     []                                             |
+     vorbis-tools       |                                 []                 |
+     wastesedge         |     ()                                 ()          |
+     wdiff              | []                                                 |
+     wget               | []  []  []             [] []    []     [] []       |
+     wyslij-po          | []  []                          []                 |
+     xchat              | []  []        []    []    []    []     [] []    [] |
+     xdg-user-dirs      | []  []  [] [] [] [] []    []    []  [] [] []    [] |
+     xkeyboard-config   | []  []                    []    []     []          |
+                        +----------------------------------------------------+
+                          fi  fr  ga gl gu he hi hr hu hy id  is it ja ka kn
+                          105 121 53 20  4  8  3  5 53  2 120  5 84 67  0  4
+
+                          ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
+                        +-----------------------------------------------+
+     a2ps               |                               []              |
+     aegis              |                                               |
+     ant-phone          |                                               |
+     anubis             |                               []    []        |
+     aspell             |                         []                    |
+     bash               |                                               |
+     bfd                |                                               |
+     bibshelf           |                []             []              |
+     binutils           |                                               |
+     bison              |                               []              |
+     bison-runtime      |       []    [] []             []    []        |
+     bluez-pin          |    [] []    [] []             []              |
+     bombono-dvd        |                                               |
+     buzztard           |                                               |
+     cflow              |                                               |
+     clisp              |                                               |
+     coreutils          |          []                                   |
+     cpio               |                                               |
+     cppi               |                                               |
+     cpplib             |                                               |
+     cryptsetup         |                                               |
+     dfarc              |                   []                          |
+     dialog             |    []       [] []             []    []        |
+     dico               |                                               |
+     diffutils          |                []             []              |
+     dink               |                                               |
+     doodle             |                                               |
+     e2fsprogs          |                                               |
+     enscript           |                                               |
+     exif               |                []                             |
+     fetchmail          |                                               |
+     findutils          |                                               |
+     flex               |                                               |
+     freedink           |                                     []        |
+     gas                |                                               |
+     gawk               |                                               |
+     gcal               |                                               |
+     gcc                |                                               |
+     gettext-examples   |       []       []             [] []           |
+     gettext-runtime    | []                                            |
+     gettext-tools      | []                                            |
+     gip                |                []             []              |
+     gjay               |                                               |
+     gliv               |                                               |
+     glunarclock        |                []                             |
+     gnubiff            |                                               |
+     gnucash            | ()          ()                      ()     () |
+     gnuedu             |                                               |
+     gnulib             |                                               |
+     gnunet             |                                               |
+     gnunet-gtk         |                                               |
+     gnutls             |                               []              |
+     gold               |                                               |
+     gpe-aerial         |                []                             |
+     gpe-beam           |                []                             |
+     gpe-bluetooth      |                []                []           |
+     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               |                                               |
+     grub               |                                               |
+     gsasl              |                                               |
+     gss                |                                               |
+     gst-plugins-bad    |             [] []                [] []        |
+     gst-plugins-base   |             [] []                             |
+     gst-plugins-good   |                []                []           |
+     gst-plugins-ugly   |             [] []             [] [] []        |
+     gstreamer          |                                               |
+     gtick              |                                               |
+     gtkam              |                                     []        |
+     gtkorphan          |                []                      []     |
+     gtkspell           |       []    [] []       []    []    [] []     |
+     gutenprint         |                                               |
+     hello              | []             []             []              |
+     help2man           |                                               |
+     hylafax            |                                               |
+     idutils            |                                               |
+     indent             |                                               |
+     iso_15924          |             [] []                             |
+     iso_3166           | [] []       () [] [] []    []       []        |
+     iso_3166_2         |                                               |
+     iso_4217           |             []                      []        |
+     iso_639            |                      []    []                 |
+     iso_639_3          |                            []                 |
+     jwhois             |                []                             |
+     kbd                |                                               |
+     keytouch           |                []                             |
+     keytouch-editor    |                []                             |
+     keytouch-keyboa... |                []                             |
+     klavaro            |                                     []        |
+     latrine            |                []                             |
+     ld                 |                                               |
+     leafpad            | []          [] []                             |
+     libc               | []                                            |
+     libexif            |                                               |
+     libextractor       |                                               |
+     libgnutls          |                               []              |
+     libgpewidget       |                []             []              |
+     libgpg-error       |                                               |
+     libgphoto2         |                                               |
+     libgphoto2_port    |                                               |
+     libgsasl           |                                               |
+     libiconv           |                                               |
+     libidn             |                                               |
+     lifelines          |                                               |
+     liferea            |                                               |
+     lilypond           |                                               |
+     linkdr             |                                               |
+     lordsawar          |                                               |
+     lprng              |                                               |
+     lynx               |                                               |
+     m4                 |                                               |
+     mailfromd          |                                               |
+     mailutils          |                                               |
+     make               | []                                            |
+     man-db             |                                               |
+     man-db-manpages    |                                               |
+     minicom            |                                     []        |
+     mkisofs            |                                               |
+     myserver           |                                               |
+     nano               |                               []    []        |
+     opcodes            |                                               |
+     parted             |                                               |
+     pies               |                                               |
+     popt               | []             []                   []        |
+     psmisc             |                                               |
+     pspp               |                                               |
+     pwdutils           |                                               |
+     radius             |                                               |
+     recode             |                                               |
+     rosegarden         |                                               |
+     rpm                |                                               |
+     rush               |                                               |
+     sarg               |                                               |
+     screem             |                                               |
+     scrollkeeper       |                                     []     [] |
+     sed                |                                               |
+     sharutils          |                                               |
+     shishi             |                                               |
+     skencil            |                                               |
+     solfege            |                                     []        |
+     solfege-manual     |                                               |
+     soundtracker       |                                               |
+     sp                 |                                               |
+     sysstat            |                []                             |
+     tar                |       []                                      |
+     texinfo            |                                     []        |
+     tin                |                                               |
+     unicode-han-tra... |                                               |
+     unicode-transla... |                                               |
+     util-linux-ng      |                                               |
+     vice               |                                               |
+     vmm                |                                               |
+     vorbis-tools       |                                               |
+     wastesedge         |                                               |
+     wdiff              |                                               |
+     wget               |             []                                |
+     wyslij-po          |                                               |
+     xchat              | []             [] []                          |
+     xdg-user-dirs      | [] []       [] [] []       []       [] []     |
+     xkeyboard-config   | []    []    []                                |
+                        +-----------------------------------------------+
+                          ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
+                          20  5 10  1 13 48  4  2  2  4 24 10 20  3   1
+
+                          nl  nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr
+                        +---------------------------------------------------+
+     a2ps               | []           []     []  []   [] []       []    [] |
+     aegis              | []                      []      []                |
+     ant-phone          |                         []   []                   |
+     anubis             | []           []                 []                |
+     aspell             | []                           [] []    [] []       |
+     bash               | []                                    []          |
+     bfd                |                                 []                |
+     bibshelf           | []  []                                            |
+     binutils           |                                 []    []          |
+     bison              | []           []                 []                |
+     bison-runtime      | []           []     []  []   [] []       []       |
+     bluez-pin          | []           []         []   [] []    [] []    [] |
+     bombono-dvd        |     []                          ()                |
+     buzztard           | []  []                                            |
+     cflow              |              []                                   |
+     clisp              | []                              []                |
+     coreutils          | []           []     []  []      []       []       |
+     cpio               | []           []                 []                |
+     cppi               |              []                                   |
+     cpplib             | []                                                |
+     cryptsetup         | []                                                |
+     dfarc              |              []                                   |
+     dialog             | []           []         []      []                |
+     dico               |              []                                   |
+     diffutils          | []           []         []   [] []             [] |
+     dink               | ()                                                |
+     doodle             | []                                          []    |
+     e2fsprogs          | []           []                                   |
+     enscript           | []                      []   [] []       []       |
+     exif               | []           []              [] ()    []          |
+     fetchmail          | []           []                 []          []    |
+     findutils          | []           []     []          []       []       |
+     flex               | []           []         []   [] []                |
+     freedink           | []           []                                   |
+     gas                |                                                   |
+     gawk               | []           []         []   []                   |
+     gcal               |                                                   |
+     gcc                |                                                [] |
+     gettext-examples   | []           []     []       [] []    [] []    [] |
+     gettext-runtime    | []  []       []     []       [] []    [] []    [] |
+     gettext-tools      |              []              [] []    [] []    [] |
+     gip                | []           []                 []    []       [] |
+     gjay               |                                                   |
+     gliv               | []           []         []   [] []    []          |
+     glunarclock        | []                      []   []       []       [] |
+     gnubiff            | []                           ()                   |
+     gnucash            | []           ()         ()      ()                |
+     gnuedu             | []                                                |
+     gnulib             | []           []                 []       []       |
+     gnunet             |                                                   |
+     gnunet-gtk         |                                                   |
+     gnutls             | []           []                                   |
+     gold               |                                                   |
+     gpe-aerial         | []                  []  []   [] []       []    [] |
+     gpe-beam           | []                  []  []   [] []       []    [] |
+     gpe-bluetooth      | []                      []                        |
+     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               | []           []                 []    []          |
+     grub               | []           []                 []                |
+     gsasl              | []           []                       []       [] |
+     gss                |              []              []       []          |
+     gst-plugins-bad    | []           []         []      []    []    []    |
+     gst-plugins-base   | []           []         []      []    []          |
+     gst-plugins-good   | []           []         []      []    []          |
+     gst-plugins-ugly   | []           []         []      []    [] []       |
+     gstreamer          | []           []         []      []    []          |
+     gtick              | []                              []    []          |
+     gtkam              | []        [] []         []      []    []          |
+     gtkorphan          | []                                                |
+     gtkspell           | []           []     []  []   [] []    [] [] [] [] |
+     gutenprint         | []                              []                |
+     hello              | []           []                       [] []       |
+     help2man           |              []                 []                |
+     hylafax            | []                                                |
+     idutils            | []           []         []   [] []                |
+     indent             | []           []         []   [] []    []       [] |
+     iso_15924          | []           []                 []       []       |
+     iso_3166           | []  [] [] [] []     ()  []   [] [] [] [] [] [] [] |
+     iso_3166_2         | []           []                          []       |
+     iso_4217           | []  []       []     []          [] []    []    [] |
+     iso_639            | []     [] [] []                 [] [] [] []    [] |
+     iso_639_3          |        [] []                                      |
+     jwhois             | []           []         []   []                   |
+     kbd                | []           []              []                   |
+     keytouch           | []           []                       []          |
+     keytouch-editor    | []           []                       []          |
+     keytouch-keyboa... | []           []                       []          |
+     klavaro            | []                      []                        |
+     latrine            |              []                 []                |
+     ld                 |                                                   |
+     leafpad            | []  []       []     []  []      []    [] []    [] |
+     libc               | []           []                 []    []          |
+     libexif            | []           []         ()            []          |
+     libextractor       |                                                   |
+     libgnutls          | []           []                                   |
+     libgpewidget       | []           []                          []       |
+     libgpg-error       |              []              []                   |
+     libgphoto2         | []           []                                   |
+     libgphoto2_port    | []           []         []      []    []          |
+     libgsasl           | []           []              []       []       [] |
+     libiconv           | []           []                       [] []    [] |
+     libidn             | []           []                                   |
+     lifelines          | []           []                                   |
+     liferea            | []           []     []  []   [] ()    ()    []    |
+     lilypond           | []                                                |
+     linkdr             | []                  []          []                |
+     lordsawar          |                                                   |
+     lprng              |              []                                   |
+     lynx               | []                      []      []                |
+     m4                 | []           []         []   [] []                |
+     mailfromd          |              []                                   |
+     mailutils          |              []                                   |
+     make               | []           []         []      []                |
+     man-db             | []           []                 []                |
+     man-db-manpages    | []           []                 []                |
+     minicom            |              []         []   [] []                |
+     mkisofs            | []           []                 []                |
+     myserver           |                                                   |
+     nano               | []           []         []      []                |
+     opcodes            | []                           []                   |
+     parted             | []           []                 []    []          |
+     pies               |              []                                   |
+     popt               | []           []     []          []                |
+     psmisc             | []           []                 []                |
+     pspp               | []                      []                        |
+     pwdutils           |              []                                   |
+     radius             | []           []                 []                |
+     recode             | []           []     []  []   [] []    [] []       |
+     rosegarden         |              ()                 ()                |
+     rpm                | []           []     []                            |
+     rush               | []           []                                   |
+     sarg               |                                                   |
+     screem             |                                                   |
+     scrollkeeper       | []  []       []              [] []    []    [] [] |
+     sed                | []           []     []  []   [] []    [] []    [] |
+     sharutils          | []           []                 []             [] |
+     shishi             |              []                                   |
+     skencil            |                     []  []                        |
+     solfege            | []           []         []      []                |
+     solfege-manual     | []           []         []                        |
+     soundtracker       |                                       []          |
+     sp                 |                                                   |
+     sysstat            | []           []         []      []                |
+     tar                | []           []                 []       []       |
+     texinfo            | []           []              [] []                |
+     tin                |                                 []                |
+     unicode-han-tra... |                                                   |
+     unicode-transla... |                                                   |
+     util-linux-ng      | []           []         []      []       []       |
+     vice               | []                                                |
+     vmm                | []                                                |
+     vorbis-tools       | []           []                                   |
+     wastesedge         | []                                                |
+     wdiff              | []           []                                   |
+     wget               | []           []     []  []      []    [] []       |
+     wyslij-po          | []  []       []                                   |
+     xchat              | []        [] []     []          []    [] [] [] [] |
+     xdg-user-dirs      | []  [] [] [] []  [] []  []   [] []    [] [] [] [] |
+     xkeyboard-config   | []           []                 []                |
+                        +---------------------------------------------------+
+                          nl  nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr
+                          135 10  4  7 105  1 29  62   47 91  3 54 46  9 37
+
+                          sv  sw ta te tg th tr uk vi  wa zh_CN zh_HK zh_TW
+                        +---------------------------------------------------+
+     a2ps               | []              [] [] [] []                       | 27
+     aegis              |                          []                       |  9
+     ant-phone          | []                 []    []      []               |  9
+     anubis             | []                 [] [] []                       | 15
+     aspell             |                       [] []  []                   | 20
+     bash               | []                    [] []                       | 12
+     bfd                |                          []                       |  6
+     bibshelf           | []                       []      []               | 16
+     binutils           |                       [] []                       |  8
+     bison              | []                       []                       | 12
+     bison-runtime      | []              []    [] []      []          []   | 29
+     bluez-pin          | []              [] [] [] []  []  []          []   | 37
+     bombono-dvd        |                          []                       |  4
+     buzztard           |                          []                       |  7
+     cflow              |                       [] []      []               |  9
+     clisp              |                                                   | 10
+     coreutils          | []                    [] []      []               | 22
+     cpio               | []                 [] [] []      []          []   | 13
+     cppi               |                       [] []                       |  5
+     cpplib             | []                 [] [] []      []          []   | 14
+     cryptsetup         | []                       []                       |  7
+     dfarc              |                          []                       |  9
+     dialog             | []  []          []       []  []  []          []   | 30
+     dico               |                       []                          |  2
+     diffutils          | []                 [] [] []      []          []   | 30
+     dink               |                                                   |  4
+     doodle             | []                       []                       |  7
+     e2fsprogs          | []                 []    []                       | 11
+     enscript           | []                 [] [] []                       | 17
+     exif               | []                       []      []               | 16
+     fetchmail          |                    []    []      []               | 17
+     findutils          | []                 [] [] []      []               | 20
+     flex               | []                 []    []                  []   | 15
+     freedink           |                          []                       | 10
+     gas                |                    []                             |  4
+     gawk               | []                 []    []      []               | 18
+     gcal               | []                 []                             |  5
+     gcc                | []                 []            []               |  7
+     gettext-examples   | []                 [] [] []      []    []    []   | 34
+     gettext-runtime    | []                 [] [] []      []    []    []   | 29
+     gettext-tools      | []                 [] [] []      []          []   | 22
+     gip                | []                       []      []          []   | 22
+     gjay               |                          []                       |  3
+     gliv               | []                 []    []                       | 14
+     glunarclock        | []                       []  []  []          []   | 19
+     gnubiff            | []                       []                       |  4
+     gnucash            |                    () [] ()      []          ()   | 10
+     gnuedu             |                          []                  []   |  7
+     gnulib             | []                    [] []      []               | 16
+     gnunet             |                          []                       |  1
+     gnunet-gtk         | []                 []    []                       |  5
+     gnutls             | []                       []      []               | 10
+     gold               |                          []                       |  4
+     gpe-aerial         | []                       []      []               | 18
+     gpe-beam           | []                       []      []               | 19
+     gpe-bluetooth      | []                       []      []               | 13
+     gpe-calendar       | []                       []  []  []               | 12
+     gpe-clock          | []                 []    []  []  []               | 28
+     gpe-conf           | []                       []  []  []               | 20
+     gpe-contacts       | []                       []      []               | 17
+     gpe-edit           | []                       []      []               | 12
+     gpe-filemanager    | []                       []  []  []               | 16
+     gpe-go             | []                 []    []  []  []               | 25
+     gpe-login          | []                       []      []               | 11
+     gpe-ownerinfo      | []                 []    []      []          []   | 25
+     gpe-package        | []                       []      []               | 13
+     gpe-sketchbook     | []                       []      []               | 20
+     gpe-su             | []                 []    []  []  []               | 30
+     gpe-taskmanager    | []                 []    []  []  []               | 29
+     gpe-timesheet      | []                 []    []      []          []   | 25
+     gpe-today          | []                 []    []  []  []          []   | 30
+     gpe-todo           | []                       []  []  []               | 17
+     gphoto2            | []                    [] []      []          []   | 24
+     gprof              | []                 []    []                       | 15
+     gpsdrive           | []                       []      []               | 11
+     gramadoir          | []                       []      []               | 11
+     grep               |                 []       []      []               | 10
+     grub               | []                       []      []               | 14
+     gsasl              | []                       []      []          []   | 14
+     gss                | []                       []      []               | 11
+     gst-plugins-bad    | []                 []    []      []               | 26
+     gst-plugins-base   | []                 [] [] []      []               | 24
+     gst-plugins-good   | []                 []    []      []               | 24
+     gst-plugins-ugly   | []                 [] [] []      []               | 29
+     gstreamer          | []                    [] []      []               | 22
+     gtick              |                       [] []      []               | 13
+     gtkam              | []                       []      []               | 20
+     gtkorphan          | []                       []      []               | 14
+     gtkspell           | []              [] [] [] []  []  []    []    []   | 45
+     gutenprint         | []                                                | 10
+     hello              | []              [] []    []      []          []   | 21
+     help2man           | []                       []                       |  7
+     hylafax            |                          []                       |  5
+     idutils            | []                 []    []      []               | 17
+     indent             | []                 [] [] []      []          []   | 30
+     iso_15924          |                 ()    [] ()      []          []   | 16
+     iso_3166           | []        []    () [] [] ()  []  []    []    ()   | 53
+     iso_3166_2         |                 ()    [] ()      []               |  9
+     iso_4217           | []              () [] [] ()      []    []         | 26
+     iso_639            | []     [] []    ()    [] ()  []  []    []    []   | 38
+     iso_639_3          |        []                ()                       |  8
+     jwhois             | []                 []    []      []          []   | 16
+     kbd                | []                 [] [] []      []               | 15
+     keytouch           | []                       []      []               | 16
+     keytouch-editor    | []                       []      []               | 14
+     keytouch-keyboa... | []                       []      []               | 14
+     klavaro            |                          []                       | 11
+     latrine            |                    []    []      []               | 10
+     ld                 | []                 []    []                  []   | 11
+     leafpad            | []                 [] [] []      []          []   | 33
+     libc               | []                 []    []      []          []   | 21
+     libexif            |                          []      ()               |  7
+     libextractor       |                          []                       |  1
+     libgnutls          | []                       []      []               |  9
+     libgpewidget       | []                       []      []               | 14
+     libgpg-error       | []                       []      []               |  9
+     libgphoto2         |                       [] []                       |  8
+     libgphoto2_port    | []                    [] []                  []   | 14
+     libgsasl           | []                       []      []               | 13
+     libiconv           | []                       []  []  []               | 21
+     libidn             | ()                       []      []               | 11
+     lifelines          | []                                                |  4
+     liferea            | []                 []            []               | 21
+     lilypond           |                          []                       |  7
+     linkdr             | []                 []    []      []          []   | 17
+     lordsawar          |                                                   |  1
+     lprng              |                          []                       |  3
+     lynx               | []                 [] [] []                       | 17
+     m4                 | []                       []      []          []   | 19
+     mailfromd          |                       [] []                       |  3
+     mailutils          |                          []                       |  5
+     make               | []                 []    []      []               | 21
+     man-db             | []                       []      []               |  8
+     man-db-manpages    |                                                   |  4
+     minicom            | []                       []                       | 16
+     mkisofs            |                          []      []               |  9
+     myserver           |                                                   |  0
+     nano               | []                       []      []          []   | 21
+     opcodes            | []                 []    []                       | 11
+     parted             | []                 [] [] []                  []   | 15
+     pies               |                       [] []                       |  3
+     popt               | []              [] []    []      []          []   | 27
+     psmisc             | []                       []                       | 11
+     pspp               |                                                   |  4
+     pwdutils           | []                       []                       |  6
+     radius             |                       [] []                       |  9
+     recode             | []                 []    []      []               | 28
+     rosegarden         | ()                                                |  0
+     rpm                | []                       []                  []   | 11
+     rush               |                       [] []                       |  4
+     sarg               |                                                   |  1
+     screem             |                          []                       |  3
+     scrollkeeper       | []                 [] [] []                  []   | 27
+     sed                | []                 []    []      []          []   | 30
+     sharutils          | []                 []    []      []          []   | 22
+     shishi             |                          []                       |  3
+     skencil            | []                       []                       |  7
+     solfege            | []                 []    []      []               | 16
+     solfege-manual     |                    []                             |  8
+     soundtracker       | []                 []    []                       |  9
+     sp                 |                    []                             |  3
+     sysstat            |                          []      []               | 15
+     tar                | []                 [] [] []      []          []   | 23
+     texinfo            | []                 [] [] []      []               | 17
+     tin                |                                                   |  4
+     unicode-han-tra... |                                                   |  0
+     unicode-transla... |                                                   |  2
+     util-linux-ng      | []                 [] [] []                       | 20
+     vice               | ()                 ()                             |  1
+     vmm                |                          []                       |  4
+     vorbis-tools       |                          []                       |  6
+     wastesedge         |                                                   |  2
+     wdiff              | []                       []                       |  7
+     wget               | []                 []    []      []          []   | 26
+     wyslij-po          |                       [] []                       |  8
+     xchat              | []              []    [] []      []          []   | 36
+     xdg-user-dirs      | []     [] []    [] [] [] []      []    []    []   | 63
+     xkeyboard-config   | []                    [] []                       | 22
+                        +---------------------------------------------------+
+       85 teams           sv  sw ta te tg th tr uk vi  wa zh_CN zh_HK zh_TW
+      178 domains         119  1  3  3  0 10 65 51 155 17  98     7    41    2618
+
+   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
+used for implementing regional variants of languages, or language
+dialects.
+
+   For a PO file in the matrix above to be effective, the package to
+which it applies should also have been internationalized and
+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 June 2010 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://translationproject.org/extra/matrix.html'.
+
+1.5 Using `gettext' in new packages
+===================================
+
+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
+in particular that even non-free programs can use `libintl' as a shared
+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
+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
+`coordinator@translationproject.org' to make the `.pot' files available
+to the translation teams.
+
diff --git a/AUTHORS b/AUTHORS
index 53a0ba3..8e041b1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,10 +2,6 @@ Authors of the SANE standard:
 
  Andreas Beck and David Mosberger
 
-Java API:
-
- Jeff Freedman
-
 Backends:
 
  abaton:        David Huggins-Daines
@@ -14,132 +10,136 @@ Backends:
  artec:         Chris Pinkham
  artec_eplus48u:Sergey Vlasov, Andreas Nowack, David Stevenson, and
                 Michael Herder
- as6e:          Eugene S. Weiss (*)
- avision:       Meino Christian Cramer, Rene Rebe (*)
+ as6e:          Eugene S. Weiss
+ avision:       Meino Christian Cramer, René Rebe (*)
  bh:            Tom Martone
  canon:         Helmut Koeberle, Manuel Panea, and Markus Mertinat
                 Mitsuru Okaniwa, Ulrich Deiters (*)
- canon630u:     Nathan Rutman (*)
+ canon630u:     Nathan Rutman
  canon_dr:      m. allan noah (*)
- canon_pp:      Matthew Duggan (*), Simon Krix
- coolscan:      Didier Carlier, Andreas Rick
+ canon_pp:      Matthew Duggan, Simon Krix
  cardscan:      m. allan noah (*)
- coolscan2:     Andras Major (*)
- coolscan3:     Alessandro Zummo (*)
- dc25:          Peter Fales (*)
+ coolscan:      Didier Carlier, Andreas Rick
+ coolscan2:     Andras Major
+ coolscan3:     Alessandro Zummo
+ dc25:          Peter Fales
  dc210:         Brian J. Murrell
- dc240:         Peter Fales (*)
- dell1600n_net: Jon Chambers (*)
+ dc240:         Peter Fales
+ dell1600n_net: Jon Chambers
  dll:           David Mosberger
  dmc:           David F. Skoll
  epjitsu:       m. allan noah (*)
- epson:         Karl Heinz Kremer (*)
- epson2:        Alessandro Zummo (*)
- epsonds:       Alessandro Zummo (*)
- fujitsu:       Randolph Bentson, Frederik Ramm, Oliver Schirrmeister (*), 
+ epson:         Karl Heinz Kremer
+ epson2:        Alessandro Zummo
+ epsonds:       Alessandro Zummo
+ fujitsu:       Randolph Bentson, Frederik Ramm, Oliver Schirrmeister,
                 m. allan noah (*)
- gphoto2:       Peter Fales (*)
- genesys:	Henning Geinitz (*), Gerhard Jaeger (*), Stéphane Voltz (*),
-                Pierre Willenbrock (*)
+ genesys:       Henning Geinitz, Gerhard Jaeger (*), Stéphane Voltz,
+                Pierre Willenbrock
+ gphoto2:       Peter Fales
  gt68xx:        Sergey Vlasov, Andreas Nowack, David Stevenson, and
-                Henning Geinitz (*)
+                Henning Geinitz
  hp:            Peter Kirchgessner (*)
                 Geoffrey Dairiki
- hpsj5s:        Max Vorobiev
  hp3500:        Troy Rollo (*)
- hp3900:        Jonathan Bravo Lopez (*)
+ hp3900:        Jonathan Bravo Lopez
  hp4200:        Adrian Perez Jorge, Andrew John Lewis, Arnar Mar Hrafnkelsson,
-                Frank Zago, Henning Geinitz (*)
- hp5400:        Martijn van Oosterhout, Thomas Soumarmon (*)
+                Frank Zago, Henning Geinitz
+ hp5400:        Martijn van Oosterhout, Thomas Soumarmon
  hp5590:        Ilia Sotnikov (*)
  hpljm1005:     Philippe Rétornaz
- hs2p:		Jeremy Johnson
- ibm:           M.F., Henning Geinitz (*)
+ hpsj5s:        Max Vorobiev
+ hs2p:		Jeremy Johnson (*)
+ ibm:           M.F., Henning Geinitz
  kodak:         m. allan noah (*)
- kodakaio:	Paul Newall
+ kodakaio:	Paul Newall (*)
  kvs1025:       Tao Zhang, m. allan noah (*)
  kvs20xx:       unknown, m. allan noah (*)
  kvs40xx:       unknown, m. allan noah (*)
- leo:           Frank Zago (*)
- lexmark:       Fred Odendaal, Stéphane Voltz (*)
- ma1509:        Henning Geinitz (*)
- magicolor:     Reinhold Kainhofer (based on epson2 backend)
- matsushita:    Frank Zago (*)
- microtek:      Matthew Marjanovic (*)
+ leo:           Frank Zago
+ lexmark:       Fred Odendaal, Stéphane Voltz
+ ma1509:        Henning Geinitz
+ magicolor:     Reinhold Kainhofer(based on epson2 backend)
+ matsushita:    Frank Zago
+ microtek:      Matthew Marjanovic
  microtek2:     Bernd Schroeder, Karsten Festag
  mustek:        Andreas Bolsch, David Mosberger, Andreas Czechanowski,
-                Henning Geinitz (*), and James Perry.
- mustek_pp:     Jochen Eisinger (*), Eddy De Greef (*)
- mustek_usb:    Tom Wang and Henning Geinitz (*)
- mustek_usb2:   Roy Zhou, Jack Xu, Vinci Cen, and Henning Geinitz (*)
- nec:           Kazuya Fukuda (*)
- net:           Andreas Beck, David Mosberger, Julien Blache (*)
- niash:         Ullrich Sigwanz (*), Bertrik Sikken
- p5:		Stéphane Voltz (*)
- pie:           Simon Munton (*)
- pieusb:        Jan Vleeshouwers, Michael Rickmann, Klaus Kämpf
+                Henning Geinitz, and James Perry.
+ mustek_pp:     Jochen Eisinger, Eddy De Greef
+ mustek_usb:    Tom Wang and Henning Geinitz
+ mustek_usb2:   Roy Zhou, Jack Xu, Vinci Cen, and Henning Geinitz
+ nec:           Kazuya Fukuda
+ net:           Andreas Beck, David Mosberger, Julien Blache
+ niash:         Ullrich Sigwanz, Bertrik Sikken
+ p5:		Stéphane Voltz
+ pie:           Simon Munton
+ pieusb:        Jan Vleeshouwers, Michael Rickmann, Klaus Kämpf
  pint:          Gordon Matzigkeit
- pixma:         Wittawat Yamwong (*)
-                Nicolas Martin (*)
+ pixma:         Wittawat Yamwong
+                Nicolas Martin
                 Louis Lagendijk (*)
                 Dennis Lou
                 Rolf Bensch (*)
  plustek:       Gerhard Jaeger (*)
  plustek_pp:    Rick Bronson (former pp driver-code), Gerhard Jaeger (*)
  pnm:           Andreas Beck, Gordon Matzigkeit, David Mosberger, Michael
-                Herder, and Henning Geinitz (*)
+                Herder, and Henning Geinitz
  qcam:          Scott Laird (original driver), David Mosberger (SANE backend),
                 despeckling filter by Patrick Reynolds, 
                 B&W fixes by Andrew Kuchling
  ricoh:         Feico W. Dillema
- rts8891:       Stéphane Voltz (*)
+ rts8891:       Stéphane Voltz
  s9036:         Ingo Schneider
- sceptre:       Frank Zago (*)
- sharp:         Kazuya Fukuda (*) and Abel Deuring (*)
- sm3600:        Marian Eichholz (*) and Glenn Ramsey
- sm3840:        Earle F. Philhower III (*)
+ sceptre:       Frank Zago
+ sharp:         Kazuya Fukuda and Abel Deuring
+ sm3600:        Marian Eichholz and Glenn Ramsey
+ sm3840:        Earle F. Philhower III
  snapscan:      Kevin Charter, Franck Schneider, Michel Roelofs, Sebastien
                 Sable, Henrik Johansson, Chris Bagwell, and Oliver Schwartz (*)
  sp15c:         Randolph Bentson
  st400:         Ingo Wilken
- stv680:        Gerard Klaver (*)
+ stv680:        Gerard Klaver
  tamarack:      Rogier Wolff
- teco1:         Frank Zago (*)
- teco2:         Frank Zago, Gerard Klaver (*)
- teco3:         Frank Zago (*)
- test:          Henning Geinitz (*)
+ teco1:         Frank Zago
+ teco2:         Frank Zago, Gerard Klaver
+ teco3:         Frank Zago
+ test:          Henning Geinitz
  u12:           Gerhard Jaeger (*)
- umax:          Oliver Rauch (*) and Michael K. Johnson
- umax_pp:       Stéphane Voltz (*)
+ umax:          Oliver Rauch and Michael K. Johnson
  umax1220u:     Marcio L. Teixeira, Patrick Lessard
- v4l:           Juergen G. Schimmer, and Henning Geinitz (*)
+ umax_pp:       Stéphane Voltz
+ v4l:           Juergen G. Schimmer, and Henning Geinitz
  xerox_mfp:     Alex Belkin (*)
 
 Frontends:
 
  jscanimage:    Jeff Freedman and Guido Muesch
- saned:         Andreas Beck, David Mosberger, Julien Blache (*)
+ saned:         Andreas Beck, David Mosberger, Julien Blache
  scanimage:     Andreas Beck, David Mosberger, Gordon Matzigkeit,
-                m. allan noah (*), Julien Blache (*), Stéphane Voltz (*)
- tstbackend:    Frank Zago (*)
+                m. allan noah (*), Julien Blache, Stéphane Voltz
+ tstbackend:    Frank Zago
 
 Sanei internal code:
 
   Adrian Perez Jorge, Andreas Beck, Andreas Czechanowski, Christian Bucher,
-  David Mosberger-Tang, Frank Zago (*), Henning Geinitz (*),
-  Jeff Freedman, Jochen Eisinger (*), Marcio Teixeira, Yuri Dario,
+  David Mosberger-Tang, Frank Zago, Henning Geinitz,
+  Jeff Freedman, Jochen Eisinger, Marcio Teixeira, Yuri Dario,
   Gerhard Jaeger (*), m. allan noah (*)
 
+Java API:
+
+ Jeff Freedman
+
 Miscellaneous coding:
 
-  Julien Blache (*), Mattias Ellert (*), Petter Reinholdtsen (*),
-  Chris Bagwell (*)
+  Julien Blache, Mattias Ellert, Petter Reinholdtsen,
+  Chris Bagwell, Olaf Meeuwissen (*)
 
 Translators:
 
   Giuseppe Sacco (*)
 
-(*) Maintainer with CVS write access
+(*) Maintainer with Git repository write access
 
 
 Please also read the file PROJECTS for projects that are planned or
@@ -204,7 +204,7 @@ Karsten Festag <karsten.festag@gmx.de>
 Kazuhiro Sasayama <kaz@hypercore.co.jp>
 Kazuya Fukuda <kaafuu@mug.biglobe.ne.jp>
 Kevin Charter <charter@cs.rice.edu>
-Klaus Kämpf <kkaempf@suse.com>
+Klaus Kämpf <kkaempf@suse.com>
 Louis Lagendijk <llagendijk-guest at users.alioth.debian.org>
 M.F. <massifr@tiscalinet.it>
 Manuel Panea <Manuel.Panea@rzg.mpg.de>
@@ -225,6 +225,7 @@ Milon Firikis <milonf@ariadne-t.gr>
 Mitsuru Okaniwa <m-okaniwa@bea.hi-ho.ne.jp>
 Nathan Rutman <nathan@gordian.com>
 Nicolas Martin <nicols-guest at users.alioth.debian.org>
+Olaf Meeuwissen <paddy-hack@member.fsf.org>
 Oliver Rauch <Oliver.Rauch@Rauch-domain.de>
 Oliver Schirrmeister <oschirr@abm.de>
 Oliver Schwartz <oliverschwartz@users.sourceforge.net>
diff --git a/ChangeLog b/ChangeLog
index 06efddb..5197a3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,507 +1,4111 @@
-******  Release of sane-backends 1.0.25. End of code freeze ******
-
-2015-09-30 Rolf Bensch <rolf at bensch hyphen online dot de>
-    * doc/descriptions/pixma.desc, doc/sane-pixma.man:
-      Canon PIXMA MG5600 Series is working, reported by Gavin Falconer.
-
-2015-09-26 Rolf Bensch <rolf at bensch hyphen online dot de>
-    * backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.23
-
-2015-06-22 Louis Lagendijk <louis dot lagendijk at gmail dot com>
-	* doc/saned.man: updated to clarify systemd integration and 
-	configuration for thecase where saned is compiled with  systemd
-	glue.
-
-2015-09-18 Rolf Bensch <rolf at bensch hyphen online dot de>
-    * backend/pixma_imageclass.c: for all adf scanners restrict maximum page
-      height at flatbed scans
-
-2015-09-16 Stéphane Voltz <stef.dev@free.fr>
-	* backend/niash.c: merged pu/protect-niash-option-access-315132 and
-	ifdef'ed unused code
-
-2015-09-16 Stéphane Voltz <stef.dev@free.fr>
-	* backend/pieusb.c: include sane/config.h first
-
-2015-09-14 Stéphane Voltz <stef.dev@free.fr>
-	* backend/bh.c: replace mktemp by mkstemp #300134
-
-2015-09-13 Paul Newall <p dot newalls at ntlworld dot com>
-	* backend/kodakaio.c:
-	redundant variable bitposn and redundant function kodakaio_rxflush
-	commented out.
-
-2015-09-09 Stéphane Voltz <stef.dev@free.fr>
-	* doc/sane-genesys.man, doc/descriptions/genesys.desc: No LiDE 120
-	support.
-
-2015-09-08 m. allan noah <kitno455 at gmail dot com>
-	* backend/artec_eplus48u.c: fix HOME env bug #315071 (from Jörg Frings-Fürst)
-
-2015-09-03 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_mp810.c: Canon Pixma MP990 needs specific reordering pixels
-	  for 4800 dpi, patch from Guillaume Courtois.
-	* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.22
-
-2015-08-20 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* README.linux: add mandatory and optional development environment to
-	  install description
-	* frontend/scanimage.c: remove atexit() function. In some cases atexit()
-	  doesn't work with libusb-compat.
-
-2015-08-10 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_io_sanei.c: EOF is a bjnp timeout error.
-	* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.21
-
-2015-08-10 Stéphane Voltz <stef.dev@free.fr>
-	* backend/abaton.c, backend/agfafocus.c, backend/apple.c,
-	backend/bh.c, backend/coolscan.c, backend/dmc.c, backend/ricoh.c,
-	backend/s9036.c, backend/sp15c.[ch], backend/tamarack.c:
-	fix for memleak in sane_get_devices (bugs #300132 #300131 #300130 #300129
-	#300127 #300126 #300124 #300122 #300121 #300120)
-
-2015-08-10 Klaus Kämpf <kkaempf@suse.com>
-	* backend/pieusb.c, doc/descriptions/pieusb.desc, doc/sane-pieusb.man,
-          backend/pieusb_buffer.c, backend/pieusb_scancmd.c, backend/pieusb_specific.c,
-          backend/pieusb_usb.c:
-	  New scanners PIE PowerSlide 3600,3650,4000,5000 / Reflecta DigitDia 3600,
-          4000, 5000, 6000; ProScan 7200; CrystalScan 7200. These scanners need
-          further testing.
-
-2015-08-08 Stéphane Voltz <stef.dev@free.fr>
-	* backend/test.c: fix memleaks (#313553)
-	* configure.in, configure: don not harcode -I/usr/local/include
-	(#315060)
-
-	open/close tests.
-2015-08-07 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* README.linux: update development packages list. OpenSuse needs
-	  libusb-compat-devel. Sane doesn't support libusb 1.0.
-	* backend/pixma_io_sanei.c: EOF isn't an usb timeout error; this fixes usb
-	  communication problems, e.g. with OpenSuse.
-	* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.20
-
-2015-08-06 Stéphane Voltz <stef.dev@free.fr>
-	*  backend/genesys_devices.c, backend/genesys_gl841.c, backend/genesys_low.c:
-	fix GPIO setup for LiDE 33/40/50, add more usleep() for GL847
-	scanning issues. Some GL841 LEDADD improvements.
-
-2015-07-31 Stéphane Voltz <stef.dev@free.fr>
-	* frontend/tstbackend.c: add an option to do tests scans during
-	open/close tests.
-	* backend/genesys.c, backend/genesys_low.c: fixes for
-	- #315104
-	- #315105
-	And a timing issue on USB3 hardware debugged and tracked by John S.
-	Weber <jweber53@gmail.com>
-
-2015-07-29 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	  New scanner Canon PIXMA MG3600 Series. This scanner needs further testing.
-	* backend/pixma_mp150.c: Canon PIXMA MG7500 Series doesn't need special
-	  image format post processing.
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	  Canon PIXMA MG7500 Series is working, reported by Jonathan Anderson.
-	* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.19
-
-2015-07-24 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	  Canon PIXMA MX470 Series is working, bug #314894.
-
-2015-06-27 Louis Lagendijk <louis dot lagendijk at gmail dot com>
-	* backend/pixma_bjnp.c: added missing return in case of no error
-
-2015-06-27 Louis Lagendijk <louis dot lagendijk at gmail dot com>
-	* backend/pixma_bjnp.c Added backend version in bjnp debug output
-
-2015-06-11 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_gl124.h: LiDE 120 support
-	improvement.
-
-2015-05-18 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_imageclass.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	  New scanner Canon i-SENSYS MF8300 Series, reported by Florian Nierhaus.
-	* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.18
-
-2015-04-12 Stéphane Voltz <stef.dev@free.fr>
-	* doc/sane-genesys.man backend/genesys.[ch] backend/genesys_low.c:
-	fix calibration cleared when calibration file loaded,
-	add expiration time option for cache.
-
-2015-04-07 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_mp810.c: Canon Pixma MP990 TPU scan patch from Guillaume
-	  Courtois.
-	* doc/descriptions/pixma.desc: remove unmaintained websites
-	* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.17
-
-2015-04-03 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_imageclass.c, doc/descriptions/pixma.desc,
-	  doc/sane-pixma.man: New Canon scanners i-SENSYS MF210 Series, MF220 Series,
-	  MF5900 Series, MF6100 Series and imageCLASS MF810/820. All scanners need
-	  further testing.
-	* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.16
-	* backend/pixma.[ch], backend/pixma_common.[ch], backend/pixma_imageclass.c,
-	  backend/pixma_io_sanei.c, backend/pixma_mp150.c, backend/pixma_mp7[35]0.c,
-	  backend/pixma_mp810.c: update copyright.
-
-2015-03-17 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c, backend/genesys.conf.in,
-	backend/genesys_devices.c, backend/genesys_gl124.c,
-	backend/genesys_gl124.h, backend/genesys_low.h,
-	doc/descriptions/genesys.desc, doc/sane-genesys.man: add support for
-	Canon LiDE 120
-
-2015-03-14 René Rebe <rene@exactcode.de>
-	* backend/avision.h backend/avision.c:
-	fixed 32-bit build regression due new feature_type and
-	reverted 4d38523bdacd18186857ee8a93daaa0f8721c89b
-
-2015-03-13 René Rebe <rene@exactcode.de>
-	* doc/sane-avision.man, backend/avision.h, backend/avision.c:
-	fixed newer avision scanner duplex scanning, and removed unnecessary
-	feature_type2 clutter by using a uint64_t to share all bits
-
-2015-03-12 René Rebe <rene@exactcode.de>
-	* doc/descriptions/avision.desc, backend/avision.c:
-	fixed multiple regressions (range initilaizer, clobbering
-	paper-length window bits, ...) introduced over the past years, added
-	support for newer ASIC gamma table size, added AV220D2+ ID
-2015-03-04 Stéphane Voltz <stef.dev@free.fr>
-	* doc/descriptions/genesys.desc: mark LiDE 120 as unsupported.
-
-2015-03-02 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_low.c, backend/genesys_gl124.[ch]:
-	improve parking reliability for LiDE 210
-
-2015-03-01 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_devices.c, backend/genesys_gl124.c:
-	final tuning for Canon LiDE 220
-
-2015-02-26 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c, backend/genesys.conf.in,
-	backend/genesys_devices.c, backend/genesys_gl124.c,
-	backend/genesys_gl124.h, backend/genesys_low.h,
-	doc/descriptions/genesys.desc, doc/sane-genesys.man: add support for
-	Canon LiDE 220
-
-2015-02-21 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_mp150.c: Canon PIXMA MG6400 Series doesn't need special
-	  image format post processing.
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	  Canon PIXMA MG6400 Series is working, reported by Christian Spielberger.
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	  New scanners Canon PIXMA MX490 Series and E480 Series. All scanners need
-	  further testing.
-	* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.15
-
-2015-02-09 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* doc/descriptions/pixma.desc: Canon PIXMA MX920 Series supports Ethernet
-	  and WiFi interfaces.
-
-2015-02-06 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	  Canon PIXMA MG2500 Series is working, reported by Brenda Ruch.
-
-2015-01-20 Ilia Sotnikov <hostcc at gmail dot com>
-	* backend/hp5590.c:
-	Invert pixels in case of TMA Negatives source has been selected.
-	Thanks for Will Kranz who reported this.
-
-2015-01-17 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	  Canon PIXMA MG2200 Series is working (bug #314944).
-
-2014-12-31 Paul Newall <p dot newalls at ntlworld dot com>
-	* backend/kodakaio.c:
-	connection to device moved from sane_open to sane_start
-	disconnection move from sane_close to sane_cancel
-	in order to fix bug where scanner disconnected after 30s idle.
-
-2014-12-19 Paul Newall <p dot newalls at ntlworld dot com>
-	* backend/kodakaio.c:
-	param.depth corrected for lineart mode, was 8 now 1
-	sequence of modes changed to make the color mode the default.
-
-2014-12-16 m. allan noah <kitno455 at gmail dot com>
-	* sanei/sanei_usb.c: add calls to sanei_usb_set_altinterface in
-	sanei_usb_close and sanei_usb_clear_halt- hopefully work around
-	USB3/xhci problems in Linux.
-
-2014-11-18 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_imageclass.c:
-	  - Canon i-SENSYS MF8200C and MF8500C use generation 2 protocols.
-	  - Also use has_paper() for generation 2 scanners.
-	* backend/pixma_imageclass.c, doc/descriptions/pixma.desc: Canon i-SENSYS
-	  MF8200C: ADF supports max. 300DPI.
-	* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.14
-
-2014-11-15 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/avision.c:
-	  - Remove firmware checking for HP5370c scanners. Launchpad bug #1080787,
-	    reported by Night Train.
-	  - Build version 297.
-
-2014-10-29 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	  New Canon scanners MAXIFY MB5000, MB5300, MB2000 and MB2300;
-	  PIXMA MG7500, MG6600, MG5600, MG2900 and E460. All scanners need further
-	  testing.
-	* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.13
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	  Canon PIXMA MG2900 Series is working, reported by Yannick Dirou.
-
-2014-10-27 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_mp150.c: Canon PIXMA MG3500 Series doesn't need special
-	  image post processing.
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	  Canon PIXMA MG3500 Series is working.
-	* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.12
-
-2014-10-20 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_imageclass.c, doc/descriptions/pixma.desc,
-	  doc/sane-pixma.man: New Scanner Canon imageCLASS D530.
-	* backend/pixma_mp150.c:
-	  - increase calibration timeout
-	  - calibration can finish with 0x01 or 0x02
-
-2014-09-18 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	  Canon Pixma MG5500 Series is working, bug #314819.
-
-2014-09-16 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man: Canon Pixma MG2400 Series
-	  is working, reported by Marcus Wellnitz.
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	  Canon Pixma MX530 Series is working, reported by Stephen Weston.
-	* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.11
-
-2014-09-13 Paul Newall <p dot newalls at ntlworld dot com>
-	* backend/kodakaio.c, backend/kodakaio.h:
-	* Added lineart mode with threshold option.
-
-2014-09-07 Paul Newall <p dot newalls at ntlworld dot com>
-	* backend/kodakaio.c:
-	* Fixed error where the colour compensation curves did not have enough
-	elements and this caused speckles in areas of very low or high colour.
-
-2014-08-23 Louis Lagendijk <louis dot lagendijk at gmail dot com>
-	* backend/pixma_bjnp.c:
-	* Keep TCP-connection closed untill we really need it. This avoids
-          the scanner closing the TCP-connection when idle
-	* Add an explicit error message when we detect that the scanner
-	  closed the TCP-connection
-
-2014-08-16 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_imageclass.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	New scanners Canon i-SENSYS MF8200C Series and MF8500C Series. MF8500C
-	Series need further testing.
-	* doc/sane-pixma.man: add up to now undocumented verbose debug-level
-	* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.10
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	Canon PIXMA MX720 Series scanner is working (bug #314787).
-
-2014-07-25 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	New scanners Canon Pixma E400, E560, MX470 and MX530. All scanners need
-	further testing.
-
-2014-07-14 m. allan noah <kitno455 at gmail dot com>
-	* frontend/scanimage.c: batch-print option and exit value changes
-	from Jeff Breidenbach jeff@jab.org
-
-2014-07-01 Stéphane Voltz <stef.dev@free.fr>
-	* testsuite/sanei/sanei_config_test.c: fix #314694 by exporting a
-	specific SANE_CONFIG_DIR env dir for tests
-
-2014-06-29 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_gl646.c: fix regression in coarse gain calibration
-
-2014-06-05 Tom Callaway <spot@fedoraproject.org>
-	* lib/snprintf.c: update to newer version from LPRng. The old version is
-	licensed under the Artistic License 1.0 which isn't compatible with the
-	GPL and arguably non-free.
-
-2014-06-02 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_*.[ch]: add internal ini_scan_regs_api. Add proper
-	target speed for LiDE 110/210 grey mode motor tables.
-
-2014-05-29 Paul Newall <quandry@ntlworld.com>
-	* backend/kodakaio.c: change to comment on ./configure parameters
-
-2014-05-26 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_mp150.c: fix ADF paper empty @ start scanning for Canon
-	  Pixma MP150 based ADF scanners
-	* backend/pixma_common.c: remove unused variable
-	* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.9
-
-2014-05-08 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_mp150.c: fix MG7100 image data post processing @ high
-	  resolutions > 600dpi.
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man: Canon Pixma MG7100
-	  Series scanner is working, reported by Gert Cauwenberg.
-	* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.8
-
-2014-05-13 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_gl646.[ch] backend/genesys.c backend/genesys_low.c:
-	fix bug #314663. Set gamma for gl646 devices only at scan time. Reset
-	endpoint each time before leaving.
-
-2014-05-08 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.7
-	* backend/pixma_mp150.c:
-	  - all Canon Pixma MP150 based ADF scanners support 14" legal paper size
-	  - fix ADF paper empty bug for Canon Pixma MP150 based ADF scanners
-	* doc/descriptions/pixma.desc: remove comments for Canon Pixma MP150 based
-	  ADF scanners: adf empty buggy
-	* doc/sane-pixma.man: Canon Pixma MX360 shouldn't hang anymore (@ ADF paper
-	  empty)
-
-2014-04-07 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man: Canon Pixma MX410
-	is working, reported from Javier Gorostiza.
-
-2014-03-21 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man: Canon Pixma MG3200
-	is working, reported in ubuntuforums.org/showthread.php?t=2072162.
-	* doc/descriptions/pixma.desc: rename WLAN to WiFi
-	* backend/pixma_mp150.c:
-	- Canon Pixma MX520 Series supports 14" legal paper size in ADF mode.
-	- MX520 has button support.
-	* backend/pixma_common.c: Clamp minimum image size to 16 px x 16 px. Some
-	new scanners need minimum 16 px height.
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man: Canon Pixma MX520 Series
-	is working, reported by Trygve Flathen.
-
-2014-02-28 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_imageclass.c, doc/descriptions/pixma.desc,
-	doc/sane-pixma.man: Rename Canon i-SENSYS MF4550d to Canon i-SENSYS MF4500
-	Series. This fixes ethernet problems. Patch from chrysn.
-
-2014-02-24 Stéphane Voltz <stef.dev@free.fr>
-	* doc/sane-genesys.man backend/genesys.[ch]:
-	avoid calibration file name collision in case of several identical
-	scanners
-
-2014-02-10 Louis Lagendijk <louis.lagendijk at gmail.com>
-	* backend/pixma_bjnp.c backend/pixma_bjnp.h backend/pixma_bjnp_private.h:
-	- Added support for Canon laser multi-functionals using the MFNP protocol over port 8610
-	- Improved debug-logging to be more readable
-
-2014-02-08 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_mp150.c:
-	- Canon Pixma MX510 Series supports 14" legal paper size in ADF mode.
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	- Canon Pixma MX510 Series is working, reported by sebastien_gd.
-
-2014-01-29 m. allan noah <kitno455 at gmail dot com>
-	* backend/umax-uc630.c: updates from Ondrej Zary
-
-2014-01-21 Stéphane Voltz <stef.dev@free.fr>
-	* doc/descriptions/unsupported.desc doc/descriptions/genesys.desc:
-	update status of the HP Scanjet 4850C
-
-2014-01-17 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* doc/descriptions/pixma.desc: Update specification file for
-	Canon i-SENSYS MF4800 Series:
-	- Ethernet is buggy.
-	- ADF is working.
-
-2014-01-09 Gerhard Jaeger <gerhard@gjaeger.de>
-	* tools/sane-find-scanner.c tools/check-usb-chip.c: Add LM983x usb
-	chip detection when compiled for libusb-1.0.
-
-2014-01-02 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* doc/descriptions/pixma.desc: ADF is working for Canon i-SENSYS MF4800
-	Series, reported by Yvan L. Gélinas.
-
-2014-01-02 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma.[ch], backend/pixma_common.[ch], backend/pixma_imageclass.c,
-	backend/pixma_io_sanei.c, backend/pixma_mp150.c, backend/pixma_mp7[35]0.c,
-	backend/pixma_mp810.c: update copyright.
-	* backend/pixma_imageclass.c, doc/descriptions/pixma.desc,
-	doc/sane-pixma.man: bug #314411, Canon imageCLASS MF4570dw is working.
-
-2013-12-27 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_imageclass.c, doc/descriptions/pixma.desc,
-	doc/sane-pixma.man:
-	- Canon i-SENSYS MF4800 Series has ADF and supports 14" legal paper size
-	  in ADF mode.
-	- Canon i-SENSYS MF4800 Series is working, reported by Yvan L. Gélinas.
-
-2013-12-23 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_common.c: fix usb cmd transaction timeout
-
-2013-12-23 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_devices.c backend/genesys.c backend/genesys_low.h
-	backend/genesys_gl841.[ch]: color calibration improvement for LiDE80,
-	working LEDADD for gl841 CIS scanners
-
-2013-12-16 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_imageclass.c, doc/descriptions/pixma.desc,
-	doc/sane-pixma.man:
-	- rename Canon imageCLASS MF4770n to i-SENSYS MF4700 Series
-	- rename Canon i-SENSYS MF4890dw to MF4800 Series
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	- Canon MX920 reported as working; ADF is still buggy
-	- MX920 has 14" ADF paper length
-	- MX920 has button support
-	- fix vertical stripe shifting for MX920
-	- tidy function calc_shifting()
-	* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.6
-
-2013-12-16 Stéphane Voltz <stef.dev@free.fr>
-	* doc/descriptions/genesys.desc: update LiDE 80
-	* backend/genesys_devices.c backend/genesys.c backend/genesys_low.h
-	backend/genesys_gl841.[ch]: basic support for LiDE 80
-
-2013-12-10 m. allan noah <kitno455 at gmail dot com>
-	* backend/fujitsu*: fujitsu backend v118
-	- support fi-7160, fi-7260, fi-7180 and fi-7280
-	- remove unused var from do_scsi_cmd()
-	- added more request_sense options
-	- add adv_paper_protect option
-	- enable paper protection by default
-	- increase max_x_fb for fi-6240 and fi-6230
-
-2013-12-09 m. allan noah <kitno455 at gmail dot com>
-	* backend/canon_dr*: canon_dr backend v42
-	- initial DR-G1100 support
-	- add support for paper sensors (P-215 & P-208)
-	- add initial support for card reader (P-215)
-	- removed unused var from do_scsi_cmd()
-
-2013-11-21 Stéphane Voltz <stef.dev@free.fr>
-	* testsuite/tools/Makefile.*: handle sane git version change in tests.
-
-2013-10-19 Stéphane Voltz <stef.dev@free.fr>
-	* doc/descriptions/genesys.desc doc/Descriptions/unsupported.desc:
-	update LiDE 80 and HP2400 information
-	* backend/genesys_devices.c backend/genesys.conf.in backend/genesys.c
-	backend/genesys_low.h backend/genesys_gl841.[ch]: add first element of
-	LiDE 80 support.
-
-2013-10-15 Paul Newall <quandry@ntlworld.com>
-	* configure.in: detection of cups was commented out. Avahi is now used
-	for autodetection in kodakaio so the detection of cups is no longer required.
-
-2013-10-14 Paul Newall <quandry@ntlworld.com>
-	* backend/kodakaio.c: fix bug #314301, 
-	Segfault when unexpected data returned by avahi auto discovery.
-
-2013-10-11 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_imageclass.c: Use generation variable instead of single
-	defines of scanner pid's. Now new scanners should work without extensive
-	code editing.
-	* backend/pixma_imageclass.c, doc/descriptions/pixma.desc,
-	doc/sane-pixma.man: New scanner Canon i-SENSYS MF4890dw. This scanner needs
-	further testing.
-	* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.5
-
-2013-10-02 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* README.linux: Update Installation description for 1.0.25git.
-
-2013-09-30 m. allan noah <kitno455 at gmail dot com>
-	* ChangeLog*, configure*, doc/releases.txt:
-	Various updates related to starting 1.0.25git 
-
-Older entries can be found in ChangeLog-1.0.24.
+commit 16f3060061a17cbc54f3415a7e2abc1c35f3fcd2
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Sat May 20 14:13:19 2017 +0200
+
+    pixma: i-SENSYS MF240 Series is working
+
+commit ad5fd9edc83f2c6b6e27e9a366cd8ff5e00376b8
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Fri May 19 20:24:14 2017 -0400
+
+    Updated NL translation from Martin Kho
+
+commit baf786742f0382bed3f1b58d9977229826e3df5f
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon May 15 21:37:34 2017 +0900
+
+    po/*.po: sync with source code
+
+commit 05553c679fd02648fc5b6dd3a4abf75fe67e1d27
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Sun May 14 21:34:36 2017 -0400
+
+    updated uk.po translation
+    
+    Update from Yuri Chornoivan
+
+commit 479ccaedddcb0a491b351e20cac22595196df02a
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun May 14 19:48:41 2017 +0900
+
+    autotools: Sync derived files
+    
+    This was done by running
+    
+      autoreconf --force --install
+    
+    on Debian GNU/Linux 8.8 and reverting the removal of SANE specific
+    tweaks to ltmain.sh.
+
+commit 02037adb134a2b533bb3201833444aed7bedc8f6
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun May 14 19:47:31 2017 +0900
+
+    Fix unused parameter compiler warnings in check tools
+
+commit 85b91bcd248d2a40300b9fda76bdb88853fbcd0b
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Date:   Sat May 13 18:11:40 2017 +0900
+
+    doc: fix typos, formatting and stylistic issues
+
+commit 1808a63b0091f0e5562586278b13d7ae63184f43
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Date:   Sat May 13 18:07:26 2017 +0900
+
+    Replace the startup gamma with the same from the standalone version
+    
+    Fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=629470
+
+commit 5c0812c51b6d48516acb9dd9efcfbe2b34f04a79
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Date:   Sat May 13 18:05:43 2017 +0900
+
+    genesys.conf: fix comment typo
+
+commit e21bb28e5051d8fdd64df3c4ea2625b9f45538c8
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Date:   Sat May 13 18:03:42 2017 +0900
+
+    Source code string typo fixes
+
+commit 09cf70563a1129116ab6888e944bfcb44fec8dd0
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat May 13 16:33:23 2017 +0900
+
+    configure.ac: Fix condition
+
+commit 9230e0c251f2351ce1c7b8d7fca08dc39c320925
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat May 13 13:12:06 2017 +0900
+
+    saned: Link against Avahi library
+
+commit da5ce7216cf63a454411fa781bc2ea30fa881974
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat May 13 13:09:25 2017 +0900
+
+    Add a header to dll.conf
+    
+    Document dll.conf in a header, point to the dll.d directory for external
+    backends and document the net backend w/ pointers to the manpages.
+    
+    Based on a patch by Julien BLACHE <jblache@debian.org>
+
+commit 77dcf26860b239dafb3094c863691aaef304805a
+Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
+Date:   Sat May 13 13:07:01 2017 +0900
+
+    Fix potential assert in avahi backend
+    
+    avahi_browser contains a reference to an AvahiClient, which may be
+    avahi_client.  If it does, then freeing avahi_browser references avahi_client,
+    resulting in an assert() in Avahi's linked list macro.
+    
+    Fix this by freeing avahi_browser before avahi_client.
+    See https://bugs.launchpad.net/bugs/831867
+
+commit e6711c377f266d33a3d8bc28d7a508e3c4c29c79
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Wed May 10 19:10:26 2017 +0200
+
+    remove unused entry from ChangeLog
+
+commit 0cf531e44528a541d76c3571bca72f395b7892ae
+Author: Klaus Kämpf <kkaempf@suse.de>
+Date:   Tue May 9 10:52:12 2017 +0200
+
+    Update pieusb.conf and pieusb.desc
+
+commit 135b4a3909e0fe0d14062dc009bfba8085ebf167
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Wed May 10 11:51:35 2017 +0200
+
+    pixma.desc: fix version of backend
+
+commit 5b10b0b635157cdb9766197a5f2ea7f1d24a402a
+Author: René Rebe <rebe@exactcode.de>
+Date:   Fri May 5 07:05:30 2017 +0200
+
+        epson2: fixed network transport for new scanners
+    
+        increased command buffer due memory overrun, and always read receive
+        status, even for zero length on network scanenrs, should fix #315552
+
+commit 6ffeb9097386268e425ae2390ed2835853dbd439
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat May 6 20:40:25 2017 +0900
+
+    Fix test for API specification generation
+    
+    If none of the formats can be generated but API specs are requested,
+    bomb.  The original test aimed to do so but was testing against "no",
+    a value that was never assigned.
+
+commit f3f8afb08c2098d9659757a8e7b8c212a09ddf79
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat May 6 12:24:13 2017 +0900
+
+    kvs20xx.c: don't assume sane_get_devices() has been called
+    
+    Nor that that function is called with a non-NULL argument.
+    This aligns the implementation with that of kvs40xx.c.
+    
+    Fixes 315625.
+
+commit 8995b1fc81e4378d2b5b0b6b0d354735403210ed
+Author: Martin Husemann <martin@NetBSD.org>
+Date:   Tue Mar 15 18:07:00 2016 +0900
+
+    sanei_usb: fix number of bytes read for 64bit big-endian systems
+    
+    Fixes 315337.
+
+commit b1a2c6105443c5279684f0c6827c268594aa234d
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Fri May 5 19:46:28 2017 +0200
+
+    pixma: backend version 0.17.37
+
+commit 09c467deab5ca4301ab7da37241c3fc072b94399
+Author: Klaus Kaempf <kkaempf@suse.de>
+Date:   Wed May 3 17:52:15 2017 +0200
+
+    pieusb: Support ProScan 10T and Reflecta CrystalScan 3600
+    
+    Neither of these scanner have an automated slide transport and fail on
+    respective SCSI commands.
+    
+    - Add flags parameter to control if automatic slide transport is available
+    - Reflect flags in pieusb.conf.in
+    - rename SLIDE_LAMP_ON to SLIDE_INIT
+      it fails on scanners without automatic slide transport, so it has
+      nothing to do with the lamp.
+    - run SLIDE_INIT only FLAG_SLIDE_TRANSPORT is set
+    - pieusb.conf.in: Add Reflecta CrystalScan 3600
+
+commit 801558f959a03b5042d6df288cb1fd2c87035798
+Author: Aaron Muir Hamilton <aaron@correspondwith.me>
+Date:   Mon May 1 20:15:23 2017 +0000
+
+    Write density (resolution) JFIF header information with JPEG files.
+
+commit b219bc2c73113fd9d8f7c5795bd662f03a8610ea
+Merge: f624a9f 92e5979
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu May 4 18:26:55 2017 +0900
+
+    Merge branch 'icc-profiles'
+
+commit f624a9f72527fc2896562e338f9b7c07549af0f0
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon May 1 09:39:59 2017 +0900
+
+    utsushi.desc: sync with upstream
+
+commit 0ca2fc46136dbaa30da25f4b79b67871c7e2d39b
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Wed May 3 13:52:06 2017 +0200
+
+    fix 1200 dpi scanning for MB5000 series
+
+commit ff5c11622dafe58d1025f34a3672c7a059e963a7
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Wed May 3 13:48:20 2017 +0200
+
+    Fix scanbutton detection for MB5000 series
+
+commit 6af0e32bd6bd9e2c1b2adc5cb2a0561902eef526
+Author: Paul Newall <quandry@ntlworld.com>
+Date:   Mon May 1 19:49:41 2017 +0100
+
+    kodakaio.c patched to change avahi callback variable from global to local. Bug 315705
+
+commit e0741f71e289b878f0efad6cbb56b15d73b49f4e
+Author: Paul Newall <quandry@ntlworld.com>
+Date:   Sun Apr 30 18:09:59 2017 +0100
+
+    deleted a line in configure.ac. This was a commented out line left from when the backend kodakaio used CUPS to autodetect printers.
+
+commit 92e59791d2e478484409f5f2e634196863d7dafb
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Apr 30 20:05:12 2017 +0900
+
+    Fix [-Werror=implicit-function-declaration] compiler error
+    
+    The fileno() is only available if its feature test macro passes.  The
+    various symbols are defined appropriately in ../include/sane/config.h
+    during configuration of the build.
+
+commit adebd37b5cb3ec0cab3025300db5cdd03c2173cc
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Apr 30 20:00:28 2017 +0900
+
+    Fix [-Wpointer-arith] compiler warnings
+
+commit c3903cc476909884ace9fedbea5f69b3a4085b70
+Author: Aaron Muir Hamilton <aaron@correspondwith.me>
+Date:   Mon Apr 17 12:07:40 2017 +0000
+
+    Avoid attaching grayscale ICC profiles to rgb images, or vice-versa.
+    
+      If the ICC profile added does not match the colour format of the
+      image, libpng will abort. This can leave the scanner motors in an
+      incorrect state and possibly cause permanent damage.
+
+commit a907b61bd58f00fd6b1d8468d9d28d6d39232c79
+Author: Aaron Muir Hamilton <aaron@correspondwith.me>
+Date:   Mon Apr 17 12:07:39 2017 +0000
+
+    Add ICC profile embedding for PNG output.
+
+commit 2c653a926af83d7bb910307f441055a6d7603f0b
+Author: Aaron Muir Hamilton <aaron@correspondwith.me>
+Date:   Sun Apr 16 15:13:06 2017 +0000
+
+    Separate ICC profile loading into a separate file.
+    
+      This cuts out some duplicate code, and enables us to reuse this
+      logic for PNG, JPEG, and any other future output format.
+      sanei_load_icc_profile also allows us to know that an ICC profile
+      file is not long enough before we start to write it to the output;
+      this should prevent poorly-written software from overflowing into
+      image data when they read the bad profile based on its length.
+
+commit 611388db1d56b0ffd74af05c4a51fe518269c90d
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Thu Apr 27 21:59:24 2017 +0200
+
+    pixma.desc: fix usbid for PIXMA TS5000 Series
+
+commit 5389301a40d67ed627b1998e19a1af60da26e93f
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Apr 27 22:26:01 2017 +0900
+
+    utsushi.desc: PID 0156 is a ES-400
+    
+    See Alioth issue 315695.
+
+commit a0321d2a92286afbc9557fa44e2de4f706cf2407
+Author: Aaron Muir Hamilton <aaron@correspondwith.me>
+Date:   Sun Apr 16 09:06:48 2017 +0000
+
+    Include physical resolution (pHYs section) in PNG output.
+
+commit 469dc738aafe42b231ecae778e393263028ab1b9
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Apr 27 21:17:34 2017 +0900
+
+    Only swap 16-bit PNG bytes on machines that are not big-endian
+    
+    The SANE API specifies that image bytes are in machine native order.
+
+commit 28eb09eec4c64d9070b5747c93c25134395cab53
+Author: Aaron Muir Hamilton <aaron@correspondwith.me>
+Date:   Sun Apr 16 00:27:54 2017 +0000
+
+    Swap bytes in 16-bit PNGs, because PNG is big-endian.
+
+commit 5fa4be5ae4f9937d79f076f7004a4b48ba765e8a
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Wed Apr 26 11:06:00 2017 +0200
+
+    pixma: backend version 0.17.36
+
+commit 879565cefcac61e371581d09696ef6d738c2a720
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Wed Apr 26 11:43:30 2017 +0200
+
+    new scanners Canon i-SENSYS MF230 and MF240 Series
+
+commit ddccf956b44509fc21cdcd4c52b6750e2ddab37a
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Wed Apr 26 11:02:46 2017 +0200
+
+    pixma_mp150: MG5400 Series has button scan support
+
+commit f14285dba30404f23fc9de13d632e69f23f7cb75
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Thu Apr 6 11:20:40 2017 +0200
+
+    pixma_mp150: MG5400 Series doesn't need special image format post processing @ high dpi
+
+commit 0960bf9c72d25a0f8686314fbe9a6a0f9002ea3c
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Tue Apr 18 20:12:31 2017 +0900
+
+    utsushi.desc: sync with upstream
+
+commit dcddb9505c88485bda6cdcf77927d14008b449ee
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Tue Apr 11 21:22:05 2017 -0400
+
+    epjitsu backend v31
+    
+    - hardware gray support for fi-60F/65F (disabled pending calibration)
+    - merge fi-60F/65F settings
+    - improve desc, conf and man files
+
+commit 34e4dbf6c35946ca52678f6a7a61ef002fddb1c2
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Apr 10 20:23:03 2017 +0900
+
+    Bump Alpine and Fedora builder versions
+
+commit 9712e2aa2595f440252d40c26b680c3cf2b8ae30
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Sat Apr 8 21:44:27 2017 -0400
+
+    fujitsu backend v133 2017-04-08, MAN
+    
+    - initial support for fi-7600/7700
+    - autodetect various double feed capabilities using VPD
+    - call send_lut if we are using a downloaded gamma table
+
+commit 5edb87f9ac950473f8c3a57b4071c970887d8440
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Apr 8 21:08:12 2017 +0900
+
+    genesys: Trigger reallocation of gamma tables on next sane_open()
+    
+    Fixes 315491.
+
+commit 6eb4a1f164ef116a3ed10ee42883a15c268ea01e
+Author: Robert Ancell <robert.ancell@canonical.com>
+Date:   Tue Apr 4 11:36:05 2017 +1200
+
+    kodakaio: Fix crash when Avahi search fails
+
+commit ccb47215e653724f317f7d40138098762578a6f9
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Fri Apr 7 20:28:02 2017 +0900
+
+    Add missing double quote
+    
+    Accidently removed in 38ce7fc086a6ecbee94ef31901a6eb874fb611b1.
+    Thanks to Jon Nelson for pointing this out.
+
+commit 38ce7fc086a6ecbee94ef31901a6eb874fb611b1
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Apr 5 18:29:41 2017 +0900
+
+    Update SANE developer and backend maintenance status
+
+commit cbcab6dffadffdb40f87ddffaf2aa7e1618bb72b
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Tue Apr 4 11:28:18 2017 +0200
+
+    pixma: backend version 0.17.35
+
+commit 66ce95a5a1a716a92260701c76c0989abf4196bb
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Tue Apr 4 11:59:56 2017 +0200
+
+    new scanners Canon PIXMA G3000, E470, G3000, TS5000, TS6000, TS8000 and TS9000 [#315658]
+
+commit a2e26572729d62123b2f167fee9e671bf26b8987
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Tue Apr 4 11:27:38 2017 +0200
+
+    pixma: signal scan cancel from the frontend with new parameter s->param->frontend_cancel
+
+commit c5bfbc5a3a43a81776841289cd164a584c2e8ec2
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Tue Apr 4 11:25:53 2017 +0200
+
+    pixma: implement adf-wait for imageclass scanners
+
+commit 17f3899b1583971351ea7ac40e92660f6558268d
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Tue Apr 4 11:23:03 2017 +0200
+
+    pixma: new option adf-wait
+
+commit 3ef45ec3c3d56bfc60b339dac8a2f19543387ef3
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Tue Apr 4 11:16:20 2017 +0200
+
+    pixma: update docs for MG5400 Series
+
+commit e6c8ea6f0bcb2c6b6f7004feadc7db6cbfc3ee2b
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Wed Mar 22 12:33:27 2017 -0400
+
+    epjitsu backend v30 again
+    
+    - typo in previous commit broke low resolution scans on fi-65F
+
+commit a7fde11e15e5604c7b37bc9553cbd08086c08e53
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Tue Mar 21 21:35:59 2017 -0400
+
+    epjitsu backend v30
+    
+    - bump build number
+
+commit 891e3984d0410fa8c698d99d79948df3237e258d
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Tue Mar 21 20:39:47 2017 -0400
+
+    epjitsu v30
+    
+    - fix image truncation when using 150 DPI in Y direction
+    - add 200 and 400 DPI Y direction support for fi-60F/65F
+
+commit 42896939822b44f44ecd1b6d35afdfa4473ed35d
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Feb 19 16:45:45 2017 +0900
+
+    Address memory corruption and information leakage.
+    
+    Addresses CVE-2017-6318, Alioth#315576 and Debian's BTS#854804.
+
+commit eaa4d4407d96585b7cdbe194d8ac295eee3e6299
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Sat Mar 18 19:15:03 2017 -0400
+
+    epjitsu backend v29
+    
+    - fix infinite loop when scaling in Y direction
+
+commit 2f9ea038b157fc6d08ce882a1d9984d37b46d809
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Mar 11 10:48:35 2017 +0900
+
+    Fix typo
+    
+    See http://lists.alioth.debian.org/pipermail/sane-devel/2017-March/035099.html
+
+commit 1e028b72cae0f4caaf48868504bd2cd1667d6da7
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Mar 6 20:54:59 2017 +0900
+
+    pixma: updated status for MG5400 Series
+    
+    See http://lists.alioth.debian.org/pipermail/sane-devel/2017-March/035072.html
+    and http://lists.alioth.debian.org/pipermail/sane-devel/2017-March/035082.html
+
+commit 928b803ef1f1bc1007ca3fa83418f103c6a7bdd7
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Mar 5 15:35:06 2017 +0900
+
+    utsushi.desc: sync with upstream
+
+commit f450049bccc1e331790cb2546c2c1440fa3d24c0
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Tue Feb 14 18:52:25 2017 +0900
+
+    utsushi.desc: sync with upstream
+
+commit e3ed043500e786724cc77fdd0565993e878a51fc
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Dec 26 08:13:33 2016 +0900
+
+    Update backend maintenance status
+    
+    Following the project member list cleanup, only backends that list
+    a project member with git write access in the AUTHORS file are now
+    considered maintained.
+
+commit 7a0e1126b3eebd38944b8b281e6a481b95a35bbd
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Fri Jan 6 23:30:31 2017 +0100
+
+    Revert "pixma_mp150.c: Fix scanbutton detection for MB5000 series"
+    
+    This reverts commit 53aa78df3a6980791ce250c471d019c5c59b83ec.
+
+commit 306f8f16e78b52948a6e09fa0957b3e364e0189f
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Fri Jan 6 23:29:59 2017 +0100
+
+    Revert "pixma_mp150.c: fix 1200 dpi scanning for MB5000 series"
+    
+    This reverts commit dfc5487571ed2915bda7bdedbd4c79015004361b.
+
+commit 9bc734042f6a2af159772eef412efe7c65ebb02f
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Fri Jan 6 23:28:56 2017 +0100
+
+    Revert "pixma_mp150.c: scan param 0x26-0x29 should contain localtime HHMM, also for MB5000 series"
+    
+    This reverts commit eb712c6bd8ca6a42a1d3941583fa18b9981b8712.
+
+commit 6c439bce791522aa9cd3fc04cf62087bdd6c6875
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Fri Jan 6 23:28:31 2017 +0100
+
+    Revert "pixma_mp150.c: replace multiple if statements with case statement in handle_interrupt"
+    
+    This reverts commit 28dcd0aef4ac91b87527c17c8aa89e879f39f20d.
+
+commit 06b4b27ecfad1aa30c772fa0fac15d1c144c1e7a
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Fri Jan 6 23:28:09 2017 +0100
+
+    Revert "pixma_mp150.c: fix parameter settings for MB5000 in send_scan_param"
+    
+    This reverts commit 1d2a40ec96aea0ba183415efea570301159d4159.
+
+commit 589e011992a21ae1edb4684eb89582350c47333f
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Fri Jan 6 22:15:24 2017 +0100
+
+    Update the sane-pixma man-page for the new timout setting option.
+
+commit 1b442ce1ea7068bda1129c061071dc94bfd6a8d2
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Fri Jan 6 21:37:52 2017 +0100
+
+    Added examples for new bjnp timer settings in the pixma config file
+
+commit cfc7a069d2696942bfeac90e0ff7aa50f83d0ec1
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Sat Dec 31 17:56:06 2016 +0100
+
+    Added timeout options for the bjnp protocol
+
+commit c2898cb6021fac6e2a526c2ce4692783ca69b18d
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Fri Dec 30 21:36:26 2016 +0100
+
+    Remove incorrect comment left from old version
+
+commit 526f642f6487cd348b39a6e138c2bffa9a88d0f6
+Merge: 32be261 68cd274
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Fri Dec 30 20:04:53 2016 +0100
+
+    Merge branch 'master' of ssh://git.debian.org/git/sane/sane-backends
+
+commit 68cd2744d1906ebf00b2bfdc90662992f8e5385c
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Dec 18 16:53:26 2016 +0900
+
+    Sort backends with LC_COLLATE=C
+
+commit d47957075ff0859f5bd52c683f5b6408c63d1e46
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Dec 17 17:03:32 2016 +0900
+
+    Update git repositor write access info
+
+commit 078435eaf19d00e6b863a7802073863604c9e9dc
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Sep 12 19:58:42 2016 +0900
+
+    Fix typo
+
+commit 755e829caa23b9781863e4b1e1d24c3cfee9e8bf
+Author: Dave Platt <dplatt@radagast.org>
+Date:   Thu Dec 15 23:12:07 2016 -0800
+
+    avision.c: abort "wait for light" loop if interrupted
+    
+    Adds a "cancelled" flag to the Avision device structure, cleared
+    in sane_start() and set in sane_cancel().  Test this flag in
+    wait_4_light() and bail out of the 90-second "wait for the
+    light to warm up" loop if the scan is cancelled.
+
+commit 28963459a4ac43100b8e377d65332d81a2660c0d
+Author: Dave Platt <dplatt@radagast.org>
+Date:   Thu Dec 15 23:02:42 2016 -0800
+
+    avision.c: Recognize "backlight on" status
+    
+    Avision scanners can return an additional light-status value meaning
+    "Transparent Media Adapter back-light is on".  Accept this as
+    equivalent to "on" during the lamp-warmup check prior to starting a
+    scan.  Re-check the light status after sending the window command, as
+    the light selection might have been changed and a further warm-up
+    may be required.
+
+commit 6585b6f60d07a196e42c99b935e2754bbc80b3c8
+Author: Dave Platt <dplatt@radagast.org>
+Date:   Thu Dec 15 22:29:16 2016 -0800
+
+    avision.c: Add "skip-adf" option
+    
+    The code which tries aggressively to reset/initialize HP 82xx/83xx
+    Automatic Document Feeders doesn't work well if there's no ADF attached,
+    because the scanner reports a non-zero ADF model type in this case.
+    The retry code makes several attempts to initialize the ADF, and then
+    bails out with an "Operation not supported" error.
+    
+    Add a new "option skip-adf" which will cause the backend to believe
+    the "ADF not present" status if that's what the scanner reports.
+    
+    Fixes #313751
+
+commit f58ce8f9201364bd0fe28ef736d4b1345f3f71b2
+Author: Troy Rollo <troy@kawseq.com>
+Date:   Fri Dec 2 01:37:23 2016 +1100
+
+    HP3500: Always enable the second set of CCDs. This
+    prevents ghosting that occurs when only enabling the
+    first set of CCDs, even though at some resolutions
+    we will not get any data from the second set.
+
+commit 77986b1d14db5ba285d595ab7630748b3c6d9284
+Author: Troy Rollo <troy@kawseq.com>
+Date:   Fri Dec 2 01:20:43 2016 +1100
+
+    HP3500: Move to scan area more quickly if it is a
+    long way from the home position
+
+commit b1f3815014f11bbadd74d255ee4343e16ffee6b8
+Author: Troy Rollo <troy@kawseq.com>
+Date:   Tue Nov 29 21:11:06 2016 +1100
+
+    Add missing math library to HP3500 backend link flags
+
+commit fd7a3505f644573e832f417c7f0f62ca8ddeb7c8
+Author: Troy Rollo <troy@kawseq.com>
+Date:   Tue Nov 29 20:47:59 2016 +1100
+
+    HP3500 backend: fix #314811, greatly improve
+    	calibration, support harware calibration
+    	in 120DPI and 400DPI, and add support for
+    	hardware gamma correction.
+
+commit 6484ff8fc368db24b567e1d2fbb44cd86e0f9e43
+Author: Alex Belkin <abc@telekom.ru>
+Date:   Sun Nov 6 23:03:23 2016 +0300
+
+    Forgoten comma in backends man pages list.
+
+commit 69a008830b84437701022cbd96a8863ac61d3ddf
+Author: Alex Belkin <abc@telekom.ru>
+Date:   Sun Nov 6 22:28:03 2016 +0300
+
+    Pre-create temporary file for Jpeg scanning.
+    
+    Jpeg mode (as submitted by Samsung developer) uses temporary file with
+    fixed name. This opens attacks on reading its content or overwriting any
+    other user-writable file (with symlink). This change pre-creates
+    temporary file with O_CREAT|O_EXCL and mode 0600. Assuming usual +t
+    permissions for tmp this should mitigate issue.
+
+commit 226c2b9deb2f4f4b1d7c51ad4bb83d181e5e31b5
+Author: Alex Belkin <abc@telekom.ru>
+Date:   Sun Nov 6 21:50:06 2016 +0300
+
+    Update header and copyright statements for xerox_mfp.
+
+commit 58c1e43b83712899162030d83df3ecac151d69d3
+Author: Alex Belkin <abc@telekom.ru>
+Date:   Sun Nov 6 21:38:47 2016 +0300
+
+    Indent of xerox_mfp-tcp.c and xerox_mfp-usb.c
+    
+    This is purely indent commit without any code changes, in
+    follow-up to 83bbcfe7d546b4d0cd28269b647fb558c6a1e00a.
+    
+    Indent command used:
+        astyle -A8 -U -H -k3 -W3 -o xerox_mfp-{usb,tcp}.c
+    
+    Proof that code is not changed:
+        git log -w -p xerox_mfp-{usb,tcp}.c
+
+commit 610533a9a66d7232a8a0ecd360871e3a6fa67980
+Author: Alex Belkin <abc@telekom.ru>
+Date:   Sun Nov 6 21:24:38 2016 +0300
+
+    Update xerox_mfp man page.
+
+commit ba6a5710b508e73f4cb7152d034adc865f5201d7
+Author: Alex Belkin <abc@telekom.ru>
+Date:   Sun Nov 6 21:00:58 2016 +0300
+
+    Update sane.man to index xerox_mfp backend.
+
+commit 83bbcfe7d546b4d0cd28269b647fb558c6a1e00a
+Author: Alex Belkin <abc@telekom.ru>
+Date:   Sun Nov 6 20:24:02 2016 +0300
+
+    Run indent: astyle -A8 -U -H -k3 -W3 -o xerox_mfp.[ch]
+    
+    This is purely indent commit w/o any code changes.
+    To prove run `git diff -w`.
+
+commit e4aed53a1e46b9d46a76f814d414ef8d2c2276e3
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Sat Oct 8 19:32:43 2016 -0400
+
+    fujitsu backend v132
+    
+    - remove ipc_mode option and variables
+    - set ipc mode based on other options
+    - cleanup inverted logic DTC options
+    - fixes threshold option reported in #315069
+
+commit cfa98fd0d1271dd426ff2d6c565790d87cf3986d
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Sat Oct 8 14:25:33 2016 +0200
+
+    pixma: backend version 0.17.34
+
+commit 7e20475c8b45249d05315d5a889551924210666d
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Sat Oct 8 14:24:53 2016 +0200
+
+    pixma: new scanner Canon PIXMA MG3000 Series
+    
+    see bug report #315521
+
+commit 3b63fdab2b94f14765f8ba165546f6d69fc23ea9
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Wed Oct 5 20:05:37 2016 +0200
+
+    pixma: backend version 0.17.33
+
+commit c751a9ca22934ef93ca6b7afd3d0aaea4969c5fc
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Wed Oct 5 19:51:35 2016 +0200
+
+    fix ADF scanning for Canon MF57x0 devices
+    
+    - ignore result from calibrate(): don't interrupt @ PIXMA_STATUS_BUSY
+    - MF57x0 devices don't require abort_session() after the last page
+    - reported by Dmitry Deshevoy
+
+commit a9806de08ea65acb8a1109b480147a4a7ec76cb5
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Sep 25 17:06:15 2016 +0900
+
+    AWARE: Treat compiler warnings as errors on debian-8-mini too!
+
+commit 490c4501c7ca59568bd9611665386c512163b51b
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Sep 25 17:04:23 2016 +0900
+
+    Sync autofoo
+
+commit da49686efe16bc5f7b4ddef18ea0dcb5f7c18d77
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Sep 25 17:00:54 2016 +0900
+
+    sane-find-scanner: disable USB if not supported
+    
+    This fixes a [-Wpedantic] compiler warning about ISO C forbidding empty
+    translation units.  The check-usb-chip.c file reduces to such a file in
+    the case USB support was explicitly disabled or no usable library found.
+
+commit 471e8ac0c1b565e5aea92f35ae173e167f3b61c7
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Sep 25 16:28:11 2016 +0900
+
+    sanei_pp: fix [-Wcpp] compiler warning
+    
+    The `#warning` directive is turned into an error by `-Werror`.  The
+    directive triggers is guaranteed to trigger with __GNUC__ when no
+    parallel support is available.  This would prevent strict CI builds.
+    
+    Output a message with all compilers that understand the pragma.  Those
+    that don't should ignore it, according to C99.
+
+commit 7d7030a40986d97d3cf7a5313bf889bce4af8131
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Sep 25 15:53:46 2016 +0900
+
+    sanei_usb: : fix [-Wunused-parameter] compiler warnings
+    
+    These were issued in the absence of libusb.
+
+commit e6faafcdc94e253f7f4fe793fec6110ce37e8014
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Sep 25 15:44:36 2016 +0900
+
+    xerox_mfp: fix [-Wunused-parameter] compiler warnings
+    
+    These are issued when libjpeg was not found during configuration.
+
+commit 32be261254a78d1f314b3ee86fd5e5b40ab91a86
+Merge: ec8bf64 97d2a3d
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Wed Sep 21 22:35:10 2016 +0200
+
+    Merge branch 'master' of ssh://git.debian.org/git/sane/sane-backends
+
+commit 97d2a3d22d9c6a6d0a277de0066c73e9059abd92
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Sep 21 22:11:09 2016 +0900
+
+    AWARE: Treat compiler warnings as errors on debian-8-full
+    
+    This build became compiler warning free in ee550e5d.  Let's keep it
+    that way!
+
+commit 4119f05d5f400803a9c952896125e9feabb07393
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Sep 21 21:54:39 2016 +0900
+
+    Fix USB ID typo
+
+commit ee550e5de8e636642b9895d54f6740aa38ee6ff8
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Sep 19 12:52:31 2016 +0900
+
+    pieusb: fix [-Wunused-parameter] compiler warnings
+    
+    The functions that trigger these warnings were not used.
+
+commit bf088a6ed15733237df446a84d6659c4e0145c9a
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Sep 19 17:45:35 2016 +0900
+
+    Merge comments
+    
+    This gets rid of a missing :usbid warning.
+
+commit e01f574b19be74081650e9be9bcb16a3420068ef
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Sep 19 17:44:48 2016 +0900
+
+    Merge duplicate entry
+
+commit 1a328e412fb7bf3872de20fe6e57b00ab913a75d
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Sep 19 15:26:14 2016 +0900
+
+    Add missing USB IDs
+    
+    Taken from http://www.linux-usb.org/usb.ids
+
+commit dd940a1f612f56d2acb929afd54614ebc6dfb309
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Sep 17 20:43:44 2016 +0900
+
+    utsushi.desc: sync with upstream
+
+commit fb0464d9e3e39a93306e98602ff879c43276de5c
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Sep 12 20:12:28 2016 +0900
+
+    niash: fix [-Wunused-but-set-variable] compiler warning
+    
+    This makes explicit what the compiler has effectively been doing all
+    along anyway since at least 727dd4ab (2004-08-03).
+
+commit 6f4b88b6173745f09e4ce1fa465db534eca85751
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Sep 12 20:05:42 2016 +0900
+
+    epson2: fix [-Wunused-but-set-variable] compiler warning
+    
+    This makes explicit what the compiler has effectively been doing all
+    along anyway since at least 728e032a (2009-06-01).
+
+commit 4dce101c05515200a6cd337451da664c1978f115
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Sep 19 10:04:35 2016 +0900
+
+    Keep generated *.eps and *.pdf files out of the repository
+
+commit 46bc0ff1c89a6759fd22f80fd1ceb9551268da4f
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Sep 18 21:41:03 2016 +0900
+
+    Sync autofoo
+
+commit 2b973d75fed73771664958ea6cb5b4b8fd7b1307
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Sep 18 21:21:35 2016 +0900
+
+    Add fig2dev as prerequisite for API HTML docs
+    
+    The target for sane-html depends on sane.dvi which requires fig2dev.
+    
+    Thanks to:
+     - https://lists.debian.org/debian-user/2016/08/msg00484.html
+     - http://superuser.com/questions/1101439/error-building-sane-backend-on-debian
+
+commit db22a031d130d533f5fd41710ddabdc61280d313
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Sep 18 21:19:12 2016 +0900
+
+    Fix typo introduced in fa41b180.  Fixes 315435
+
+commit 9d388c35937b75cf5f47410ead07ef2226ac8005
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Sun Sep 11 19:03:23 2016 -0400
+
+    canon_dr v56
+    
+    - add initial support for P-150M (and probably P-150)
+
+commit 39ceeae616a2e1638c2760d4364adcaa210a413b
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Sep 7 21:03:30 2016 +0900
+
+    md5: fix [-Wstrict-aliasing] compiler warnings
+
+commit 27a4da41b1761acba33e99aab4d782e726934c04
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Sep 7 21:01:26 2016 +0900
+
+    Prefer *our* `include/` files
+    
+    This fixes discrepancies in build results for VPATH builds.
+
+commit 737977199ccd2419a51e120c472981b1a1263ab0
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Sep 5 23:40:39 2016 +0900
+
+    umax_pp: fix [-Wunused-but-set-variable] compiler warning
+
+commit 50fa8efdcff0dd159d3ff51e219a3c08020ca54c
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Sep 4 14:39:52 2016 +0900
+
+    gphoto2: fix libgphoto2 logging integration
+    
+    In libgphoto2-2.5.0 (tagged for release on 2012-07-10) the GPLogFunc no
+    longer takes a va_list.  Instead, it passes a formatted message.
+
+commit 23f052113b5567033da0d9c4679451d97c484220
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Sep 4 12:50:19 2016 +0900
+
+    saned: fix [-Wunused-parameter] compiler warning
+    
+    The `__sane_unused__` attribute has been moved from sanei_backend.h to
+    sanei.h to make it generally useful instead of limited to backends.
+
+commit 0d527f6659e06175d855aaa1a70fc2be52aad1a7
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Sep 4 12:13:16 2016 +0900
+
+    Drop build environments
+    
+    Adding them did not quite have the effect I thought it would. I had
+    thought it would allow for easy linking to build logs by environment
+    name.  Alas, no such luck.
+    
+    This reverts commits:
+     - 9c44317289f1be0a72089ffd030be84caf75b58c
+     - 6209fecf3a11e90e2e5efc057cf650f4ab792b50
+
+commit 74b4a34e82124621616c699ac0d5ba0d5e93b6a1
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Sep 4 12:12:14 2016 +0900
+
+    dll: fix pedantic compiler warning
+
+commit 246673715d9abdbfbea349de4636322b242f9700
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Sep 3 14:36:49 2016 +0900
+
+    utsushi.desc: sync with upstream
+
+commit a65e74fe83ae96d5d00af6a05c751086cdae8d38
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Aug 28 15:49:44 2016 +0900
+
+    umax_pp: fix [-Werror=unused-but-set-parameter] compiler warnings
+
+commit 4eaefe43713036f73ab322e8d6b519589055540d
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Aug 28 15:27:50 2016 +0900
+
+    magicolor: fix [-Werror] compiler warning
+    
+    This casts away const-ness in the hope that libsnmp doesn't change
+    the session.peername.
+
+commit 31ac0db73672347732dc80cf8f2afe8e6f3d466b
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Aug 28 15:25:43 2016 +0900
+
+    magicolor: fix [-Werror=pointer-sign] compiler warnings
+    
+    The libsnmp API requires a u_char *session.community :-(
+
+commit c32d48ef5fd4a47a93933e6ffba5c8a93d26e43f
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Aug 28 14:18:48 2016 +0900
+
+    kodakaio: fix [-Weror=format=] compiler warning
+
+commit 0337514b8f0e484c11b668d8ca0e0af998d3dfbc
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Aug 28 14:18:00 2016 +0900
+
+    kodakaio: fix [-Werror=sign-compare] compiler warning
+
+commit 763816814bc072b19f1178e0d92031217d7f5f06
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Aug 28 13:55:30 2016 +0900
+
+    hp5400: fix [-Werror=overflow] compiler warning
+    
+    This explicitly implements what gcc and clang assign.
+
+commit 9c44317289f1be0a72089ffd030be84caf75b58c
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Aug 28 13:24:17 2016 +0900
+
+    Fix environment name (periods are not allowed)
+
+commit 984fefd55173f30f4cde3ed7acb462d660c676eb
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Aug 28 13:21:11 2016 +0900
+
+    plustek_pp: fix [-Werror=sign-compare] compiler warning
+
+commit f0153bc7fe7fd79ef2b1b41d259adf3d20b9d641
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Aug 28 12:57:17 2016 +0900
+
+    v4l: fix [-Werror=sign-compare] compiler warning
+
+commit 6209fecf3a11e90e2e5efc057cf650f4ab792b50
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Aug 28 12:17:46 2016 +0900
+
+    Make referencing builds easier
+
+commit 235de98784897edb63d1ed1a32609b7786d799d0
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Aug 28 11:58:16 2016 +0900
+
+    md5: fix [-Wpointer-arith] compiler warnings
+    
+    This reverts commits 9aecb00947e6bf7ef1cf412aff2ab41202617b30 and
+    cdad5961f3888f0a3c0c525d0efab33174c11a24 which fixed a different
+    compiler warning that seems to have disappeared (at least on the
+    debian-8-full builds).
+
+commit bf53c714348dbf4654de887ae7e649fbad6b2288
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Aug 4 22:47:01 2016 +0900
+
+    Sync with upstream
+
+commit ffd93a9fad10ced31de037f2c6180f328a38b547
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Aug 3 22:43:06 2016 +0900
+
+    Sync autofoo
+
+commit cb3090cb5472b63d5cdfb5110652f568bd9477ad
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Aug 3 22:16:26 2016 +0900
+
+    pixma: Fix include guard typo
+    
+    This was introduced in f573865 on 2008-10-18.
+
+commit 23cc2e1ba043ea8309923f5f1dcc5acaeee38a95
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Aug 3 22:08:49 2016 +0900
+
+    Fix include guard typo
+    
+    This seems to have been present since the beginning of sanei/sanei_scsi.c.
+
+commit 63b55e2b591ba977a285a4c91fde0118c25246e7
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Aug 3 22:05:03 2016 +0900
+
+    Drop check for sys/bitypes.h
+    
+    It was obsoleted in 70f3fdf on 2009-02-26.
+
+commit d263f25911a0b359b7edec0faa9320d5d13928da
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Aug 3 21:48:54 2016 +0900
+
+    Fix typo
+    
+    Appears to have been introduced in 0330a4d on 2009-02-02.  There is no
+    evidence that a scdds.h file has ever existed.
+
+commit 970464f7332a1995bfd825de285425f0c957b1da
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Aug 3 20:53:06 2016 +0900
+
+    Drop unused CPP define
+    
+    The last reference to it was removed in 5dcf165 on 2007-06-21.
+
+commit 5389808029f0f81d204630f6e78abe11dfd61122
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Tue Aug 2 21:56:09 2016 +0900
+
+    Fix memory leak
+
+commit 1006445982877970d376c0f657e04fc1481e2459
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Tue Aug 2 21:38:43 2016 +0900
+
+    Use DIR_SEP instead of hard-coding ":"
+    
+    Fixes 313540
+
+commit b021c3bee8e9edc7854050a3975cef003586b2e5
+Author: Troy Rollo <troy@kawseq.com>
+Date:   Sun Jul 31 22:47:25 2016 +1000
+
+    Fix bug 314571 - hp3500 backend does not set correct size for string option.
+
+commit 1859803563f8baadeb6c0926610b2f782350d1e4
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Jul 27 21:17:08 2016 +0900
+
+    Add a Fedora 24 Clang builder
+
+commit f6c8be1380c2f12080cdbd7a81eb2d5156eaa154
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Jul 18 20:55:14 2016 +0900
+
+    kvs40xx: fix [-Wunused-function] compiler warning
+    
+    This rather unceremoniously removed the function.  Note that a near copy
+    can be found in the kvs20xx backend code.
+
+commit effc26e4028f2d21a5bd9fec0458a78c0f6dc330
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Jul 18 20:53:51 2016 +0900
+
+    kvs20xx: fix [-Wunused-function] compiler warning
+    
+    This rather unceremoniously removed the function.  Note that a near copy
+    can be found in the kvs40xx backend code.
+
+commit 2d468852288b5d80e9e8b6831467081fe3ec874e
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Jul 18 17:32:21 2016 +0900
+
+    pnm: fix [-Wformat=] compiler warning
+
+commit 2f39c7227021e85b8fdde8161358858797bd7461
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Jul 18 17:11:26 2016 +0900
+
+    v4l: fix [Wunused-parameter] compiler warnings
+
+commit 880992739020eee8cc0e005e6bdf853f2ff3572f
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Jul 18 17:10:56 2016 +0900
+
+    sm3600: fix [-Wunused-parameter] compiler warning
+
+commit 99c14f2d9503cd9a6c77d71d590e434e504052c6
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Jul 18 16:51:08 2016 +0900
+
+    Use a single symbol to flag unused parameters
+    
+    The __sane_unused__ symbol was used slightly more often then UNUSEDARG
+    and, more importantly, defined in include/sane/sanei_backend.h.  That
+    makes it readily available to virtually all backends.
+
+commit b73a6e5017f6d4d2d0ef7a61bf6e2113f848be94
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Jul 18 16:14:20 2016 +0900
+
+    niash: fix [-Wunused-parameter] compiler warning
+    
+    The attribute needs to go before the pointer designation for it to have
+    any effect.
+
+commit 61719e0a131a6f0d4bf53aa98ecf510ce7081ca7
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Jul 18 16:11:39 2016 +0900
+
+    dc240: fix [-Wunused-parameter] compiler warning
+    
+    The attribute needs to go before the pointer designation for it to have
+    any effect.
+
+commit ef8e258165526175c9ac2d262448f16b551d19e9
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Jul 14 21:12:38 2016 +0900
+
+    Sync autofoo
+
+commit 57350969f6f46195c5fd5e255b3d1906df401d19
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Jul 14 20:51:42 2016 +0900
+
+    sane.tex: mark up email as a URL
+
+commit 707baa0d160ff13331bed6063d2502b09f902f38
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Jul 14 20:50:14 2016 +0900
+
+    doc/sane.tex: drop html.sty in favour of url.sty
+    
+    The latter is part of the core TeX Live distribution which is readily
+    available on all major operating systems.
+
+commit bfd1626c4b119404429a847aaa92df77ca3fbb40
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Jul 13 23:44:26 2016 +0900
+
+    Sync autofoo
+
+commit 8598f81d0b9542b6f4928b8b870a26b50f440379
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Jul 13 23:43:35 2016 +0900
+
+    Fix figure orientation
+
+commit 00bc3e9b451f8dfb89553305cce89172be520bb1
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Jul 13 23:40:19 2016 +0900
+
+    Generate EPS figures too
+    
+    It's good to know how this is done so that we can modify any original
+    figure if need be.
+
+commit cc8f99b900d5ae44248677f6881f1b74d7885bfb
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Jul 13 23:24:29 2016 +0900
+
+    Generate PDF figures explicitly with fig2dev
+    
+    This utility has less dependencies and supports conversion to a pile of
+    other formats that may come in handy as well.
+    
+    Clean up of generated PDF figures has been moved to the clean target as
+    well.
+
+commit d7e1995d001b0d16b9920e751be923f6a8393bf1
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Jul 13 22:37:44 2016 +0900
+
+    doc/sane.tex: Replace epsfig with graphicx
+    
+    The graphicx package allows for file specification without a hardcoded
+    extension.  This provides more freedom in chosing how to prepare images
+    in *.eps and *.pdf formats.
+    
+    Moreover, epsfig is considered mostly obsolete in the TeX community and
+    graphicx is the "current 'preferred' solution" to embed figures.
+    See https://www.ctan.org/pkg/epsfig.
+
+commit 0aab12b934a9f9620fb1236e13dd2b71a7426000
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Jul 11 20:41:54 2016 +0900
+
+    Bump standard minor version
+    
+    This is to acknowledge the SANE_STATUS_GOOD fixes in net.tex that were
+    committed in 4daf488 and 1100883.
+
+commit 1ed3b9fa86e6bc6875a72a9b347164a5879ffe8b
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Jul 11 20:37:08 2016 +0900
+
+    Reclassify doc/html.sty
+    
+    It is a package used by doc/sane.tex.
+
+commit 2481e1e98b02e927cdb9c2e6e404252ef9e49041
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Jul 10 15:43:42 2016 +0900
+
+    Sync autofoo
+
+commit fa41b18001f74e8941813709f15a15cc9ea299e1
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Jul 10 20:35:04 2016 +0900
+
+    Refactor API spec conversion support
+    
+    Unless explicitly asked to do without, all formats for which required
+    tools are found will be built.  Checks cover PostScript, PDF and HTML.
+    
+    All logic and files involved are now collected in a single "section"
+    and grouped in such a way that their function should be clearer.
+    
+    fixup! Refactor API spec conversion support
+
+commit d7c69d141ffb4f456d659b443aa4c3d3be82793e
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Jul 10 19:40:04 2016 +0900
+
+    Add test for the TeX to HTML converter
+
+commit fe2fbe06e1b7db42ea2578e8d853cf83d7bb72a9
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Jul 10 19:29:55 2016 +0900
+
+    Refactor TEXINPUTS handling
+
+commit f322cbc7f950b087e969ac115a5b4e14735881e4
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Jul 10 15:41:08 2016 +0900
+
+    Add support for PDF API spec output
+    
+    Note that pdflatex internally uses epstopdf which in turn requires a
+    working ghostscript.
+
+commit 5a73fb24d1e7a5dcdd287ce7654050b1703cc9c6
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Jul 10 14:48:43 2016 +0900
+
+    Be quiet but do not hide errors
+
+commit e0fd693bb170813f95241898a53ba3f9c261c22a
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Jul 10 13:32:22 2016 +0900
+
+    Fix API spec generation for VPATH builds
+
+commit cb04102a20bc5b1e9cbb990805de3586a0a940c0
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Jul 9 15:10:00 2016 +0900
+
+    Add GitLab CI musl build job
+
+commit be7af6835741c18ea93babd421c083c377b1f88d
+Author: Ruslan Nabioullin <rnabioullin@gmail.com>
+Date:   Sat Oct 29 20:27:47 2011 -0400
+
+    Fixed scanning status messages.  Fixes 313411
+
+commit d62d0a2e452e9ed1ae74cc20c01488543cda8ef9
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Jul 6 20:23:12 2016 +0900
+
+    check-po.awk: fix awk invocation
+    
+    The awk utility has been moved to /usr/bin and the script relies on
+    features present in gawk but not in mawk.
+
+commit ddbdfd6206e30e513509720dd5137c26c9efc248
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Jul 3 21:11:04 2016 +0900
+
+    Fix configure time test
+
+commit c17821e3609080309bcb8a3173cb071e1493a62c
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Jul 2 19:23:01 2016 +0900
+
+    Fix configure time warning during CI build
+
+commit c96236862635f74d8a1c01654430d93bed83f756
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Fri Jul 1 23:45:43 2016 +0900
+
+    Sync autofoo
+
+commit a9c813944e9aa0ceb6c153d06dff286ba855b90e
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Fri Jul 1 23:37:49 2016 +0900
+
+    Make libusb-1.0 the default for USB support
+    
+    When libusb-1.0 is not found, libusb-0.1 will be tried.  On BeOS and
+    OS2, nothing should have changed in terms of detection of USB support.
+    
+    On all systems the --enable-libusb* flags are now ignored.  Instead, the
+    --with-usb and --without-usb flags now control support.  When neither is
+    given USB support will be enable if possible and disabled otherwise.  If
+    --with-usb is requested but not possible, ./configure will fail.  There
+    is no support to prefer libusb-0.1 over libusb-1.0.
+
+commit 418fbb987d731ed2468f48a6fb162f47ea7da55e
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Jun 30 21:50:33 2016 +0900
+
+    Sync autofoo, once again ...
+
+commit 602182931dceeedddcc6be3b144cbc1423bd9b4a
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Jun 30 21:49:25 2016 +0900
+
+    Improve test shell builtin invocation portability
+    
+    Looks like I missed this when committing 309a8140.
+
+commit 828cd013e9a4411158af8816a63b133b6da19ed5
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Jun 30 21:38:04 2016 +0900
+
+    Compile getopt replacement functions only if needed
+    
+    This ought to get rid of the last empty compilation unit warnings.  This
+    merges libfelib.la with liblib.la.  The former was always used together
+    with the latter.  The latter was only ever used without the former when
+    linking backends and tools.
+    
+    Tools might want to use the getopt functions, backends might just want
+    to use MD5.
+
+commit 89dc05006ec93e8fd8a103504701db720814669a
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Jun 29 22:21:10 2016 +0900
+
+    Sync autofoo
+    
+    Looks like the sorting of the DIST_COMMON file list is not stable.
+
+commit a298bfe5a8c65236ac13130e891a93bf3cf58976
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Jun 29 22:20:51 2016 +0900
+
+    Fix AS_IF condition
+
+commit f03f1f66d4a7704c20d221897665509d7f1a626a
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Jun 29 22:15:06 2016 +0900
+
+    Sync autofoo files
+
+commit 1c946f7c194869966f6d3af9df499184d3035c20
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Tue Jun 28 22:42:09 2016 +0900
+
+    Compile replacement functions only if needed
+    
+    This ought to get rid of most empty compilation warnings.
+
+commit 0c2b86ac0b56ee7cb8b962102c54855f05887b08
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Jun 27 22:33:28 2016 +0900
+
+    Fix distcheck issues in tools/
+    
+    Automake is smart enough these days to compile the *.lo files that are
+    used when linking.
+    
+    The umax_pp_CPPFLAGS are useless because backend/umax_pp_low.c undefines
+    BACKEND_NAME unconditionally and sets it to what was passed here ;-)
+
+commit 81f9557966ad335a76deff57a112607d9813ba7a
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Jun 27 22:08:20 2016 +0900
+
+    Clean up .gitignore file content
+    
+    Removes empty lines and duplicates (note that .gitignore patterns are
+    recursive unless anchored with a leading /).
+
+commit 61f3fec68e14944be7ecf219ec604e599141cbdf
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Jun 27 22:05:50 2016 +0900
+
+    Remove references to SANE CVS
+    
+    The references in in-file changelogs and the ChangeLog files have not
+    been modified.  Only those references that refer to current practices
+    or locations.
+
+commit c23791cbd71d58b2627cfc65bbf2cb20aeb51bba
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Jun 27 21:51:43 2016 +0900
+
+    Sync AUTHORS content with current status
+    
+    We've been using git for a while ;-).  Also updates the write access
+    info and fixes encoding issues.
+
+commit cb4924f210bf758558b583220a14ed5a62f178dc
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Jun 26 10:22:35 2016 +0900
+
+    Stop distclean from removing files willy-nilly
+    
+    The distclean target should only remove files that make creates.  If
+    there are any that need taking care of, they should be added in on a
+    per file basis in the Makefile.am that creates it.
+
+commit 0065aaa1c8cb823d20b1e0ff32b3f6197e73db3f
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Jun 26 10:11:42 2016 +0900
+
+    Remove overly zealous ignore patterns
+    
+    Text editor backup and temporary files like *~ are a per developer
+    issue, add them to your global .gitignore.  Other dot-files should
+    be ignored on a case-by-case basis.
+
+commit 8274a52eec3c20becf9901acaab4837b6b61c2f7
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Jun 26 10:07:26 2016 +0900
+
+    Sort .gitignore files
+
+commit b25ef62c2bb163fffea56000ef25544a236d2096
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Jun 26 10:05:12 2016 +0900
+
+    Fix sorting of ignore files
+    
+    We haven't been using CVS since ... 2009-05-04 :-|
+
+commit 0bc7b6aed7e3ac8ee78190f0e795ce9c62c3f36e
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Jun 26 09:16:54 2016 +0900
+
+    Sync *.po files with previous changes
+    
+    This changes the file/line references in all files (and picks up any
+    new messages as a side effect).
+
+commit bdade6bb07a0ec27e3930c0b3b86c28a5c2a5bd9
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Jun 26 09:15:24 2016 +0900
+
+    Sync derived files with previous changes
+
+commit ec4fe7ec7200a881feba5b539256dc58ae1edbaf
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Jun 26 08:50:04 2016 +0900
+
+    Prefer gettext's --disable-nls option
+
+commit c676acbe472f2a57763d0ce198e50b048d37bbda
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Jun 26 08:49:14 2016 +0900
+
+    Switch to using the gettext build machinery
+    
+    This adds two automatically maintained English variants that handle
+    quote substitution in onrder to provide smart quotes.
+
+commit 0286bf46fc2992dfd2e9539fb939c243db13e91f
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Jun 26 08:30:45 2016 +0900
+
+    Add gettext build machinery files for I18N/L10N support
+    
+    These are courtesy of autopoint and target gettext-0.18.1 because that
+    is the version in Debian 7 (which is what Alioth is running).  The one
+    warning this produces on autoreconf is fixed in gettext-0.18.2, BTW.
+
+commit eecee6d1014537cabe427d44168fce9ac9894301
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Jun 25 15:23:05 2016 +0900
+
+    Fix VPATH build issue
+    
+    The source *.po files weren't found when you configured outside of the
+    top source directory.
+
+commit 00984cd1119bb9bb5b794bfc0f1ef77369978d68
+Author: Yurii Kolesnykov <yurikoles@gmail.com>
+Date:   Sat Jun 25 03:34:12 2016 +0300
+
+    Fix compilation of saned.c under OS X
+
+commit ad176ba9fe1f7608d8ad8032407cf1f7dc66dad6
+Author: Alessandro Zummo <a.zummo@towertech.it>
+Date:   Tue Jun 21 00:50:02 2016 +0200
+
+    epsonds: remove unused var
+
+commit 1dbabdce5d34e686608bb997245c49a823e19fb5
+Author: Alessandro Zummo <a.zummo@towertech.it>
+Date:   Tue Jun 21 00:49:08 2016 +0200
+
+    epsonds: fix compilation
+
+commit 9b389a61c5e698e8bffb186bdbc005739128b427
+Author: Alessandro Zummo <a.zummo@towertech.it>
+Date:   Tue Jun 21 00:43:39 2016 +0200
+
+    epsonds: added support for network scanners
+
+commit f13ca02b86a4d27951149723ca2ae81491991c18
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Jun 20 21:42:56 2016 +0900
+
+    Fix variable name typo and other typographic nit-picks
+
+commit e7100e275d58d67b903e883e7a02e45d18f81ef7
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Jun 15 20:47:28 2016 +0900
+
+    Update documentation to reflect recent changes
+
+commit 5695d01077c7e575808a37a66df37d1f9fafa637
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Jun 15 20:23:33 2016 +0900
+
+    Silence overly verbose targets
+    
+    This only takes effect with silent rules enabled.
+
+commit 43cdc1056af899520797b09f3f78ba64703ed74d
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Jun 15 20:18:25 2016 +0900
+
+    Do not duplicate Warning on output
+
+commit 40bfec7a6b4a804201bad7f0517f16b0c6ae4110
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Jun 15 20:17:29 2016 +0900
+
+    GitLab-CI: fix configure option
+
+commit f75e271853f40c6cb00ce59cbb4e9d62d083a1b2
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Tue Jun 14 21:24:53 2016 +0900
+
+    Tweak GitLab CI builds
+    
+    The idea is to build as much as possible for the *-full flavour build,
+    make compiler warnings stand out and muddle on after errors so that we
+    get all the problems in a single log.
+
+commit ef7deff36c759efa8d371251febef6d37d4eb94b
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Tue Jun 14 21:20:48 2016 +0900
+
+    Add missing autofoo file
+    
+    This should have gone in with d853463e.
+
+commit d853463ef1b97082d657a0be32d1b27a04940ea2
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Tue Jun 14 06:30:48 2016 +0900
+
+    Sync derived files
+    
+    This was done with
+    
+      AUTOMAKE="automake --add-missing --copy" autoreconf --force
+    
+    on Debian GNU/Linux 8.5.
+
+commit 17d78ab7c326069c3a596f17ded6418ef42930bc
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Fri Feb 12 21:09:32 2016 +0900
+
+    Fix warnings of "newer" automake versions
+
+commit a7376ffa6dd1796c1678b33bd03bf19766e227de
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Fri Feb 12 20:52:57 2016 +0900
+
+    Fix libtoolize warning
+
+commit 7675cb7c3eb5b6e97fb87adc464b6bcc67cfd7dd
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Feb 11 17:43:14 2016 +0900
+
+    Drop Makefile.in from EXTRA_DIST
+    
+    Automake is smart enough to include this on its own.
+
+commit 7bfa818c57485310994650528124a7036894eb36
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Jan 14 21:22:00 2016 +0900
+
+    Set up compiler and linker early and in one place
+
+commit f80cf1dbbdd85f2a0b595aef83cc63faa0c91c04
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Jan 14 20:21:49 2016 +0900
+
+    Remove unused SANE_LINKER_RPATH macro
+
+commit e4ad1f58f31ec7110df716494b13cf96156b6a7c
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Jan 14 18:50:47 2016 +0900
+
+    Enable ISO C99 support for more compilers
+
+commit 444b572d1a559d93a6ad172f86bdcc9197377e75
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Jan 9 18:43:36 2016 +0900
+
+    Use autoconf provided --docdir
+
+commit f1f4180e5b6f71bf3a674bbfcbf7932b401d7a96
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Jan 9 18:24:20 2016 +0900
+
+    Collect autoconf bits in one place
+
+commit 35f1936aeba18b34628d35938529e0d2af0e58c7
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Jan 9 18:11:53 2016 +0900
+
+    Determine version bits and release programmatically
+
+commit 16497dc13838e14784778883fb2837fbcf9e288e
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Jan 9 17:59:20 2016 +0900
+
+    Replace convenience variable by its expansion
+
+commit 9a52b5bc27c2a50e14161b4dcaba43f825cf91a4
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Jan 9 17:48:27 2016 +0900
+
+    Fix variable name typo
+
+commit 79c623628a28b6c28321cad6518bf98cf7a705a4
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Jan 9 17:48:03 2016 +0900
+
+    Fix new automake warnings
+
+commit 97fed76717367289a8e160dab4341d79586c1079
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Jan 9 17:22:31 2016 +0900
+
+    Replace obsolescent macro with LT_INIT option
+
+commit c868a2e8d48e3c31051b6a8978c9b1df494bc36b
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Jan 9 17:22:07 2016 +0900
+
+    Remove commented out code
+
+commit 4894b1513d829957e109e5c49b812dc688fe78b3
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Jan 9 17:11:19 2016 +0900
+
+    Drop a pile of unnecessary macro invocations
+    
+    These are already taken care of by other macros.
+
+commit ae89c8f98362a4e50d4b1a0ce8f3586b77a81989
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Jan 9 15:59:35 2016 +0900
+
+    Update to automake-1.11.6
+    
+    This turns on additional warnings and adds support for silent make
+    rules (so compiler warning really stand out ;-).
+
+commit 87e12bbf2e4312bf0bd18656afe579919c8788e1
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Jun 13 22:24:21 2016 +0900
+
+    Sync derived files with autoreconf --force
+    
+    For the record, this was done on Debian GNU/Linux 8.5.
+
+commit 309a8140e7285f87d5fc5ee24b942f1713e80be8
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Oct 28 21:59:42 2015 +0900
+
+    Improve test shell builtin invocation portability
+    
+    POSIX 2008 obsoletes the -a and -o operands (according to the autoconf
+    documentation).
+
+commit d9e2f441139c0514c3d388976d1f8fc78a04de95
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Oct 28 20:59:22 2015 +0900
+
+    Double quote code passed to AC_LANG_PROGRAM
+    
+    Upon re-reading the autoconf documentation, this seemed the right thing
+    to do.  The AC_LANG_PROGRAM macro does not quote its arguments so any
+    occurence of [ and ] will get stripped out if not double quoted.
+    
+    Current code snippets passed do not use them but it is better to use a
+    consistent quoting approach for such snippets.  In other places in the
+    configure.ac file double quoting is used already.
+
+commit d3d5dc3da04cce842f7fa8d941676f2f5abc3bbd
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Oct 22 22:18:19 2015 +0900
+
+    Update to autoconf-2.69
+    
+    This gets rid of a number of obsoleted macros and replaces RETSIGTYPE
+    with a void literal which can be assumed for C89 and later.
+    
+    This changeset was prepared using autoupdate and modified to get rid of
+    whitespace and doubled [] changes.  Changes to acinclude.m4 were added
+    by hand.
+
+commit 2d6fad58b4c61d59bec3879dab9ccf0c1b88dd11
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Oct 22 20:15:45 2015 +0900
+
+    Respect GNU Standards user variables
+    
+    Several variables are considered "user variables" by the GNU Standards.
+    This means that the user can pass these to their ./configure and make
+    invocations as they see fit.  These variables include CPPFLAGS, CFLAGS
+    and LDFLAGS.
+    
+    This changeset pushes our use of these variables to the automake shadow
+    variables, AM_CPPFLAGS, AM_CFLAGS and AM_LDFLAGS, so that user variables
+    will no longer clobber flags required in order to build.
+
+commit 7a2b112d20e08337528128745bf7cc1d6096a1d8
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Oct 21 22:33:53 2015 +0900
+
+    Prefer make variables over literal substitutions
+    
+    The AC_SUBST and PKG_CHECK_MODULE invocations in configure.ac as well as
+    acinclude.m4 are sufficient to trigger automake to insert initialization
+    logic for the variables these introduce.  There is no need to do this by
+    hand.  Wherever these values are needed, it is better to use a variable.
+    This allows for one-off overrides on the make command-line (without the
+    need to run ./configure) for one thing.
+
+commit 2745528b60617d737a7a597c4ee5397359a6ddfd
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Oct 19 21:52:47 2015 +0900
+
+    Fix non-POSIX automake file variable warning
+    
+    This addresses warnings about the use of the $(wildcard) function.
+    It has been replaced by a plain shell glob.  There is one case where
+    this will result in an error, when there are no matches, but that is
+    when the targets that use it make no sense.  It is probably good to
+    get an error in that case.
+
+commit d81836bd2332e42136a15a72961c0b9295d94b58
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Oct 19 21:04:53 2015 +0900
+
+    Add automake subdir-objects option
+    
+    This addresses autoreconf output such as:
+    
+      tools/Makefile.am:37: warning: source file '../backend/sane_strstatus.c' is in a subdirectory,
+      tools/Makefile.am:37: but option 'subdir-objects' is disabled
+    
+    The option was introduced in automake version 1.9 and is slated for
+    unconditional activation with automake-2.0.
+
+commit d38a098ec6fce0aa18dd757677c5a07ff1a44163
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Oct 19 20:20:56 2015 +0900
+
+    Rename configure.in to configure.ac
+    
+    This name has been preferred since autoconf-2.52 and automake-1.5.
+    Both were released in the summer of 2001.  Support for configure.in
+    is slated for removal in automake-2.0.
+    
+    The configure.ac file itself requires autoconf-2.54 or later (and
+    does not care about the automake version).
+
+commit c9027378a12a6f67b22ee5fe203df1739486e3ad
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Jun 13 20:35:34 2016 +0900
+
+    xerox_mpf: Make JPEG support an option
+
+commit 359bb9c3d48c87324b2ead602de76e0e35daadba
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Jun 12 20:32:30 2016 +0900
+
+    Add CI support to test selected build scenarios
+
+commit 5ba37467e88ca8052973b37128ce8fd36ad5d61d
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Thu Jun 9 21:51:18 2016 -0400
+
+    fujitsu backend v131
+    
+    - hide compression-arg option when jpeg disabled
+    - add Send/SC/GHS macros for recent scanners
+    - add initial support for fi-74x0
+    - add initial support for fi-7030
+    - set has_MS_lamp=0 for fi-71x0
+    - add I18N macros to all option titles and descriptions
+    - add usb ids for many newer scanners
+
+commit ec8bf64396b394c4d483b811f9948871f12882b4
+Merge: 1d2a40e 1e01365
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Sat May 21 22:06:57 2016 +0200
+
+    Merge branch 'master' of ssh://git.debian.org/git/sane/sane-backends
+
+commit 1e013654cc3af09f4731ab9ec8d8324d03a7de4a
+Author: Alessandro Zummo <a.zummo@towertech.it>
+Date:   Mon May 9 11:10:35 2016 +0200
+
+    pieusb: mkostemp -> mkstemp
+
+commit 926bfade544de4a4fd5f1a8082b85a97e2443770
+Author: Alex Belkin <abc@telekom.ru>
+Date:   Sat May 7 22:33:03 2016 +0300
+
+    Color scanning for Samsung models, which support JPEG Lossy compression.
+    
+    Patch is submitted by Laxmeesh Onkar Markod <m.laxmeesh@samsung.com>
+    
+    Patch to code is applied almost verbatim, except, insignificant
+    formatting fixes and making new functions static.
+    
+    Also, new USB ids added and scanner support is changed as reported.
+
+commit 1d2a40ec96aea0ba183415efea570301159d4159
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Sat Apr 30 15:32:55 2016 +0200
+
+    pixma_mp150.c: fix parameter settings for MB5000 in send_scan_param
+
+commit 28dcd0aef4ac91b87527c17c8aa89e879f39f20d
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Wed Apr 27 18:45:22 2016 +0200
+
+    pixma_mp150.c: replace multiple if statements with case statement in handle_interrupt
+
+commit eb712c6bd8ca6a42a1d3941583fa18b9981b8712
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Wed Apr 27 17:55:52 2016 +0200
+
+    pixma_mp150.c: scan param 0x26-0x29 should contain localtime HHMM, also for MB5000 series
+
+commit c8169b1e656f7f95c67946298da5a0e1c143f8e8
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Fri Apr 22 23:58:23 2016 +0200
+
+    pixma.h: step version of the backend to 0.17.32
+    sane-pixma.man pixma.desc: mark Maxify MB5000 as complete (but ADF does not work)
+
+commit dfc5487571ed2915bda7bdedbd4c79015004361b
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Fri Apr 22 22:42:48 2016 +0200
+
+    pixma_mp150.c: fix 1200 dpi scanning for MB5000 series
+
+commit d5e1323738a4ed2edc96b566138c7cc6c55f3f5e
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Fri Apr 22 21:05:40 2016 +0200
+
+    pixma.h: step pixma backend version to 0.17.31
+
+commit c2985f0fd60279bca0dcfed3d3fb60cc33cfe4dc
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Fri Apr 22 21:03:48 2016 +0200
+
+    pixma_bjnp_private.h: change minimum timeout value for the bjnp protocol to 1 sec
+    as 500 ms gives errors on scanimage -A (it workked for scanbd)
+
+commit 4b2f171a13248a8e3d79379e368c54fb71ed97e2
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Wed Apr 20 11:19:32 2016 +0200
+
+    pixma_bjnp.c pixma_bjnp_private.h: set minimum timeout for network operations to 500ms
+
+commit affe1ac821b17813188bd91045ced32fe4fcfe56
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Wed Apr 20 10:58:54 2016 +0200
+
+    pixma_bjnp.c pixma_bjnp_private.h: make bjnp protocol follow timeouts set by backend
+
+commit 53aa78df3a6980791ce250c471d019c5c59b83ec
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Mon Apr 18 22:00:15 2016 +0200
+
+    pixma_mp150.c: Fix scanbutton detection for MB5000 series
+
+commit 1452cf2e0d9f56602a5ca9b07e52f8d8f6b9ec8a
+Author: Louis Lagendijk <louis.lagendijk@gmail.com>
+Date:   Sat Apr 16 21:37:25 2016 +0200
+
+    pixma_bjnp: Remove dead code in polling
+
+commit 19c128a23e27c1ab5a030fa6ff74da1b740629bb
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Tue Apr 12 18:30:24 2016 +0200
+
+    README.linux: move installation description into new document INSTALL.linux
+
+commit 51943537c314c9060138df8b37307377c307ba3a
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Tue Apr 12 18:14:55 2016 +0200
+
+    pixma: backend version 0.17.30
+
+commit 270a8cd3bebfb2a630a1b74d5abd0b6fe2fc2e5d
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Tue Apr 12 18:13:36 2016 +0200
+
+    pixma: Canon PIXMA MG7700 Series is working
+
+commit 2556ffc2c593c3408cc554ecc97e07db457c975d
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Thu Mar 31 11:21:27 2016 +0200
+
+    pixma_mp150: MG7700 Series doesn't need special image format post processing @ high dpi
+
+commit e6b6ad9d4847e86aed8be0837a19bfada881f52d
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Tue Apr 5 20:30:10 2016 -0400
+
+    canon_dr backend v55
+    
+    fixed-width scanners were calculating left-side offset incorrectly in color
+    initial support for DR-F120
+    rename all DUPLEX_INTERLACE_* to indicate start and end of line
+
+commit 41a416e4afcf6cada69193dc408ef184d0e5f678
+Author: Alessandro Zummo <a.zummo@towertech.it>
+Date:   Mon Mar 21 18:59:47 2016 +0100
+
+    epsonds: fixed resolution setting bug, DS-60000 workaround is needed no more
+
+commit 52bc4d241c9587e99be2ae4566ad01469a3ecab9
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Mon Mar 21 10:53:29 2016 +0100
+
+    pixma: backend version 0.17.29
+
+commit bc1637bb39794b415a2e73ee990e4763c73be3f9
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Tue Feb 16 16:20:58 2016 +0100
+
+    pixma_mp150: MG3600 Series doesn't need special image format post processing @ 1200dpi
+
+commit 23eb95582da718791103b83ea002e947caa0f5fc
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Fri Mar 4 13:38:12 2016 +0100
+
+    pixma: backend version 0.17.28
+
+commit eba9c9e2391d59459e5fa3f362d8dc08d14c7b9c
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Fri Mar 4 13:36:08 2016 +0100
+
+    pixma_imageclass: software lineart for all imageCLASS, imageRUNNER, i-SENSYS and laserBase scanners,
+                      supported by this sub-backend
+    
+    imageCLASS scanners:
+    D420, D480, D530, MF810/820, MF3240, MF4010, MF4150, MF4270, MF4320, MF4360,
+    MF4410, MF4570dw, MF4690, MF5630, MF6500, MF8030, MF8170c
+    
+    i-SENSYS scanners:
+    MF210, MF220, MF3010, MF4500, MF4700, MF4800, MF5880dn, MF5900, MF6100,
+    MF6680dn, MF8200C, MF8300, MF8500C
+    
+    imageRUNNER scanners:
+    iR1133
+    
+    laserBase scanners:
+    MF5650
+
+commit 38d6f1ba6dd48d8139b3ef504b4c7920d0e4736b
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Fri Mar 4 13:08:31 2016 +0100
+
+    pixma_imageclass: MF6100 Series document feeder does not have 600DPI capability
+
+commit 328e9b93d71d1f9b031c4066e4cba00893703c4a
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Thu Mar 3 21:59:24 2016 +0100
+
+    raise build number
+
+commit 8ad2c60d82797cc3495f63f8230bdf6f999067a1
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Thu Mar 3 21:58:55 2016 +0100
+
+    use half step mode for LiDE 110 600 dpi scan
+
+commit 52ea420d44a26832f662c837bbbe4d2f7002875a
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Thu Mar 3 21:46:43 2016 +0100
+
+    use half step for LiDE 210 600 dpi scans
+
+commit bd0b0cd218504868f32962a5558449956c8ce242
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Thu Mar 3 21:39:25 2016 +0100
+
+    use rewind instead of slow_back_home
+    
+    - if required by flags, do a rewind instead a slow_back_home that pollutes
+      shading settings
+
+commit 3dee0f8d48e26e3aceb0243d03199af5870f30e2
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Thu Mar 3 21:31:01 2016 +0100
+
+    implement rewind for gl847 and gl124
+
+commit de635a32f9638f5fad5806ab5de9498f5fa47ca9
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Thu Mar 3 21:12:29 2016 +0100
+
+    add rewind function to command set
+
+commit 270d6a4242c95d6d376f442ca701e067e3fc74d1
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Mon Feb 29 21:14:30 2016 +0100
+
+    fix Lide 110 gray mode max speed
+
+commit 2f891c13bb5cb1728479ee08ba45b756f68a3287
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Thu Mar 3 13:40:46 2016 +0100
+
+    pixma: backend version 0.17.27
+
+commit bbd327f5e7c973db331f3f309788d852367bc79a
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Thu Mar 3 13:38:33 2016 +0100
+
+    pixma_imageclass: reduce timeout for failed first usb command to 2 seconds
+
+commit c41640f36433e646989665bac0ac5da460f2d9a9
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Thu Mar 3 13:36:44 2016 +0100
+
+    pixma: new global parameter to set duration of receive timeout loop
+    
+    The default value for receive timeout loop duration has not been changed.
+    The loop still takes 8 seconds if a timeout occurs.
+
+commit 9897357727b65d13167b89cd1d1fe816f4d72563
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Sun Feb 28 21:26:27 2016 +0100
+
+    enable pixel averaging whne bleow 600 for all models
+
+commit d784dec60b096b8e8fe18f5f7b5c1921249d6ed2
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Sun Feb 28 12:26:12 2016 +0100
+
+    motor table fixes
+    
+    - add target speed for 600 dpi gray
+    - add slope table for 4800/2400 dpi, gray and color
+
+commit 759729331cc60a86d884518064b2dc92736f7abd
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Sun Feb 28 12:18:56 2016 +0100
+
+    fix maximum speed compute in gray mode
+
+commit e1b1ba8aeecf2eefa2855ec8c77604a8070027ab
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Fri Feb 26 05:57:35 2016 +0100
+
+    fix expiration time option reading
+
+commit 61d6f5c2140e6e659db20916937cc95c5c7256f3
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Thu Feb 25 21:37:55 2016 +0100
+
+    mode set fixes
+
+commit fa2c9dc9b216fa7b7f1baf013b7cbe8eb3df8597
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Thu Feb 25 21:37:00 2016 +0100
+
+    fix GPIO during scan
+
+commit c5117ed0f1b522eab10fd2248f140b2acad2a708
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Wed Feb 24 21:43:29 2016 +0100
+
+    doc and version update
+
+commit 747275a00f03e4ab643461448985ce20879e1d12
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Wed Feb 24 21:15:26 2016 +0100
+
+    add 1200 and 2400 dpi mode for LiDE 120
+
+commit 2a18600792c00f9ca37ff5b52d2cc1c8202d8b4b
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Wed Feb 24 06:35:46 2016 +0100
+
+    make 1200 dpi scan mode work for LiDE 120
+
+commit b11a69d27572aa938cedff303ba7560ca9793943
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Wed Feb 24 06:17:50 2016 +0100
+
+    make 600 dpi mode work for LiDE 120
+    
+    - add override for registers 0x16 and 0x70 since 120's sensor
+      is set differently according to resolution
+
+commit 15e203de89abe53f732aa431548645c5c9838237
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Tue Feb 23 21:11:00 2016 -0500
+
+    Various copyright comment updates
+
+commit 1465543cc0dd9e4fb4b3706ca6793e90a35ce389
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Tue Feb 23 21:07:06 2016 -0500
+
+    fujitsu backend v130
+    
+    run init_model before init_ms so some scanners can override
+    set all M309x and M409x scanners s->broken_diag_serial = 1
+
+commit 963de58dfc4498693aeeec35a9ff23363af6ac67
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Tue Feb 23 20:42:52 2016 -0500
+
+    Enable padded read for DR-3080CII
+
+commit 1207ce5a40664c04b934bd0a6babbc1575361356
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Tue Feb 23 20:36:32 2016 -0500
+
+    Support SANE_USB_WORKAROUND env var
+    
+    Here, we add a new env var (SANE_USB_WORKAROUND) to sanei_usb.c.
+    This allows end users to conditionally enable the workaround added
+    in commit 014b45d920f1fb630e1a31bb01f1da02ea2a6a87. The default is
+    to not enable the workaround, because more recent Linux kernels no
+    longer seem to need it. Some users have even reported failure with
+    the workaround enabled.
+
+commit 219198838be069d7e3d48b53762727f1bbfb93e5
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Tue Feb 23 21:39:22 2016 +0100
+
+    LiDE 120 working [75-300] dpi
+    
+    - fix sensor pixel number
+    - enable calibration
+    - default to 16 pixel DUMMY
+
+commit 4fd1d10228047a740f28b1cd25579b7c40c93b1f
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Mon Feb 22 21:45:02 2016 +0100
+
+    tune scanarea geometry
+
+commit a74ebe551daf8750821b1ab57324e54141a84461
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Sun Feb 21 22:14:48 2016 +0100
+
+    first almost correct scan at 300 dpi
+
+commit 8f938f2d00d27070e826f88a77264ee36d0bbedf
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Sun Feb 21 09:48:26 2016 +0100
+
+    GL124 DAC and SENSOR setup changes
+
+commit f56ffa63b99db4767b35d294fef96476b228f993
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Sun Feb 21 09:47:47 2016 +0100
+
+    doxygne fix
+
+commit 2e1102dc3ab1ee4d7bfec3e7cbf6e3a1527f5264
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Thu Feb 18 21:41:38 2016 +0100
+
+    add dedicated reference slope tables for LiDE 120
+
+commit 214dfad1d5aa841b597187004747ec88c507cf06
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Wed Feb 17 21:43:05 2016 +0100
+
+    use dedicated LiDE120 GPIO
+
+commit 387cea7d6ce75af9441c5841221267bef7b7924c
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Wed Feb 17 21:04:55 2016 +0100
+
+    define dedicated motor/sensor/gpio for LiDE 120
+
+commit e90f8cb8a1e62f6865d9e237fd1f0e7f773e5094
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Fri Feb 12 08:11:20 2016 +0100
+
+    latin1 -> utf8
+
+commit d74d3bcd887d2a3d59ee96e04eb68f15c0a3b882
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Thu Feb 18 22:34:16 2016 +0100
+
+    README.linux: add some hints for individual SANE installations
+
+commit 926a7e67b6f81ffdb1b4f67a55bf84862efcf6b9
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Wed Feb 17 21:24:18 2016 +0100
+
+    pixma: fix scanner names
+
+commit 235dc80b5f3faaf195eef1e177a1f38284ca3bee
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Wed Feb 17 21:10:44 2016 +0100
+
+    pixma: Canon i-SENSYS MF6100 Series is working
+
+commit 6d89f7ef25266cc9a53440bbf68ff2e1a37d4b86
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Wed Feb 17 21:06:04 2016 +0100
+
+    pixma: backend version 0.17.26
+
+commit 7a227dcaf2771b31feb852e6a83336976966a0ab
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Wed Feb 17 21:03:18 2016 +0100
+
+    pixma_imageclass: wait for 8sec to throw last page out of ADF feeder @ ADFDUP
+
+commit 23efb9f55f466179df86848912acbed1a94c10ff
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Wed Feb 17 21:01:48 2016 +0100
+
+    pixma_imageclass: PIXMA_ENO_PAPER check also for ADFDUP scans
+
+commit 29ceb0e377009cd6829d8f68c58a2197ac19a20d
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Wed Feb 17 20:59:32 2016 +0100
+
+    pixma_imageclass: fix for failed first usb command (timeout)
+    
+    Sometimes the first usb command to the scanner fails after a previous scan.
+    A workaround was to reconnect the usb cable. This fix simply resends the
+    failed command.
+
+commit 8f1202d6537568e56b4886ebe5d41d0210ffacd9
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Wed Feb 17 20:55:49 2016 +0100
+
+    pixma_imageclass: fixes for MF6100 Series
+    
+    - special ADF settings
+    - the MF6100 Series is a Generation 2+ scanner, but uses the old read image command
+
+commit 02855737ee84e3c72bceff9ba06fddc5a5d99860
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Wed Feb 17 20:32:00 2016 +0100
+
+    pixma: use usb timeout instead of sleep timer while waiting for usb response
+
+commit 4771fab9c16b477dc376bd2e5fdd8d0dc7f2c478
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Wed Feb 17 20:30:47 2016 +0100
+
+    pixma: reduce global usb read and write timeouts to 1 sec
+
+commit 99f7e7872f2619c3ebec2590b91de3fb0ca28a1a
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Feb 13 17:37:34 2016 +0900
+
+    Disable use of pthreads if pthread.h cannot be found
+
+commit 04d5e4a0cf775f6483873a3f1e70a173587546b6
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Feb 13 17:34:46 2016 +0900
+
+    Move #include <pthread.h> to sanei_thread.h
+    
+    The sanei header file may need pthread_t.  If it does, make sure it
+    is available.
+
+commit af35e9ba749cce6e735d685ec4495e8c8d85778c
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Thu Feb 11 12:06:34 2016 +0100
+
+    pixma: Canon Pixma MG3600 Series is working
+    
+    Reported by Rajib Bandopadhyay
+
+commit 7bd773ade5ff1bc4170d2a1773428efe759aaa75
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Tue Feb 9 09:55:26 2016 +0100
+
+    LiDE 120 support wip
+
+commit 056f590f2d147099554d97a89dd5e0ddfa8d6dda
+Author: Alessandro Zummo <a.zummo@towertech.it>
+Date:   Sat Jan 23 00:55:31 2016 +0100
+
+    epsonds: fixed comment
+
+commit cf2dfea0008d16cb70f8baeaae5a414e9bdafda3
+Author: Alessandro Zummo <a.zummo@towertech.it>
+Date:   Fri Jan 22 20:44:36 2016 +0100
+
+    epsonds: extend the bug fix to all depths
+
+commit 8fd6151acd1a1b313b1c9fabb5e2691ba45de9d6
+Author: Alessandro Zummo <a.zummo@towertech.it>
+Date:   Fri Jan 22 17:38:00 2016 +0100
+
+    epsonds: fix stripes on DS-60000 at 1bpp/300dpi
+
+commit 4fa7f4f6f8b69f41fd5d03abc12d16e0f2e876b3
+Author: Alessandro Zummo <a.zummo@towertech.it>
+Date:   Fri Jan 22 17:01:57 2016 +0100
+
+    epsonds: clear endpoints on startup in order to fix some strange scanner / xhci combo
+
+commit f78e85cad666492fadd5612af77fa7c84e270a12
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Fri Jan 8 18:35:20 2016 +0100
+
+    pixma: backend version 0.17.25
+
+commit b08c324223732407d736a79ab8c59f01b3774736
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Fri Jan 8 18:34:27 2016 +0100
+
+    pixma: Canon PIXMA MG5700 Series is working
+    
+    Reported by Andrew Reginato, bug #315244
+
+commit 0f47b47b759908e7b11800404d269087d60d87ad
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Fri Jan 8 17:32:36 2016 +0100
+
+    pixma_mp[150|810]: disable send_time()
+    
+    The function send_time() makes trouble with a lot of scanners.
+    We send a warning to the debug output instead of sending the time.
+    
+    fix for [#315248] Canon MP250 with pixma backend is not working
+
+commit b040b150a08b0b5394ad3bc91a45966d97f58152
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Fri Jan 8 16:54:30 2016 +0100
+
+    pixma: fix for [#315244] Add support for Canon PIXMA MG5700, MG6800, MG6900 and MG7700
+    
+           These scanners are new and need further testing!
+
+commit 81c429082c3c139f8616de4a73733953cd5aa33f
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Fri Jan 8 16:43:46 2016 +0100
+
+    pixma: update copyright
+
+commit 9aecb00947e6bf7ef1cf412aff2ab41202617b30
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Fri Jan 8 21:26:31 2016 +0900
+
+    md5: Avoid the need for casting
+    
+    This also modifies the code slightly to follow the original array
+    access more closely.
+
+commit cdad5961f3888f0a3c0c525d0efab33174c11a24
+Author: Volker Diels-Grabsch <v@njh.eu>
+Date:   Sun Dec 6 01:23:51 2015 +0100
+
+    Introduce md5_set_uint32
+    
+    This fixes the following GCC warning:
+    
+    warning: dereferencing type-punned pointer will break strict-aliasing rules
+
+commit f3471c2ca6ea22846dd6619aff7913610722a6c0
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Jan 2 17:50:34 2016 +0900
+
+    saned: Use system header IPv6 test macros if available
+    
+    This should fix [-Wstrict-aliasing] compiler warnings on those systems
+    where the IN6_IS_ADDR_LOOPBACK and IN6_IS_ADDR_V4MAPPED macros exist.
+    POSIX.1-2001 states that they shall be defined in netinit/in.h so most
+    systems will probably have them.
+
+commit 0de5416a9bafa1ade52722c509817276bbf87d8a
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Jan 2 16:06:34 2016 +0900
+
+    umax_pp: fix memory leak
+    
+    Found courtesy of [-Wunused-but-set-variable] compiler warning.
+
+commit 9d78ace3b7e60afa2b3cb829ac23e5f8b4ccdc07
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Jan 2 16:06:00 2016 +0900
+
+    umax_pp: fix [-Wunused-but-set-variable] compiler warnings
+
+commit 3f0c3df2fcde8d0cf30ab68c70cb5cad984dda6f
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Dec 31 17:51:00 2015 +0900
+
+    kvs40xx: fix [-Wstrict-aliasing] compiler warnings
+
+commit b1f886a2e36555fb0b01c8eb22a0041aebe25795
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Dec 31 17:47:40 2015 +0900
+
+    kvs20xx: fix [-Wstrict-aliasing] compiler warnings
+
+commit 0e3a5c4197fe36eae739a6086b484ff16b83d663
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Dec 31 17:43:25 2015 +0900
+
+    kodakaio: fix [-Wformat=] compiler warnings
+    
+    This uses the ANSI C approach that is used in a lot of existing code
+    rather than what ISO C99 allows for consistency.
+
+commit cadb4b0fff00540159625320416e5601c4704627
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Dec 26 17:45:56 2015 +0900
+
+    saned: fix [-Wmaybe-uninitialized] compiler warning
+
+commit 572e61d39a10ac7299d95005fa7543afe4957d80
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Dec 26 14:56:12 2015 +0900
+
+    p5: fix [-Wunused-but-set-variable] compiler warnings
+
+commit f9e44963801be2940c71e49d7c76a4e59b28dfc7
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Dec 26 14:51:21 2015 +0900
+
+    xerox_mfp: fix [-Wunused-but-set-variable] compiler warning
+
+commit f276e3e05503c5f44890df5a8105959ea07dbb6d
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Dec 26 14:49:25 2015 +0900
+
+    umax1220: fix [-Wunused-but-set-variable] compiler warning
+
+commit e28bdadae98f203188253c5b0a8825a284c8c066
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Dec 26 13:27:47 2015 +0900
+
+    u12: fix [-Wunused-but-set-variable] compiler warning
+
+commit 70c9e1d13ce705249ddbbee2dad5e6307fe77ffa
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Dec 26 13:25:18 2015 +0900
+
+    sm3840: fix [-Wunused-but-set-variable] compiler warnings
+
+commit 9d4f2a72098436e4a65d2047a151ba3c0af82907
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Dec 26 13:18:13 2015 +0900
+
+    sm3600: fix [-Wunused-but-set-variable] compiler warning
+
+commit 82720a2023d8e75480036a9e86f8a57d0bfe6a10
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Dec 24 19:01:09 2015 +0900
+
+    sharp: fix [-Wunused-but-set-variable] compiler warning
+
+commit da010d6088a75ed85472c46e9a29ace18cd7eda9
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Dec 24 17:44:04 2015 +0900
+
+    niash: fix [-Wunused-but-set-variable] compiler warning
+
+commit 86c5d6d7bd52dcb4208c7d5a1ba8844e8c8011e5
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Dec 24 17:38:41 2015 +0900
+
+    nec: fix [-Wunused-but-set-variable] compiler warning
+
+commit 220429ff9ebc78e9869e431125ffd9a235efa93d
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 22:27:47 2015 +0900
+
+    mustek_usb2: fix [-Wunused-but-set-variable] compiler warnings
+
+commit 7efb05627273266a8171d3f9244bbd7a433d6e44
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 22:19:01 2015 +0900
+
+    mustek_pp: fix [-Wunused-but-set-variable] compiler warning
+
+commit 664398cc311b85647a804bee0f8f230a0e3a3f49
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 22:12:07 2015 +0900
+
+    mustek: fix [-Wunused-but-sed-variable] compiler warnings
+
+commit 8b75c6d45002ffafae6cfbf2edd64b3de35d3b04
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 22:17:40 2015 +0900
+
+    microtek2: fix another [-Wunused-but-set-variable] compiler warning
+    
+    This allows for the fact that the backend may be compiled with and
+    without support for authorization.
+
+commit c1458770955b5476eedc89755bb424744b05b055
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 22:11:31 2015 +0900
+
+    microtek2: fix [-Wunused-but-set-variable] compiler warnings
+
+commit 26aa8b52f60adf7553b2872f54a85cfd7b20dd98
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Dec 26 17:41:09 2015 +0900
+
+    magicolor: fix [-Wunused-function] compiler warning
+    
+    This function is only used when SNMP support is activated.
+
+commit 292dd42bb6585e2801623d1f33497581626d9d72
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 21:50:42 2015 +0900
+
+    magicolor: fix [-Wunused-but-set-variable] compiler warning
+
+commit d0e85e9d5e775f143f3db98e762d72861f60a82b
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 21:48:09 2015 +0900
+
+    ma1509: fix [-Wunused-but-set-variable] compiler warning
+
+commit 7c0f5ec66c7fd673d27876b538e52440a897cc1f
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Dec 26 17:36:57 2015 +0900
+
+    lexmark: fix [-Wmaybe-uninitialized] compiler warning
+    
+    This adds a default handler to switch statement so low_get_start_loc()
+    bails before the start_600 variable is used.
+
+commit 068c3bb75d3972dd2218caa84a6de761c5ca0db8
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Dec 26 17:28:34 2015 +0900
+
+    kodakaio: fix [-Wunused-function] compiler warning
+    
+    The function is only used when Avahi support is enabled and has been
+    put in a suitable compilation scope.
+
+commit 610dc9ceb4d9eb061209d935e2b1966dfca5a74c
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 21:38:08 2015 +0900
+
+    kodak: fix [-Wunused-but-set-variable] compiler warning
+
+commit 2724f85552def3fa0c92d88389854c283eac38d3
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 21:36:54 2015 +0900
+
+    hpsj5s: fix [-Wunused-but-set-variable] compiler warning
+
+commit aabb63dbbfdfea9f444019a19171bdcace08b0dd
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 21:35:39 2015 +0900
+
+    hp4200: fix [-Wunused-but-set-variable] compiler warnings
+
+commit a82798d5e1d8352daa1d519d77a7a22771c8439e
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 21:33:40 2015 +0900
+
+    hp3500: fix [-Wunused-but-set-variable] compiler warning
+
+commit 51277aec4a6959f88d46d7ca14cfb94166c328eb
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 21:24:10 2015 +0900
+
+    hp: fix [-Wunused-but-set-variable] compiler warnings
+
+commit a97b1738dfcc16cd0a7fd68f95df8b013f3cb206
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 21:19:46 2015 +0900
+
+    gphoto2: fix [-Wunused-but-set-variable] compiler warning
+
+commit cbeb98daeceb262b3a868c1b2ea2102b98760e61
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 21:10:29 2015 +0900
+
+    epson: fix [-Wunused-but-set-variable] compiler warning
+
+commit cbc72a017123b81a21c6b69ffcb6f828cc810f03
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 21:08:46 2015 +0900
+
+    dmc: fix [-Wunused-but-set-variable] compiler warning
+
+commit fb4147c4f13f7f39c00a807ecc327b5824df21f5
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 20:58:07 2015 +0900
+
+    dc240: fix [-Wunused-but-set-variable] compiler warning
+
+commit bcfa3f6591744e43a0aa7be228505423b25f7731
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 20:56:49 2015 +0900
+
+    dc210: fix [-Wunused-but-set-variable] compiler warning
+
+commit c31cf621062ae4ef69a80d51879d242978853859
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 20:55:36 2015 +0900
+
+    dc25: fix [-Wunused-but-set-variable] compiler warnings
+
+commit 43b296471bc5a902de470f57df681d0c04964b91
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 20:51:28 2015 +0900
+
+    coolscan: fix [-Wunused-but-set-variable] compiler warnings
+
+commit 50ca4bc97670fed1083a5677ddfa71f74bd495dc
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 20:49:17 2015 +0900
+
+    cardscan: fix [-Wunused-but-set-variable] compiler warning
+
+commit c2b7b1af748527dd8ba0fcabc4310fcac1bdf491
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 20:46:13 2015 +0900
+
+    canon636u: fix [-Wunused-but-set-variable] compiler warning
+
+commit e8818437456f36c721f12d311bdb65f3d45606c7
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 20:39:15 2015 +0900
+
+    canon: fix [-Wunused-but-set-variable] compiler warnings
+
+commit 592430016c97b4362314c63a1ac7c96f23d71e4d
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 20:30:02 2015 +0900
+
+    avision: fix [-Wunused-but-set-variable] compiler warning
+    
+    The variable seems to have been superseded by conv_out_size in the
+    else branch of set_calib_data().
+
+commit 5b8fdd317f1bb4076b8fe661db78c230af21004b
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 20:27:20 2015 +0900
+
+    artec_eplus48u: fix [-Wunused-but-set-variable] compiler warning
+    
+    This leaves the sane_close() implementation just as broken as it has
+    been from the initial commit sometime in 2002.
+
+commit ec1936713e67b192d057b2f552a25622f88844a1
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 20:26:21 2015 +0900
+
+    artec_eplus48u: fix [-Wunused-but-set-variable] compiler warning
+    
+    The variable was only used to silence a [-Wunused-parameter] warning.
+
+commit 5b21a24312f2cf2ced5d5c70b0f7d2c1f0c58f35
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 19:57:13 2015 +0900
+
+    artec: fix [-Wunused-but-set-variable] compiler warning
+    
+    The variable is used to assign return values but is not referenced by
+    anything itself.
+
+commit 57ae115eafa5b52b84b8e2878982cdad7c1a9f13
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Dec 26 17:12:41 2015 +0900
+
+    sanei_thread: fix [-Wmaybe-uninitialized] compiler warning
+
+commit cd3453948dd812aaa77d921b198351b340f8c748
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Dec 23 18:53:06 2015 +0900
+
+    sanei_usb: const_cast data buffer
+    
+    The libusb_bulk_transfer() API caters to both reads and writes and
+    as a result of that will not take a const pointer.
+
+commit be084e0d7bb7933e1826e6e48b42f43bc3cb077a
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Dec 26 17:05:17 2015 +0900
+
+    sanei_usb: Move variable declarations to scope of usage
+    
+    Fixes an [-Wunused-variable] when compiling without libusb.
+
+commit 0d7882e34b5f5625261258a3a341a58a04beb304
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Dec 26 16:51:44 2015 +0900
+
+    Change compile time warning policy
+    
+    The -Wall flag is now always enabled (when using gcc).  The -Wextra
+    flag (previously known as -W) and -pedantic flags are, by default,
+    enabled during development but disabled for releases.
+    
+    All other flags have been removed.
+
+commit 5136e664b8608604f54a2cc1d466019922b311e6
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Dec 20 21:58:45 2015 +0900
+
+    Document ChangeLog policy change
+
+commit 674b75fc913187415b4f151a52e4bc7004c5d5b0
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Dec 20 17:33:55 2015 +0900
+
+    Improve readability of condition
+    
+    This also fixes the following GCC warning:
+    
+      warning: logical not is only applied to the left hand side of comparison
+
+commit 58052a7ce6b205e25a2fc85f31158595cad00258
+Author: Volker Diels-Grabsch <v@njh.eu>
+Date:   Sat Dec 5 21:33:48 2015 +0100
+
+    Change GCC mode from ISO C90 to ISO C99
+    
+    Add GCC flag "-std=c99".  Also remove GCC flag "-ansi" which is an
+    alias for "-std=c90" and would make the flag "-std=c99" ineffective.
+    This fixes all occurrences of the following GCC warning:
+    
+    warning: ISO C90 does not support '__func__' predefined identifier
+
+commit baec5e039504de390cae41557b0b8323343721c3
+Author: Volker Diels-Grabsch <v@njh.eu>
+Date:   Sat Dec 5 10:48:59 2015 +0100
+
+    Use consistently __func__ instead of __FUNCTION__
+    
+    Some parts of SANE used __FUNCTION__ while other parts used __func__.
+    Now, __func__ is used consistently throughout the SANE sources.  This
+    fixes all occurrences of the following GCC warning:
+    
+    warning: ISO C does not support '__FUNCTION__' predefined identifier
+
+commit 93298674d02b1127efdf4e726e92e797a0081c9e
+Author: Volker Diels-Grabsch <v@njh.eu>
+Date:   Sat Dec 5 20:44:14 2015 +0100
+
+    Merge all compatibility macros around __func__ and __FUNCTION__
+    
+    Various parts of SANE introduced their own compatibility macros for
+    old compilers that don't support __func__.  Most of these definitions
+    are identical or have minor differences.  This patch replaces them
+    with a single instance in the central header file for backends.
+
+commit 7c8c8e29beed2c4e6f96db08031c12c9001ca784
+Author: Volker Diels-Grabsch <v@njh.eu>
+Date:   Sun Dec 6 03:32:51 2015 +0100
+
+    Remove dead code due to unused variables
+    
+    This fixes some occurrences of the following GCC warning:
+    
+    warning: variable '...' set but not used
+
+commit aba87a4582d594cf953b4bda5b5d42e37e13f21c
+Author: Volker Diels-Grabsch <v@njh.eu>
+Date:   Sun Dec 6 01:30:30 2015 +0100
+
+    Mark internal function toupper_ascii as static
+    
+    This fixes the following GCC warning:
+    
+    warning: no previous prototype for 'toupper_ascii'
+
+commit 13b6faee2a0696eb02a61f22121b7f4854987f2e
+Author: Volker Diels-Grabsch <v@njh.eu>
+Date:   Sun Dec 6 03:03:06 2015 +0100
+
+    Fix interface of helper function write_many
+    
+    This fixes two occurrences of the following GCC warning:
+    
+    warning: cast discards 'const' qualifier from pointer target type
+
+commit badd7025b21b2207cfb95001aeb324597e24b301
+Author: Volker Diels-Grabsch <v@njh.eu>
+Date:   Sun Dec 6 02:37:10 2015 +0100
+
+    Bugfix: On error, return the actual error code in sanei_magic_rotate
+    
+    Up to now, on failure the sanei_magic_rotate function returned a
+    success status.  This fixes the following GCC warning:
+    
+    warning: variable 'ret' set but not used
+
+commit 6aced758f4a95fd858906f3e898ee967a9718641
+Author: Volker Diels-Grabsch <v@njh.eu>
+Date:   Sun Nov 29 16:02:01 2015 +0100
+
+    Fix typos in comments
+    
+    While reading through the SANE sources I noticed some annoying typos
+    in the comments.  This patch is my contribution to make the SANE
+    sources slightly more pleasant to read.
+
+commit 6d8b8d5aa6e8da2b24e1caa42b9ea75e9624b45d
+Author: Alessandro Zummo <a.zummo@towertech.it>
+Date:   Tue Dec 15 16:17:53 2015 +0100
+
+    epsonds: fix duplex w/ double feed detection
+
+commit e9b52639e8dca938b5569b1697c36796ab92174a
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Tue Dec 15 07:23:42 2015 -0500
+
+    Add note about changelogs
+
+commit 06d876f74e5d07cb82d02ca1222926a61a3e458b
+Author: Stéphane Voltz <stef.dev@free.fr>
+Date:   Tue Dec 15 06:05:07 2015 +0100
+
+    fix for #315050
+    
+    - handle case where linesel is rounded to 0 when scan y resolution is
+      below minimal scan resolution but higher than half of the minimum
+
+commit 753d123f36d08cdb8047adac7c89a9fe015c4b25
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Sat Nov 28 08:34:58 2015 -0500
+
+    canon_dr desc update
+    
+    add note about mode switch on P-208
+
+commit f1593204c72124f3077b0b29f3c128d30be415b5
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Fri Nov 27 21:26:46 2015 +0900
+
+    Drop execute permission
+    
+    Source code, description files and configuration templates should never
+    need to be executed.
+
+commit e094c5b43b6d8d8bec84bd5b1ab2c6009f38e14b
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Fri Nov 13 22:06:30 2015 +0900
+
+    Invert sense of sanei_thread validity check
+    
+    Double negatives suck.
+
+commit fe12d31e6873f5c3de330f1de4c4fbc851df1e9f
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Fri Nov 13 21:41:56 2015 +0900
+
+    Fix SANE_Pid related -Wsign-compare warnings
+    
+    This may fix threading related issues on WIN32 platforms, BTW.
+
+commit ed59056d40a143b3cf9243ea0068448a88ce3108
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Mon Nov 23 21:26:09 2015 -0500
+
+    canon_dr backend v54
+    
+    - br_x and br_y locked to page_width/height until changed
+
+commit d0ea697ab83360bf0ccddcd02565f85ea0f96b50
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Mon Nov 23 21:08:30 2015 -0500
+
+    fujitsu backend v129
+    
+    - br_x and br_y locked to page_width/height until changed
+    - add USB ID's for fi-6xxxLA and fi-6xxxZLA scanners
+    - add USB ID's for unsupported SP11xx scanners (genesys based)
+
+commit e6a249e0424f6854b7ed12f8272633a0edecfa90
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Thu Nov 12 21:10:49 2015 -0500
+
+    revert mustek_usb2 backend upgrade
+    
+    Instead of 100+ revert commits, I've lumped everything into a
+    single commit. This removes all of dedf0ac30 through db7f038f1,
+    plus the parts of 497d59180 which were specific to mustek_usb2
+
+commit 21c5f4d814f93a363377798635c7f1cbc1c79342
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Nov 11 22:38:56 2015 +0900
+
+    Add missing #include for malloc()
+
+commit 7dc416b7ae3f0db7c5ce97b5bce0f05f869d877f
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Nov 11 22:38:32 2015 +0900
+
+    Remove unnecessary cast
+
+commit fff1c5962a94ab410dba4fed541312554c8edf8d
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Nov 11 22:35:34 2015 +0900
+
+    Fix "discards 'const' qualifier from pointer target type" warnings
+    
+    The line variable is not (and cannot be) declared 'const'.  The string
+    variable points to a location in line, hence it is safe to cast away
+    'const'ness of the sanei_config_skip_whitespace() return value.
+
+commit 38153b33e1657137e6956e63a9fcb76d665f86f2
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Nov 11 22:33:34 2015 +0900
+
+    Fix "discards 'const' qualifier from pointer target type" warning
+    
+    The device2 variable is not modified so let's make that clear.
+
+commit d2576bbb948dd9d8e06f66dc4cede774c5518751
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Nov 11 22:30:10 2015 +0900
+
+    Fix "discards 'const' qualifier from pointer target type" warnings
+    
+    The cs3_xfree() functions is really just a checked call to free() so its
+    signature has been changed to match that.  The warnings that causes have
+    been fixed in the same way and on the same grounds as the previous commit.
+
+commit e65fd1b4cb5e9463d16a6fb4cd8eeb129ba58e63
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Nov 11 22:28:17 2015 +0900
+
+    Fix "discards 'const' qualifier from pointer target type" warnings
+    
+    The resources pointed to have been acquired by the backend.  It is safe
+    to cast away the 'const' qualifier when releasing these resources.
+
+commit 497d59180649a831691220aefcc8ec81d5f90960
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Sun Nov 8 17:17:37 2015 -0500
+
+    automake for recent changes
+    
+    updates to mustek_usb2, canon_dr and umax_pp require automake run
+
+commit db7f038f108ca12966b947dd80f3772e2133495e
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat Jul 14 23:15:02 2012 +0200
+
+    Fix a bug introduced during refactoring that caused discolored stripes to appear at the left and right sides of the scan area.
+
+commit a64477bf1a381458e0500ef7c62da521d6c4d97f
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat Jul 14 16:44:28 2012 +0200
+
+    Remove USB 2.0 mode, as it causes horrible backtracking for resolutions > 300 dpi.
+
+commit 98248f6088850045579a1e46f2e8aa16302f9dd9
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat Jun 30 22:37:21 2012 +0200
+
+    properly add new handle to linked list
+
+commit 3b48a6d10560e855cef815ca5c1ecbb50fd02d00
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat Jun 30 00:04:06 2012 +0200
+
+    fix integer overflow bug in image data conversion
+
+commit d0ea79f00059a4a8c3a2ac710fd0443c8bbb3d3a
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun May 27 12:23:53 2012 +0200
+
+    Add model-specific functions for computing the number of motor steps.
+
+commit 15fbbf60a6d8c9956a6b6a874f2d0b734ab1b935
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun May 15 22:42:17 2011 +0200
+
+    Split SetMotorSteps into a function that computes the number of steps for the various motor states and and a function that writes the step counts to the controller's registers.
+
+commit 70dcfa4cedf3619575d413126d3530b28e490fd3
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun May 15 21:16:00 2011 +0200
+
+    Simplify SetMotorStepTable*.
+
+commit 27b636d294876c7aac0b53922bacac627ba873c9
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun May 15 19:58:09 2011 +0200
+
+    Provide model-specific function for computing the motor current.
+
+commit 8f405f5a937fd05a67a7554138c047fb5abe5e2c
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun May 15 18:13:44 2011 +0200
+
+    Update motor table generation according to new dumps.
+
+commit 2fa054456e723d7741be4eeb09bb879b802fad9d
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun May 15 15:09:21 2011 +0200
+
+    Detect USB controller type.
+
+commit d8a203a69373bb6f207de9ddc9c30a60da4a2cc9
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun May 15 14:35:06 2011 +0200
+
+    Add function to compute scan motor table for 4800H48U, rearrange code in Asic_SetWindow.
+
+commit ceb7d29690f2ce8f32576caa4b7197fc91b024c1
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun May 8 17:39:31 2011 +0200
+
+    Fix some misuse of SENSOR_DPI constant.
+
+commit 30e39071560412b362e03a105e20996093074d81
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun May 8 16:44:15 2011 +0200
+
+    Allow for model-specific parameters in mustek_usb2_high.c.
+
+commit 47c56e3f19b38c97db4f2d14f780343adca9024f
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun May 8 14:55:42 2011 +0200
+
+    Add some motor-related code for the Microtek 4800H48U.
+
+commit 7b26e0e3fa48742b66bd4632772d70d140058c70
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun May 8 13:56:17 2011 +0200
+
+    Simplify SimpleMotorMove.
+
+commit 0a1125895b3f1ed0058729fcc29d6858ac6d5e56
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat May 7 13:58:24 2011 +0200
+
+    Add some information about the values retrieved by GetChipStatus.
+
+commit c691b0224130763239966c1d7856e96810289238
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat May 7 13:28:52 2011 +0200
+
+    Remove restriction to 8-bit color in negative mode.
+    
+    The only reason for that restriction was that the histogram stretching code, which has been removed earlier, could only handle 8-bit color.
+
+commit 4ced7a900a6463c460121eaed7583f4249ef74c2
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat May 7 12:45:50 2011 +0200
+
+    Improve debug logging and fix a bug in TestDRAM.
+
+commit e1c00bd9ab9d3f4b568d5bb6d09e0812cbef7b7f
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Wed May 4 23:30:14 2011 +0200
+
+    Introduce SetMotorCurrentAndPhase for Microtek scanner, fix old bug in simplification of Mustek variant.
+
+commit 96b4950499d0cf44369fc8e50099925de2ac3c4f
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Mon Apr 25 20:25:02 2011 +0200
+
+    Register related fixes.
+
+commit 5d556cd5e65ba9d1df30e3a3beb0322549d040ff
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Mon Apr 25 19:26:32 2011 +0200
+
+    Introduce structure for specifying model-specific parameters on the ASIC level.
+
+commit 529b6a1d6dc3ff52945f8bf3323bf571596e8088
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 24 21:01:10 2011 +0200
+
+    Fix bug in device list handling.
+
+commit 877f250b5c32f8403ab321d14fd76afd7e2c2d1d
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 24 20:54:19 2011 +0200
+
+    Resolve issue with debug logging.
+
+commit 272c1d6fdeb8af9d6d4b61f85b4a77ca2ebbb645
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 24 20:30:19 2011 +0200
+
+    Add preliminary model entry for the Microtek 4800H48U.
+
+commit 7fda9bbf93f4565e1334ebafd0b6caf13d462de4
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 24 20:21:41 2011 +0200
+
+    Introduce support for multiple scanners.
+    
+    Keep all state local and ensure that all resources are freed by sane_exit. Ensure that each function returns only those error codes that are valid according to the SANE standard.
+
+commit 6865eaf6edef0cc5ea30bcc0d72b52189132f4d6
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 24 14:49:06 2011 +0200
+
+    Simplify sane_read, other fixes to mustek_usb2.c.
+
+commit 63793907e2c2120511603a504396f7053fdc5149
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 24 14:15:59 2011 +0200
+
+    Minor fixes to image processing.
+
+commit bc203e8aa125f276ce84498091185482a22d3527
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 24 13:55:35 2011 +0200
+
+    Sanitize option handling and add support for scanner buttons.
+
+commit b2b3cf767a9a91677b0ac13a6645ed918ca71d55
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 24 00:59:19 2011 +0200
+
+    Use standard macros for byte swapping.
+
+commit 281f53aa1829a61286232efed7a9d6253cec32d4
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 24 00:39:59 2011 +0200
+
+    Remaining endian safety fixes.
+
+commit 80b7249ebf9c57b60cbc0a25288cc04ba2302b56
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat Apr 23 22:42:45 2011 +0200
+
+    Resolve minor thread safety problem.
+
+commit de84f51270f05ead6758d2811a2d36160c412cb1
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat Apr 23 19:31:50 2011 +0200
+
+    Simplify row stride calculation in Asic_SetWindow().
+
+commit 7cd88d41222c85bd262fbf681401ae8c2dab1bce
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat Apr 23 19:21:52 2011 +0200
+
+    Remove Scanner_ScanSuggest.
+
+commit 3f5592ef8e7eedc0a9ff52b8091f9b41b9c2d56f
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat Apr 23 19:04:31 2011 +0200
+
+    Move global state variables of mustek_usb2_high.c into scanner structure.
+
+commit 60a244ed1e1a4e4f8c4dbd83f12141c0c35202ab
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat Apr 23 18:08:28 2011 +0200
+
+    Store size of shading table in ASIC structure.
+
+commit ed1997b22f5f11ccc96262ed841f03b705982737
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat Apr 23 17:22:15 2011 +0200
+
+    Do not test for NULL before calling free().
+
+commit 35c6a52834271e41960030b0c24f8cda2245230d
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat Apr 23 15:28:26 2011 +0200
+
+    Fix error propagation in mustek_usb2_high.c and a layering violation.
+
+commit babee5168909c8c3b8d01c36ab509ea4f7092c4f
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Thu Apr 21 23:25:34 2011 +0200
+
+    Fix indentation of debug macros.
+
+commit c0e44738a41c2cd772125d0774772a541dbac7c5
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Thu Apr 21 23:23:18 2011 +0200
+
+    Simplify debug output in mustek_usb2.c.
+
+commit c377a0245332df3f5e07c3cbd5ead889f18e0549
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Thu Apr 21 23:10:08 2011 +0200
+
+    Simplify debug output in mustek_usb2_high.c.
+
+commit eebbe92c4e73922f1fa1368852a77697c23a1ad1
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Thu Apr 21 22:45:21 2011 +0200
+
+    Simplify debug logging in mustek_usb2_asic.c.
+
+commit 2c712f27c90109e2106d7e8d2f5eeb5af6314260
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Thu Apr 21 00:12:26 2011 +0200
+
+    Remove uninformative function name prefixes, move gamma table creation into separate function.
+
+commit c1dc16d709459e054f50604f86f1ee41c0e7177f
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Wed Apr 20 23:10:53 2011 +0200
+
+    Extensive changes to reduce the amount of global variables in mustek_usb2_high.c.
+    
+    Might have made MustScanner_SetupScan less readable, though.
+
+commit 9444bf1156f0ab52937d101ba6120ae8685b645b
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 17 22:54:14 2011 +0200
+
+    Reorganize some MustScanner_* functions.
+
+commit bd7107ca057b1f45313d96114c6376bb5ee7c200
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 17 22:29:32 2011 +0200
+
+    Remove some unneeded global variables from mustek_usb2_high.c.
+
+commit 589d6e15eee356121582eae90d7a938ff094c1e6
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 17 21:57:18 2011 +0200
+
+    Endian-safe macros; moved remaining ASIC state into structure.
+
+commit f89a7962deafc3b015700469bc2976ac1b931165
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 17 21:00:26 2011 +0200
+
+    Fix indentation.
+
+commit df045634cb6a9667c625fb88ecb36bcb58310cda
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 17 19:14:53 2011 +0200
+
+    Misc fixes.
+
+commit 86f399bd21d7794ba07265b503fea39baa1bb859
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 17 19:00:30 2011 +0200
+
+    Code in mustek_usb2.c should not use global state of mustek_usb2_high.c.
+
+commit 74effd61fd8c9663b994459e8f5a738cc95c4932
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 17 18:25:00 2011 +0200
+
+    Remove histogram stretching for negative images.
+
+commit 4962b35abd7426b7b51a00d907a538a2a38dc859
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 17 15:56:40 2011 +0200
+
+    Use prefix 'p' instead of 'lp', fix other style issues.
+
+commit 9e2aabc97690baae4dd5a7d79d5e7d18df2cf697
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 17 15:27:14 2011 +0200
+
+    If g_isCanceled is true, the thread has already been canceled.
+
+commit a75bd3e8f789435ac5d86ef100dd04e8bd155f76
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 17 15:18:58 2011 +0200
+
+    Improve error handling in mustek_usb2_high.c.
+
+commit 1d0f3ca42ee9d84bd4afc2f379e46bc6a376de96
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 17 14:51:01 2011 +0200
+
+    Fix remaining comments.
+
+commit 9226162537706c982405a7469e7003c4d61808e0
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 17 14:23:46 2011 +0200
+
+    Normalize naming of constants, structures, and enums.
+
+commit d7ebb1553b8e28a9291493aa94003737f0c87298
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 17 13:48:45 2011 +0200
+
+    Remove USB host type enum.
+
+commit 41ac627e5f4dbd84c082d1756414ef9922c294e7
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 17 13:45:42 2011 +0200
+
+    Get rid of unnecessary forward declarations.
+
+commit da64a1fc1efd8a2e8b8245d6101deb103eea1dc4
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat Apr 16 21:37:20 2011 +0200
+
+    First hack to build mustek_usb2* source files separately.
+
+commit 3479acf538335e1290ca00a5e5fef3097a835579
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat Apr 16 20:24:26 2011 +0200
+
+    Merge mustek_usb2_reflective/transparent.c into mustek_usb2_high.c.
+
+commit a45931dd11e5fd270d963c5d4e1b882fa3755c90
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Fri Apr 15 20:12:28 2011 +0200
+
+    Remove MustScanner_GetScannerState.
+
+commit c9516d53656ed5a7e45dc63b1f2202c96269a7ef
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Wed Apr 13 00:22:06 2011 +0200
+
+    Merge Reflective_Reset, Transparent_Reset, and MustScanner_Prepare into new function MustScanner_Reset.
+
+commit b2f52afa321331bf5214cdfe00d15ef479b88651
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 10 18:53:37 2011 +0200
+
+    Further cleanup of mustek_usb2.c.
+
+commit ccce2d4a9a9e2762f8802af051db3f9ed2922ac8
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Apr 10 18:42:05 2011 +0200
+
+    Further cleanup of mustek_usb2.c.
+
+commit 39141a4c0265d97fe4d77084a5a63eaaafd8b8c4
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Wed Mar 30 20:57:54 2011 +0200
+
+    Return SANE_STATUS_UNSUPPORTED unconditionally in sane_set_io_mode and sane_get_select_fd.
+
+commit d9c1df0bb84bffb23ee54be2fbd977e2a18ff4ed
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Wed Mar 30 19:41:05 2011 +0200
+
+    Remove vestigial support for custom gamma tables.
+
+commit acf84e0c9474382d78ae85120c2671b5525bd079
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Tue Mar 29 18:25:19 2011 +0200
+
+    Clean up function StopScan.
+
+commit 9158d10df92b7d96bda66d9e601f248c5474259f
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat Mar 19 14:55:33 2011 +0100
+
+    Further simplification of MustScanner_Get*Line functions.
+
+commit 1f6b405451fda5fe349df1653e3423e8fc360e3b
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat Mar 19 14:14:30 2011 +0100
+
+    First attempt at simplifying the Get*Line functions.
+
+commit a6b15f18ccc430db08c638510bcd603d569723ee
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Mon Mar 14 00:50:30 2011 +0100
+
+    Break remaining long lines.
+
+commit 25242ff9c85f06275ca190896fe37b6d8902e122
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Mon Mar 14 00:21:44 2011 +0100
+
+    Clean up mustek_usb2_high.c.
+
+commit c8982a99392cb7c982f12201a978fb4ae5e9e15a
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 13 21:13:26 2011 +0100
+
+    Do not use prefix "by" for byte variable names.
+
+commit d7b4e02780acd916ebbdd1cf8a9cc99945ea1acd
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 13 21:07:55 2011 +0100
+
+    Use SANE_Status and SANE_TRUE/SANE_FALSE consistently.
+
+commit 8b3c78838ae099d0099b54fbd640c0db1bb3b88c
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 13 20:06:24 2011 +0100
+
+    Create common helper function for Asic_CarriageHome and Asic_MotorMove, remove MotorBackHome.
+
+commit ed5dc8a7cdfb7c32faff37e7ea23446b5de9fc41
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 13 19:41:40 2011 +0100
+
+    Further refactoring of Asic_SetWindow.
+
+commit 82a40d5dca84990f41c15998ae89425eaa576ff6
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 13 19:24:17 2011 +0100
+
+    Refactoring of Asic_SetWindow.
+
+commit 93a79af5d3322fd06369c59a7e72f6773f9bed52
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 13 15:54:02 2011 +0100
+
+    Fix indentation.
+
+commit b43f0688dbb309b7841e89074aab00d4aa61c3a2
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 13 15:15:47 2011 +0100
+
+    Use symbolic constants in more places.
+
+commit 3c87b646b5831b24e6d9d13f26f2a08ec83b6cff
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 13 14:48:40 2011 +0100
+
+    First attempt at merging Asic_SetCalibrate into Asic_SetWindow.
+
+commit 033ebe6d9b6db266fb8146a4ac17d82043b5636a
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat Mar 12 19:25:59 2011 +0100
+
+    Made error handling in mustek_usb2_asic.c more consistent.
+
+commit 96c6ee1dae3dffe2eae9cf3466a0d246d9e3317d
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat Mar 12 16:20:36 2011 +0100
+
+    Cleaned up firmware state handling.
+
+commit c1f22ef9a9a3be1db26fc03721156a72156870b5
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat Mar 12 14:18:48 2011 +0100
+
+    Clean up Asic_SetCalibrate, make Asic_SetCalibrate and Asic_SetWindow more similar.
+
+commit 3cd05daccad6bb1e50cc4030c0b471ed00897367
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sat Mar 12 02:13:34 2011 +0100
+
+    Refactoring the smaller high level ASIC functions.
+
+commit de5b647c4a47938f186b4661615dfbbd3315636d
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Fri Mar 11 23:48:21 2011 +0100
+
+    Refactored medium level ASIC functions.
+
+commit 693da258ce3bbcaf5c8ea31b9a08b77af615c0f2
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Fri Mar 11 18:36:07 2011 +0100
+
+    Move some definitions from mustek_usb2_asic.h to more appropriate headers.
+
+commit 2776b336d15b0e8094271c69dfda7055cd1d896b
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Fri Mar 11 18:17:54 2011 +0100
+
+    Simplify LLFSetMotorCurrentAndPhase.
+
+commit dea59ee824157d33c64df719869ee937749f5428
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Fri Mar 11 17:44:11 2011 +0100
+
+    Refactored all low-level motor functions except LLFSetMotorCurrentAndPhase.
+
+commit e47fee8dcc88ef4fc3e68ed65def29aacb56d17d
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Fri Mar 11 16:27:03 2011 +0100
+
+    Simplified computation of motor current, removed a redundant register assignment.
+
+commit 5688a78ace501c9a0ca36cee5f67a5929d652e81
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Fri Mar 11 16:08:35 2011 +0100
+
+    Simplify low-level ASIC functions, add missing error checks.
+
+commit 1d8a008856d049df910b1d68599a622986ce85c4
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Fri Mar 11 14:25:09 2011 +0100
+
+    Simplify SetRWSize, use symbolic constants for registers whenever possible.
+
+commit 794b15ff9e1daf87b80898aade0dc401e1f597d8
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Fri Mar 11 13:38:40 2011 +0100
+
+    Simplyfied Asic_SetShadingTable.
+
+commit 6d5a5123ea3c41ada76e984670b988f847de2145
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Fri Mar 11 13:12:31 2011 +0100
+
+    Remove whitespace at the end of debug output lines.
+
+commit d418094b64ad7ae2558860568c3e1e28a5a6cbc7
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Fri Mar 11 13:08:03 2011 +0100
+
+    Some motor table related fixes.
+
+commit 3d1b409a1b526025c52c314f143cedd4d2d5d05f
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Fri Mar 11 02:28:14 2011 +0100
+
+    Fix a few comments.
+
+commit 88cac5b4ade1ad4ace0da5be843c879e9256c71c
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Fri Mar 11 02:25:43 2011 +0100
+
+    Begin simplifying LLFSetMotorCurrentAndPhase, ensure all fields of LLF_MOTOR_CURRENT_AND_PHASE are initialized.
+
+commit fb55a9260404049e00f13e627d7e3c8e06b397b8
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Fri Mar 11 02:08:46 2011 +0100
+
+    Remove even more unused code from mustek_usb2_asic.c.
+
+commit 77ea9b01c374833e061ecee271d81a37f38dad77
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Fri Mar 11 00:07:43 2011 +0100
+
+    Improved readability of functions in mustek_usb2_high.c.
+
+commit ca1e0db16f6aeb5c92e2ddf08700981f6799fc4e
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Thu Mar 10 01:39:01 2011 +0100
+
+    Remove unused code and fix indentation in mustek_usb2_high.c.
+
+commit 3f7cf8a65f48447fbc70808229ef6d2f50c3e412
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Wed Mar 9 01:56:04 2011 +0100
+
+    Remove DISABLE bit flag constants.
+
+commit 073fe96611477986de970ab0c444f73024ecea33
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Wed Mar 9 01:26:09 2011 +0100
+
+    LLF_MOTOR_CURRENT_AND_PHASE: only first byte of arrays MotorCurrentTableA/B is ever used
+
+commit 4b242a71394221a2155379b8e89340610a8ed725
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Wed Mar 9 01:18:10 2011 +0100
+
+    Remove unused parameter isOrderInvert from MustScanner_GetMono*Line.
+
+commit 78863d13deacf657ef15b6078d0926fadbd9991a
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Wed Mar 9 01:05:41 2011 +0100
+
+    Remove redundant typecasts.
+
+commit cf6c88bfd1debd288ca563b54120e8ff3903f634
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Wed Mar 9 00:41:21 2011 +0100
+
+    Try to reduce differences between mustek_usb2_reflective.c and mustek_usb2_transparent.c, part 1.
+
+commit 972fc54793d767a6cd18c722ae36feb408f45f9f
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Wed Mar 9 00:02:06 2011 +0100
+
+    Move some code that was duplicated in mustek_usb2_transparent.c and mustek_usb2_reflective.c to mustek_usb2_high.c.
+
+commit db37c13bb337c153ddd83902b8c9ad0b4a445c2a
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Tue Mar 8 23:10:57 2011 +0100
+
+    Remove information-less comments, break long lines, fix indentation.
+
+commit fa8101e05e0432a385e782acd663ce56e0c00367
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Tue Mar 8 18:37:55 2011 +0100
+
+    Remove unused enum FS_NULL.
+
+commit ccde6b063555892ae55ac6c7bfeb8a7d44e02a4e
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Tue Mar 8 18:29:13 2011 +0100
+
+    Remove unused fields of struct GETPARAMETERS.
+
+commit 2be2be76aec39dbef8bbe0501eabaaf0838b3cbc
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Tue Mar 8 18:26:32 2011 +0100
+
+    Unified style of struct and enum definitions.
+
+commit ce6d7010d3fc0bfc5a54cd3411660db43e382bac
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Tue Mar 8 18:15:30 2011 +0100
+
+    Pixel flavor is never PF_WhiteIs0, so the associated code can be removed.
+
+commit 76a23c3bc4c80f91f223f29ae8cc5c91a1a8e4f8
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 6 20:31:48 2011 +0100
+
+    Remove dead "auto level" code, sanitize key handling.
+
+commit e7c44fe6799e5c1d4bce272b539927337b7a2aca
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 6 20:19:27 2011 +0100
+
+    Cleanup of Asic_SetWindow
+
+commit 16485d47da8b2d0a829e378afa1443c1ef4839f8
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 6 19:37:25 2011 +0100
+
+    Optimize motor table calculation.
+
+commit 8821c2882f51d309a7832b362407c46ff11ccd4a
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 6 19:16:16 2011 +0100
+
+    First attempt at cleaning up mustek_usb2_asic.c.
+
+commit 30087b3f43f4e6f2dd83373145dbe0a533b27419
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 6 17:06:14 2011 +0100
+
+    Avoid some unorthodox language constructs.
+
+commit 030c7fa122dccca2f47c949ca46a5972efca20b8
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 6 16:55:39 2011 +0100
+
+    Remove redundant code from mustek_usb2_high.c.
+
+commit a554d61c17206e6b1585bacdfd41fe4aacea1a95
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 6 16:18:18 2011 +0100
+
+    Remove redundant code from mustek_usb2_asic.c, add a missing error check.
+
+commit a49bff1a60386c88168d9aa8a94cdc0ccecac7fd
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 6 15:39:23 2011 +0100
+
+    Simplify DRAM test.
+
+commit bc9252c09464b7ed460bf726dcca3d67f97cd74d
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 6 15:27:19 2011 +0100
+
+    Remove bogus automatic warmup and power saving functions.
+
+commit 0f63d16121ea84f99f75331582c3bdd0cd0d4e1f
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 6 15:13:46 2011 +0100
+
+    Remove redundant code from mustek_usb2.c.
+
+commit 694a69dcab0dddf2ab12eebba49c66c7ac20fdad
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 6 14:48:40 2011 +0100
+
+    Remove unused definitions from mustek_usb2.h.
+
+commit 21be236e840be4f8ca4bead69844f7cd691a8353
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 6 13:57:10 2011 +0100
+
+    Remove unused definitions from mustek_usb2_asic.h.
+
+commit 2404326ddeaf7552e094062b1ed57521e9a21cb4
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 6 02:41:42 2011 +0100
+
+    Remove unused definitions from mustek_usb2_high.h and ensure that the remaining ones are used consistently.
+
+commit d1851a6512a113d1dc4f20beb86a8be29310b627
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 6 01:50:53 2011 +0100
+
+    Remove some particularly pointless comments, reduce size of block comments.
+
+commit 047631050c262142a0f52ed4e1ecc053b03869ad
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 6 01:15:12 2011 +0100
+
+    Remove pointless indirection.
+
+commit dedf0ac30d341b9bcbab7fb32050ff953cc73eff
+Author: Jan Hauffa <jhauffa@gmail.com>
+Date:   Sun Mar 6 01:03:14 2011 +0100
+
+    Remove unused global variable g_pDeviceFile and associated logic.
+
+commit 3b73e1e8a3b0085ad5db38837f0bf44f5a5b8919
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Sun Nov 8 09:24:37 2015 -0500
+
+    fujitsu backend v128
+    
+    do not ask fi-4340 for serial number
+
+commit 72ecee97ce9db13f148aedf52eb46911212d58e4
+Author: Thomas Klausner <wiz-guest@users.alioth.debian.org>
+Date:   Tue Oct 27 20:06:00 2015 +0900
+
+    Add DragonFly BSD support (fixes 315205)
+
+commit a4cc05f677f110c9361f3274fc5d15087a2f8906
+Author: Thomas Klausner <wiz-guest@users.alioth.debian.org>
+Date:   Tue Oct 27 20:09:00 2015 +0900
+
+    Add DragonFly BSD support to sane-find-scanner (fixes 315206)
+
+commit 1baab222e418275ec6fd14afad91b64d0110fdbd
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Nov 8 18:49:58 2015 +0900
+
+    Add missing include (fixes 315207)
+    
+    Both Linux and NetBSD mention this header for use of setsocketopt().
+    DragonFly BSD needs it for the SOL_SOCKET symbol.
+
+commit b0a99cb48938cae5a88c5f37a9a91b60589bad4e
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Nov 8 18:36:57 2015 +0900
+
+    Fix non-portable endian.h include issue (315209)
+
+commit d7516a11ebd6a8d96380c5ee256b171be1cb5e35
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sun Nov 8 18:16:17 2015 +0900
+
+    Fix sane-desc testsuite logic
+    
+    This fixes test failures for release tarballs (pointed out by Mike
+    Frysinger), clamps down on wildcards and prints a failure message
+    when a test does not succeed.
+
+commit 358cbd7f319c64055cd76fedf62a92500b0c5cf5
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Fri Nov 6 21:39:35 2015 -0500
+
+    canon_dr v53 continued
+    
+    reorder geometry group options
+    use bg_color to fill missing image data
+
+commit 398610336b6aadf1a0c37390a0a5e2bd926bdfdf
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Fri Nov 6 12:19:20 2015 -0500
+
+    canon_dr backend v53
+    
+    add swskip option
+
+commit b4bc0eb518ce74ffbfdbe0ce1a14bb404804cd57
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Fri Nov 6 11:46:17 2015 -0500
+
+    canon_dr backend v53
+    
+    replace image processing methods with sanei_magic
+
+commit 666c9a74ff26fd530b40db28f03b447209cf419e
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Thu Nov 5 21:42:29 2015 -0500
+
+    canon_dr backend v52
+    
+    improve dropout option handling
+    add software dropout implementation for downsampled modes
+
+commit 9dc79245291f6d4312c5656fff4232b07f70b673
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Wed Nov 4 13:49:02 2015 -0500
+
+    canon_dr backend v52
+    
+    add must_downsample and must_fully_buffer
+
+commit 01063a769d5431ca83069a9cf240894f893d01f0
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Wed Nov 4 13:05:05 2015 -0500
+
+    canon_dr backend v52
+    
+    set can_color=1 by default (recent models dont have 'C' in name)
+    enable jpeg for DR-6080
+
+commit 0b822359b3e1798294e30a7ea9cfd6fd9a1e3e85
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Wed Nov 4 13:00:10 2015 -0500
+
+    cardscan backend v3
+    
+    add USB IDs for newer model 800c
+
+commit 33495ef9b42a783c8f5f2c056ac5699481d3cc7e
+Author: Luiz Angelo Daros de Luca <luizluca@gmail.com>
+Date:   Thu Oct 15 12:35:00 2015 +0900
+
+    Add missing <sys/types.h> includes
+
+commit 4f803bff0872460433dae1ac2a2954ad1016b678
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Thu Oct 22 22:23:47 2015 +0900
+
+    Escape [] for configure help strings
+
+commit 471453d2b825a569d467d60160b0eaaf6746bf67
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Oct 19 20:51:04 2015 +0900
+
+    Drop unused INCLUDES substitution variable
+    
+    This addresses the following autoreconf output:
+    
+      configure.ac:85: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
+    
+    The INCLUDES variable is not referenced anywhere in configure.ac or
+    configure.  In addition, none of the Makefile.am files use it.
+
+commit 32c25b8b8235762d9feb5dbd0e81496a56e15569
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Oct 19 21:11:53 2015 +0900
+
+    Fix duplicate automake file variable initialization issue
+    
+    This was introduced in 74c00494.
+
+commit f8d35b8d2fdcacc9b664594d141102c2c80ac076
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Mon Oct 26 08:34:17 2015 -0400
+
+    Update canon_dr.desc
+    
+    We had a few scanners that were reported by email or in tracker
+    tickets, which had not been updated in the desc file.
+
+commit 716340e7320e7f946329ad7a3cd911d676c92f6d
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Sat Oct 17 13:55:17 2015 +0900
+
+    Include sys/types.h for u_long.  Fixes compile on OS X
+
+commit 03d90ac2edf287bb0358044d7abdd9f6008dffc5
+Author: Alessandro Zummo <a.zummo@towertech.it>
+Date:   Wed Oct 14 21:55:31 2015 +0200
+
+    epsonds: do not enable double feed detection by default
+
+commit a90d7c91b36b06bd002af890863c1d608dcdd7d4
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Wed Oct 14 19:05:03 2015 +0200
+
+    changelog for recent work
+
+commit 4a83d9c8a4f4c396f5261d62bf7d2f9b8684eba9
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Wed Oct 14 19:04:27 2015 +0200
+
+    Pixma backend version 0.17.24
+
+commit 3095ab46c45e004163f5fb36efa00ce378770a9e
+Author: Rolf Bensch <roben-guest@alioth.debian.org>
+Date:   Wed Oct 14 19:02:43 2015 +0200
+
+    new scanners Canon PIXUS MP5/SmartBase MPC190/imageCLASS MPC190 and Canon MP10/SmartBase MPC200/imageCLASS MPC200
+
+commit 06b865cfd24f1e6c71506684d73ef79b43edc3cf
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Wed Oct 14 20:39:39 2015 +0900
+
+    Prevent possible buffer overflows [-Wstrncat-size].  Fixes 315198
+
+commit 18e4c4a08622e2ee4536dcb423d4548a4bc7a7e3
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Tue Oct 13 23:32:40 2015 +0900
+
+    Revert "Prevent use of uninitialized variable"
+    
+    This change introduces a variable that shadows the file scope one.
+    
+    This reverts commit 45e66aee952dcdada88293901580a111262fc1e9.
+
+commit 36876a83663832cf89fa945737d004ce9b46fb01
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Oct 12 20:55:19 2015 +0900
+
+    saned: minor improvement of help message wording
+
+commit 32986192bd9ce14276e1ae144d71d42461e591b9
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Oct 12 20:42:50 2015 +0900
+
+    fix: declaration-after-statement warning
+
+commit 42aa01e4e558e0019df00702579c928f9fd126e6
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Oct 12 20:42:01 2015 +0900
+
+    fix: missing-field-initializers warning
+
+commit fa001c2193045844dd3318f9538b309e11089c9c
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Oct 12 20:49:07 2015 +0900
+
+    Follow getopt_long usage in scanimage.c
+    
+    This is on the off chance that getopt_long is not in the system's
+    standard library.
+
+commit 45e66aee952dcdada88293901580a111262fc1e9
+Author: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date:   Mon Oct 12 20:47:43 2015 +0900
+
+    Prevent use of uninitialized variable
+
+commit eab8fd457d2b8f38f9425f87258cf4fe42dac15c
+Author: Matteo Croce <matteo@openwrt.org>
+Date:   Sun Oct 11 19:50:04 2015 +0200
+
+    saned: add '-b' option to bind to a specific address
+
+commit fed2a2cf60511d87e413148f1b9063f9ea4e6917
+Author: Matteo Croce <matteo@openwrt.org>
+Date:   Sun Oct 11 19:50:03 2015 +0200
+
+    saned: use getopt_long() for option parsing
+    
+    The help message has been adjusted to match getopt_long conventions.
+
+commit 418d1ecea7571d10acd08df2edc7967a91e14b0d
+Author: Matteo Croce <matteo@openwrt.org>
+Date:   Sun Sep 20 19:55:37 2015 +0200
+
+    saned: move help message to usage() function
+
+commit a79cd0abe7daed1a749c8ad2cd7e2a89cc6153e4
+Author: Matteo Croce <matteo@openwrt.org>
+Date:   Sun Sep 20 19:55:36 2015 +0200
+
+    saned: parse inetd args in main()
+    
+    move argument parsing logic from run_inetd() to main()
+
+commit 2c3cb206ce55a7ac9ff9b479de452a332ba2aa1a
+Author: Matteo Croce <matteo@openwrt.org>
+Date:   Sun Sep 20 19:55:35 2015 +0200
+
+    saned: parse standalone args in main()
+    
+    move argument parsing logic from run_standalone() to main()
+
+commit 2239d2aaff16964a5d67293f5e4220d235e2c84d
+Author: Alexander Hofmann <alexander.hofmann@new-h.de>
+Date:   Tue Oct 6 17:42:05 2015 +0200
+
+    Replace obsolete interface with standard include files
+
+commit 56e69f0998005db432b4f7dd38693a870f663520
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Mon Oct 5 08:21:39 2015 -0400
+
+    added kvs1025.conf.in and utsushi.desc
+
+commit 69a9a3116eb18f8d0c618217e033a1c134215954
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Sun Oct 4 21:25:08 2015 -0400
+
+    minor release doc update
+
+commit 5e1d45cad7d7933b7120646ae5174ccdc8a9b49f
+Author: m. allan noah <kitno455@gmail.com>
+Date:   Sun Oct 4 21:13:39 2015 -0400
+
+    reopen sane-backends 1.0.26git
diff --git a/ChangeLog-1.0.0 b/ChangeLog-1.0.0
deleted file mode 100644
index 0600ae1..0000000
--- a/ChangeLog-1.0.0
+++ /dev/null
@@ -1,4309 +0,0 @@
-1998-11-21  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* Version 1.0 released
-
-	* From Brian J. Murrell:
-	
-	* backend/dll.conf: Mention dc210.
-
-	* backend/cderror.h: New file.
-	* backend/jinclude.h: Ditto.
-	* backend/djpeg.c: Ditto.
-	* backend/dc210.desc: Ditto.
-	* backend/dc210.h: Ditto.
-	* backend/dc210.c: Ditto.
-	* backend/cdjpeg.h: Ditto.
-
-	* doc/Makefile.in (SECT5): Mention sane-abaton.5.
-	* doc/sane-abaton.man: New file.
-	* backend/abaton.c: Ditto.
-	(wait_ready): Explicitly cost tv_sec member to (long) in order
-	to print it (avoids warning on platforms where tv_sec is not a long).
-
-	* backend/abaton.h: Ditto.
-	* backend/abaton.conf: Ditto.
-	* backend/abaton.desc: Ditto.
-	* backend/dll.conf: Mention abaton.
-
-	* Apollo/DomainOS fixes by Paul Walker:
-	* sanei/sanei_DomainOS.h: Add this missing file.
-	* sanei/sanei_config2.c: Include <sane/config.h> to get
-	u_char defined if necessary.
-	* sanei/sanei_DomainOS.c (upper_string): Delete.
-	(do_help): Ditto.
-	* include/sane/config.h.in: Add #undef HAVE_SYS_TIME_H.
-
-	* lib/usleep.c [HAVE_SYS_TIME_H]: Include <sys/time.h> only if
-	we have it.
-
-	* configure.in (CPPFLAGS): Check for sys/time.h.
-
-	* frontend/gtkglue.c: Move include of <sys/types.h> in front
-	of include of <sys/stat.h>.
-
-	* config.sub: Apply patch to recognize -sys5.3.
-
-	* backend/microtek.c: Applied Matto's latest patch to upgrade
-	backend from v0.9 to v0.10.
-
-1998-11-04  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/microtek2.desc: Mention ScanMaker X6 and Phantom 636.
-
-	* backend/microtek2.c (check_inquiry): Mention Phantom 636 in
-	model string.
-
-1998-11-03  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/microtek2.c (check_inquiry): Added patch by Sebastian
-	Erdmann <serdmann@cs.tu-berlin.de> to recognize ScanMaker X6.
-
-1998-11-02  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/artec.c: Print size_t as recommended in backend/GUIDE.
-
-1998-11-02  Chris Pinkham <cpinkham@infi.net>
-
-	* backend/artec.c: changes to correct bugs when using AT12.
-	(sense_handler): New function (by Dick Bruijn).
-	(wait_ready): Ditto (by Dick Bruijn).
-	(abort_scan): Ditto (by Dick Bruijn).
-	Support added to read capability data from scanner if the model.
-	Supports this command (by Dick Bruijn).
-	Added call to sanei_scsi_close() if detected scanner is not
-	a Artec/Ultima model (by Francois Ouellet).
-	Added Negative option.  Added Halftone Pattern option.
-	Added Filter Type option for mono scans.
-	Added Quality Calibration option.
-	Moved test_unit_ready command till AFTER we check for ULTIMA scanner.
-
-1998-11-02  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* config.guess: Upgrade to libtool v1.2.
-	* config.sub: Ditto.
-	* ltconfig: Ditto.
-	* ltmain.sh: Ditto.
-
-1998-10-29  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/mustek.c (encode_resolution): If MUSTEK_FLAG_DOUBLE_RES
-	is set, use resultion encoding reported by
-	<Heiko_Schroeder@t-online.de>
-	(attach): Set MUSTEK_FLAG_DOUBLE_RES for MSF-06000CZ.  Do other
-	models need this, too?
-	(calibration): Declare NUM as size_t, not int.  #ifdef out this
-	unused routine.
-	(reader_process): Print size_t values as %lu with explicit cast
-	to u_long.
-
-	* backend/mustek.h (MUSTEK_FLAG_DOUBLE_RES): New flag.
-
-	* backend/mustek.c (init_options): Initialize resolution with 18
-	dpi, not 100dpi so that "scanimage" without options gives a
-	preview-quality image that doesn't take much space or time.
-
-	* backend/mustek.c: Updated with Andreas Bolsch's version (adds
-	support for SE models).
-	* backend/mustek.h: Ditto.
-	* backend/mustek.spec: Ditto.
-
-	* backend/pnm.c (sane_read): Replace C++ comment with C comment.
-
-	* backend/microtek2.c: Updated with Bernd's v0.5.
-	* backend/microtek2.h: Ditto.
-	* backend/microtek2.conf: Ditto.
-
-	* backend/umax.c: Updated with Oliver's latest version.
-	* backend/umax.h: Ditto.
-	* backend/umax-scsidef.h: Ditto.
-	* backend/umax-scanner.h: Ditto.
-	* backend/umax-uc630.h: Ditto.
-	* backend/umax-uc840.h: Ditto.
-	* backend/umax-ug630.h: Ditto.
-	* backend/umax-ug80.h: Ditto.
-	* backend/umax-uc1200s.h: Ditto.
-	* backend/umax-uc1200se.h: Ditto.
-	* backend/umax-uc1260.h: Ditto.
-	* backend/umax.conf: Ditto.
-	* include/sane/saneopts.h: Ditto.
-	* doc/sane-umax-doc.html: Ditto.
-	* doc/sane-umax-doc.tex: Ditto.
-	* doc/sane-umax.man: Ditto.
-
-1998-10-28  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* doc/sane.tex (subsection{sane_control_option}): Clarify that
-	paramter "v" is ignored for SET_AUTO calls.
-
-	* frontend/saned.c (init): Initialize w->version.
-
-	* backend/net.c (connect_dev): Accept version code 2 and
-	set peer's version code in dev->wire.version.
-
-	* include/sane/sanei_wire.h: New member "version".
-
-	* sanei/sanei_net.c (sanei_w_control_option_req): Encode
-	option value only if peer_version is < 3 or if action is
-	not SANE_ACTION_SET_AUTO.
-
-	* include/sane/sanei_net.h (SANEI_NET_PROTOCOL_VERSION): Up
-	protocol version to version 3.
-
-	* sanei/sanei_net.c (sanei_w_control_option_req): Transcode
-	value_type, value_size, and value only if req->action !=
-	SANE_ACTION_SET_AUTO.  Reported by Petter Reinholdtsen.
-
-	Patches by Petter Reinholdtsen <pere@hungry.com>:
-
-	* backend/dmc.c (attach_one): Don't use C++-style comments.
-
-	* backend/dc25.h (DEFAULT_TTY_BAUD): New macro.  Move SPEEDS macro
-	to dc25.c.
-
-	* backend/dc25.c: Initialize tty_baud to DEFAULT_TTY_BAUD.  Use
-	B57600 and B115200 only if defined.
-
-	* doc/saned.man: Mention that hostname matching no longer is case
-	significant.
-
-	* configure.in
-	(lib/Makefile.in,lib/strcasecmp.c,frontend/saned.c): Use
-	strcasecmp() instead of strcmp to compare DNS hostnames.  Case is
-	irrelevant when using DNS.
-
-	* backend/dll.c: Add support for HP-UX 10.xx style shared
-	libs.
-
-	* configure.in include/sane/config.h.in backends/dll.c:
-	Use dhl_load() family for DLL support on HP/UX.
-
-	* backend/snapscan.c (sane_snapscan_open): Don't cast lvalue
-	(illegal according to ANSI C, I think).
-
-	* backend/apple.c (init_options): Add explicit "break" after
-	"default:" to make HP-UX compiler happy (?).
-	(sane_read): Make stuff after #endif a comment.
-
-	* backend/agfafocus.c: New file (by Karl Anders Oygard
-	<karlo@opera.no>).
-	* backend/agfafocus.h: Ditto.
-	* doc/sane-agfafocus.man: Ditto.
-
-	* doc/sane-net.man: Fix typo: network service is called "sane",
-	not "saned" (by Andreas Dilger <adilger@enel.ucalgary.ca>).
-
-	* backend/hp-scl.c (sanei_hp_scsi_pipeout): Use SIGPWR only if its
-	defined (by Peter Kirchgessner).
-
-	* frontend/Makefile.in (INCLUDES): Mention @GTK_CFLAGS@ as part of
-	INCLUDES macro instead of CFLAGS.  Despite its name, @GTK_CFLAGS@
-	is guaranteed to contain CPP include directives only.  (Reported
-	by Kevin Dalley <kevind@rahul.net>.)
-
-1998-10-27  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* sanei/sanei_scsi.c (sanei_scsi_open): Return
-	SANE_STATUS_ACCESS_DENIED if open() fails with errno==EACCES.
-
-	* backend/ricoh-scsi.c: #ifdef out unused code and print values of
-	type size_t as prescribed in the file backend/GUIDE.
-
-	* backend/dll.conf: Mention Ricoh backend.
-
-	* backend/ricoh.c: New file (by Ricoh Dillema).
-	* backend/ricoh.h: Ditto..
-	* backend/ricoh-scsi.c: Ditto..
-
-	* backend/microtek.c: Apply Aug 7 patch by Matto Marjanovic.
-
-	* backend/dc25.c: Apply patch by Peter Fales (v1.1).
-	* backend/dc25.desc: Ditto.
-	* doc/sane-dc25.man: Ditto.
-
-	* backend/pnm.c: Applied patch by Goran Thyni <goran@bildbasen.se>
-	that allows scanning parts of a PNM image.
-
-	* backend/GUIDE: Add Matto's comment on .desc files.
-
-	* backend/hp.c: New file from Peter Kirch (formerly known as xhp).
-	* backend/hp.h: Ditto.
-	* backend/hp-accessor.h: Ditto.
-	* backend/hp-device.h: Ditto.
-	* backend/hp-handle.h: Ditto.
-	* backend/hp-option.h: Ditto.
-	* backend/hp-scl.h: Ditto.
-	* backend/hp-scsi.h: Ditto.
-	* backend/hp-accessor.c: Ditto.
-	* backend/hp-device.c: Ditto.
-	* backend/hp-handle.c: Ditto.
-	* backend/hp-hpmem.c: Ditto.
-	* backend/hp-option.c: Ditto.
-	* backend/hp-scl.c: Ditto.
-	* backend/Makefile.in (libsane-hp.la): Make libsane-hp.la
-	dependent upon hp-accessor.lo, hp-device.lo, hp-handle.lo,
-	hp-hpmem.lo, hp-option.lo, and hp-scl.lo.
-
-1998-10-22  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* doc/sane-hp.man (Model): Mention HP6200 as per report by Tom
-	Martone <tommartone@erols.com>.
-
-1998-07-30  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* include/sane/config.h.in: Apply Cory Kempf's
-	<ckempf@enigami.com> FreeBSD CAM support patch.
-	* sanei/sanei_scsi.c: Ditto.
-	* tools/find-scanner.c: Ditto.
-	* configure.in: Ditto.
-
-1998-07-27  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* Version 0.74 released.
-
-	* configure.in (CPPFLAGS): Save old CPPFLAGS in saved_CPPFLAGS and
-	then set CPPFLAGS (not saved_CPPFLAGS!) to include GTK_CFLAGS.
-	This should get GIMP detected again.
-
-	* frontend/xscanimage.c (init): Add missing newline.
-
-	* backend/net.c (sane_init): Look for service "sane", not "saned".
-
-	* configure.in (V_MINOR): Make it 74.
-
-	* tools/sane-desc.el: Hack a bit so sane-backends.html can be
-	generated some place other than the working directory
-	(which may not be writable).
-
-	* tools/sane-desc.el: New file by Matto.
-
-	* doc/Makefile.in (sane-backends-html): New rule to generate
-	sane-backends.html.
-
-	* backend/apple.desc: List sane-apple man page.
-
-	* backend/umax.c: Updated with Oliver's latest version (with Irix
-	4MB workaround).
-
-	* backend/microtek.c: Updated with Matto's v0.9.
-	* backend/microtek.h: Ditto.
-	* backend/microtek.conf: Ditto.
-	* backend/microtek.desc: Ditto.
-	* doc/sane-microtek.man: Ditto.
-
-	* backend/apple.h: Updated with Milon's v0.3.
-	* backend/apple.c: Ditto.
-
-	* doc/sane-apple.man: New file (contributed by Milon Firirkis).
-
-1998-07-23  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/canon-scsi.c (reserve_unit): Don't compile unused
-	reserve_unit().
-
-	* sanei/sanei_scsi.c: Apply Yuri's patch to add
-	sanei_scsi_find_devices() support to OS/2.
-
-	* sanei/sanei_pio.c: Include <sane/sanei_backend.h> instead of
-	just <sanei/sanei_debug.h> so we pick up #define's for inb and
-	out.
-
-	* include/sane/config.h.in: Mention HAVE_OS2_H and
-	HAVE_SYS_TYPES_H.
-
-	* configure.in (AC_CHECK_HEADERS): Mention sys/hw.h and
-	sys/types.h.
-	(AC_CHECK_LIB): Check for syslog.
-	(AC_CHECK_FUNCS): Check for _portaccess.
-	(CPPFLAGS): Don't disable qcam backend if we have _portaccess.
-	These patches contributed by Yuri for the benefit of OS/2.
-
-	* backend/qcam.c (qc_unlock) [!F_SETLK]: Fall back to convention
-	UNIX-style locking using O_EXCL (not ideal, but better than
-	nothing at all).
-	(qc_lock_wait): Ditto.
-
-	* sanei/sanei_scsi.c (KillDomainServer): Add missing paren.
-
-	* lib/usleep.c [HAVE_SYS_SELECT_H]: Include <sys/select.h>.
-
-	* include/sane/sanei_backend.h: Define i/o-port access
-	compatibility macros (by Yuri Dario).
-
-	* backend/Makefile.in (CONFIGS): Mention dummy saned.conf
-	(this really ought to go in frontend/Makefile, but I'm too lazy to
-	add a configuration-install rule there...).
-
-	* backend/coolscan.c: Update with Didier's latest version.
-	(send_one_LUT): Merge in alloca() fix from 1998-04-04.
-
-1998-07-22  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/dll.conf: Mention artec backend.
-
-	* backend/mustek.c (sane_start): Remove duplicate status test.
-
-1998-07-21  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* frontend/saned.c (main): Look for service name "sane", not
-	"saned".
-
-1998-07-20  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/epson.c (epson_cmd): Add patch by Holger Frahm
-	<frahm@itp.uni-hannover.de> to support GT9500.
-
-	* backend/microtek.c: Update with latest version (v0.8).
-
-	* backend/artec.c (PREFER_PIXEL_MODE): Apply Chris Pinkham's
-	6/4/98 patch to add preliminary support for AT6 and AT12 scanner
-	models.
-
-	* backend/epson.c: Apply Christian Bucher's patch.
-	
-	* backend/dc25.h: New file (by Peter Fales <psfales@earthling.net>)
-	* backend/dc25.c: Ditto.
-	* backend/dc25.conf: Ditto.
-	* doc/sane-dc25.man: Ditto.
-
-	* backend/microtek2.c: Replace dynamically sized array with
-	alloca() to be ANSI C compliant.
-
-	* backend/epson.c: Replace zero-sized byte arrays with 1 byte
-	arrays to be ANSI C compliant.
-
-	* doc/sane-hp.man: Mention ScanJet 3P (reported by Patrick Debois
-	<Patrick.Debois@lin.vlaanderen.be>).
-
-	* backend/umax.c: Updated with Oliver's 5/7/98 patch.
-
-1998-07-20  Chris Pinkham  <cpinkham@infi.net>
-
-	* backend/artec.c: Added code to default to using millimeters
-	instead of pixels for measurements, can revert to pixels by
-	defining PREFER_PIXEL_MODE at compilation time.
-	
-	Added code to cause sane_read to block until data available to return,
-	also buffers as much data as possible before returning.
-
-	Added code to cause sane_read to read as much data from scanner as
-	possible for each call, previously would read 1 line max from
-	scanner.
-
-	Added code to attempt to detect scanner capabilities from scanner
-	if scanner supports this command, it not program has defaults
-	coded in for certain scanner models.
-
-	Separated horizontal and vertical resolution settings with ability
-	to bind them together.  This still has a bug, so the option is is
-	disabled by default until I can get it working correctly.
-
-	Bug-fixes to get backend working properly with xscanimage.
-	Added preview mode option.
-	Added threshold option.
-
-	* backend/artec.h: Added options codes to go along with options
-	added in artec.c file.
-
-1998-07-20  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/epson.c (scsi_write): Apply patch by Thomas Bogendoerfer
-	<tsbogend@alpha.franken.de> to get Epson backend to work for SCSI
-	scanners again.
-
-1998-06-05  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/mustek.c (attach): Move dev_wait_ready() after the check
-	for a Mustek scanner.  This is to make sure we don't issue any
-	command other than INQUIRY to SCSI devices that are not known to
-	be Mustek scanners.
-
-1998-05-22  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/dmc.c: Updated with David Skoll's latest patch.
-
-	* sanei/sanei_scsi.c (sanei_scsi_find_devices): Declare missing
-	findtype arg for dummy sanei_scsi_find_devices().
-
-1998-05-16  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/hp.c (attach): Return right after INQUIRY if the device
-	doesn't look like an HP scanner.
-
-1998-05-15  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* Version 0.73 released.
-
-	* backend/mustek.c (attach): Initialize *devp to 0.
-
-	* configure.in: Use AM_PATH_GTK to figure out if/how to compile
-	with gtk libs.
-
-	* aclocal.m4: Include gtk.m4 from gtk-1.0.1 distribution.
-
-	* backend/Makefile.in (install): Change install rule so there is
-	guaranteed to be a (symlink) of the form
-	libsane-$(BACKEND).so.$(V_MAJOR) pointing to the right version
-	of a dll.
-
-	* backend/dll.c (load): Get rid of .la parsing non-sense.  Instead,
-	always attempt to open libsane-$(BACKEND).so.$(V_MAJOR).
-
-	* backend/mustek.c (sane_init): Make sure empty lines really
-	are ignored.
-
-1998-05-13  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/microtek2.conf: Add line "scsi * * Scanner".
-	* backend/microtek.conf: Ditto.
-
-	* sanei/sanei_scsi.c (get_devicename): New function.
-
-	* sanei/sanei_config2.c: New file.
-
-	* sanei/Makefile.in (LIBSANEI_OBJS): Mention sanei_config2.
-	(LIBSANEI_LTOBJS): Ditto.
-
-	* sanei/sanei_scsi.c (sanei_scsi_find_devices): New function
-	(comes in two flavors: one for Linux, one for the remaining
-	platforms).
-
-	* include/sane/sanei_scsi.h: New function.
-
-	* doc/sane-dll.man: Fix to make it work with man2html (use
-	\- instead of -).
-	* doc/sane-dmc.man: Ditto.
-	* doc/sane-epson.man: Ditto.
-	* doc/sane-hp.man: Ditto.
-	* doc/sane-microtek.man: Ditto.
-	* doc/sane-microtek2.man: Ditto.
-	* doc/sane-mustek.man: Ditto.
-	* doc/sane-pint.man: Ditto.
-	* doc/sane-scsi.man: Ditto.
-	* doc/sane-umax.man: Ditto.
-	* doc/saned.man: Ditto.
-	* doc/scanimage.man: Ditto.
-	* doc/xscanimage.man: Ditto.
-
-	* doc/Makefile.in (MAN2HTML): New macro.
-	(html-man): New rule to generate HTML version of man-pages.
-
-	* configure.in (V_MINOR): Up to 73.
-
-	* backend/umax.conf: Add lines "scsi UMAX" and "scsi LinoHell
-	Office".
-
-	* backend/microtek2.h: New file (by Bernd Schroeder
-	<bernd@aquila.muc.de>).
-	* backend/microtek2.c: Ditto.
-	* backend/microtek2.conf: Ditto.
-
-	* backend/dll.conf: Mention "microtek2".
-
-	* backend/apple.conf: Add line "scsi APPLE".
-	* backend/mustek.conf: Add lines for "scsi MUSTEK" and "scsi
-	SCANNER".
-
-	* backend/apple.c (attach_one): New function.
-	(sane_init): Use sanei_config_attach_matching_devices().
-	* backend/artec.c: Like for apple.c.
-	* backend/canon.c: Ditto.
-	* backend/coolscan.c: Ditto.
-	* backend/dmc.c: Ditto.
-	* backend/epson.c: Ditto.
-	* backend/hp.c: Ditto.
-	* backend/microtek.c: Ditto.
-	* backend/mustek.c: Ditto.
-	* backend/s9036.c: Ditto.
-	* backend/snapscan.c: Ditto.
-	* backend/tamarack.c: Ditto.
-
-1998-05-11  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/snapscan.c (sane_snapscan_get_parameters): Always set
-	depth of 8.
-
-	* configure.in: Check for gtk_tooltips_set_tips _after_ gtk
-	libraries have been located.  (Patch by Jake E. Hamby
-	<jehamby@lightside.com>).
-
-1998-05-09  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* sanei/Makefile.in (.c.o): Patch by Kaz Sasayama
-	<Kaz.Sasayama@hypercore.co.jp>: invoke $(COMPILE) if libtool
-	doesn't give us a regular .o file.
-	* lib/Makefile.in (.c.o): Ditto.
-
-	* frontend/preview.c (preview_update): Call update_selection() so
-	selection is updated when scanwindow geometry changes.  The patch
-	from 1998/4/2 never worked satisfactorily (and indeed was never
-	enabled in any of the SANE releases).
-
-1998-05-06  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/mustek.c (sane_init): Use sanei_config_skip_whitespace()
-	to skip whitespace.
-
-1998-05-05  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* frontend/xscanimage.c (init): Allow -g as an option.
-
-	* sanei/sanei_config.c (sanei_config_get_string): New function.
-	(sanei_config_skip_whitespace): Ditto.
-
-	* backend/umax.c: Updated with Oliver's latest patch.
-
-	* Makefile.in (INSTALLED_INCLUDES): Mention sanei_readproc.h.
-
-	* backend/microtek.h: Updated with Matto's 0.7 patch.
-	* doc/sane-microtek.man: Ditto.
-	* backend/microtek.c: Ditto.
-	Added precalibration code:  tries to intelligently have scanner
-	run a calibration only once when necessary --- this shaves a solid
-	six seconds off every scan!
-	Added model code/vendor name for ScanMaker 600ZS.
-	Added model codes/vendor name for Agfa Arcus II, StudioScan,
-	StudioScan II.
-	Patched up 3-pass scanning (forgot to switch color planes).
-	Corrected IIHR to 600dpi base resolution.
-	Check so that 0x0 regions are recognized as invalid.
-	Fixed subtle buffering bug in color scans.
-	Fixed-up active/inactive dependencies among options.
-	Make sure shadow <= midtone <= highlight.
-	Let shadow/midtone/hightlight be active during LineArt and Halftone.
-	"Halftoning" option moved into Scan Mode Group (from Enhancement).
-	Removed some illegal "TEST_UNIT_READY" commands (during scan).
-	Removed "MODE_SENSE_1", since it didn't quite work anyway.
-
-1998-05-03  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* frontend/xscanimage.c (scan_preview): Don't register
-	preview_window_destroyed as a delete_event handler.
-
-1998-05-02  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/Makefile.in: Remove unused LIBLIB macro.
-
-1998-04-30  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	Patches by Matto Marjanovic:
-
-	* frontend/gtkglue.c (gsg_close_dialog_callback): Remove
-	client_data pointer arg.
-
-	* frontend/xscanimage.c (scan_win_delete): Remove GdkEvent arg.
-	(preview_window_destroyed): Ditto.
-	(input_available): Include bad_depth handling code only if
-	HAVE_LIBGIMP_GIMP_H is defined.
-	(scan_dialog): Remove client_data pointer arg.
-
-1998-04-29  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* frontend/gtkglue.c (gsg_get_filename): Use gtk_events_pending()
-	instead of gdk_events_pending().
-	* frontend/preview.c (input_available): Ditto.
-	* frontend/xscanimage.c (quit_xscan): Ditto.
-	(input_available): Ditto.
-
-1998-04-08  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* sanei/sanei_pio.c (sanei_pio_open): Fix prototype.
-
-1998-04-07  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* Version 0.72 released.
-
-	* backend/epson.c (sane_init): Fix up config file reading
-	to be more like that of other backends.
-	(PATH_MAX): Use PATH_MAX instead of FILENAME_MAX.
-
-	* backend/canon.c (sane_init): Read & process canon.conf (patch by
-	Yuri Dario <mc6530@mclink.it>).
-
-1998-04-06  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* sanei/sanei_init_debug.c (sanei_init_debug): Move up #endif
-	so NULL-test works for OS/2, too.
-
-	* frontend/saned.c: Include <sys/types.h>.
-
-	* backend/snapscan.c: Don't include non-ANSI <values.h>.
-	(sane_snapscan_start): Use INT_MAX instead of MAXINT.
-	(PATH_MAX): Define PATH_MAX as 1024 if not defined otherwise.
-
-1998-04-05  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/umax.c: Updated with Oliver's latest version
-	(0.72pre-a).
-
-1998-04-04  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/coolscan.c: Do lalloca.h spiel instead of including
-	alloca.h.
-
-	* configure.in: Look for glib/include directory in /usr/local/lib
-	and /usr/lib.  Add $C_SWITCH_X_SITE to CPPFLAGS, not DEFS.
-
-	* doc/sane-mustek.man: Mention MFS-1200SP v1.07 as working as
-	reported by ehramm@dk3uz.hh.provi.de (Edmund H. Ramm).
-
-1998-04-03  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/canon-scsi.c (request_sense): ifdef out to quiet down
-	gcc.
-
-	* backend/artec.c (read_data): Print size_t as (u_long) to make it
-	work right and without compiler warning both on 32 and 64 bit
-	platforms.
-	(artec_get_status): Ditto.
-	(init_and_start_scan): Ditto.
-	(sane_start): Ditto.
-	(sane_read): Ditto.
-	(artec_buffer_line_offset): Declare LEN as size_t.
-	* backend/epson.c (sane_read): Ditto.
-
-	* sanei/sanei_pio.c (pio_wait): Initialize STAT with 0 to quiet
-	down gcc.
-
-	* backend/Makefile.in (libsane-epson.la): Mention sanei_pio.lo.
-	(libsane-dll.la libsane.la): Ditto.
-
-	* sanei/Makefile.in (LIBSANEI_OBJS): Mention sanei_pio.o.
-	(LIBSANEI_LTOBJS): Mention sanei_pio.lo.
-
-	* frontend/xcam.c (input_available): Undo braindamage regarding
-	break out of scan loop (the SANE docs _do_ specify that in
-	blocking mode, *len==0 implies end of scan).
-	* frontend/xscanimage.c: Ditto.
-
-	* doc/sane-dmc.man: New file by David Skoll.
-
-	* sanei/sanei_DomainOS.c: New file by Paul Walker.
-
-	* backend/snapscan.c (DL_INFO, DL_MAJOR_ERROR): Up error code to 1
-	to avoid printing anything unless the user specifically asked
-	for this.
-
-	* include/sane/sanei_debug.h (DBG_LEVEL): Define debug level
-	variable as macro DBG_LEVEL.
-
-	* README.solaris (NOTE): Emphasize that generic scsi driver
-	needs to be installed before running configure.
-
-	* backend/s9036.c: Don't depend on GNU C dynamically sized arrays.
-	
-	* backend/coolscan.c (send_one_LUT): Use alloca() instead of
-	depending on GNU C dynamically sized arrays.
-	Include <alloca.h>.
-
-	* frontend/xscanimage.c (input_available): Break out of the
-	loop only if LEN==0 _and_ we have a non-negative input tag.
-	* frontend/xcam.c (input_available): Ditto.
-
-	* backend/microtek.c (parse_inquiry): Handle for ScanMaker 35t+.
-	(id_microtek): Ditto.
-
-1998-04-02  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* configure.in (CPPFLAGS): Check for libXi.
-
-	* frontend/gtkglue.c (panel_destroy): Clear dialog elements
-	after destroying the panel.
-
-	Patches by Christian Bucher <cbucher@vernetzt.at>:
-
-	* include/sane/sanei_pio.h: New file.
-	* sanei/sanei_pio.c: Ditto.
-	* backend/epson.c, backend/epson.h, backend/epson.conf: Updated
-	with Christian's version adds support for parallel port interface.
-	
-	* sanei/sanei_scsi.c (sanei_scsi_req_wait): Patch by Matto to let
-	sense-handler decide whether a non-zero sense_buffer[0] really
-	should be considered an error (needed for Microtek backend).
-
-	* doc/sane.tex (\subsubsection{Option Value Unit}): Document new
-	unit SANE_UNIT_MICROSECOND.
-
-	Patches by Oliver Rauch:
-	
-	* frontend/gtkglue.c (unit_string): Handle SANE_UNIT_MICROSECOND.
-	* frontend/scanimage.c (print_unit): Ditto.
-	(parse_scalar): Ditto.
-
-	* include/sane/sane.h: Add SANE_UNIT_MICROSECOND.
-
-	* Upgrade to Kevin's latest SnapScan backend (0.4).
-
-	* doc/sane-hp.man: Mention ScanJet IIp C1790A as working (reported
-	by Ronald.Vogelaar@nl.origin-it.com).
-
-	* frontend/xscanimage.c (init): Issue an error message when we see
-	option -g as this is most likely due to someone invoking
-	xscanimage through GIMP when GIMP support is missing.
-	(scan_done): Add sanity check.
-	(scan_start): Ditto.
-
-	* Upgraded to Matto's latest Microtek backend (0.6).
-
-	* Upgraded to Oliver's latest UMAX backend (0.71h).
-
-	* frontend/preview.c (draw_selection): Fix so that selection is
-	updated when sliders are moved.  Patch by Mikko Tyo"la"ja"rvi.
-
-	* backend/snapscan.c (DL_INFO): Increase from 0 to 1.
-	(DL_MAJOR_ERROR): Ditto.  This avoids printing error messages
-	unless the user specifically requests them.
-	
-	* frontend/gtkglue.c: Include <sys/types.h>.
-
-	* include/sane/config.h.in: Ignore HAVE_USLEEP under Apollo
-	Domain.
-
-	Patches by Paul Walker:
-
-	* sanei/sanei_scsi.c: New Domain OS code.
-
-	* tools/find-scanner.c: Include <sane/config.h>.
-
-	* lib/usleep.c (usleep): Use time_$wait() to avoid broken usleep()
-	implementation in Domain Sys5.3 environment.
-
-	* config.sub: Translate sys5.3 into sysv3 for the benefit
-	of Apollo Domain/OS.
-
-	* sanei/sanei_init_debug.c (sanei_init_debug): Use DosScanEnv()
-	instead of getenv() under OS/2.  (Patch by Yuri Dario
-	<mc6530@mclink.it>)
-
-1998-03-02  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* frontend/xcam.c (main): Remove obsolete call to
-	gdk_set_debug_level (0).
-
-	* backend/mustek.c (attach): Print debug message when discovering
-	unknown model.
-
-	* doc/sane-scsi.man: Mention Adaptec 1505.
-
-	* tools/find-scanner.c (main): List FreeBSD specific device names.
-
-	* tools/Makefile.in (LIBS): Define.
-	(find-scanner): Mention $(LIBS).
-
-	* backend/epson.conf: New file.
-
-	Patches by Yuri Dario <mc6530@mclink.it>:
-	
-	* backend/epson.c (sane_init): Support config file.
-
-	* sanei/sanei_ab306.c (outb): Add missing parens.
-
-	* backend/snapscan.c: Don't include <values.h>
-
-	* backend/net.c: Include netdb.h after in.h to appease OS/2.
-	Include <sys/types.h>.
-
-	* sane-0.71.spec (%files): Mention sane-dmc.5.
-	* doc/Makefile.in (SECT5): Ditto.
-
-	* backend/dmc.c, backend/dmc.h: Update with Feb 26 patch from
-	David Skoll.
-	* doc/dmc.man: New file by David Skoll.
-
-1998-02-25  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/dmc.c (DMCSetMode): Add missing field name (patch by
-	Martin Huber).
-
-	* tools/find-scanner.c (main) [__sun]: Add missing command (patch
-	by Martin Huber.
-
-	* sanei/sanei_scsi.c (sanei_scsi_cmd): Fix typo: fd_Info->fd_info
-	(patch by Jeff Freedman).
-
-	* configure.os2: Update with patch by Jeff Freedman.
-
-	* backend/snapscan.c (sane_snapscan_start): Replace non-standard
-	MAXINT by INT_MAX from <limits.h>.
-	(PATH_MAX): Define PATH_MAX as 1024 if not defined by headers.
-
-1998-02-23  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* Version 0.71 released.
-
-	* backend/dmc.c (DMCAttach): Close scsi fd before returning.
-
-	* backend/microtek.c: Default to no_dump.
-	(sane_init): Change "nodump" into "dump" option.
-	* doc/sane-microtek.man: Document this change.
-
-	* backend/snapscan.c: Include <sane/sanei_config.h>.
-	(sane_snapscan_init): Use sanei_config_open() instead of fopen().
-
-	* backend/snapscan.c: Upgrade to latest version (0.3 patch 7).
-	* backend/snapscan.h: Ditto.
-	
-	* configure.in (V_MINOR): Up version to 0.71.
-
-	* sanei/sanei_scsi.c (scsi_cmd) [USE == SOLARIS_INTERFACE]: "or"
-	in lun instead of overwriting cdb[1] (patch by Martin Huber
-	<hu@garfield.m.isar.de>).
-
-	* backend/snapscan.c: Replace <posix1_lim.h> with <limits.h>.
-
-	* backend/mustek.c (fix_line_distance_mfs): Add back missing
-	multiplication by bpl (patch by Stefano Garavaglia
-	<alter.ego@iol.it>).
-
-	* backend/coolscan.c: Updated with Didier's latest version.
-	(COOLSCAN_CONFIG_FILE): Rename from PATH_COOLSCAN_CONFIG and
-	define as "coolscan.conf".  Include <sane/sanei_config.h>.
-	(sanei_init): Use sanei_config_open() instead of fopen().
-
-	* backend/coolscan-scsidef.h: Ditto.
-	* backend/coolscan.h: Ditto.
-
-	* backend/hp.c (sane_close): Change s to s->next (patch by David
-	Skoll <dskoll@chipworks.com>).
-
-1998-02-17  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/Makefile.in (PRELOADABLE_BACKENDS): Mention apple &
-	coolscan.
-
-	* backend/coolscan.c: New file (by Didier Carlier
-	<didier@sema.be>)..
-	* backend/coolscan.h: Ditto.
-	* backend/coolscan-scsidef.h: Ditto.
-
-	* backend/apple.c: Include <sane/sanei_config.h>
-	(APPLE_CONFIG_FILE): Rename from PATH_APPLE_CONFIG.
-	(sane_init): Use sanei_config_open().
-
-	* backend/apple.conf: New file.
-
-	* backend/dll.conf: Mention apple & coolscan backends.
-
-	* backend/apple.c: New file (by Milon Firikis
-	<milonf@isosun.ariadne-t.gr>).
-	* backend/apple.h: Ditto.
-
-	* sane-0.70.spec: Make symlink for libsane.so.0.
-
-	* doc/sane-epson.man: Mention GT-5500 scanner as working (as
-	reported by Umberto Zanatta <uzanatta@foscolo.org>).
-
-1998-02-12  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* sanei/sanei_scsi.c (DOMAINOS_INTERFACE): Define.  Add
-	Apollo Domain/OS support contributed by Paul Walker.
-
-	* configure.in (AC_CHECK_HEADERS): Mention apollo/scsi.h.
-	Add #undef of HAVE_APOLLO_SCSI_H.  Add type checks for u_char,
-	u_int, u_long (DomainOS reportedly needs these).
-
-	* sanei/sanei_scsi.c (sanei_scsi_req_wait) [USE ==
-	LINUX_INTERFACE]: Always check for a non-zero error code in the
-	sense-buffer.  The Linux sg driver guarantees that the sense
-	buffer is clear to zero when no sense code has been requested, so
-	this is safe.
-
-1998-01-28  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* Version 0.7 released.
-
-1998-01-27  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* frontend/xscanimage.c (quit_xscan): Exit with status 0, not 1.
-
-	* tools/xerox (scale): Added improvements contributed by Joachim
-	Woll <woll@physik.uni-kassel.de>.
-
-	* Upgrade to Oliver's latest UMAX backend. 
-
-	* include/Makefile.in (distclean): Add empty all rule.  Add
-	distclean rule to delete Makefile.
-
-	* Makefile.in (distclean): Delete japi/Makefile as well (this
-	command should be removed once japi gets added to SUBDIRS).
-
-	* backend/Makefile.in (EXTRA): Remove ../lib/usleep.lo and
-	../lib/strndup.lo.
-	(libsane.la): Make dependent on $(LIBOBJS).
-
-	* frontend/xscanimage.c (preview_window_destroyed): Declare second
-	arg (added in some version of gtk?).
-
-	* tools/find-scanner.c (main): Change __sgi__ to __sgi.
-
-1998-01-26  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/microtek.c: Don't declare strdup()---you're bound to get
-	it wrong for some platforms!
-
-	* doc/sane-scsi.man: Say explicity that generic SCSI support needs
-	to be enabled.
-
-	* doc/sane-hp.man (Problems): Document PhotoSmart problems
-	as reported Peter Kirchgessner <Pkirchg@aol.com>.
-
-	* backend/snapscan.c: Upgrade to v0.3 from
-	http://www.cs.ualberta.ca/~charter/snapscan.html.
-	* backend/snapscan.h: Ditto.
-
-1998-01-22  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	SnapScan backend by Franck Schnefra, Michel Roelofs and
-	Kevin Charter:
-
-	* backend/snapscan.c: New file.
-	* backend/snapscan.h: Ditto.
-	* backend/snapscan.conf: Ditto.
-
-	* backend/umax-scanner.h (scanner_str): Add missing comma.
-
-	* sanei/sanei_scsi.c (sanei_scsi_cmd): Pass sense_handler_arg to
-	sense handler for BSD_INTERFACE, HPUX_INTERFACE,
-	OPENSTEP_INTERFACE, DECUNIX_INTERFACE, SCO_OS5_INTERFACE,
-	OS2_INTERFACE, IRIX_INTERFACE, AIX_GSC_INTERFACE, and
-	SOLARIS_INTERFACE.
-
-	* include/sane/config.h.in: Add missing #undef of
-	HAVE_SYS_SCSI_TARGETS_SCGIO_H.
-	Ditto for HAVE_SYS_SCSI_SGDEFS_H.
-
-1998-01-20  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* Version 0.69 released.
-
-	* doc/sane-scsi.man: Limit ncr810 patch to kernel versions <
-	2.0.33.
-
-	* tools/xerox (HEIGHT): Add A4 paper size as comment.
-
-1998-01-19  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* frontend/preview.c (make_preview_image_path): New function.
-	(preview_destroy): Save scan surface parameters as a comment
-	in the preview image.
-	(restore_preview_image): Read scan surface parameters from
-	preview image file and restore only if the parameters match
-	the currently selected surface.
-	(paint_image): Gracefully handle NULL image_data.
-	(event_handler): Don't call restore_preview_image().
-	(preview_update): Detect if the scan surface changed.  If so,
-	establish a new preview widget size, preview area size, and
-	restore a preview image, if available.
-
-	* backend/mustek.c (sense_handler): Declare closure argument.
-
-	* sanei/sanei_scsi.c (sanei_scsi_open): Fix typos.
-
-	* backend/umax-scsi.c (umax_open_scanner): Pass us as sense_arg.
-	(umax_open_scanner): Ditto.
-	(umax_open_scanner): Ditto.
-	* backend/umax.c (sane_start): Ditto.
-
-	* backend/canon.c (attach): Pass 0 as sense_arg to sanei_scsi_open().
-	(sane_start): Ditto.
-	* backend/epson.c (attach): Ditto.
-	(sane_start): Ditto.
-	* backend/tamarack.c (sense_handler): Ditto.
-	* backend/s9036.c (sane_start): Ditto.
-	* backend/mustek.c (dev_open): Ditto.
-	* backend/hp.c (attach): Ditto.
-	(sane_start): Ditto.
-	* backend/mustek.c (dev_open): Ditto.
-	* tools/find-scanner.c (main): Ditto.
-
-	* include/sane/sanei_scsi.h (SANEI_SCSI_Sense_Handler): Declare
-	closure arg.
-	(sanei_scsi_open): Ditto.
-
-	* doc/sane-hp.man (Model): Remove obsolete comment regardign 5P.
-
-1998-01-17  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/mustek.c (dev_open): Fix debug message.
-
-	* Solaris related patches by Martin Huber:
-	
-	* backend/umax-scsi.c (umax_wait_scanner): Sleep for 1 second
-	instead of 100ms on Sun platforms---the SCHILYscg driver prints a
-	warning message each time a device is busy.  Duh.
-	(umax_get_data_buffer_status): Don't do
-	umax_get_data_buffer_status() on Sun's.  This should be fixed...
-
-	* sanei/sanei_scsi.c (sanei_scsi_open): Call unit_ready() towards
-	the end of this function.
-	(CCS_SENSE_LEN): Define as 18 if not defined
-	by any header files.
-	(sanei_scsi_cmd): Use sensebuffer to collect sense info.
-	(scsi_cmd): Better error handling when using SCHILYscg driver.
-
-1998-01-14  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* frontend/xscanimage.c (scan_start): Turn off dialog sensitivity.
-	(scan_done): Restore dialog sensitivity.
-
-	* backend/qcam.c (init_options): Turn on SANE_CAP_ALWAYS_SETTABLE.
-
-	* frontend/preview.c (scan_done): Enable dialog sensitivity.
-	(scan_start): Disable dialog sensitivity.
-
-	* include/sane/sane.h (SANE_CAP_ACTIVE_WHILE_SCANNING): New
-	manifest constant.
-
-1998-01-12  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* frontend/gtkglue.c (panel_destroy): Call gtk_tooltips_unref()
-	instead of gtk_tooltips_destroy() as suggested by Ben Gertzfield
-	<che@debian.org>.
-
-1997-12-25  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/canon.c: New file by Helmut Koeberle
-	<helmut.koeberle@bytec.de>.
-	(sane_start): Print variables of type size_t as %lu and cast to
-	(u_long), to make it compile without warning on all platforms.
-	(attach): Remove extraneous semicolon.
-
-	* backend/canon.h (canon_h): Ditto
-	* backend/canon-scsi.c: Ditto.
-
-1997-12-24  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* sanei/sanei_ab306.c (sanei_ab306_cmd): Write the first
-	6 bytes of a SCSI command only (suggested by Andreas, but
-	is this really correct??).
-
-	* backend/mustek.c (gamma_correction): Add patch by Andreas
-	Czechanowski <andreas@inspc44c.ins.uni-stuttgart.de> to
-	fix lineart scanning for Paragon II 600 N scanner.
-
-1997-12-23  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* tools/find-scanner.c (scanner_identify_scanner): Print info on
-	all SCSI devices when --verbose is in effect.
-	(main): Add Sun device names.
-
-	* include/sane/config.h.in: Define _POSIX_SOURCE and
-	__EXTENSIONS__ when compiling on a Sun with GCC.
-
-	* configure.in (AC_CHECK_HEADERS): Mention sys/scsi/sgdefs.h and
-	sys/scsi/targets/scgio.h.
-
-1997-12-17  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* frontend/xscanimage.c (device_dialog): Suggestion by Matt: set
-	window auto-shrink by calling gtk_window_set_policy().
-
-	* japi/ImageCanvas.java: Updated with Jeff's latest patch.
-	* japi/Jscanimage.java: Ditto.
-	* japi/Makefile.in: Ditto.
-	* japi/README.JAVA: Ditto.
-	* japi/ScanIt.java: Ditto.
-	* japi/ImageCanvasClient.java: New file.
-
-1997-12-16  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* frontend/gtkglue.c (panel_build): Patch by Matt: a) For all
-	individual options flagged as "advanced", panel_build will only
-	display the option if the "Show advanced" button is toggled.
-	Group identifiers flagged as "advanced" are handled the same as
-	before.  b) panel_rebuild is called whenever the "Show advanced"
-	button is toggled on or off.
-
-	* doc/sane-scsi.man: Mention sane-epson(5) and sane-microtek(5).
-	* doc/scanimage.man: Ditto.
-	* doc/xscanimage.man: Ditto.
-
-	* doc/sane-microtek.man: New file by Matt.
-
-	* backend/microtek.c: Updated with Matt's version 0.4.
-	* backend/microtek.h: Ditto.
-	* backend/microtek.conf: Ditto.
-
-	* doc/Makefile.in (SECT5): Mention sane-microtek.5.
-
-1997-12-15  Fred Hucht & Michael Staats <{fred|michael}@thp.Uni-Duisburg.DE>
-
-	* Added support for generic SCSI under AIX 4.1.x using the device
-	driver gsc written by Matthew Jacob <mjacob@feral.com> (nice piece
-	of work!).
-	Find this driver under
-	ftp://ftp.feral.com/pub/aix/gsc.tar.gz or
-	ftp://ftp.thp.Uni-Duisburg.DE/pub/source/gsc.tar.gz.
-	Changed files: sanei/sanei_scsi.c, include/sane/config.h.in,
-	configure.in.
-
-	* Moved '#include <lalloca.h>' to very beginning in all source
-	files as AIX needs it there.
-
-	* Added define OUTFILENAME to frontend/xscanimage.c.
-
-	* Fixed wrong environment reference in /doc/sane-scsi.man.
-
-	* Several changes in tools/find-scanner.c to run using
-	above mentioned driver.
-	Fixed wrong IN_periph_devtype_cpu (was 1, should be 3).	
-
-1997-12-14  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* doc/sane-hp.man: Mention ScanJet 4P (reported to work by
-	Adam Sjoegren <asjo@diku.dk>).
-
-1997-12-09  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* frontend/saned.c (check_host): Change len from size_t to int to
-	match getpeername() as per Single Unix Spec (as opposed to POSIX
-	drafts...).
-	(start_scan): Ditto for getsockname().
-	* backend/net.c (sane_start): Ditto.
-
-	* backend/tamarack.c (TAMARACK_CONFIG_FILE): Delete.
-	(TAMARACK_CONFIG_FILE): New macro.
-	Include <sane/sanei_config.h>.
-	(sane_init): Use sanei_config_open() instead of fopen().
-	(read_data): Declare nbytes as size_t---makes a difference
-	on 64-bit platforms.
-
-1997-12-07  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/s9036.c (sane_init): Run through "indent -gnu". Use
-	sanei_config_open() instead of fopen().  Include
-	<sane/sanei_config.h>.
-	(read_more_data): Print size_t variables by casting them to
-	(u_long) and using %lu format (some platforms have size_t as
-	u_long, others as u_int, which does make a difference if
-	sizeof(long) > sizeof(int).
-	(sane_start): Ditto.
-	Add English translation for comments that were in German only.
-
-	* backend/s9306.c: New file by Ingo Schneider.
-	* backend/s9306.h: New file by Ingo Schneider.
-
-1997-12-04  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/mustek.c (sane_cancel): Collect child process status
-	after killing it (avoids accumulating zombie processes).  Reported
-	by Mike Sweet.
-	* backend/umax.c (sane_cancel): Ditto.
-	* backend/qcam.c (sane_close): Ditto.
-	(sane_cancel): Ditto.
-
-1997-12-03  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* Version 0.68 released.
-
-1997-12-02  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* frontend/scanimage.c (window_val_user): New variable.
-	(fetch_options): Don't overwrite window_val[i] if it's
-	user-specified.
-	(main): Set window_val_user[i] as necessary.
-
-	* backend/mustek.c (send_gamma_table): New function.
-	(sane_start): Send gamma table both before and after start_scan().
-	The MFS-06000CX is reported to need the gamma-table before
-	start_scan() and the Mustek docs do indeed indicate downloading
-	the gamma-table twice.
-	(init_options): Make --custom-gamma option active by default (since
-	gray-scale mode is the default mode).
-
-1997-11-30  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* doc/sane-mustek.man: Mention MFC-08000CZ.
-
-	* backend/mustek.c (attach): Reduce y_range.max for MFC-08000CZ
-	from 300 to 292mm as reported by Jeroen Steenblik
-	<jeroens@esrac.ele.tue.nl>.  Ditto for MFC-06000CZ.
-
-1997-11-28  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/umax-scanner.h (scanner_str): Add "Astra 610S".
-	(known_scanners): Increment from 13 to 14.
-
-	PP fixes by Andreas Czechanowski:
-	* backend/mustek.c (EXTRA_SAVE_LINES): New macro.
-	(fix_line_distance_pp): Use EXTRA_SAVE_LINES instead of hardcoded
-	constant.  Various fixes to make it actually work.
-	(reader_process): Initialize s->ld_ld_line to zero.
-
-	* backend/mustek.h (struct Mustek_Scanner): Add member ld_line.
-
-1997-11-26  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* tools/Makefile.in (.c.o): Add this rule.
-
-	* tools/find-scanner.c: Include sanei_scsi.h and sanei_debug.h
-	via <> quotes (note "").
-
-1997-11-25  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* sanei/sanei_ab306.c (sanei_ab306_exit): Fix by Andreas
-	Czechanowski: output 0x00 at port[i].base + 1 instead.
-
-1997-11-22  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* doc/sane-mustek.man (Model): Clarify that paralell port != printer
-	port.
-
-	* backend/mustek.c (fix_line_distance_mfs): Add missing SANE_UNFIX()
-	calls for x_range.max and dpi_range.max.
-	(fix_line_distance_pp): Correct based on Andreas' feedback.
-
-1997-11-18  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* configure.in (CFLAGS): Don't specify -ansi---with older libcs,
-	it's causing more problems than it's worth.
-
-	* Patch by Jeff Freedman:
-
-	* japi/Sane.c: Limit string length to option size.
-
-	* japi/SaneOption.java: Fix indentation.
-	(unitString): New function.
-	
-	* japi/ImageCanvas.java: New file.
-	* japi/Jscanimage.java: Ditto.
-	* japi/ScanIt.java: Ditto.
-	
-	* japi/Makefile.in (CLASSES): Mention ScanIt.class and
-	ImageCanvas.class.
-	(all): Mention Jscanimage.class.
-	* japi/Scan.c: Include <string.h>.
-	(String_length): New function.
-
-1997-11-16  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* frontend/gtkglue.c (scale_update): In recent versions of GTK,
-	"value_changed" callbacks no longer return a value.  Change this
-	function to type "void" accordingly.
-
-	* sanei/sanei_scsi.c: Declare cam_fd only if USE ==
-	DECUNIX_INTERFACE.
-
-	* sanei/sanei_load_values.c (sanei_load_values): Detect errors
-	while reading the option name (first call to sanei_w_string()).
-	Reported by Geoffrey T. Dairiki.
-
-	* sanei/sanei_ab306.c [HAVE_UNISTD_H]: Include <unistd.h>.  Fix by
-	Geoffrey T. Dairiki.
-
-	* lib/alloca.c: Enclose in #ifndef HAVE_ALLOCA bracket.  Fix by
-	Geoffrey T. Dairiki.
-
-	* include/lalloca.h: Declare alloca() as returning void* when
-	__STDC__ is in effect so declaration matches definition in
-	lib/alloca.c.  Reported by Geoffrey T. Dairiki.
-
-	* frontend/preview.c (update_selection): Set coord[] values to
-	rounded-to-nearest-int of float values.  This avoids the jumping
-	selection box effect. Fix by Geoffrey T. Dairiki.
-
-	* frontend/gtkglue.c (scale_update): Patch by Geoffrey T. Dairiki
-	<dairiki@apl.washington.edu>: emit value_changed signal if the
-	backend changed the value.
-
-	* backend/umax.c: Upgraded to Oliver's latest UMAX version.
-
-	* backend/mustek.c (sane_init): Ignore white space in front of an
-	option/device-name.
-
-1997-11-12  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* sanei/sanei_ab306.c (sanei_ab306_get_io_privilege):
-	(struct port): Remove member HAVE_IO_PRIVS.
-	(sanei_ab306_get_io_privilege): Get ioperm()issions independent of
-	HAVE_IO_PRIVS.
-
-	* backend/mustek.c (do_stop): Always send STOP command before
-	closing the device.
-	(dev_read_req_enter): For parallel-port scanner, set *idp to 0.
-
-1997-11-10  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	Bug reported by Matto Marjanovic <maddog@mir.com>:
-
-	* frontend/gtkglue.c (panel_build): Create button only after we
-	know the option's value.
-	(button_new): Add VAL argument and initialize button state to
-
-	correct value before connecting the toggled callback.
-
-	Bugs reported by Petter Reinholdtsen <pere@link.no>:
-	
-	* sanei/sanei_config.c (sanei_config_open): Add missing cast to
-	(char *).
-
-	* sanei/sanei_scsi.c (sanei_scsi_cmd) [USE == IRIX_INTERFACE]: Fix
-	(u_char) cast to (u_char *).
-
-1997-11-06  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/qcam.c (init_options): Set the type of OPT_NUM_OPTS to
-	SANE_TYPE_INT (suggested by Guido Muesch
-	<odiug@faho.rwth-aachen.de>).
-	* backend/mustek.c (init_options): Ditto.
-
-1997-11-04  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* frontend/xcam.c (xcam_exit): Protect against recursive
-	invocation.
-	(main): Turn on preferences.advanced as no graphical geometry
-	selection exists right now.
-	Include <preferences.h>.
-	preferences: New variable.
-	(pref_toggle_advanced): New function.
-	(pref_toggle_tooltips): Ditto.
-	(build_preferences_menu): Add button to control advanced & tooltips
-	preferences.
-
-	* doc/sane.tex (subsection{sanecontrol_option}): Make it illegal
-	for SANE_INFO_RELOAD_OPTIONS to be set needlessly.
-
-	* backend/hp.c (sane_control_option): Only turn on RELOAD_PARAMS
-	when value changed.
-	
-	* backend/qcam.c (sane_control_option): Only turn on
-	RELOAD_PARAMS when value changed.
-
-	* backend/mustek.c (sane_control_option): Only turn on
-	RELOAD_OPTIONS and/or RELOAD_PARAMS when value changes.
-
-	* Integrate b&w quickcam fixes by Guido Muesch
-	<odiug@faho.rwth-aachen.de>:
-
-	* backend/qcam.c (bw_x_range, odd_bw_x_range, bw_y_range,
-	odd_bw_y_range): New constants.
-	(sane_open): Disable despeckle, black-level, hue, saturation,
-	resolution & test options for b&w camera (either not useful or not
-	supported at this point).
-	(sane_start): Use QC_MONO_SET_CONTRAST instead of
-	QC_BW_SET_CONTRAST.
-	(sane_start): Call qc_reset() for b&w camera to avoid hangs (color
-	camera doesn't need this and is faster that way).
-	(sane_start): Multiply undecimated_width by s->val[OPT_DEPTH].w,
-	not 4.
-
-	* backend/qcam.h: Remove obsolete QC_BW_SET_CONTRAST,
-	QC_BW_AUTO_ADJUST_OFFSET, QC_BW_GET_OFFSET, and QC_SET_CONTRAST
-	macros.
-
-1997-11-02  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* doc/sane-hp.man (Model): Mention ScanJet IIcx.  Johannes Geiger
-	<J_Geiger@fleury.de> reported it to work fine under OS/2 with
-	sane-0.66
-
-	* backend/umax.c: Apply patch by Oliver Rauch that avoid
-	umax hangs.
-
-1997-11-01  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* Version 0.67 released.
-
-	* sanei/sanei_ab306.c: New file.
-
-	* backend/mustek.h (MUSTEK_FLAG_PP): New macro.
-	(struct Mustek_Scanner): Add members ld.index and ld.lmod3
-	for parallel-port scanner line-distance correction.
-
-	* backend/mustek.c (color_seq): Move to global level from
-	fix_line_distance_normal().
-	(fix_line_distance_pp): New function.
-	(scsi_wait_ready): Renamed from wait_ready().
-	(pp_wait_ready): New function.
-	(dev_wait_ready): Ditto.
-	(dev_open): Ditto.
-	(dev_cmd): Ditto.
-	(dev_req_wait): Ditto.
-	(dev_read_start): Ditto.
-	(dev_read_req_enter): Ditto.
-	(dev_close): Ditto.
-	(attach): Modify to use dev_open().  Set minimum scan resolution
-	to 51 dpi for parallel-port scanners.
-	(scan_area_and_windows): Call dev_cmd() instead of
-	sanei_scsi_cmd().
-	(mode_select): Ditto.
-	(gamma_correction): Ditto.
-	(start_scan): Ditto.
-	(stop_scan): Ditto.
-	(line_distance): Ditto.
-	(get_image_status): Ditto.
-	(backtrack_and_adf): Ditto.
-	(gamma_correction): Return immediately if custom-gamma is turned
-	off or if not doing a multibit scan.  Add support for sending all
-	three gamma tables with a single command.
-	(line_distance): Initialize additional line-distance correction
-	state needed by parallel-port scanner.
-	(read_req_enter): Remove.
-	(send_data): Modify to support parallel-port scanner line-distance
-	correction.
-	(reader_process): Require I/O-privilege if dealing with parallel
-	port scanner and call dev_read_start().  Use dev_read_req_enter()
-	instead of read_req_enter(), dev_req_wait() instead of
-	sanei_scsi_req_wait().
-	(sane_start): For parallel-port scanner, send gamma table with
-	a single gamma_correction() call.
-
-	* doc/sane-mustek.man: Update with info regarding parallel port
-	scanner.
-
-	* backend/dll.c (add_backend): When a backend is present already,
-	move it to the head of the backend list, so pre-loaded backends
-	appear in the same order as if they had been loaded dynamically
-
-	* backend/mustek.c (pp_mode_list): New constant.
-
-	* backend/mustek.c (init_options): Use pp_mode_list for parallel
-	port type scanners (no color lineart/halftone modes).
-
-	* sanei/sanei_codec_ascii.c (ascii_w_string): free(*s) only if *s
-	is non-NULL (reported by Geoffrey T. Dairiki
-	<dairiki@apl.washington.edu>).
-
-	* backend/mustek.c (attach): Turn on MUSTEK_FLAG_LD_NONE for
-	MFS-12000SP with firmware 1.02 or newer. Reported by Henning
-	Busacker <henning.busacker@Duesseldorf.netsurf.de>.
-
-1997-10-25  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* doc/sane.tex (chapter{Contact Information}): Update mailing list
-	and home page address.
-
-	* backend/dll.c: Include <sane/sanei_config.h>.  Call
-	sanei_config_open() instead of fopen().
-	* backend/hp.c: Ditto.
-	* backend/mustek.c: Ditto.
-	* backend/net.c: Ditto.
-	* backend/pint.c: Ditto.
-	* backend/qcam.c: Ditto.
-	* backend/umax.c: Ditto.
-
-	* backend/Makefile.in (EXTRA): Mention ../sanei/sanei_config.lo.
-
-	* doc/sane-dll.man: Document SANE_CONFIG_DIR.
-	* doc/sane-hp.man: Ditto.
-	* doc/sane-mustek.man: Ditto.
-	* doc/sane-net.man: Ditto.
-	* doc/sane-pint.man: Ditto.
-	* doc/sane-qcam.man: Ditto.
-	* doc/sane-scsi.man: Ditto.
-	* doc/sane-umax.man: Ditto.
-	* doc/saned.man: Ditto.
-
-	* backend/microtek.c: Updated with v0.3 from Matt.
-	Include <sane/sanei_config.h>
-	(MICROTEK_CONFIG_FILE): Define as "microtek.conf".
-	(PATH_MICROTEK_CONFIG): Delete.
-	(sane_init): Replace fopen() with sanei_config_open().
-
-	* backend/microtek.h: Ditto.
-
-1997-10-24  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* sanei/sanei_config.c (sanei_config_open): Add multiple-directory
-	support for SANE_CONFIG_DIR.
-
-	* sanei/sanei_config.c: New file by Jeff Freedman.
-	* include/sane/sanei_config.h: Ditto.
-
-1997-10-23  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* Fixes for OS/2 by Jeff Freedman:
-	* frontend/Makefile.in (SBINPROGS): Set to @SANED@.
-	* configure.os2 (LN_S): Add --sysconfdir=.
-	* configure.in: Set up SANED depending on <sys/socket.h>.
-	* backend/Makefile.in (EXTRA): Mention usleep.lo and strndup.lo.
-	* backend/pnm.c (rgblength, rgbbuf, rgbleftover): Declare as
-	static.
-	* ltconfig: Upgrade to 1.0d.
-	* ltmain.sh: Ditto.
-	* sanei/sanei_constrain_value.c: Include <sane/config.h>.
-
-1997-10-22  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* frontend/gtkglue.h (struct GSGDialog): Remove idle_id member.
-
-	* frontend/gtkglue.c (idle_handler): Remove.  GTK's reference
-	counting appears to have been fixed (?).
-
-	* backend/umax_scanner.h: Update with Oliver's latest version.
-	* backend/umax-scsi.c: Ditto.
-	* backend/umax-scsidef.h: Ditto.
-	* backend/umax-struct.h: Ditto.
-	* backend/umax.c: Ditto.
-	* backend/umax.h: Ditto.
-
-1997-10-18  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* sanei/sanei_scsi.c (sanei_scsi_req_enter): Set cdb.hdr.pack_id
-	to unique id number.
-
-1997-10-17  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* japi/Makefile.in: New file (by Jeff Freedman <jsf@hevanet.com>).
-	* japi/README.JAVA: Ditto.
-	* japi/Sane.c: Ditto.
-	* japi/Sane.java: Ditto.
-	* japi/SaneDevice.java: Ditto.
-	* japi/SaneOption.java: Ditto.
-	* japi/SaneParameters.java: Ditto.
-	* japi/SaneRange.java: Ditto.
-	* japi/Test.java: Ditto.
-
-	* configure.in (AC_OUTPUT): Mention japi/Makefile.
-
-	* sanei/sanei_scsi.c (sanei_scsi_cmd) [USE == IRIX_INTERFACE]:
-	Add data buffer alignment fix by Michael Sweet.
-
-1997-10-24  Jeff Freedman <jsf@hevanet.com>
-
-	* sanei_open_config() added.  Backends call it to open .conf files.
-
-1997-10-14  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* Version 0.66 released.
-
-	* README: Update with new URLs and latest GIMP/GTK info.
-
-1997-10-11  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* include/sane/saneopts.h: Add #defines for TEN_BIT_MODE, WARMUP,
-	RGB_PREVIEW_PATCH, and START_SCAN_PATCH.
-
-	* README: Remove umax-specific configure options (they're now
-	runtime options).
-	* configure.in (CPPFLAGS): Ditto.
-	* include/sane/config.h.in: Ditto.
-
-	* backend/epson.c: Updated 
-
-1997-10-09  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/umax.c (sane_exit): Remove bogus call to free()
-	(reported by Peter).
-
-Thu Oct  9 20:20:32 1997  Kazuhiro Sasayama  <kaz@hypercore.co.jp>
-
-	* epson.c (sane_start): Fix lcount computation.
-
-Thu Oct  9 11:44:03 1997  Kazuhiro Sasayama  <kaz@hypercore.co.jp>
-	* epson.c (sane_start): Use byte-interleaved mode if available.
-	(sane_start): Set line counter for byte-interleaved mode.
-	(sane_read): Handle byte-interleaved mode.
-	(sane_init) [PACKAGE && VERSION]: Debug out PACKAGE and VERSION.
-
-Tue Oct  7 18:44:36 1997  Kazuhiro Sasayama  <kaz@hypercore.co.jp>
-
-	* epson.c (set_lcount): New function.
-	(sane_start): Use block mode for monochrome if available.
-	(sane_read): Handle block mode.
-
-	* epson.h (struct Epson_Scanner): Add block.
-
-Tue Oct  7 15:48:11 1997  Kazuhiro Sasayama  <kaz@hypercore.co.jp>
-
-	* epson.c (set_speed): New function.
-	(sane_start): Use set_speed.
-
-Tue Oct  7 15:44:33 1997  Kazuhiro Sasayama  <kaz@hypercore.co.jp>
-
-	* README: Add info about a mailing list.
-
-	* Makefile.am (libsane_epsonx_la_LDFLAGS): Increment the revision.
-
-	* epson.c (identify): Debug output the command level.
-
-1997-10-08  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/mustek.conf: Turn on linedistance-fix and lineart-fix by
-	default.
-
-	* include/sane/config.h.in: Remove
-	NEED_MUSTEK_LINE_DISTANCE_WORKAROUND.
-
-	* doc/sane-mustek.man (CONFIGURATION): Document option
-	linedistance-fix and lineart-fix.
-
-	* configure.in: Remove test for --enable-ld-fix.
-
-	* backend/mustek.h (MUSTEK_FLAG_LD_FIX): New flag.
-	(MUSTEK_FLAG_LINEART_FIX): Ditto.
-
-	* backend/mustek.c (line_distance): Replace
-	NEED_MUSTEK_LINE_DISTANCE_WORKAROUND with runtime test for same.
-	(reader_process): If MUSTEK_FLAG_LINEART_FIX is on, delay 200ms
-	when scanning in lineart mode.
-	(sane_init): New variable.  Add linedistance-fix and lineart-fix
-	support.
-
-	* backend/Makefile.in (install): Fix install rule so all symlinks
-	necessary for libsane.so are installed.
-
-	* backend/dll.c (load): Change from LIBNAME to LIBPATH (as per
-	libtool-1.0c documention).
-
-	* sanei/sanei_scsi.c (issue): Declare `static'.
-
-	* aclocal.m4: Update with contents of libtool.m4.
-
-	* configure.in (AC_PROG_RANLIB): Remove (once again!).
-
-	* config.guess: Update from libtool-1.0c.
-	* config.sub: Ditto.
-	* ltconfig: Ditto.
-	* ltmain.sh: Ditto.
-
-	* backend/epson.c: Update with Kazuhiro's latest epson version
-	(1.1.6).
-
-1997-10-07  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* frontend/gtkglue.c (panel_destroy): Clear elem->menu after
-	freeing it (reported by Kazuhiro Sasayama <kaz@hypercore.co.jp>).
-
-1997-10-06  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/epson.c: Updated with Kazuhiro Sasayama
-	<kaz@hypercore.co.jp> latest version (1.1.5).
-
-1997-10-04  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* Version 0.65 released.
-
-	* sanei/sanei_scsi.c (close_aspi): Rename from sanei_close_aspi (static
-	functions don't need ugly sanei_ prefix...).
-	(open_aspi): Ditto.
-
-	* configure.os2: New file (from Jeff's config.os2).
-
-	* backend/umax-scsi.c: Mmove include of <scsi/scsi.h> and
-	<scsi/sg.h> into !def UMAX_TO_SANE bracket.
-
-	* backend/pnm.c (getparmfromfile): Open with mode "rb" to get
-	binary file on platforms where this is meaningful.
-
-1997-10-02  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* doc/sane-epson.man: Mention that backend is known to work with
-	GT-5000.
-
-1997-10-01  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* doc/sane-epson.man: New file (based on Kzuhiro's README file).
-
-	* backend/Makefile.in (PRELOADABLE_BACKENDS): Mention epson.
-	(libsane-epson.la): Add dependencies for Epson backend.
-
-	* backend/epson.c: New file by Kazuhiro Sasayama
-	<kaz@hypercore.co.jp>.
-	* backend/epson.h: Ditto.
-
-	* backend/microtek.c: Updated with latest version from
-	http://www.mir.com/mtek/ by Matt Marjanovic <maddog@mir.com>.
-	* backend/microtek.h: Ditto.
-	
-1997-10-3   Jeff Freedman <jsf@hevanet.com>
-
-	* sanei/sanei_scsi.c:  Minor fixes for OS/2 support.
-
-	* configure.in: Check for presence of sys/socket.h to set @NET@.
-
-	* backend/Makefile.in: net -> @NET@
-
-1997-09-30  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* sanei/sanei_scsi.c: Integrate OS/2 support by Jeff Freedman:
-	(OS2_INTERFACE) Define.
-	(open_aspi,close_aspi): New OS/2-specific functions.
-	(sanei_scsi_open): Add OS/2 support.
-	[USE = OS2_INTERFACE]: OS/2 version of sanei_scsi_cmd().
-	(sanei_scsi_cmd, sanei_scsi_req_wait) [STUBBED_INTERFACE]:
-	Return proper value.
-	
-	* include/sane/config.h.in (HAVE_STRNCASECMP, HAVE_OS2_H): Add
-	#undef.  If !HAVE_STRNCASECMP, define strncasecmp macro as
-	alias for strnicmp.
-
-	* configure.in (AC_CHECK_FUNCS): Check for strncasecmp().
-	(AC_CHECK_HEADERS): Check for os2.h.
-
-1997-09-30  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* sanei/sanei_scsi.c: Integrate OS/2 support by Jeff Freedman:
-	(OS2_INTERFACE) Define.
-	(open_aspi,close_aspi): New OS/2-specific functions.
-	(sanei_scsi_open): Add OS/2 support.
-	[USE = OS2_INTERFACE]: OS/2 version of sanei_scsi_cmd().
-	(sanei_scsi_cmd, sanei_scsi_req_wait) [STUBBED_INTERFACE]:
-	Return proper value.
-	
-	* include/sane/config.h.in (HAVE_STRNCASECMP, HAVE_OS2_H): Add
-	#undef.  If !HAVE_STRNCASECMP, define strncasecmp macro as
-	alias for strnicmp.
-
-	* configure.in (AC_CHECK_FUNCS): Check for strncasecmp().
-	(AC_CHECK_HEADERS): Check for os2.h.
-
-1997-09-24  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* Version 0.64 released.
-
-	* PROJECTS (Backend): Update microtek entry.
-	Add entry for sgivl.
-
-	* backend/microtek.conf: New file.
-
-	* backend/dll.conf: Mention microtek.
-
-	* backend/Makefile.in (PRELOADABLE_BACKENDS): Mention microtek.
-	(libsane-microtek.la): Mention microtek dependencies.
-
-	* backend/microtek.c: New file by Matthew Marjanovic.
-	* backend/microtek.h: Ditto.
-
-1997-09-23  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* sanei/sanei_scsi.c (sanei_scsi_cmd): Integrate Michael Sweet's
-	latest Irix implementation of sanei_scsi_cmd().
-
-Sat Sep  6 08:59:24 1997  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* Version 0.63 released.
-
-	* configure.in (V_MINOR): Bump up to 63.
-
-	* configure.in (AM_PROG_RANLIB): Go back to AC_PROG_RANLIB.  The
- 	former causes a bad configure script.
-
-Fri Aug 29 16:08:05 1997  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* doc/sane-umax.man: Change status of "Astra 1200S" to "all modes ok"
-	as Oliver tells me that this has been tested and is working now.
-
-Wed Aug 20 17:23:04 1997  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* sane-0.63.lsm: Update email addresses etc.
-
-	Integrate Oliver Rauch's UMAX improvements:
-
-	* README: Document --enable-umax-preview-fix,
- 	--enable-umax-start-scan-fix.
-
-	* configure.in (UMAX_RGB_PREVIEW, UMAX_START_SCAN_PATCH): Define if
-	necessary.
-
-	* include/sane/config.h.in (UMAX_RGB_PREVIEW, UMAX_START_SCAN_PATCH):
-	Add #undef.
-
-	* include/sane/saneopts.h: Add manifest constants for options
-	resolution-bind, negative, quality-cal, threshold, analog-gamma,
-	analog-gamma-r, analog-gamma-g, analog-gamma-b, analog-gamma-bind,
-	smear, white-bind, black-bind.
-
-	* AUTHORS (Frontends): Update email addresses of Oliver Rauch and
-	myself.
-
-1997-08-07  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.c (attach): Print Mustek scanner info at
-	debug level 2, not 3.
-
-1997-08-06  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/preview.c (XSERVER_WITH_BUGGY_VISUALS): Make conditional
-	on #ifdef __alpha__ (Michael Sweet reports that the old code broke
-	SGI IRIX 6.3).
-
-1998-08-01  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* include/sane/config.h.in (HAVE_SYS_SCSICMD_H, HAVE_SYS_DSREQ_H):
- 	Undefine.
-
-	* configure.in (AC_CHECK_HEADERS): Mention sys/scsicmd.h and
- 	sys/dsreq.h.
-
-	* sanei/sanei_scsi.c (SCO_OS55_INTERFACE, IRIX_INTERFACE,
- 	SOLARIS_INTERFACE): Define.
-
-1997-07-27  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/xscanimage.c (quit_xscan) [HAVE_LIBGIMP_GIMP_H]: When
-	running as a GIMP extension, call gimp_quit().
-	(init) [HAVE_LIBGIMP_GIMP_H]: Set GDK's xshm flag based on GIMP's
-	flag.
-
-	* doc/sane-mustek.man (SCSI ADAPTER TIPS): Try to make complete
-	sentences.
-
-1997-07-25  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* Version 0.62 released.
-
-	* configure.in (CPPFLAGS): Test for gtk_gamma_curve_new() to
-	see whether appropriate version of gtk is installed.
-
-	* backend/mustek.c (sane_init): Add parsing support for option
-	`strip-height'.
-	(strip_height): New variable to limit scan strip height.
-	(reader_process): If strip_height is greater than 0.0, limit
-	lines_per_buffer so that no more than strip_height inches are
-	scanned with a single SCSI read command.
-
-	* doc/sane-mustek.man (CONFIGURATION): Describe strip-height
-	option.
-
-1997-07-23  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/sane-hp.man (Model): Added ScanJet 3c info.
-
-1997-07-22  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/scanimage.README: Remove file.
-
-	* doc/sane-scsi.man: Add info on generic AM53C974 driver.
-
-1997-07-19  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* sanei/sanei_scsi.c [USE == LINUX_INTERFACE]: Include
-	<sys/time.h>.
-
-1997-07-18  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* sanei/sanei_scsi.c (sanei_scsi_req_flush_all)
-	[WE_HAVE_ASYNC_SCSI]: Implement stub.
-
-	* scripts/xerox: New file (simple xeroxing script).
-
-	* frontend/scanimage.c (main): When opening a device fails, also
-	print reason for failure.
-
-	* frontend/preview.c (preview_new): Register expose_event handler.
-	(preview_destroy): Call scan_done() if called when preview
-	scanning in progress.
-
-	* backend/mustek.c (attach): Add argument MAY_WAIT.  If it's TRUE,
-	wait for scanner to become ready before sending inquiry command.
-	(do_cancel): Rename to do_stop.  Ignore child's exist status
-	when we're really cancelling a scan.  Issue stop_scan() command
-	only if the scan got cancelled and do a wait_ready() before
-	issueing the stop_scan().
-	(read_data): Delete.
-	(sane_init): Call attach() with MAY_WAIT set to SANE_FALSE.
-	(sane_open): Call attach() with MAY_WAIT set to SANE_TRUE.
-
-	* frontend/preview.c (display_partial_image): Use gtk_preview_put()
-	to update the preview window.  Much faster than hiding/showing the
-	widget.
-	(expose_handler): New function.
-
-	* frontend/progress.c (progress_new): Make "Cancel" button a
-	toggle-button so user can see when it was pressed down while
-	the backend cancels its operation.
-
-	* backend/mustek.c (do_cancel): Call wait_ready() before
-	attempting to stop scanner.
-	(read_req_enter): New function.
-	(send_data): Ditto.
-	(sigterm_handler): New function.
-	(reader_process): Reimplement using asynchronous SCSI command
-	interface.
-	(wait_ready): Use gettimeofday() to implement timeout.  The
-	scsi command itself may take a considerable amount of time
-	(1 second or more) so we can't just loop for a fixed number
-	of times.
-
-	* include/sane/sanei_scsi.h: Declre sanei_scsi_req_enter,
-	sanei_scsi_req_wait, and sanei_scsi_req_flush_all.
-
-	* sanei/sanei_scsi.c [WE_HAVE_ASYNC_SCSI]: Define.
-	(issue): New function.
-	(sanei_scsi_req_flush_all): New function.
-	(sanei_scsi_req_enter): Ditto.
-	(sanei_scsi_req_wait): Ditto.
-	(sanei_scsi_cmd): Reimplement in terms of enter/wait.
-	(sanei_scsi_req_enter) [!WE_HAVE_ASYNC_SCSI]: Stub that
-	simply calls sanei_scsi_cmd().
-	(sanei_scsi_req_wait): Empty stub.
-
-1997-07-16  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/sane-scsi.man: Add Tekram DC390 info (contributed by
-	kawk@Home.Yo.COM (Kolja Waschk))
-
-1997-07-15  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* sanei/sanei_scsi.c (sanei_scsi_cmd) [USE==LINUX_INTERFACE]:
-	Return SANE_STATUS_NO_MEM if write() of SCSI command fails.
-
-	* backend/mustek.c (do_cancel): If reader_process exited, use
-	exit status as return value.
-	(reader_process): Return SANE_STATUS_IO_ERROR instead of 1.
-	Return SANE_STATUS_NO_MEM instead of 2.  Return STATUS instead
-	of 3.  Return SANE_STATUS_GOOD instead of 0.
-	(sane_read): If do_cancel() returns anything but
-	SANE_STATUS_CANCELLED or SANE_STATUS_GOOD, something bad has
-	happened and the return status should be returned.
-
-	* doc/sane-scsi.man: Fix typo: sg.h is in /usr/include/scsi, not
-	/usr/include.
-
-	* PROBLEMS: Add warning about updating Linux kernel after increasing
-	SG_BIG_BUFF.
-
-1997-07-14  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/xscanimage.c (quit_xscan): Destroy preview window before
-	quitting, so preview image gets saved if necessary.
-
-	* frontend/Makefile.in (LIBX11): New macro.
-	(LIBGTK): Ditto.
-	(xscanimage): Use $(LIBGTK) instead of $(LIBS).
-	(xcam): Use $(LIBGTK) instead of $(LIBS).
-
-	* configure.in (LIBX11): Define as all libraries necessary when
-	using X11.
-	(LIBGTK): Define as all libraries necessary when using GTK+.
-
-	* backend/mustek.c (sane_start): Don't send gamma in lineart and
-	halftone mode!
-
-	* doc/sane-scsi.man: Add info on how to setup BT958 card (contributed
-	by Jeremy <jeremy@xxedgexx.com>).
-
-1997-07-13  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/sane-scsi.man: Add info on FreeBSD.
-
-1997-07-12  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* ltmain.sh: Installed libtool-1.0-nomode patch.
-
-	* configure.in (AC_PROG_RANLIB): Change to AM_PROG_RANLIB.
-
-1997-07-11  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* ltmain.sh: Upgrade to libtool-1.0.
-	* ltconfig: Ditto.
-	* config.guess: Ditto.
-	* config.sub: Ditto.
-	* aclocal.m4: Ditto.
-
-1997-07-08  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* Version 0.61 released.
-
-	* backend/Makefile.in (LIBLIB_FUNCS): Mention snprintf.
-
-	* backend/umax-struct.h (LINEART, HALFTONE, GREYSCALE, RGB): Move
-	the pound sign to the beginning of the line.
-	* backend/umax-scsidef.h: Ditto for all indendent #defines in this
-	file.
-	* backend/umax-scsi.c: Ditto for all # directives in here.
-
-	* frontend/saned.c [HAVE_LIBC_H]: Include <libc.h>.
-
-1997-07-07  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/net.c [HAVE_LIBC_H]: Include <libc.h>.
-
-	* lib/usleep.c: New file (adapted from glibc).
-
-	* lib/strndup.c: Move #ifndef HAVE_STRNDUP up so nothing
-	except <config.h> gets included unless really needed.
-	Include <sys/types.h> to get size_t defined.
-
-	* lib/snprintf.c (vsnprintf): Rename from vplp_snprintf.
-	(snprintf): Rename from plp_snprintf.
-
-	* include/sane/config.h.in: Add #undef HAVE_USLEEP.  Add #undef
-	HAVE_IO_CAM_CAM_H.
-
-	* configure.in: Test ${ac_cv_prog_gcc} instead of $CC to find out
-	whether we're dealing with gcc.  Test for io/cam/cam.h header.
-	(AC_C_INLINE): Add.
-	(AC_CHECK_FUNCS): Mention usleep.
-	Check for Xext after checking for X11 since on some platforms,
-	linking against Xext requires functions from X11.
-
-	* backend/umax.c (PATH_MAX): Define as 1024 if undefined.
-
-	* backend/Makefile.in (CONFIGS): Don't add $(srcdir) prefix.
-	(LIBLIB_FUNCS): Mention usleep.
-	(install): Invoke $(LIBTOOL) $(MINST) --finish $(libdir) in
-	a final step.  Correct installation rule for config files.
-
-1997-07-06  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* sanei/sanei_scsi.c (sanei_scsi_cmd): New variable RESULT.
-
-1997-07-05  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* sanei/sanei_scsi.c (sanei_scsi_cmd): Improve BSD version based
-	on patch by Amancio Hasty <hasty@rah.star-gate.com>.
-	(BSD_INTERFACE): Rename from NETBSD_INTERFACE (FreeBSD uses the
-	same interface).
-
-	* configure.in (CPPFLAGS): Check for scsireq_enter in libscsi.a.
-
-	* doc/Makefile.in (SECT5): Mention sane-scsi.5.
-	* doc/sane-scsi.man: New file.
-
-	* doc/sane-umax.man: Add SEE ALSO section mentioning sane-scsi(5).
-	* doc/sane-mustek.man: Ditto.
-
-	* doc/scanimage.man: Mention sane-umax(5).
-	* doc/xscanimage.man: Ditto.
-	* doc/saned.man: Ditto.
-
-	* configure.in (AC_TYPE_PID_T): Add.
-	* include/sane/config.h.in: Add undef of pid_t.
-
-1997-07-04  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* lib/sigprocmask.c (sigprocmask): Use hardcoded values instead
-	of SIG_BLOCK, SIG_UNBLOCK, and SIG_SETPROCMASK.
-
-1997-07-03  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* configure.in (CPPFLAGS): Remove -D_POSIX_SOURCE.  We can't define
-	it safely since it causes select() related typedefs and defines
-	to go away under FreeBSD, for example.
-
-1997-07-02  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* configure.in (CPPFLAGS): Put -D_GNU_SOURCE and -D_POSIX_SOURCE
-	in CPPFLAGS, not CFLAGS.
-
-	* doc/sane-umax.man: Change SG_BIG_BUFF example from 128KB to
-	127.5KB.
-	* doc/sane-mustek.man: Ditto.  Mention DTC3181E together with
-	DTCT436.
-
-	* frontend/gtkglue.c (gsg_create_dialog): Initialize dialog->advanced
-	to TRUE so "dumb" frontends will show all options.
-
-	* frontend/xscanimage.c (device_dialog): Turn off advanced options
-	by default.
-
-	* configure.in (AC_CHECK_TYPE): Check for u_long and u_int.
-	Check for scsireq_t.
-	* sanei/sanei_scsi.c: Don't define scsireq_t here.
-
-	* include/sane/config.h.in: Add undef of u_long, u_int, and
-	scsireq_t.
-
-1997-07-01  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/xscanimage.c (quit_xscan): No longer call
-	preview_destroy() since that now gets called as part of
-	the "destroy" callback.
-
-	* backend/hp.c (attach) [PREFER_DEVICEPIXEL]: Use device-pixel
-	unit commands instead of decipoint commands so things work on a 5p
-	as well (contributed by NOGAYA Shigeki
-	<nogaya@mbox.kyoto-inet.or.jp>).
-	(sane_start) [PREFER_DEVICEPIXEL]: Convert from mm to pixels.
-
-	* frontend/preview.c (input_available): Break out of per-bit loop
-	when done with one line (fix contributed by NOGAYA Shigeki
-	<nogaya@mbox.kyoto-inet.or.jp>).
-	* frontend/xscanimage.c (input_available): Ditto.
-
-	* doc/sane-umax.man: Rename SCSI id to Product id to reduce
-	confusion.
-	* doc/sane-hp.man: Ditto.
-	* doc/sane-mustek.man: Ditto.
-
-	* backend/mustek.c (wait_ready): Ignore errors during wait_ready().
-	With 3-pass scanners, ncr810 driver returns EIO while the scanner
-	is getting ready for pass 2 or 3.
-
-1997-06-30  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.c (sense_handler): Print debug info if we
-	find unknown sense result.
-
-	* sanei/sanei_scsi.c (sanei_scsi_cmd): Consider sense_buffer[]
-	only when result != 0.
-
-	* frontend/scanimage.c (sighandler): Change return value type
-	from void to RETSIGTYPE (from <sane/config.h>).
-
-	* doc/sane-mustek.man: Mention problems with MSFS-12000SP.
-
-	* backend/umax.c (sane_start): Don't use C++ style line comments.
-
-	* backend/umax-scsi.c (umax_do_scsi_cmd): Use sigemptyset() to clear
-	out signal set.  Include <sane/config.h>.
-
-	* frontend/saned.c [HAVE_SYS_SELECT_H]: Include <sys/select.h>.
-	* include/sane/config.h.in: Mention HAVE_SYS_SELECT_H.
-
-Thu Jun 26 10:19:50 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* README: Mention permissions on generic SCSI device.
-
-Tue Jun 24 17:35:52 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/xscanimage.man: Fix spacing.
-
-	* doc/sane-dll.man: Mention how list of pre-loaded backends
-	can be changed.
-
-Sun Jun 22 08:29:47 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* PROBLEMS: Add note on SCSI device names under OpenStep.
-
-	* sanei/sanei_scsi.c (sanei_scsi_cmd): Fix various minor bugs.
-	(sanei_scsi_open): Add support for OpenStep.
-
-	* backend/Makefile.in (install): Replace 'ln -f -s' with `rm -f',
- 	`ln -s' sequence.  OpenStep doesn't support the -f option at all.
-
-Fri Jun 20 07:30:18 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/sane-qcam.man: Updated B&W status.
-
-	* sanei/sanei_save_values.c [HAVE_LIBC_H]: Include <libc.h>.
-	* sanei/sanei_load_values.c: Ditto.
-
-	* lib/sigprocmask.c: New file.
-	* lib/strdup.c: Ditto.
-
-	* lib/Makefile.in (LIBLIB_OBJS): Mention strdup.o and sigprocmask.o.
-	(LIBLIB_LTOBJS):  Mention strdup.lo and sigprocmask.lo.
-	(liblib.a): Use $(RANLIB) instead of -ranlib.
-
-	* include/sane/sanei_backend.h [!HAVE_SIGPROCMASK]: Define
- 	compatibility macros sigset_t, sigemptyset(), sigfillset(),
-	sigaddset(), sigdelset(), and sigaction().
-	Define macro SIGACTION.
-
-	* frontend/saned.c (HAVE_VARARG_MACROS): Don't define unless we
-	have at least gcc 2.6.
-	* include/sane/sanei_debug.h Ditto.  Use HAVE_VARARG_MACROS
-	instead of __GNUC__.
-	* sanei/sanei_init_debug.c: Ditto.
-
-	* configure.in (AC_PROG_RANLIB): Mention.
-	(CFLAGS): Move up near the beginning and add -D_POSIX_SOURCE.
-	(AC_CHECK_HEADERS): Test for libc.h.
-	(AC_TYPE_SIGNAL): Mention.
-	(AC_CHECK_FUNCS): Check for sigprocmask.
-
-	* backend/net.c (sane_init): Honor SANE_NET_HOSTS even if
-	net.conf does not exist.
-
-	* backend/mustek.c (sane_start): Use "struct SIGACTION" so it's
-	easier to make code work on platforms that don't support
-	sigprocmask().
-	* backend/umax.c (sane_start): Ditto.
-
-	* ltmain.sh: Upgrade to libtool-0.9h.
-	* ltconfig: Ditto.
-	* config.guess: Ditto.
-	* config.sub: Ditto.
-	* aclocal.m4: Ditto.
-
-Thu Jun 19 08:26:33 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* configure.in (V_MINOR): Update forgotten version number...
-
-	* backend/qcam.c (reader_process): Scale 4 and 6 bpp to 8 bpp.
-
-	* backend/mustek.h (MUSTEK_FLAG_LD_NONE): New flag.
-	* backend/mustek.c (attach): Turn on MUSTEK_FLAG_LD_NONE for
-	MSF-06000SP (this fixes the problems for Andreas Gaumann
- 	<gg261@appl2.hrz.uni-siegen.de>).
-	(attach): Print debug message when MUSTEK_FLAG_LD_NONE is on.
-	(line_distance): Fix up ld correction only if MUSTEK_FLAG_LD_NONE
-	is not on.
-
-Wed Jun 18 15:42:25 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/sane.tex (section{Image Data Format}}): Clarify
-	what valid bit-depths are.
-	
-Tue Jun 17 07:47:51 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/qcam.c (sane_get_parameters): Test for != QC_COLOR
-	instead of == QC_MONO.  Apparently, there are several versions
-	of the monochrome camera.
-	(qc_setscanmode): Ditto.
-
-	* lib/snprintf.c: Update with latest version (also includes
-	license information now).
-
-	* sane-0.6.lsm (Author): Update Tristan Tarrant's email address.
-	* AUTHORS: Ditto.
-	* frontend/xscanimage.c: Ditto.
-
-Sun Jun 15 10:08:44 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/xscanimage.man: Add section on how to run xscanimage under
- 	the GIMP.
-
-	* frontend/xscanimage.c (init) [HAVE_LIBGIMP_GIMP_H]: Call
- 	gtk_rc_parse() with gimp_gtk_rc() to get space-saving layout of
- 	The GIMP. (Suggested by Sven Neumann.)
-
-	* sanei/sanei_scsi.c (sanei_scsi_cmd): Add NeXTStep/OpenStep
- 	implementation.
-	(sanei_scsi_cmd): Adjust NetBSD version to make it more like
-	NeXTStep/OpenStep version.
-
-	* configure.in (AC_CHECK_HEADERS): Mention bsd/dev/scsireg.h.
-
-Thu Jun 19 15:19:38 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
-
-	* backend/umax-scsi.c: Parameterize slightly more so that the
- 	build succeeds on non-Linux platforms.
-
-	* Makefile.in, backend/Makefile.in, doc/Makefile.in,
- 	frontend/Makefile.in (install): Fail immediately if any
- 	installation fails.  Use mkinstalldirs to create all installation
- 	directories.
-
-Sat Jun 14 11:07:13 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* Version 0.6 released.
-
-	* frontend/preview.c (preview_new): Connect "destroy" signal
-	so we notice if window manager closes our window.
-	(top_destroyed): New function.
-
-	* frontend/xscanimage.c (scan_preview): Make it robust against
- 	preview_new() returning NULL and connect "destroy" signal so we
- 	notice when the window manager closes the preview window.
-	(preview_window_destroyed): New function.
-
-	* LICENSE: New file.
-
-	* backend/dll.c: Change license from GPL to relaxed GPL.
-	* backend/hp.c: Ditto.
-	* backend/hp.h: Ditto.
-	* backend/mustek.c: Ditto.
-	* backend/mustek.h: Ditto.
-	* backend/net.c: Ditto.
-	* backend/net.h: Ditto.
-	* backend/pint.c: Ditto.
-	* backend/pint.h: Ditto.
-	* backend/pnm.c: Ditto.
-	* backend/pnm.h: Ditto.
-	* backend/qcam.c: Ditto.
-	* backend/qcam.h: Ditto.
-	* sanei/sanei_codec_ascii.c: Ditto.
-	* sanei/sanei_codec_bin.c: Ditto.
-	* sanei/sanei_constrain_value.c: Ditto.
-	* sanei/sanei_init_debug.c: Ditto.
-	* sanei/sanei_load_values.c: Ditto.
-	* sanei/sanei_net.c: Ditto.
-	* sanei/sanei_save_valus.c: Ditto.
-	* sanei/sanei_scsi.c: Ditto.
-	* sanei/sanei_wire.c: Ditto.
-
-Fri Jun 13 18:35:47 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* lib/snprintf.c: New file (Patrick Powell).
-
-	* frontend/xcam.c: Use guint32 and guint32 instead of u_int16_t
- 	and u_int32_t (Tristan Tarrant).
-
-	* doc/Makefile.in (SECT5): Mention sane-umax.5.
-
-	* configure.in (PACKAGE_VERSION): Check for snprintf (Tristan
- 	Tarrant).
-
-	* backend/dll.conf: Mention umax.
-
-	* backend/umax-scanner.h: New file (from umax-0.5.5).
-	* backend/umax-scsi.c: Ditto.
-	* backend/umax-scsidef.h: Ditto.
-	* backend/umax-struct.h: Ditto.
-	* backend/umax-uc630.h: Ditto.
-	* backend/umax-ug630.h: Ditto.
-	* backend/umax-umax.c: Ditto.
-	* backend/umax.conf: Ditto.
-	* backend/umax.h: Ditto.
-	* doc/sane-umax.5: Ditto.
-
-	* backend/Makefile.in (PRELOADABLE_BACKENDS): Mention umax.
-	(libsane-umax.la): List dependencies for umax library.
-
-	* COPYING: New file.
-
-	* include/sane/config.h.in: Add #undef HAVE_SNPRINTF.
-
-Tue Jun 10 21:00:34 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* ltmain.sh: Upgrade to libtool-0.9g.
-
-Sun Jun  8 21:24:27 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/dll.c (load): Also check SHLIB_PATH (HP-UX) and LIBPATH
- 	(AIX).
-
-	* include/sane/config.h.in: Remove HAVE_GTK_GTKCURVE_H.
-
-Sat Jun  7 11:19:57 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/xscanimage.c (pref_device_save): Call gsg_sync() before
-	saving the values.
-
-	* backend/Makefile.in (libsane-%.la): Add -export-dynamic flag.
-
-	* frontend/xscanimage.c (query): Rename "/Extensions/" to "/Xtns/"
- 	to reflect gimp-0.99.10 changes.
-	(query): Don't put in separator---it confuses gimp.
-	(main): Temporarily install a null print handler so gimp_main()
- 	doesn't produce any ugly messages when program gets invoked in
- 	stand-alone mode.
-
-	* ltconfig: Upgrade libtool to version 0.9f.
-	* ltmain.sh: Ditto.
-	* config.guess: Ditto.
-	* config.sub: Ditto.
-
-	* frontend/Makefile.in (install): Define MKDIR as
-	$(top_srcdir)/mkinstallldirs.
-	Use $(MKDIR) instead of mkdir.
-	* backend/Makefile.in (install): Ditto.
-	* doc/Makefile.in (install): Ditto.
-
-	* mkinstalldirs: New file (from maint-0.1g).
-
-Tue Jun  3 10:29:17 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* LEVEL2: New file.
-
-Sun Jun  1 13:26:40 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/Makefile.in (LATEX, DLH): New macros.
-	(sane.ind): Prefix source filename with $(srcdir).
-	(ps): Ditto.
-	(html): Ditto.
-
-	* doc/net.tex (subsection{SANE_NET_START}): Document member
-	byte_order.
-
-	* sanei/sanei_net.c (sanei_w_start_reply): (De-)code BYTE_ORDER
- 	member.
-
-	* frontend/saned.c (byte_order): New union.
-	(process_request): Initialize byte_order member.
-
-	* include/sane/sanei_net.h (SANE_Net_Byte_Order): New enum type.
-	(SANE_Start_Reply): New member BYTE_ORDER.
-
-Wed May 28 17:13:43 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/Makefile.in (install): Create $(mandir)/man1 and
- 	$(mandir)/man5 if necessary.
-
-Tue May 27 09:31:39 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/hp.c: Remove s7_range and s1_range.
-	(attach): Add inquiry of min/max brightness/contrast and fill in
- 	dev->brightness_range and dev->contrast_range accordingly.
-	(init_options): Use s->hw->brightness_range instead of s7_range.
-  	Use s->hw->contrast_range instead of s7_range.  Disable contrast
- 	option if min value is same as max value.
-
-	* backend/hp.h (struct HP_Device): Add members BRIGHTNESS_RANGE
- 	and CONTRAST_RANGE.
-
-	* sanei/sanei_scsi.c (sanei_scsi_open): Add more debug info.
-
-Mon May 26 10:43:51 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* sanei/Makefile.in: Add definitions for VPATH, srcdir, top_srcdir,
- 	and top_builddir.
-	(INCLUDES): Move -I directives from CPPFLAGS to this macro.  Also
- 	search in $(srcdir), $(top_builddir)/include, and
-	$(top_srcdir)/include.
-
-	* lib/Makefile.in: Add definitions for VPATH, srcdir, top_srcdir,
- 	and top_builddir.
-	(INCLUDES): Move -I directives from CPPFLAGS to this macro.  Also
- 	search in $(srcdir), $(top_builddir)/include, and
-	$(top_srcdir)/include.
-
-	* include/Makefile.in: New file.
-
-	* frontend/Makefile.in: Add definitions for VPATH, srcdir, top_srcdir,
- 	and top_builddir.
-	(INCLUDES): Also search in $(srcdir), $(top_builddir)/include, and
-	$(top_srcdir)/include.
-	(install): Add $(srcdir) prefix to sane-style.rc.
-
-	* doc/Makefile.in: Add definitions for VPATH, srcdir, top_srcdir,
- 	and top_builddir.
-	(%.1 %.5): Use $^ instead of $* so source file can be found even
-	when in a different directory.
-
-	* configure.in (AC_OUTPUT): Create (dummy) include/Makefile to
-	ensure include directory exists in build tree.
-
-	* backend/Makefile.in: Add definitions for VPATH, srcdir,
- 	top_srcdir, and top_builddir.
-	(INCLUDES): Also search in $(srcdir), $(top_builddir)/include, and
-	$(top_srcdir)/include.
-	(CONFIGS): Add $(srcdir) prefix.
-	(%-s.c): Ditto.
-
-	* Makefile.in (INSTALLED_INCLUDES): Mention include/sane/config.h.
-	Add definitions for VPATH, srcdir, top_srcdir, and top_builddir.
-	(INSTALLED_INCLUDES): Change include/sane to $(top_srcdir)/include/sane
-	and use "addprefix" function to add prefix.
-
-Thu May 15 07:26:06 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/sane-mustek.man (Model): Add entry for MFC-600CD.
-	(Model): Mention AHA-2940.
-
-	* frontend/xscanimage.c (scan_dialog): Move gsg_sync() to here
- 	(from scan_start()).
-
-	* backend/mustek.c (init_options): Disable brightness/contrast for
- 	1-pass scanners only (in color mode).
-
-Wed May 14 09:17:02 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.c: Add ax_brightness_range, ax_contrast_range.
-	(init_options): Use ax_brightness_range/ax_contrast_range for
-	brightness/contrast option when using a 3-pass scanner.
-	(encode_percentage): Remove extraneous division by 100.0.
-
-	* doc/sane-mustek.man (Model): Add MFS-12000CX entry.
-
-Mon May 12 07:58:34 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/scanimage.c (main): Shorten help string so it fits in
- 	80 characters.
-
-	* frontend/preview.c (paint_image): Only increment height if
- 	height < p->image_height.
-
-Sat May 10 14:43:05 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* Version 0.57 released.
-
-	* backend/mustek.c (attach): Fix range to 220x300mm.
-	(init_options): Initialize OPT_PREVIEW and OPT_GRAY_PREVIEW.
-	(sane_control_option): Handle OPT_PREVIEW and OPT_GRAY_PREVIEW.
-  	Do not allow OPT_NUM_OPTS to be set.
-	(sane_get_parameters): Except for s->params.format and
- 	s->params.last_frame, do not change any parameters when scanning
-	is in progress.
-	(sane_start): Handle mono-chrome previewing.
-
-	* backend/mustek.h (Mustek_Option): Add OPT_PREVIEW and
- 	OPT_GRAY_PREVIEW.
-
-	* frontend/progress.c (progress_new): Fix position of progress bar
- 	window to (progress_x,progress_y).
-
-	* frontend/gtkglue.c (panel_build): Skip Preview option.
-
-Thu May  8 19:39:48 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/scanimage.man: New file.
-
-	* doc/Makefile.in (SECT1): Mention scanimage.1.
-
-	* backend/dll.conf: Add hp to dll.conf.
-
-Wed May  7 07:28:18 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* include/sane/sanei_scsi.h (SANEI_SCSI_Sense_Handler): New type.
-	(sanei_scsi_close): Add SENSE_HANDLER argument (NULL means no
- 	special handler needed).
-
-	* backend/hp.c (sane_start): Pass 0 as SENSE_HANDLER argument.
-	(attach): Ditto.
-
-	* backend/mustek.c (sense_handler): Rename from request_sense and
-	simplify.
-	Remove all explicit request-sense calls.
-
-	* sanei/sanei_scsi.c: Include <stdlib.h>.
-	(num_handlers_alloced): New variable.
-	(sense_handler): Ditto.
-	(sanei_scsi_open): Add SENSE_HANDLER argument.  Stash it away in
- 	SENSE_HANDLER array if non-NULL.
-	(sanei_scsi_cmd) [HAVE_SYS_SG]: Invoke SENSE_HANDLER[FD] if it
- 	exists and is non-NULL and we have a valid sense-buffer.
-	(sanei_scsi_cmd) [HAVE_SYS_SCSI]: Ditto.
-	(sanei_scsi_close): Reset SENSE_HANDLER[FD] to NULL if it exists.
-
-	* frontend/xcam.c: Include <sane/config.h>.
-
-	* configure.in: Add a big fat warning that PROBLEMS should be
-	read before running any programs.
-
-	* PROBLEMS: Add info on how to avoid damaging Mustek scanners.
-
-Mon May  5 07:06:54 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/sane.tex (chapter{Contact Information}): Fix URL.
-
-	* doc/net.tex: Add missing sections.  Make into chapter.
-
-	* backend/pint.README: Remove.
-
-	* backend/dll.c (ASSERT_SPACE): Call malloc() when devlist is
- 	NULL.  SunOS realloc() returns NULL otherwise.
-	* backend/net.c (ASSERT_SPACE): Ditto.
-
-Sun May  4 09:21:48 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/saned.c (EXIT_SUCCESS): Define as 0 if not defined by
- 	stdlib.h.
-
-	* frontend/scanimage.c: Include <sys/types.h>.
-
-	* backend/qcam.c: Define PATH_MAX as 1024 if limits.h doesn't
- 	define it.
-	* backend/dll.c: Ditto.
-	* backend/hp.c: Ditto.
-	* backend/mustek.c: Ditto.
-	* backend/net.c: Ditto.
-	* backend/pint.c: Ditto.
-	* backend/qcam.c: Ditto.
-	* frontend/xscanimage.c: Ditto.
-	* frontend/xcam.c: Ditto.
-	* frontend/preview.c: Ditto.
-
-	* sanei/sanei_wire.c: Include <sane/config.h>.
-	* sanei/sanei_net.c: Ditto.
-	* sanei/sanei_codec_ascii.c: Ditto.
-	* sanei/sanei_codec_bin.c: Ditto.
-	* sanei/sanei_save_values.c: Ditto.
-	* backend/net.c: Ditto.
-	* frontend/saned.c: Ditto.
-
-	* configure.in (AC_CHECK_HEADERS): Mention
- 	/usr/src/linux/include/scsi/sg.h.
-
-	* include/sane/config.h.in: Add
- 	#undef HAVE__USR_SRC_LINUX_INCLUDE_SCSI_SG_H.
-
-	* sanei/sanei_scsi.c [HAVE__USR_SRC_LINUX_INCLUDE_SCSI_SG_H]:
- 	Include "/usr/src/linux/include/scsi/sg.
-	(sanei_scsi_cmd): Use Linux version if either HAVE_SCSI_SG_H or
-	HAVE__USR_SRC_LINUX_INCLUDE_SCSI_SG_H are defined.
-
-	* doc/xscanimage.man: Rename --no-shm to --no-xshm.
-
-Mon Apr 28 09:55:02 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* Version 0.56 released.
-
-	* backend/qcam.c (sane_open): Move disabling of despeckle-filter
-	for b&w cameras to here (from init_options()).
-
-	* frontend/preferences.c: Add missing default value for FILENAME.
-
-	* backend/qcam.h: Add QC_BW_SET_CONTRAST,
- 	QC_BW_AUTO_ADJUST_OFFSET, and QC_BW_GET_OFFSET.  * backend/qcam.c
- 	(sane_start): Use QC_BW_SET_CONTRAST when dealing with B&W camera.
-  	Fix computation of QC_SET_NUM_H value.  [Based on Guido Muensch's
- 	patches.]
-
-	* frontend/scanimage.c (advance): Move out-of-memory error message
- 	from scan_it() to here.
-	(scan_it): When height is known a priori, allocate one extra line
- 	to avoid realloc() when image has been filled.
-
-	* backend/hp.c (BACKEND_NAME): Define as hp (reported by Henryk
- 	Paluch).
-
-	* backend/mustek.c (request_sense): Increase result size from 4 to
- 	16 bytes to shut up aha1542 driver (reported by Mathias Lautner).
-
-	* frontend/scanimage.c (advance): Fix memory allocation logic
-	(bug reported by Matthias Lautner).
-
-	* doc/sane-dll.man: Clarify that pre-loaded backends are not
- 	affected by dll.conf.
-
-	* doc/sane-pint.man: New file (contributed by Gordon Matzigkeit).
-
-	* backend/dll.c (RTLD_NOW): Define as 0 if dlfcn.h doesn't define
- 	it.
-
-Wed Apr 23 23:03:47 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
-
-	* backend/Makefile.in, frontend/Makefile.in: Specify full
- 	filenames, rather than just the directory name for INSTALL
- 	destinations.  This Automakeism helps debugging when the target
- 	directory doesn't exist.
-
-	* include/sane/config.h.in (HAVE_SYS_SCANIO_H): Define, for PINT's
-	sake.
-
-	* backend/pint.c: Prefix sane includes with <sane/...>.
-
-	* backend/dll.c (RTLD_NOW): Paramaterize, so that RTLD_LAZY is
-	used if RTLD_NOW is not defined.
-	(load): Try looking up the symbol with a leading underscore, if we
- 	can't find it the first time.
-
-	Make dynamic loading conditional on HAVE_DLOPEN rather than the
- 	library and header file.
-
-	* configure.in (enable_dynamic): Disable dynamic loading if the
-	system doesn't have dlopen.
-
-Tue Apr 22 00:17:41 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* Version 0.55 released.
-
-	* frontend/xscanimage.c (browse_filename_callback): Initialize
-	FILENAME before calling gsg_get_filename().
-
-	* doc/sane.tex: Change obsolete \driver{DVIps} into DVIps document
- 	style option.
-
-	* frontend/xscanimage.c (query): Update to new command name
- 	length.
-
-Mon Apr 21 08:27:28 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/Makefile.in (install): Add rule to install man-pages.
-	(%.1 %.5): Add rule to generate man-pages (by substituting
-	actual paths).
-	(SECT1): New variable.
-	(SECT5): Ditto.
-	(MANPAGES): Ditto.
-
-	* doc/sane-pnm.man: New file.
-	* backend/pnm.README: Deleted.
-
-	* doc/sane-hp.man: New file.
-	* backend/hp.README: Deleted.
-
-	* doc/saned.man: New file.
-	* frontend/saned.README: Deleted.
-
-	* doc/sane-qcam.man: New file.
-	* backend/qcam.README: Deleted.
-
-	* doc/sane-mustek.man: New file.
-	* backend/mustek.README: Deleted.
-
-	* doc/sane-net.man: New file.
-	* backend/net.README: Deleted.
-
-	* doc/sane-dll.man: New file.
-	* backend/dll.README: Deleted.
-
-	* doc/xscanimage.man: New file.
-	* frontend/xscanimage.README: Deleted.
-
-	* frontend/preview.c (event_handler): Restore preview image only
-	if preferences.preserve_preview is TRUE.
-
-	* frontend/xscanimage.c (preview_options_dialog): Add an option
-	to control whether the preview image should be preserved.
-
-	* sanei/sanei_load_values.c (sanei_load_values): Copy string value
-	into temporary buffer that is opt->size bytes long.  Then pass copy
-	to sane_control_option().
-
-	* AUTHORS (Backends): Updated according to recent changes.
-
-	* doc/sane.tex (The SANE Application Programmer Interface (API)):
- 	Fix typo: replace () by {}.
-
-	* PROJECTS (Backend): Update PINT entry.
-
-	* frontend/xscanimage.c (prog_name): New variable.
-	(input_available): Use prog_name instead of hardcoding "xscan".
-	(preview_options_ok_callback): Ditto.
-	(preview_options_dialog): Ditto.
-	(usage): Ditto.
-	(interface): Ditto.
-	(main): Initialize prog_name.
-
-	* frontend/scanimage.c: Update for new name (scanimage instead of
- 	scan).
-
-	* frontend/Makefile.in (SCAN_OBJS): Rename sources to xscanimage.c
- 	and scanimage.c as well.
-
-Sun Apr 20 09:09:06 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* Version 0.54 released.
-
-	* sanei/Makefile.in (LIBSANEI_LTOBJS): Remove @LTALLOCA@.
-	(LIBSANEI_OBJS): Remove @ALLOCA@.
-
-	* lib/Makefile.in: Invoke $(LIBTOOL) with --mode arg to avoid
- 	depending on command names.  Prefix $(LIBTOOL) invocation with
-	@-sign to reduce verbosity.
-	* frontend/Makefile.in: Ditto.
-	* backend/Makefile.in: Ditto.
-	* sanei/Makefile.in: Ditto.
-	
-	* frontend/saned.c (_PATH_HEQUIV): Define if not defined yet..
-
-	* configure.in: Check for libgimp/gimp.h instead of -lgimp since
-	-lgimp cannot be linked by itself (it has an unresolved reference
-	to PLUG_IN_INFO).
-
-	* lib/strndup.c (strndup): Include <stdlib.h>.
-
-	* frontend/xscanimage.README: Update.
-
-	* sanei/sanei_scsi.c: Add missing "int" type in front of
- 	sanei_scsi_max_request_size.
-
-	* configure.in: Check for -lintl, -lsocket, and -lnsl for
- 	braindamaged SVR4 systems.
-
-	* frontend/scan.c (scan_it): Initialize min with 0xff, not ~0
-	(Sun CC complains otherwise).
-
-	* backend/Makefile.in: Use "ln -f -s", not "ln -sf", Solaris doesn't
-	like the former.  Grrr...
-
-	* lib/alloca.c: Don't use xmalloc().
-
-	* frontend/saned.c (store_reclen): Declare BUF as a pointer to
- 	SANE_Byte (not char).
-	(do_scan): Ditto.
-
-	* frontend/scan.c (fetch_options): Cast opt->name to (char *)
-	to suppress (spurious) warning.
-
-	* backend/dll.c (sane_init): Skip preloaded backends with no name.
-
-	* backend/hp.c (inquire): Cast BUF to (char *) to avoid warning.
-	(sane_read): Change type of NREAD to size_t (from ssize_t).
-
-	* include/sane/sanei_backend.h (u_int16_t): Define u_int8_t,
- 	u_int16_t, and u_int32_t if necessary.
-
-	* include/sane/sane.h (sane_strstatus): Remove non-ANSI "const".
-	* backend/sane_strstatus.c (sane_strstatus): Ditto
-
-	* include/sane/sanei_debug.h (DBG): Define alternate version for
-	non-GNU C compilers.
-
-	* sanei/sanei_init_debug.c (sanei_debug) [!__GNUC__]: New function.
-	(max_level) [!__GNUC__]: New variable.
-
-	* include/sane/sanei_wire.h: Fix typo in prototype for
- 	sanei_w_value_type.
-
-	* configure.in: Test for gtk_check_button_new() in libgtk.
-
-	* lib/Makefile.in (CPPFLAGS): Add -I../include/sane.
-
-	* frontend/scan.c (STRIP_HEIGHT): New macro.
-	(advance): Use above macro instead of hard-coding value.
-	(scan_it): Ditto.
-	(scan_it): Print error when out of memory.
-
-	* frontend/sane-style.rc: Make the curve in the graph red.
-
-	* frontend/preview.c (XSERVER_WITH_BUGGY_VISUALS): Define for now.
-	(preview_new): Avoid push_visual()/get_visual() since it seems to
- 	cause problems with some XFree86 servers (and may be others as
- 	well).
-
-	* frontend/preferences.h: Add member ADVANCED.
-	* frontend/preferences.c: Initialize member ADVANCED and add
-	an option descriptor for it.
-
-	* frontend/gtkglue.c (panel_build): Layout panel different: all
- 	options are now in one column (advanced options are at the
- 	bottom).  The graph widget (if any), will be shown in a separate
- 	column to the right of the options.  Display a group only when
- 	there is at least one option in it.  Create graph widget if there
- 	is at least one vector-valued option.
-	(gsg_sync): New function.
-	(gsg_set_advanced): Ditto.
-	(gsg_message_dialog_active): Rename from SHOWING_MESSAGE and make
-	global.
-
-	* frontend/gtkglue.h (GSGDialog): Rename member NOTEBOOK to
- 	MAIN_HBOX.  Add members ADVANCED_VBOX and ADVANCED.
-
-	* frontend/gtkglue.c (group_new): New function.
-	(curve_new): Ditto.
-	(vector_new): Ditto.
-
-	* backend/mustek.c (init_options): Initialize OPT_CUSTOM_GAMMA.
-	(sane_control_option): Handle OPT_CUSTOM_GAMMA.
-
-	* backend/mustek.h (OPT_CUSTOM_GAMMA): New option.
-
-	* configure.in (AC_CONFIG_HEADER): Update for new location.
-
-	* include/sane/config.h.in: Move to here from include/config.h.
-	* *.[ch]: Replace <config.h> with <sane/config.h> (except for
-	files in lib.
-
-	* frontend/saned.README: saned moved from bin/saned to sbin/saned.
-
-	* configure.in (AC_CHECK_HEADERS): Check for gtk/gtkcurve.h.
-
-	* backend/mustek.c (init_options): Undo changes of April 18th.
-
-	* frontend/Makefile.in (install): Install $(BINPROGS) in $(bindir)
- 	and $(SBINPROGS) in $(sbindir).
-	(SBINPROGS): New variable.
-	(BINPROGS): Ditto.
-	(PROGRAMS): Define as concatenation of the two vars above.
-	(install): Create $(bindir) and $(sbindir) if necessary.
-
-Sat Apr 19 18:21:02 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/Makefile.in (scanimage): Rename "scan" binary to
- 	"scanimage" to avoid name-collision with MH's scan command.
-
-	* backend/mustek.c (gamma_correction): Update according to new
-	gamma-table handling.
-
-	* backend/mustek.h: Declare gamma_table as 4 arrays of 256 words
-	each.
-
-	* backend/mustek.c (sane_control_option): Add missing return after
-	setting OPT_GAMMA_VECTOR.
-
-	* frontend/progress.h: Protect against multiple inclusion using
- 	macro progress_h, not __PROGRESS_H__ (names starting with
- 	underscores are reserved for libc/system).
-
-	* frontend/gtkglue.c: Remove include of <gtk.h>.
-	* frontend/xcam.c: Ditto.
-	* frontend/xscan.c: Ditto.
-
-	* frontend/gtkglue.h: Include <gtk/gtk.h> instead of <gtk.h>.
-	* frontend/progress.c: Ditto.
-
-	* Makefile.in (install): Install headerfiles.
-	(INSTALLED_INCLUDES): List of header files that need to be
- 	installed.
-
-Sat Apr 19 18:15:03 1997  Michael K. Johnson <johnsonm@redhat.com>
-
-	* */*.[ch]: Prefix sane-includes with <sane/...>.
-	include/sane*: Move to include/sane subdirectory.
-
-Sat Apr 19 08:25:36 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/gtkglue.c (set_option): Add missing return and use
-	snprintf instead of sprintf.
-
-	* frontend/xscan.c (update_param): Multiply size by 3 if we're
-	dealing with a frame from a 3-pass image.
-
-Fri Apr 18 07:28:46 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.c (init_options): Mark all vector options as
-	SANE_CAP_ADVANCED.
-
-	* frontend/scan.c (scan_it): Fail if advance() fails.
-
-Thu Apr 17 08:59:00 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.c (sane_read): Add debug statement.
-	(reader_process): Remove extraneous if-statement that had the
- 	effect of not passing along any data in 3-pass mode.
-
-Wed Apr 16 09:16:01 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/preview.h: Add member CANCEL.
-	* frontend/preview.c (scan_start): Make p->cancel sensitive.
-	(scan_done): Make p->cancel insensitive.
-	(preview_new): Set p->cancel insensitive.
-
-	* frontend/preferences.h (Preferences): Add member "filename".
-	* frontend/preferences.c: Initialize new member "filename".
-	Declare member "filename" as a string.
-
-	* frontend/xscan.c (device_dialog): Rename "Files" to "File".
-	(quit_xscan): Call pref_xscan_save() before exiting.  Replace
-	global variable filename by preferences.filename.
-
-	* frontend/xcam.c (main): Ditto.
-
-	* PROBLEMS: New file.
-
-	* frontend/gtkglue.c (scale_new): Set the adjustment page size to
- 	0.0.  Make horizontal scale 200 pixels wide.
-
-	* frontend/xscan.c (device_dialog): Move gtk_widget_show
- 	(ScanWin.shell) after pref_device_restore (0, 0).
-	(pref_device_restore): Make arg-less since callback arguments must
- 	not be used.
-	(device_dialog): Remove dummy args from call to pref_device_restore().
-
-	* include/saneopts.h (SANE_TITLE_SCAN_TL_X, SANE_TITLE_SCAN_TL_Y,
- 	SANE_TITLE_SCAN_BR_X, SANE_TITLE_SCAN_BR_Y): Shorten titles.
-
-	* frontend/xcam.c (main): Move gtk_widget_show(win.shell) to end
-	of function.
-
-	* backend/mustek.c (attach): Turn on MUSTEK_FLAG_USE_EIGHTS for
- 	MFS-12000CX.
-	(sane_get_parameters): Must not depend on s->mode in this routine,
-	since s->mode is valid only once scanning has begun.
-
-Tue Apr 15 23:06:17 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.c (sane_start): Issue SCAN_AREA and BACKTRACK
- 	commands even during second and third pass.
-	(sane_get_parameters): Be sure to properly update the
- 	params.format member during second and third pass.
-
-Sat Apr 12 11:40:52 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/scan.c (STRIP_HEIGHT): New macro.
-	(scan_it): Fix typo: test parm.lines instead of image.height.
-
-	* backend/pnm.c (hand_scanner): New variable.
-	(sane_control_option): Handle setting/reading of HAND_SCANNER
- 	option.
-	(getparmfromfile): Set parms.lines to -1 when simulating
- 	hand-scanner.
-	(sod): Add hand-scanner option descriptor.
-
-	* frontend/gtkglue.c (panel_build): Move gtk_widget_show
- 	(notebook) to the very of this function.  This works around the
- 	notebook redrawing problems.  Define WORKING_NOTEBOOK.
-
-	* frontend/xscan.c (interface): Call quit_xscan() if
- 	device_dialog() did not end up with a non-NULL dialog.
-	(quit_xscan): Add missing exit() call.
-
-	* backend/mustek.c (attach): Print more debug info on detected
- 	scanner (1 vs 3-pass, ADF & TA support).
-	(start_scan): Fix typo in code selecting the three-pass color filter.
-
-Sun Apr 13 23:53:02 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
-
-	* backend/pint.c, backend/pint.h, backend/pint.README: Added to
- 	distribution.
-
-Fri Apr 11 22:04:17 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* Version 0.53 released.
-
-	* frontend/xscan.c: Default to "out.pnm" instead of "out.ppm".
-
-	* backend/mustek.c (get_image_status): Add debug message.
-	(sane_start): Only divide pixels_per_line by three if we're doing
- 	a one-pass color scan.
-	(do_eof): New function.
-	(sane_read): Call do_eof() when done with a frame.
-	(do_cancel): Call do_eof().
-
-	* frontend/scan.c (write_pnm_header): New function.
-	(advance): Ditto.
-	(scan_it): Modify to support three-pass scanning and scanning of
- 	images whose height is not known a priori (hand-held scanners).
-
-Wed Apr  9 14:39:59 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/xscan.c (ok_choose_dialog_callback): Make
- 	argument-free.
-	(select_device_callback): Declare event as second argument and
- 	call ok_choose_dialog_callback() if the callback was invoked
- 	through a double-click.
-	(choose_device): Register select_device_callback() as
- 	"button_press_event" handler instead of as "clicked" so we can
- 	catch double-clicks.
-
-Tue Apr  8 10:31:47 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/xscan.c (init): Enable gtk_rc_parse() code (GTK-0.99.7
- 	requires patch for gtkstyle.c).
-
-	* backend/hp.c (attach): Fix parenthization to shut up gcc.
-
-Mon Apr  7 13:08:45 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/xscan.c (preview_options_dialog): Rename "changed_text"
-	to "changed" to reflect latest GTK version.
-	(device_dialog): Ditto.
-	* frontend/gtkglue.c (text_entry_new): Ditto.
-
-	* Version 0.52 released.
-
-	* AUTHORS: Various updates.
-
-	* backend/mustek.README: Add Adaptec info.
-
-	* backend/mustek.c (sane_start): Call wait_ready() before any
-	other scanner command.
-	(wait_ready): New function.
-	(attach): Call wait_ready() instead of open-coding it.
-
-	* doc/sane.tex (subsection{\code{sane\_strstatus}}): Include
- 	net.tex.
-	* doc/net.tex: New file.
-
-Thu Apr  3 08:51:13 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/xscan.c (update_param): Change type of SIZE to u_long
- 	(from long) since under NetBSD there seem to be some odd sign
- 	problems otherwise (compiler bug?).
-
-Wed Apr  2 07:15:41 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.c (sane_read): Always deliver EOF after reading
-	0 bytes.
-
-	* backend/qcam.c (reader_process): Fine-tune pixel interpolation.
-	(despeckle32): Ignore last red pixel in every line (it's always
- 	black).  Switch red and blue pixel location (the Connectix docs
- 	are wrong).
-
-	* backend/mustek.c (start_scan): Fix typo that caused start[4] to
-	be set incorrectly.
-
-	* frontend/preview.c: Include <sys/param.h> to get PATH_MAX.
-
-Tue Apr  1 18:45:14 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/qcam.c (despeckle): New function.
-	(despeckle32): Ditto.
-	(init_options): Initialize OPT_DESPECKLE.
-	(reader_process): Add despeckling support.
-	(sane_control_option): Ditto.
-	(sane_start): Initialize req.despeckle.
-
-	* backend/qcam.h: New member DESPECKLE.
-
-	* frontend/preview.c (restore_option): Fix typo: it should be
- 	SANE_ACTION_SET_VALUE (not _get_).
-
-	* backend/mustek.c (attach): Turn on MUSTEK_FLAG_USE_EIGHTS for
- 	MFS-06000CX.
-
-	* backend/hp.c (attach): Allow both TYPE_PROCESSOR (0x03) and
-	TYPE_SCANNER (0x06) as the first inquiry byte---some scanners use
-	the former, others the latter.
-
-	* Version 0.51 released.
-
-	* configure.in: Check for gtk_tooltips_new in libgtk.
-
-Mon Mar 31 14:42:56 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
-
-	* frontend/scan.c (main): Added full_optstring, to allow getopt to
-	do full parsing of the option arguments.
-
-	* backend/pnm.c (getparmfromfile): Need to round up the number of
-	bytes per line when scanning bitmaps.
-
-Mon Mar 31 07:48:50 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/qcam.c (attach): Send a dummy black-level command.  The
- 	first black-level command aftera camera reset doesn't appear to
- 	"take."
-
-	* lib/strndup.c: Correct typo: HAVE_STRDUP -> HAVE_STRNDUP.
-
-	* frontend/xscan.c (pref_set_tooltips): New function.
-	(pref_build_menu): Build tooltip submenu.
-
-	* frontend/preferences.h: New member TOOLTIPS_ENABLED.
-	* frontend/preferences.c: Add entry for TOOLTIPS_ENABLED.
-
-	* frontend/gtkglue.h: Add members TOOLTIPS, TOOLTIPS_FG, and
- 	TOOLTIPS_BG.
-
-	* frontend/gtkglue.c (set_tooltip): New function.
-	(autobutton_new): Add argument TOOLTIPS and add button-description
- 	via set_tooltip().
-	(button_new): New args TOOLTIPS & DESC.  Set DESC as tooltip help
- 	string.
-	(scale_new): Ditto.
-	(option_menu_new): Ditto.
-	(text_entry_new): Ditto.
-	(panel_destroy): Destroy dialog tooltips as well.
-	(panel_build): Create tooltips and allocate colors for it; pass
-	new args to above functions.
-	(gsg_set_tooltips): New function.
-
-	* Version 0.5 released.
-
-	* backend/Makefile.in (install): Add missing double-quotes to
- 	$(LIBS) and $(CONFIGS).  Also create a symlink for libsane.a.
-
-	* ltconfig: Revert back to version 0.9.
-	* ltmain.sh: Ditto.
-
-	* frontend/scan.c (print_option): Substitute our own help string
- 	for -x and -y options.
-	(main): Remove BROKEN_GETOPT code.
-
-	* frontend/Makefile.in (CPPFLAGS): Undo yesterday's change.
-	* lib/getopt1.c: Ditto.
-	* lib/getopt.c: Ditto.
-
-	* frontend/scan.c (main): Add some clever getopt () hackery to
- 	work around multi-scan getopt () bug (patch by Gord Matzigkeit).
-
-	* backend/qcam.README: Correct path of configuration file.
-
-Sun Mar 30 21:42:12 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/Makefile.in (CPPFLAGS): Add back -DBROKEN_GETOPT.
-
-	* frontend/scan.c (main): Reinstantiate BROKEN_GETOPT code.
-	getopt_long() is _STILL_ broken. ;-(
-
-	* lib/getopt.c: Use this code if __GNU_LIBRARY__ <= 6.  Early
-	versions of glibc had a buggy getopt().
-	* lib/getopt1.c: Ditto.
-
-	* frontend/Makefile.in (xscan): Mention $(LIBSANEI).
-
-	* frontend/xscan.c: Include <libgimp/gimp.h>, not <gimp.h>.
-
-	* Makefile.in (distclean): Mention libtool.
-	* configure.in (AC_CHECK_FUNCS): Ditto.
-
-	* include/config.h.in: Add undef of STRSEP.
-
-	* sanei/sane_strstatus.c: Move to backend directory to minimize
-	chance of confusing this with a SANE-internal routine.
-
-	* sanei/Makefile.in (LIBSANEI_OBJS): Remove sane_strstatus.o.
-	(LIBSANEI_LTOBJS):  Remove sane_strstatus.lo.
-
-	* backend/Makefile.in (libsane-%.la): Mention sane_strstatus.lo
- 	explicitly (every SANE backend library MUST define this function
-	so we can switch backends at will).
-
-	* frontend/Makefile.in (SCAN_OBJS): Remove getopt.o, getopt1.o.
-
-	* Makefile.in (SUBDIRS): Mention lib as first directory.
-
-	* configure.in (AC_OUTPUT): Mention lib/Makefile.
-
-	* lib/strsep.c: New file.
-	* lib/strndup.c: Ditto.
-	* lib/Makefile.in: Ditto.
-
-	* sanei/test_wire.c (main): Initialize codecs through
- 	sanei_w_init().
-
-	* sanei/sanei_codec_bin.c (sanei_codec_bin_init): Ditto.
-
-	* sanei/sanei_codec_ascii.c (sanei_codec_ascii_init): Remove
- 	w->buffer initalization---this function should be called through
-	sanei_w_init () only.
-
-	* sanei/sanei_scsi.c: Rename _sanei_scsi_max_request_size to
- 	sanei_scsi_max_request_size.
-
-	* backend/mustek.c (reader_process): Rename macro
- 	SANEI_SCSI_MAX_REQUEST_SIZE to variable
- 	sanei_scsi_max_request_size.
-
-	* include/sanei_scsi.h: Rename _sanei_scsi_max_request_size to
- 	sanei_scsi_max_request_size (names with a leading underscore are
- 	reserved for libc/system).
-	(SANEI_SCSI_MAX_REQUEST_SIZE): Remove macro.
-
-	* frontend/scan.c (main): Add a brief description of the program.
-
-	* frontend/getopt.c: Move to lib.
-	* frontend/getopt1.c: Ditto.
-
-	* backend/pnm.c (enum ppm_type): Remove non-ANSI trailing comma.
-	Correct struct indentation.
-
-	* include/lalloca.h: Isolate alloca cruft in this file.
-	* frontend/gtkglue.c: Include lalloca.h in place of alloca hack.
-	* frontend/dll.c: Ditto.
-	* frontend/scan.c: Ditto.
-	* sanei/sanei_load_values.c: Ditto.
-	* sanei/sanei_scsi.c: Ditto.
-
-Sat Mar 29 00:14:37 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
-
-	* backend/pnm.c (sane_read): Slurp in RGB files all at once,
-	rather than limping along three bytes at a time.
-
-	* frontend/xscan.c (advance): Only define if HAVE_LIBGIMP.
-
-	* backend/pnm.c (sane_read, sane_start, getparmfromfile): Handle
- 	grayscale and monochrome bitmapped PNM files.
-
-	* frontend/scan.c (main): Remove BROKEN_GETOPT workaround---the
-	new getopt() works properly when making multiple passes over the
-	argument list.
-
-Fri Mar 28 21:33:36 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
-
-	* configure.in: Make the QuickCam device conditional on whether or
- 	not the ioperm function exists.
-
-	* sanei/sanei_scsi.c: created a stubbed version of sanei_scsi_cmd.
-
-	* frontend/scan.c (main): Only print error messages to stderr.
-	Use fputs or fputc when it is possible to avoid printf.
-
-	* sanei/sanei_wire.c (sanei_w_array, sanei_w_ptr, sanei_w_init),
- 	sanei/sanei_save_values.c (sanei_save_values),
- 	sanei/sanei_codec_ascii.c (ascii_w_string): Return an error if
- 	malloc fails.
-
-	* sanei/test_wire.c (main): Added --readonly flag to help test
-	wire robustness.
-
-	* backend/Makefile.in (LIBSANEI): Deleted the `EXTRA' variable,
-	and used the convenience library, ../sanei/libsanei.a.
-
-Sat Mar 29 10:19:58 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/sane.tex: Change version from 0.42 to 0.5.
-
-	* README: Add pointer to frontend & backend specific README files.
-
-	* backend/net.c (connect_dev): Ensure dev->ctl gets closed and
- 	reset to -1 in case of failure.
-
-	* configure.in: Look for gtk_preview_new() in libgtk so we can
-	ignore old GTK versions against which we can't build.
-
-	* (config.sub): Replace with version that comes with
- 	autoconf-2.12.  The version that came with libtool-0.9
-	doesn't like i686-unknown-linux.
-
-Fri Mar 28 13:12:17 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/sane.tex (subsection{sane_get_select_fd}): Remove extraneous
- 	backslash.
-
-	* backend/stubs.c (sane_cancel): Don't return anything.
-
-	* include/sane.h: Remove trailing comma (for -pedantic).
-
-	* frontend/xscan.c (interface): Complain when trying to call
-	a device that's unavailable.
-	(select_device_callback): Correct prototype.
-
-	* frontend/xcam.c (main): Remove unused variable `label.'
-
-	* backend/net.c (sane_cancel): Call SANE_NET_CANCEL.
-	(sane_start): Handle failure of SANE_NET_START.
-
-	* frontend/saned.c (process_request): Implement SANE_NET_CANCEL.
-
-	* frontend/gtkglue.h (GSGDialogElement): Remove member "label".
-	* frontend/gtkglue.c: Update accordingly.
-	(button_new): Use gtk_check_button_new_with_label () to simplify
-	this function.
-
-	* frontend/gtkglue.c (unit_string): New function.
-	(panel_build): Append unit_string () to option's title if
-	the unit is not SANE_UNIT_NONE.  Use "title" instead of opt->title
-	when creating widgets.
-
-	* frontend/preview.c (preview_update): Compute width/height as
-	(max - min + eps) where eps is 1 for integer coordinates and
- 	SANE_UNFIX(1) for fixed-point coordinates.
-	(display_partial_image): Support different scaling in x/y
- 	direction.  In the case where surface_unit == SANE_UNIT_PIXEL,
- 	compute xscale/yscale based on the ratio between the _expected_
- 	width/height and the actual width/height.  If they're not equal,
- 	the backend must be doing some scaling (e.g., transfer-scale in
- 	the qcam backend).
-
-	* frontend/xscan.c (init): Disable gtk_rc_parse () calls for now
-	since gtk styles seem to be a bit buggy right now.
-	(scan_done): Remove input_tag if it is >= 0.
-
-	* frontend/gtkglue.c: Include <preferences.h>.
-	(panel_build): For fixed-point range-constraints scale min/max/quant
-	based on the preferred metric.
-	(scale_update): Ditto.
-	(gsg_update_scan_window): Ditto.
-
-	* backend/mustek.c (sane_control_option): For OPT_GAMMA_VECTOR_*
- 	options, fail with SANE_STATUS_INVAL if the vector has zero length
- 	(i.e., hasn't been set yet).
-
-	* frontend/progress.c (progress_new): Don't make Cancel the
- 	default-button---it's too easy to cancel by mistake otherwise.
-
-	* frontend/sane-style.rc: New file.
-
-	* frontend/xscan.c (init): New function.  Parse gtk_rc_parse ()
-	on /usr/local/share/sane-style.rc and ~/.sane/sane-style.rc if
-	those files exist.
-
-	* configure.in (CPPFLAGS): Add PATH_SANE_DATA_DIR.
-
-	* frontend/gtkglue.c (gsg_warning): New function.
-	(gsg_message): New function.
-	(gsg_error): Implement in terms of gsg_message ().
-
-Thu Mar 27 16:52:27 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/gtkglue.c (gsg_make_path): Terminate buffer with '\0'
-	before attempting mkdir().
-
-	* frontend/xcam.c (main): Use gtk_menu_item_new_label () instead
-	of gtk_label_new ()/gtk_menu_item_new ().
-
-	* frontend/preview.c (establish_selection): Invoke
- 	param_change_callback only if non-NULL.
-	(preview_update): Convert scale range to inches if that's user's
-	preference.
-
-	* frontend/xcam.c (delayed_switch): New function.
-	(device_activate_callback): Call delayed_switch() rather than
- 	executing that code directly.  Pete tells me GTK is not designed
- 	to have a widget rebuilt while a submenu is active.
-
-	* frontend/gtkglue.c (panel_build): Avoid using notebook widget
- 	until GTK+ has been fixed.
-	(idle_handler): New function: rebuild dialog if dialog->rebuild is
- 	set.
-	(set_option): Set dialog->rebuild to TRUE and schedule
- 	idle_handler() rather than directly calling panel_rebuild().  Pete
- 	tells me GTK is not designed to have a widget rebuilt while a
- 	submenu is active.
-	(gsg_refresh_dialog): Ditto.
-
-Thu Mar 27 14:54:23 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
-
-	* backend/Makefile.in: Converted all for statements that might be
-	empty to use a temporary list variable.
-
-	* frontend/Makefile.in (scan): Added getopt.o, getopt1.o to scan
-	dependencies.
-
-	* frontend/getopt.c, frontend/getopt1.c, include/getopt.h: Added
-	to the distribution.
-
-	* backend/net.c (connect_dev), frontend/saned.c (main): Don't use
- 	TCP_NODELAY if it has not been defined.  Look up tcp protocol
- 	number if SOL_TCP is not defined.
-
-	* sanei/test_wire.c (main): lseek after changing direction, or the
-	direction change ends up at the end of the output file.
-	Added option parsing, a usage message, and other cleanups.
-
-	* sanei/sanei_codec_ascii.c (sanei_codec_ascii_init),
- 	sanei/sanei_codec_bin.c (sanei_codec_bin_init): Initialize the
- 	wire if it has a 0-length buffer.
-
-	* sanei/sanei_wire.c (sanei_w_init): Only call the codec_init_func
-	if it is not NULL.
-
-	* sanei/sanei_scsi.c: Parameterize inclusion of generic SCSI
-	headers based on HAVE_SCSI_SG_H, HAVE_SYS_SCSI_H, or
-	HAVE_SYS_SCSIIO_H.
-
-	* configure.in (AC_CHECK_HEADERS): Check for scsi/sg.h,
-	sys/scsi.h, and sys/scsiio.h.
-
-	* sanei/sanei_load_values.c, sanei/sanei_scsi.c, backend/dll.c:
- 	Replaced unconditional alloca.h include with the cruft suggested
- 	by the Autoconf manual.
-
-	* sanei/alloca.c: Add to distribution.
-
-	* sanei/Makefile.in: Eliminate GNU make dependencies, and use
-	@ALLOCA@ and @LTALLOCA@ as appropriate.
-
-	* configure.in (AM_FUNC_ALLOCA): Use it.
-
-	* aclocal.m4 (AM_FUNC_ALLOCA): Define it.
-
-Wed Mar 26 17:25:49 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* sanei/sanei_wire.c (sanei_w_status): Update *v only when decoding.
-	(sanei_w_bool): Ditto.
-	(sanei_w_constraint_type): Ditto.
-	(sanei_w_value_type): Ditto.
-	(sanei_w_unit): Ditto.
-	(sanei_w_action): Ditto.
-	(sanei_w_frame): Ditto.
-
-	* frontend/xscan.c (quit_xscan): Always invoke gtk_main_quit()
-	(not just in standalone mode).
-	(quit_callback): Correct prototype.
-
-	* backend/pnm.c (sod): Fix doc-string for option "three-pass".
-
-	* frontend/xscan.c (advance): New function.
-	(input_available): Support 1 bpp frames.  Call advance() instead
- 	of open-coding it.  Add RED/GREEN/BLUE frame support in GIMP mode.
-	Complain when encountering unknown depth.
-	(ScanWin): add member first_frame.
-	(scan_start): Initialize first_frame and frame_offset in
-	GIMP mode.
-
-	* Integrate force unidirectional mode patch by Guido Muesch
-	  <odiug@faho.rwth-aachen.de>:
-	* backend/qcam.c (attach): Force uni-directional mode if port
-	address starts with `u'.
-	(attach): Add debug statement to print QCam version.
-
-	* Integrate 3-pass patches by Heiko
-	  <Heiko.Schroeder@Post.RWTH-Aachen.de>:
-	* backend/mustek.cb
- 	(scan_area_and_windows): Use 1/8" mode when MUSTEK_FLAG_USE_EIGHTS
- 	is on (instead of pixel unit).
-	(mode_select): Set bit 3 in mode byte only if
- 	MUSTEK_FLAG_USE_EIGHTS is off.
-	(encode_resolution): Don't do funky encoding for 3-pass scanners
- 	in 10% resolution mode.  It seems the docs are wrong and the
- 	actual scanners require a much simpler setup.
-
-	* frontend/preview.h: Add include of <sys/types.h>.
-
-Sat Mar 22 16:37:34 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/xscan.c (input_available): Reset ScanWin.x to zero at
- 	the end of each line.
-	(input_available): Reset tile_offset to zero after updating a
- 	tile.
-	(scan_done): Call gimp_display_new() to display the newly acquired
-	image.  Draw final few lines of image if image height is not a multiple
-	of the tile-height.
-
-	* frontend/saned.c (process_request): quit when receiving
-	unexpected procedure number---ignoring is dangerous.
-
-	* backend/dll.c (load): Fix off-by-one bug in allocation of
-	libname.
-
-	* frontend/xcam.c (prompt_for_device_name): Move grab-default
-	call behind signal_connect since otherwise the default action
-	won't work.
-
-	* frontend/xscan.c (choose_device): Let "Ok" button be the one
-	that gets activated by default (by hitting the Return key).
-
-	* frontend/preview.c (preview_destroy): Rename save_preview_image
-	to preserve_preview_image.
-  	* frontend/preview.h: Ditto.
-
-	* frontend/preview.c (restore_preview_image): New function.
-	(preview_destroy): Save preview image if it exists.
-	(preview_scan): New parameter SELECTION_ONLY.  If true,
- 	preview-scanning is limited to the selected area.
-
-	* frontend/xscan.c (scan_done): Call quit_xscan() to exit.
-	(quit_xscan): Destroy preview if ScanWin.preview is non-NULL.
-
-	* frontend/preview.c (draw_selection): Don't draw if p->gc is
-	NULL (i.e., if windows aren't mapped yet).
-
-	* frontend/xscan.c: Move HAVE_LIBGIMP-specific code further
-	down (past the type & global variable decls).
-
-	* configure.in (CPPFLAGS): Make --disable-shared impy
- 	--enable-preload.
-
-	* include/config.h.in: Add HAVE_STRNDUP.
-
-Fri Mar 21 00:01:00 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* sanei/sanei_scsi.c (sanei_scsi_cmd): Implemented FreeBSD
-	version (untested).
-
-	* sanei/sanei_load_values.c: Include <alloca.h>
-
-	* frontend/preview.c (update_selection): New function to set
-	selection based on current scan-area option values.
-	(preview_update): Call update_selection ().
-
-	* sanei/sanei_save_values.c: Add copyright notice.
-	* sanei/sanei_load_values.c: Add copyright notice and explanation
-	of algorithm.
-	(BITS_PER_LONG): New macro.
-	(SET): Ditto.
-	(IS_SET): Ditto.
-	(sanei_load_values): Add variables caused_reload and keep_going to
-	keep track of what options caused a reload_option and whether
-	the whole option-value setting process should be repeated.
-
-	* include/config.h.in: Add #undef HAVE_LIBGIMP.
-	* frontend/xscan.c: Put all GIMP-dependencies inside
-	#ifdef HAVE_LIBGIMP.
-	Include <config.h>.
-
-	* sanei/sanei_wire.c (sanei_w_init): Initialize status to 0.
-	(sanei_w_free): Preserve existing direction and do not flush i/o.
-	(sanei_w_space): Return EINVAL if reading 0 bytes.
-
-Thu Mar 20 09:11:21 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/gtkglue.h (dev_name): New member.
-	* frontend/gtkglue.c (gsg_destroy_dialog): free dialog->dev_name.
-	(gsg_create_dialog): Keep copy of device name in dev_name member.
-
-	* include/sanei_backend.h: Move stubs into backend/stubs.c and
-	define redirection macros only if STUBS is not defined.
-	* backend/stubs.c: New file.
-
-	* configure.in (AC_PROG_RANLIB): Removed.  No longer needed with
-	libtool.
-	* (frontend/Makefile.in): Adapt to libtool.
-	* (backend/Makefile.in): Ditto.
-	* (sanei/Makefile.in): Ditto.
-
-	* backend/mustek.c (attach): Check result[0] == 0x06 to find out
- 	whether we're dealing with a scanner (rather than attemting to
- 	find the string "SCANNER" ).
-
-	* backend/hp.c (sane_read): Initialize nread with max_len, not
- 	*len.
-	(sane_get_parameters): Add missing `== 0' comparison for strcmp()
- 	calls.
-	(inquire): Generalize so we can inquire any quantity and improve
- 	parsing.
-	(attach): Use reasonable default value if inquiry of a quantity
- 	fails.
-	(sane_start): Report error if inquiry of a scan parameter fails.
-
-Wed Mar 19 18:03:38 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/xcam.c (prompt_for_device_name): grab default for OK
- 	button (doesn't seem to work, though).
-
-	* frontend/progress.c (progress_new): Connect progress_cancel()
- 	via signal_connect(), not signal_connect_object() and pass P, not
- 	P->SHELL.
-	(progress_cancel): Don't free progress structure (must be done by
- 	app).
-
-	* frontend/xscan.c (input_available): New function.
-	(scan_done): Ditto.
-	(scan_start): Ditto.
-	(progress_cancel): Simply call sane_cancel().
-	(scan_dialog): Moved most of the code to above functions.
-
-	* frontend/gtkglue.c (get_filename_button_clicked): New function.
-	(gsg_get_filename): Ditto.
-
-	* frontend/xscan.c (scan_dialog): Do not quit xscan when in
-	standalone mode.
-	(scan_dialog): Prompt for output filename in standalone mode.
-	(filename): New variable.
-
-	* backend/pnm.c (sane_control_option): Remove "pnm." prefix
-	in debug messages.
-
-	* backend/qcam.c (sane_cancel): Remove "qcam." prefix in debug
- 	messages.
-
-	* backend/mustek.c: Remove "mustek." prefix in debug messages.
-
-Tue Mar 18 17:30:29 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.c (sane_close): Remove superfluous "[mustek]" in
- 	debug string.
-
-	* sanei/sanei_scsi.c (sanei_scsi_cmd): Implement HP-UX version
-	of this function (untested).
-
-	* backend/qcam.c (reader_process): Enable code to handle 4 bpp
-	and 6 bpp cases.
-
-Thu Mar 13 13:15:21 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/sane.tex (subsection{Scan Area Options}): Attempt to
-	clarify the meaning of "top-left" corner.
-
-Tue Mar 11 07:12:53 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/gtkglue.c (panel_build): Fix typo in matching of
-	"resolution" option (missing == 0).
-
-Mon Mar 10 20:19:06 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* Announced pre0.5 snapshot.
-
-	* backend/qcam.h: Make transfer-scale part of the "mode" group.
-
-	* backend/qcam.c (sane_read): Moved return of SANE_STATUS_EOF
- 	behind test for delivering EOF.
-
-	* frontend/xscan.c (device_dialog): Relabel "Cancel" button to
-	"Quit".
-
-	* backend/qcam.c (init_options): Set SANE_CAP_ADVANCED for geometry
-	group.
-	* backend/mustek.c (init_options): Ditto.
-
-	* backend/pnm.c (pass, three_pass): New variables.
-	(sod): Add option "three-pass" to simulate a three-pass scanner.
-	(sane_control_option): Add support for three_pass option.
-	(getparmfromfile): In three-pass mode, set format and last_frame
-	based on `pass'.
-	(sane_start): If input file is open already, fail unless we're
-	scanning the next frame of a three-pass image.
-	(sane_read): Handle three-pass case.
-
-Sun Mar  9 13:20:19 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/gtkglue.c (text_entry_callback): Only call
- 	gtk_entry_set_text() if the backend modified the string.  Otherwise,
-	infinite recursion occurs on any change (since the change results
-	in a change...).
-
-	* frontend/xcam.c (next_frame): Reset win.remaining to zero.
-
-	* backend/qcam.c (init_options): Set size of "resolution" option
-	to sizeof("High").
-
-	* doc/sane.tex (subsection{Scan Area Options}): Allow word-list
-	as a constraint.
-
-	* configure.in (CFLAGS): Add -D_GNU_SOURCE to CFLAGS since we
-	now depend on snprintf ().
-
-	* frontend/xscan.c (device_dialog): Fix typo: PixelHeight should
- 	be > 0, not == 0 in order for us to create the preview window.
-	(device_dialog): Ditto.
-	(device_dialog): Add ScanWin.preview to frame container.
-
-Sat Mar  8 10:19:41 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/sane.tex (subsection{sane_get_select_fd}): Clarify what
-	must happen when the end of a frame has been reached.
-
-	* frontend/xcam.c (input_available): Stop when sane_read() returns
-	0 bytes.  Fix typo: win.data needs to be set to dst, not src, on
-	exit.
-
-	* backend/qcam.h (read_fd): New member.
-	* backend/qcam.c (sane_get_select_fd): Return read_fd instead of
-	from_child.
-	(sane_open): Initialize s->read_fd to -1.
-	(sane_close): Close s->select_fd if >= 0.
-	(sane_start): Make read_fd dup() of s->from_child.
-	(sane_cancel): Close s->read_fd if >= 0.
-	(sane_set_io_mode): Modify s->read_fd instead of s->from_child.
-
-	* frontend/scan.c: Include <sanei.h> for NELEMS macro.
-	* frontend/xcam.c: Ditto.
-
-	* configure.in (CPPFLAGS): Add defines for V_MAJOR and V_MINOR.
-	(V_MAJOR, V_MINOR): New variables.
-
-	* sanei/Makefile.in (SANEI_OBJS): Mention sanei_net.o.
-
-	* include/sanei_net.h: New file (split from sanei_wire.h).
-	* sanei/sanei_net.c: New file  (split from sanei_wire.c).
-
-	* configure.in: Add -Wall to CFLAGS when using gcc.
-
-	* frontend/Makefile.in (saned): List -lsanei before -lsane
-	so saned never depends on sanei_*-routines that may be present
-	in -lsane (the only dependencies for that library must be
-	on sane_* names).
-
-	* backend/Makefile.in (LIBS): Remove -ldl (configure will add
-	it if available).
-	(SHLDFLAGS): Use -usanei_init instead of --whole-archive option.
-	(SHLDPOSTFLAGS): Remove --no-whole-archive.
-
-	* backend/dll.c: Add include of <config.h>.
-	(DYNAMIC): New macro.  Defined it dynamic loading support is
-	available and enabled.
-	Include <dlfcn.h> only when DYNAMIC is defined.
-	(load): Make no-op when DYNAMIC is not defined.
-	(sane_exit): Never call dlclose() if DYNAMIC is not defined.
-
-	* include/sanei_scsi.h: Rename from genscsi.h and rename prefix
-	from `genscsi_' to `sanei_scsi_'.
-	* sanei/sanei_scsi.c: Ditto.
-	* backend/mustek.c: Rename `genscsi_' to `sanei_scsi_'.
-
-	* configure.in: Check for availability of -ldl and <dlfcn.h>.
-
-Fri Mar  7 15:21:38 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* sanei/sanei_wire.c: New file.
-	* sanei/sanei_codec_bin.c: Ditto.
-	* sanei/sanei_codec_ascii.c: Ditto.
-
-	* backend/dll.c (sane_exit): Call dlclose() only if handle is
- 	non-NULL.
-	(sane_init): Chain together preloaded backends.
-
-	* backend/qcam.c (attach): Make static.
-	(sighandler): Ditto.
-	(qc_getstatus): Ditto.
-	* backend/mustek.c (attach): Ditto.
-
-	* backend/dll.c (op_name): Remove `sane_' prefix.
-
-	* sanei/sanei_init_debug.c (sanei_init_debug): Upcase backend
-	name when building environment variable name.
-
-	* backend/genscsi.c: Make use of sanei_debug.h.
-
-	* backend/mustek.c: Adapt to use sanei_backend.h.
-	* backend/net.c: Ditto.
-	* backend/pnm.c: Ditto.
-	* backend/qcam.c: Ditto.
-
-	* backend/dll.c (sane_exit): Fix typo that resulted in the
-	last backend not being exited.
-
-Thu Mar  6 21:25:27 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/sane.tex (subsection{\code{sane\_init}}): Allow
- 	authorization callbacks during sane_start() but not during
- 	sane_read().
-
-Tue Mar  4 21:04:16 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.c (sane_close): Print debug message when trying
-	to close an unknown handle.
-
-Thu Feb 27 18:10:20 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/sane.tex (chapter{Contact Information}\label{chap:contact}):
-	Add `listserv.' to mailing list address---seems to be needed for
-	subscriptions etc.
-
-Sun Feb  9 12:54:20 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.README: Add pointer to Ingmar's 53c400 patch.
-
-Sat Feb  8 11:49:24 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.c (line_distance): Add more debug output.
-
-Fri Feb  7 19:21:36 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.c (line_distance): Remove erroneous #ifdef
-	around FACTOR and COLOR.
-
-	* doc/sane.tex (subsection{sane_init}): Make username/password
-	fixed length arrays so no malloc/free magic is needed.
-	(subsection{Preview Mode Option}): New section.
-
-	* include/sane.h: Ditto.
-
-	* include/sane.h (SANE_Char): New type.
-
-Tue Feb  4 18:47:52 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.c (sane_get_parameters): Correct typo: replace
-	s->pass with s->params.format.
-
-Fri Jan 31 16:16:26 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.c (attach): Print debug message when using
- 	special line-distance algorithm.
-	Enable special line-distance algorithm only for firmware
- 	revisions < 1.02.
-	Determine fw revision based on INQUIRY result.
-
-Thu Jan 30 21:22:38 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/sane.tex (section{Attaching to a SANE backend}): Rename
-	metanet -> net, netproxy -> saned, metadl -> dll and update
-	hierarchy figure as well.  Added autolum meta backend as a
-	filter example.
-
-	* TODO: Rename metanet -> net, metadl -> dll.
-
-	* AUTHORS (Frontends): Rename metanet -> net, metadl -> dll,
-	mention saned and xcam and sort entries alphabetically.
-
-	* backend/net.c (sane_control_option): Replace all occurances of
- 	metanet with net.
-	* backend/net.README: Ditto.
-	Rename env var METANETHOST to SANE_NET_HOST.
-
-	* backend/dll.README: Replace all occurances of metadl with dll.
-	* backend/dll.c: Ditto.
-
-	* backend/dll.conf: Comment out metanet since it's a bit of a
- 	security risk (no authentication just yet).
-
-	* backend/Makefile.in (CONFIGS): New macro (list of config files)
-	(install): Change install rule so existing configuration files
-	are not overwritten.
-	Replace all occurances of metanet with net.
-
-	(V_MINOR): Bump up to 43.
-
-Tue Jan 28 08:17:18 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/Makefile (saned): Mention -lsanei before -lsane so
- 	saned does not incorrectly depend on sanei_printf/sanei_scanf in
- 	-lsane (if it happens to define those symbols).
-
-	* backend/metanet.c (sane_init): Rename SANE_Authorization_Callback
-	to SANE_Auth_Callback.
-	* backend/mustek.c (sane_init): Ditto.
-	* backend/pnm.c (sane_init): Ditto.
-	* backend/metadl.c (sane_init): Ditto.
-
-	* frontend/saned.c (main): Put output socket in TCP_NODELAY mode.
-	Include of <sys/socket.h>
-
-	* backend/metanet.c (openit): Ditto.
-
-Mon Jan 27 19:32:29 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-
-	* doc/sane.tex (subsection{Device Descriptor Type}): Change vendor
- 	name "None" to "Noname".
-	* backend/pnm.c (dev): Change vendor name from "noname" to "Noname".
-
-	* include/sane.h (SANE_STATUS_ACCESS_DENIED): New status value.
-	* sanei/sane_strstatus.c (sane_strstatus): Return appropriate
-	status string.
-
-	* frontend/xscan.c (scan_dialog): Don't depend on first_frame
-	when creating image---the old code didn't work for R/G/B-only
-	frames anyhow, so there is no point pretending.
-
-	* include/sane.h (SANE_Parameters): Rename first_frame to
-	last_frame.
-	* backend/metanet.c (sane_get_parameters): Update accordingly.
-	* backend/qcam.c (sane_get_parameters): Ditto.
-	* frontend/saned.c (readcmd): Ditto.
-	* frontend/test.c (testsane): Ditto.
-	* backend/mustek.c (sane_get_parameters): Set last_frame unless
-	the current pass is acquiring a red- or green-only frame.
-
-	* doc/sane.tex (subsection{sane_get_parameters)): Change
- 	FIRST_FRAME into LAST_FRAME.
-
-	* backend/metanet.c: Initialize PEER with -1.
-	(sane_get_select_fd): Return PEER and succeed if not negative.
-
-	* include/netsane.h (ns_printf, ns_scanf, netfd_wr, netfd_rd):
- 	Remove (obsolete).
-
-	* frontend/saned.c: Increase STRBUF size to 32KB to get better
-	scan_read() throughput.
-
-	* include/sane.h (SANE_Athorization_Callback): Return void
- 	(instead of int) and make USERNAME and PASSWORD (pointers to)
- 	return values.
-
-	* frontend/saned.c (netsane_auth_callback): Update prototype.
-
-	* backend/metanet.c (sane_init): Move assignments out of
- 	if-conditional for clarity (and to avoid gcc warning).
-
-	* sanei/sanei_printf.c: Include <memory.h>, <string.h>.
-
-	* backend/Makefile.in (libsane-mustek.a): Replace
- 	../sanei/sane_strstatus.o with appropriately defined EXTRA
-	macro.
-
-	* backend/mustek.c (attach): Initialize ld.mode to MLD_NORMAL for
- 	all scanners but MFS-12000SP.
-	(line_distance): In MD_MFS correction mode, do not issue LD
- 	command.
-	(sane_close): Free s->ld.red_buf if non-NULL.
-	(fix_line_distance_mfs): New function.
-	(fix_line_distance_normal): Rename from fix_line_distance().
-	(reader_process): In MLD_MFS line-distance mode, call the
-	mfs-specific routine, not the normal one.
-
-	* backend/mustek.h (Mustek_Scanner): New members ld.red_buf,
- 	ld.green_buf.
-	(MUSTEK_FLAG_LD_MFS): New flag to indicate when MFS-specific
- 	line-distance correction is needed.
-
-	* backend/metanet.c: Fix up some minor formatting problems due
-	to indent.
-
-	* Merge in Andy's netsane diffs.
-
-Sun Jan 26 00:04:22 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/xscan.c (zoom_in_preview): Ignore selections of zero
-	or negative width/height.
-	(set_max_selection): Use SANE_UNFIX() instead of open coding.
-	Adapted to use gtkglue.
-
-	* backend/metadl.c (sane_init): Grab authorization callback.
-	(authorization_callback): New variable.
-	(load): Pass authorization callback to init function.
-
-	* frontend/gtkglue.h (gsg_destroy_dialog): Add param_callback.
-
-Sat Jan 25 17:35:52 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/Makefile.in (distclean): Mention $(TESTPROGRAMS).
-
-	* backend/metanet.c (copy_opt): Fix constraint-length computation.
-
-	* backend/metadl.c (sane_get_devices): Pass along LOCA_ONLY arg
-	to backend.
-
-	* frontend/xcam.c (main): Remove extraneous calls to gtk_exit()
-	and sane_exit().
-
-	* frontend/scan.c (main): Install sane_exit() as atexit handler.
-
-	* backend/metadl.c (sane_get_devices): Ignore NULL BE_LIST.
-
-	* frontend/saned.c (quit): New function.
-	(main): catch SIGALRM, and SIGPIPE.
-
-	* backend/metanet.c (sane_get_devices): Return empty list of
-	LOCAL_ONLY is TRUE.
-
-	* frontend/saned.c (readcmd): Don't take LOCAL arg from
- 	request---always pass SANE_TRUE!
-
-	* doc/netprotocol.doc (sane_get_devices): Don't need LOCAL arg.
-
-	* include/sanei.h: Include <sane.h>.
-
-	* frontend/test.c (testsane): Print status message instead of
-	status code and make robust against failed calls.  Use fprintf(stderr
-	instead of printf.
-
-	* backend/qcam.c (reader_process): Remove extraneous arg.
-	(reader_process): Declare `static' to make setjmp() safe.
-
-	* frontend/saned.c (readcmd): Delete unused variable schr_hlp.
-	(peerfp): New variable.
-	Rename ns_printf() to sanei_printf() and pass peerfp arg.
-	Rename ns_scanf() to sanei_scanf() and pass peerfp arg.
-	(say_helo): Make peerfp refer to fd 0.
-
-	* backend/metanet.c (openit): Return FILE*, not socket.
-	(openit): Return 0, not -1 in case of failure.
-	(peerfp): New variable.
-	Rename ns_printf() to sanei_printf() and pass peerfp arg.
-	Rename ns_scanf() to sanei_scanf() and pass peerfp arg.
-
-	* sanei/sane_strstatus.c: New file (in lieu of backend/sane.c)
-	* sanei/sanei_constrain_value.c: Ditto.
-	* sanei/sanei_init_debug.c: Ditto.
-
-	* sanei/sanei_scanf.c (ns_scanf): New file (based on Andy's
- 	ns_scanf).
-	Use int8_t for 'c', int32_t for 'd'.
-	Include <sys/types.h>.
-
-	* sanei/sanei_printf.c (sanei_printf): New file (based on Andy's
- 	ns_printf).
-	Use int8_t for 'c', int32_t for 'd'.
-	Include <sys/types.h>.
-
-	* include/netsane.h (CMD_SANE_STRS): Remove.
-
-	* backend/metanet.c: Include <errno.h>
-	(sane_strstatus): Remove.
-
-	* backend/Makefile.in (BACKENDS): Mention libsane-metanet.
-
-	* backend/metanet.c (openit): Use memcpy instead of bcopy.  Use
- 	inet_aton() instead of inet_addr(), don't prototype.
-	(sane_get_devices): Use strdup() instead of opencoding it.
-	(sane_get_devices): Don't append " (NS)" to modelname!  Metanet
- 	already prefixes the devicename with netsane, which is good
- 	enough.
-
-	* backend/sanei.h (IF_DBG): New macro.
-
-	* PROJECTS (Backend): Mention saned, metanet, and autoadj.
-	(Frontend): New info.
-
-	* AUTHORS: Update to reflect sanescan -> xscan namechange.
-	Credit Andy for netsane.
-
-Fri Jan 24 00:01:45 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* doc/sane.tex (subsection{\code{sane\_get\_option\_descriptor}}):
-	Define how long the returned option descriptor must remain valid.
-
-	* frontend/gtkglue.c (autobutton_update): Check for
- 	SANE_INFO_RELOAD_OPTIONS.
-	(button_update): Ditto.
-
-	* frontend/xcam.c (main): Add device info label.
-
-	* backend/mustek.c (init_options): Make OPT_BRIGHTNESS and
- 	OPT_CONTRAST inactive by default.
-
-	* frontend/xcam.c (exit_callback): Only call gsg_destroy_dialog()
-	if dialog is non-null.
-
-Thu Jan 23 00:17:46 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.c (sane_control_option): Return
- 	SANE_STATUS_DEVICE_BUSY when attempting to set option during
- 	scanning.
-	(sane_close): Call do_cancel(), not sane_cancel().
-	(sane_start): Ditto.
-
-	* backend/pnm.c (sod): Rename "File" group to "Source Selection".
-
-	* frontend/xcam.c (device_name_dialog_cancel): New function.
-	(device_name_dialog_ok): Ditto.
-	(prompt_for_device_name): Ditto.
-	(build_device_menu): Move "Rescan devices..." from build_files_menu()
-	to here.  Add "Specify device name..." entry that invokes
-	prompt_for_device_name.
-	(play_stop_button): Ignore call if there is no device_dialog yet.
-	(main): Don't attempt to set preview size if there is no device
-	dialog yet.
-
-	* frontend/gtkglue.c (text_entry_callback): Don't ignore tab
-	key---it's used to switch focus!
-
-	* backend/qcam.c (qc_wait): Return read value so optimizer won't
- 	be able to get rid of it easily.
-	(qc_lock_wait): Use same lockname as qcam-0.7d for
- 	interoperability.
-	(reader_process): Explicitly do an enable_ports() in the reader
- 	process.  Linux/x86 doesn't inherit i/o port access rights.
-
-	* frontend/xcam.c (stop_camera): New function.
-	(input_available): Use stop_camera().
-	(next_frame): Ditto.
-
-	* backend/genscsi.c (genscsi_open): Add missing DBG_INIT(GENSCSI).
-	(genscsi_cmd): Return SANE_STATUS_DEVICE_BUSY if EBUSY is
- 	returned.
-
-	* frontend/xcam.c (input_available): Fix line wrap for
- 	SANE_FRAME_GRAY.
-
-	* include/sane.h: Remove old SANE_STATUS_AGAIN.
-	* backend/sane.c (sane_strstatus): Ditto.
-	* backend/mustek.c (sane_read): Return SANE_STATUS_GOOD, not AGAIN
-	when no data available.
-	(sane_start): Add debug printing.
-	(sane_set_io_mode): Fix typo: return SANE_STATUS_GOOD on success.
-
-	* backend/mustek.c (sane_control_option): Add support for
- 	OPT_BACKTRACK.
-	(attach): Add lots of debug printing.
-
-	* backend/qcam.README: New file.
-
-	* backend/qcam.c (sane_control_option): Allow changing resolution
- 	while scan is in progress, but set RELOAD_OPTIONS only if not
- 	scanning already.
-
-	* frontend/xcam.c (canvas_events): Get rid of old debug messages.
-
-	* backend/qcam.c (sane_get_parameters): Update parameters only if
- 	not scanning.  This makes it possible to change certain options
-	(such as width/height while a scan is in progress).
-	(sane_control_option): Allow changing of image corners,
- 	transfer-scale, and depth while scan is in progress.  Set
-	RELOAD_PARAMS only if scan is not in progress.
-	(sane_start): Return DEVICE_BUSY if scan is in progress.
-
-	* configure.in (PACKAGE_VERSION): Version 0.41 released.
-
-	* backend/qcam.c (brightness_range): New variable.
-	(init_options): Use brightness_range instead of u8_range to
-	avoid going into bulb-mode accidentally.
-
-Wed Jan 22 09:16:21 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/qcam.c (reader_process): Correct typo: it's buf, not
- 	buffer that we want to write out in high-res mode.
-	(qc_reset): New function.
-	(reader_process): Send at least one byte of data after receiving a
- 	signal.
-	(sighandler): New function.
-	(sane_cancel): If a read request is outstanding, cancel request by
- 	(a) sending SIGINT to reader process, (b) reading one byte of data
- 	in blocking mode, and then (c) reading whatever is left in the
- 	pipe in non-blocking mode.
-	(sane_read): Return SANE_STATUS_CANCELLED if SCANNING is not set.
-
-	* backend/qcam.h (QC_Scanner): Remove unused x/y fields.
-
-	* backend/qcam.c (sane_close): Call disable_ports().
-	(sane_init): Replace isblank() with isspace() (former is a GNU
- 	extension).
-	(sane_control_option): Scale corner coordinates when switching
- 	resolution and ensure they're always legal values.
-	(sane_close): Check for reader_pid >= 0 not != 0!
-	(sane_exit): Move disable_ports () from sane_close to here.
-	(sane_start): Keep track of when we're holding lock.
-	(sane_read): Release lock if s->holding_lock is TRUE and we
-	read a few bytes.
-	(sane_cancel): Release lock if it's being held.
-
-	* backend/qcam.c: Clean up unused variables.
-
-Tue Jan 21 13:49:00 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/qcam.c (sane_control_option): Keep track of changes to
- 	option values.
-	(sane_get_select_fd): Implemented.
-	(sane_set_io_mode): Ditto.
-	(reader_process): New function.
-	(sane_start): Modify to use reader_process().
-
-	* backend/qcam.h: (struct QC_Scanner): New field value_changed.
-
-Mon Jan 20 22:11:11 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/metadl.c (sane_open): Correctly handle case where
-	backend name is empty.
-
-Sun Jan 19 10:29:43 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/qcam.c (attach): Add qc_wait() calls after each
- 	write_lpcontrol() call to ensure reliable communication.
-	(attach): Add debug output in case of failure.
-
-	* Version 0.4 released.
-
-Sat Jan 18 10:12:40 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/xscan.c (get_scan_size): Handle case where scan
- 	width/height is of type SANE_TYPE_INT.
-	(get_scan_size): If width/height unit is pixels and the height is
- 	less than 500 pixels, use a ratio of 1.
-	(device_dialog): Call update_complete_dialog() to ensure inactive
- 	options do not show (there probably is a better solution to this).
-
-	* frontend/scan.c (main): Compute bottom-right position as
- 	top-left + width/height - 1 (the - 1 is new and necessary and
- 	works both for fixed and integer values).
-	(print_option): Insert line-break when column >= 79 (not 80) to
- 	leave last column blank (better when running inside Emacs, for
- 	example).
-	(main): Fix typos: case 't': window[2] -> window[3], switch short
- 	option names for top/left.
-	(print_option): Print current option values (except for vectors).
-	(fetch_options): Another off by one bug: width is br_x|y-tl_x|y+1.
-
-Thu Jan 16 20:26:29 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/sane.c (sanei_constrain_value): Fix so it properly
- 	handles strings that are longer than any of the strings in a
- 	string list.
-
-	* frontend/scan.c (main): Subtract value of top-left-x/top-left-y
-	from width/height, respectively after all options have been
-	read in.
-	(main): Print help message _after_ options have been processed.
-	(fetch_options): New function.
-	(set_option): Call fetch_options() if SANE_INFO_RELOAD_OPTIONS is
-	set.
-	(main): Call fetch_options() instead of open-coding same.
-
-	* doc/sane.tex (subsection{Device Descriptor Type}): Add index
-	entry for device-name.
-
-Wed Jan 15 19:55:03 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/metadl.c (sane_init): Call DBG_INIT() and declare
-	debug level variable with DBG_DECL.  Added various debug
-	statements.
-
-	* backend/pnm.c (sane_init): Ditto.
-	* backend/mustek.c (sane_init): Ditto.
-
-	* frontend/scan.c (parse_scalar): Default to mm again (instead of
- 	cm).  Using `mm' as the default is counter-intuitive since the
- 	help info is printed with `mm' as the unit.
-
-	* frontend/xscan.c (main): Pass local_only==SANE_FALSE as second
-	argument to sane_get_devices().
-
-Sun Jan 12 13:12:45 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/sane.c (sanei_constrain_value): For string-lists, ignore
- 	case and allow prefixes as long as they remain unique.
-
-	* frontend/scan.c (print_option): Print "auto" as a legal option
- 	value if the option has capability SANE_CAP_AUTOMATIC set.
-	(process_backend_option): If option has SANE_CAP_AUTOMATIC set,
- 	let option value of "auto" turn on automatic mode.
-
-Wed Jan  8 19:55:31 1997  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/Makefile.in (install): Modify install rule so that
-	$(libdir) gets added to /etc/ld.so.conf if it isn't there
-	already.
-	(COMPILE): Use $(SHCFLAGS) instead of $(CFLAGS).
-	(LINK): Remove (unused).
-
-Wed Dec 25 20:21:39 1996  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.README: Add section "SCSI Adapter Tips".
-
-Fri Dec 13 20:02:03 1996  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.c (line_distance): Rename
- 	LINE_DISTANCE_WORKAROUND to NEED_MUSTEK_LINE_DISTANCE_WORKAROUND.
-	Include <config.h>.
-
-Thu Dec 12 20:19:26 1996  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.h (next): New member.  Forms linked list of open
- 	handles.  * backend/mustek.c (first_handle): New variable.  Root
- 	of list of open handles.
-	(sane_open): Insert handle into list of open handles.
-	(sane_close): Remove handle from list of open handles.
-
-Wed Dec  4 18:37:45 1996  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.c (attach): Added back MFS-12000SP, MFS-08000SP,
- 	and MFS-06000SP.  At least the first one really does exist.  I
- 	don't know how the differ from the other scanners, but it looks as
- 	if line-distance correction might be different.
-
-Tue Dec  3 21:22:54 1996  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/sane.c (sane_strstatus): Remove trailing dot from error
- 	message.
-
-Mon Dec  2 19:12:53 1996  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* backend/mustek.c (max_string_size): New function to determine
- 	maximum size of a string constraint list.
-	(init_options): Use max_string_size () to initialize size of
- 	string-valued options.
-
-Sun Dec  1 15:44:53 1996  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* Version 0.1 released.
-
-	* backend/mustek.c (attach): Fix mispelled/bad model names:
-		MFS-12000SP -> MSF-12000SP
-		MFS-08000SP -> MSF-08000SP
-		MFS-06000SP -> MSF-06000SP
-		MFS-08000CZ -> <removed>
-		MFS-06000CZ -> <removed>
-
-Tue Nov 26 19:11:18 1996  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/scan.c (print_option): Separate option name from option
- 	values by blank, not equal so the syntax is correct even for short
- 	options.
-	(parse_scalar): Added missing newline to error message.
-
-Sat Nov 16 17:26:19 1996  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* frontend/scan.c (main): Created (by Andy).
-
-	* backend/pnm.c: Adapted from Andy's pnm.c (just minor updates).
-
-	* backend/mustek.c: Created.
-	* backend/metadl.c: Ditto.
diff --git a/ChangeLog-1.0.1 b/ChangeLog-1.0.1
deleted file mode 100644
index 3adfafc..0000000
--- a/ChangeLog-1.0.1
+++ /dev/null
@@ -1,449 +0,0 @@
-1999-04-19  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* Version 1.0.1 released.
-
-	* backend/artec.c (attach): Applied patch by Petter to fix URL in
-	debug output.
-
-	* backend/microtek2.c (chunky_proc_data): Apply Bernd's latest
-	patch to fix some color problems.
-
-1999-04-17  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* Patch by Mikko Työläjärvi:
-	* sanei/sanei_scsi.c: Check for cam_devices[fd]==NULL, not !=NULL.
-
-	* Patch from Petter:
-	* config.guess: Update to latest version.
-	* config.sub: Update to latest version.
-	* config.install-sh: Update to latest version.
-	* mkinstalldirs: Update to latest version.
-
-1999-04-12  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* doc/sane-dc25.man: Apply fixes by Peter Fales
-	<psfales@lucent.com>.
-	* backend/dc25.c: Apply patch by Peter Fales.
-
-1999-04-11  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* include/sane/config.h.in: Declare return type of strdup(),
-	strndup(), and strsep() if these functions are not part of the
-	standard libc.  This breaks the GNU convention of not declaring
-	standard C library functions but is required in these cases
-	because the functions return pointers.  On a 64 bit platform, bad
-	code is generated if a function is (implicitly) declared to return
-	an "int" and then returns a pointer.  To minimize the risk of
-	compile errors due to conflicting prototypes, we don't specify a
-	prototype though (just the return type).
-
-	* backend/dll.conf: Comment out dc25 and dc210 backends as those
-	are VERY slow to initialize when no camera is attached.
-
-	* backend/epson.desc: Add Epson GT-7000.
-
-1999-04-06  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/sharp.c (sane_read_shuffled): Declare as "static".
-	(sane_read_direct): Ditto.
-	Applied latest patch by Kazuya and Abel.
-
-	* sanei/sanei_scsi.c [USE == FREEBSD_CAM_INTERFACE]: Fix bugs
-	(patch by Mikko Tyo"la"ja"rvi <mikko@securitydynamics.com>).
-
-	* backend/snapscan.c (start_reader): Don't redirect scanner file
-	descriptor to fd 0 (needlessly breaks FreeBSD and other platforms
-	that don't use real file descriptors for the scanner.
-
-	* backend/microtek2.c: Apply Bernd's patch to fix "green-ness"
-	bug.
-
-	* backend/umax.BUGS: Applied Oliver's latest patch.
-	* backend/umax.CHANGES: Ditto.
-	* backend/umax.FAQ: Ditto.
-	* backend/umax.TODO: Ditto.
-	* backend/umax.c: Ditto.
-	* backend/umax.desc: Ditto.
-	* doc/sane-umax-doc.html: Ditto.
-	* doc/sane-umax-doc.tex: Ditto.
-	* doc/sane-umax-doc.man: Ditto.
-	
-1999-04-06  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* backend/snapscan.c (sane_exit sane_get_devices): Removed memory
-	leak.
-	(sane_open): Give more sensible error message when unable to open
-	temp file.  Open temp file in /var/tmp, not in current directory.
-	(mini_inquiry add_device): Make sure to only match listed models.
-  	Earlier, substrings would also match.
-
-	* backend/snapscan.c (sane_snapscan_*): Changed API entries from
-	sane_snapscan_* to sane_*.
-
-	* backend/snapscan.c (add_device init_options inquiry
- 	sane_snapscan_get_parameters sane_snapscan_start
- 	sane_snapscan_set_io_mode sane_snapscan_read) backend/snapscan.h
- 	backend/snapscan.desc: Rewrote scanner detection code to loop over
- 	array of supported SCSI names.  Added AGFA SnapScan 1236s support.
-  	It seems to be compatible with SnapScan 600.
-	Make sure to not add the same device more then once to the device
- 	list.  Bugfix in sane_snapscan_read() triggered on EOF.
-
-1999-04-04  David Mosberger-Tang  <David.Mosberger@acm.org>
-	* PROBLEMS: Note that /proc/sys/kernel/sg-big-buff is available
-	since Linux kernel v2.2.
-
-	* backend/agfafocus.desc: Changed status from "new" to "alpha".
-	* backend/hp.desc: Ditto.
-
-	* backend/microtek2.desc: Increase version number to 0.6.
-
-1999-04-04  Petter Reinholdtsen <pere@td.org.uit.no>
-	* PROBLEMS:  Updated note on SG_BIG_BUF.
-	* tools/README: Corrected typo.  Added some notes on
-	mustek600iin-off.
-	* tools/mustek600iin-off.c: Remove hardcoded path to mustek.conf.
-
-1999-04-03  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* include/sane/sanei_debug.h: Define sanei_debug_BACKEND_NAME only
-	if STUBS is not defined.
-
-	* backend/microtek2.h: #ifdef out do_dummy_scan.
-
-	* backend/Makefile.in (V_REV): New variable.
-
-	* configure.in (V_REV): New variable.
-	(VERSION): Include ${V_REV} in vesion number.
-	Substitute V_REV.
-	
-	* backend/umax.c (umax_do_request_sense): Make "static".
-
-	* backend/canon.h: Move array "option_name"...
-	* backend/canon-sane.c: ...to here and make "static".
-
-	* backend/pnm.c: Rolled back to version that shipped with
-	sane-0.74.  The scan area options were not well implemented.  If
-	someone wants to fix that code, the previous (unreliable) version
-	of the PNM backend is in backend/pnm.c-bad.
-
-	* doc/sane.tex (subsection{Resolution Option}: Remove section
-	4.5.5---it was a duplicate of section 4.5.2 (Scan Resolution
-	Option)!
-
-	* backend/microtek2.c (chunky_proc_data): Merge in latest changes
-	from Bernd.
-
-1999-04-02  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/net.c (sane_control_option): Ignore the option size
-	of BUTTONs and GROUPs as required by section 4.2.9.  (Bug
-	reported by Nick Lamb).
-
-	* frontend/xscanimage.c (null_print_func): Declare MSG param
-	as "const" to match declaration of glib-1.2.1.
-
-	* backend/ricoh.c (attach_one): return SANE_STATUS_GOOD.
-
-	* backend/microtek2.c (do_dummy_scan): #ifdef out since it
-	seems to be used for debugging only.
-
-	* backend/hp-option.c (_probe_int): Needed only if HP_EXPERIMENTAL
-	is defined.
-
-	* backend/coolscan.c: Updated with Didier's latest patch.
-
-	* backend/mustek.c: Applied Andreas's latest patch.
-
-	* doc/sane.tex (subsection{Device Descriptor Type}): Add AGFA.
-
-	* doc/net.tex (subsection{Primitive Data Types}): Clarify that
-	SANE_Char is encoded as ISO LATIN-1 and describe SANE_String
-	encoding (patch by Petter).
-
-	* frontend/saned.c (DBG): Remove extraneous parens around "msg".
-
-	* AUTHORS (Frontends): Update David Skoll's email address.
-
-	* frontend/saned.c (get_free_handle): Check for out of memory
-	situations and initialize newly allocated memory.
-	(auth_callback): Fail when we can _not_ authorize (i.e.,
-	!can_authorize), not the other way round.
-	(quit): Make sure quit() gets executed only once.
-
-	* backend/microtek2.c: Updated with Bernd's latest version.
-	* backend/microtek2.h: Ditto.
-
-	* backend/st400.desc: New file.
-
-	* backend/epson.c (sane_open): Check for NULL or empty
-	dummy_dev.sane.name to avoid segfaults.  (Suggested by Yuri
-	Dario).
-
-	* sanei/sanei_scsi.c [USE = LINUX_INTERFACE]: Make "cdb" last
-	member in "struct req" and change size of "data" to 1 byte to
-	allow dynamic sizing of data buffer based on the value of
-	sanei_scsi_max_request_size.
-	(sanei_scsi_req_enter): Calculate size of request based on
-	sanei_scsi_max_request_size.  A similar patch was proposed
-	by Petter Reinholdtsen.
-
-1999-03-13  Petter Reinholdtsen  <pere@td.org.uit.no>
-
-	* doc/saned.man: More info on how to use tcp_wrapper for access
-	control.
-
-1999-03-08  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/microtek2.c (sane_get_select_fd): Remove bogus cast.
-	Reported by Petter Reinholdtsen.
-
-	* sanei/sanei_config.c: Include <sane/config.h>.
-
-	* frontend/saned.c: Include <sys/types.h>.
-	(MAXHOSTNAMELEN): Define MAXHOSTNAMELEN if necessary.
-
-	* configure.os2 (LN_S): Updated with Yuri's latest version.
-
-	* backend/Makefile.in (install): Use $(LN_S) instead of ln -s.
-	(libsane-dll.la): Make dependent on $(DLL_PRELOAD_EXTRAS).
-	(libsane-hp.la): Make dependent on sanei_pio.lo.
-
-	* backend/hp.c (PATH_MAX): Define PATH_MAX if necessary.
-
-	* backend/hp-scl.c (sanei_hp_scsi_pipeout): Add SIGXCPU, SIGXFSZ,
-	and SIGVTALRM only if defined.
-
-	* backend/dc25.c (PATH_MAX): Define PATH_MAX if necessary.
-	(sane_init): Move up fclose(fp) to avoid segfault when fp==NULL.
-	* backend/dc210.c (sane_init): Ditto.
-
-	* backend/pnm.c: Apply Oliver's 4-liner to make TLX, TLY, BRX, and
-	BRY advanced options.
-
-	* backend/umax.c: Updated with Oliver's latest version.
-	
-	* doc/sane-sharp.man: New file (by Kazuya Fukuda).
-	* backend/sharp.c: Updated with Kazuya's latest version.
-	* backend/sharp.h: Ditto.
-	* backend/sharp.desc: Ditto.
-
-1999-03-04  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/canon.c (adjust_hilo_points): Print values of type
-	size_t as described in backend/GUIDE..
-
-	* backend/canon-scsi.c: Comment out unused code.
-
-	* backend/canon.c: Updated with Manuel Panea latest version.
-
-	* Irix patches from Michael Sweet:
-
-	* sanei/sanei_scsi.c (sanei_scsi_find_devices): Update with
-	Michael's latest version.
-	* configure.in (CPPFLAGS): Don't check for libnsl or libsocket on
-	Irix.
-	(CPPFLAGS): Check for cfmakeraw.
-	* backend/sharp.h (mode_select_param): Remove double semicolon
-	(some compiler's don't grok those in structure declarations).
-	* backend/Makefile.in (libsane-abaton.la): Make dependent on
-	sanei_config2.lo.
-	* backend/dll.conf: Enable net backend, disable pnm backend by
-	default to lessen risk of confusing novice users.
-	* backend/abaton.c (sane_read): Change type of "size" from ssize_t
-	to size_t.
-	* backend/apple.c (sane_read): Ditto.
-
-1999-03-02  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/Makefile.in (EXTRA_dc210): New macro.
-
-	* sanei/sanei_ab306.c: Apply usleep() patch by Andreas
-	Czechanowski.
-
-	* backend/hp.c: Updated with Peter's latest version (v.082).
-
-1999-03-01  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* include/sane/sanei_net.h: Changed copyright on this file (and
-	this file only!) to be public domain (same as sane.h).  This helps
-	ensuring that independent network implementations remain
-	compatible.
-
-1999-02-28  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/sharp.c: New file by FUKUDA Kazuya
-	<fukuda@avm.nhe.nec.co.jp>.
-	* backend/sharp.h: Ditto
-	* backend/sharp.conf: Ditto.
-	* backend/sharp.desc: Ditto.
-
-	* include/sane/sanei_debug.h: Define sanei_debug_BACKEND_NAME
-	only if BACKEND_NAME is defined.
-
-	* tools/find-scanner.c (main): Add NetBSD device names (patch by
-	Taniguchi Shinya <Taniguchi.Shinya@exc.epson.co.jp>).
-
-	* backend/epson.c (attach): Recognize Perfection636 scanner.
-	Suggested by Svend Daugaard Pedersen <sdp@vip.cybercity.dk>.
-
-	* backend/abaton.c (attach_one): Move past attach() to avoid
-	forward-reference.
-
-	* backend/umax.c (umax_do_request_sense): Make static.
-
-	* backend/snapscan-310.c (rgb_buf_can_get_line): Make static.
-	(rgb_buf_init): Ditto.
-	(rgb_buf_clean): Ditto.
-	(rgb_buf_push_line): Ditto.
-	(rgb_buf_get_line): Ditto.
-	(rgb_buf_set_diff): Ditto.
-	(transfer_data_diff): Ditto.
-
-	* backend/snapscan.c (gamma_8): Make static.
-	(start_reader): Ditto.
-	
-	* backend/microtek.c (do_precalibrate): Make static.
-	(finagle_precal): Ditto.
-	(pack_flat_data): Ditto.
-	(pack_goofyrgb_data): Ditto.
-	(pack_into_ring): Ditto.
-	(pack_into_dest): Ditto.
-	(pack_seqrgb_data): Ditto.
-	(ring_alloc): Ditto.
-	(ring_expand): Ditto.
-	(ring_free): Ditto.
-	(set_pass_parameters): Ditto.
-
-	* backend/epson.c (epson_cmd): Make static.
-
-	* backend/dc25.c (pp): Make static.
-	(tmpname): Ditto.
-	(tmpnamebuf): Ditto.
-	(tty_baud): Ditto.
-
-	* backend/artec.c (artec_get_status): Make static.
-	(attach_one): Ditto.
-	(cap_data): Ditto.
-
-	* backend/abaton.c (mode_update): Make mode_update() static.
-	* backend/apple.c (mode_update): Ditto.
-	(gamma_update): Make static.
-	(xquant): Ditto.
-	(yquant): Ditto.
-
-	* backend/microtek2.c: Updated with Bernd's v0.6.
-	Add missing include of <errno.h>.
-
-	* backend/microtek2.h: Ditto.
-	* backend/microtek2.conf: Ditto.
-
-1999-02-27  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* frontend/preview.c (preview_scan): Fix dpi calculation by
-	replacing gwidth by gheight.  Reported by Manuel Panea.
-
-	* doc/sane-net.man: Change service name from "saned" to "sane".
-
-	* sanei/sanei_scsi.c (MAX_DATA) [FREEDBSD_CAM_INTERFACE]:  Change
-	MAX_DATA from MAXPHYS to (DFLTPHYS - PAGE_SIZE).  Patch by
-	Parag Patel <parag@cgt.com>.
-
-	* AUTHORS (Backends): Updated Peter's email address.
-
-	* PROJECTS: Updated Peter's home page URL.
-
-	* backend/snapscan.c (EXPECTED_MAJOR): Update EXPECTED_MAJOR to 1.
-
-	* include/sane/sane.h (SANE_CURRENT_MAJOR): SANE_CURRENT_MAJOR and
-	V_MAJOR HAVE to be in sync, so I'm forced to fix SANE_CURRENT_MAJOR
-	now.  Embarassing, but fortunately only the snapscan backend seems
-	affected by this change.
-
-	* backend/dll.c (load): Use SANE_CURRENT_MAJOR, not V_MAJOR (the
-	latter is used for shared lib versioning).
-
-	* tools/find-scanner.c (main): Make verbose output a bit
-	friendlier (patch by Petter).
-
-	* backend/umax.c: Updated with Oliver's latest version (v1.0c).
-
-	* Patch by Mike Sweet: * backend/Makefile.in (libsane-ricoh.la):
-	Make dependent on sanei_config2.lo.  * sanei/sanei_scsi.c
-	(sanei_scsi_find_devices): New function.
-	(WE_HAVE_FIND_DEVICES): Define.  * frontend/saned.c (check_host):
-	A "+" in saned.conf now matches any remote host (may be a bit
-	dangerous, so use this judiciously).  * frontend/gtkglue.c:
-	Include <string.h>.  * backend/hp-accessor.c (hp_data_alloc):
-	Round size up to a multiple of sizeof(long) to avoid alignment
-	problems.  * backend/abaton.h: Remove extraneous comma in enums.
-	* backend/artec.conf: Add "scsi ULTIMA" line.  *
-	backend/abaton.conf: Add "scsi ABATON" line.  *
-	backend/epson.conf: Add "scsi EPSON" line.  * backend/ricoh.conf:
-	Add "scsi RICOH IS60" line.  * backend/snapscan.conf: Add "scsi
-	AGFA" and "scsi COLOR" line.  * backend/tamarack.conf: Add "scsi
-	TAMARACK" line.  * backend/abaton.c (sane_init): Fix fall back
-	code to attach /dev/scanner when ABATON_CONFIG_FILE doesn't exist.
-	(sane_init): Use sanei_config_attach_matching_devices().
-	(attach_one): New function.
-	* backend/hp-device.c (sanei_hp_device_probe): Mention model
-	6250C.
-
-	* backend/saned.conf: Remove the stale comments about hostname
-	matching being case-sensitive.
-
-	* backend/microtek.h: Updated with Matto's v0.10.1.
-
-	* backend/mustek.c (send_gamma_se): Apply patch by Wilco Oelen
-	<woelen@noord.bart.nl> to clip gamma values to range 0..255.
-
-	* backend/artec.desc: Updated with Chris Pinkham's latest version.
-
-	* backend/umax.c (PATH_MAX): Do conditional define of PATH_MAX
-	_after_ including all the headers to avoid "duplicate define"
-	warning message.
-
-	* backend/ricoh.h: Include <sane/config.h> to get #define for
-	"inline" if necessary.
-
-	* backend/dc210.c (init_dc210): To send break, use tcsendbreak()
-	if available or TCSBKRP or TCKSBRK ioctl() if available or fall
-	back to doing nothing if none of these are supported.  This may
-	cause the backend to work incorrectly on platforms that do not
-	support one of the above methods for sending a break, but at least
-	it will compile that way.
-
-1998-12-12  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/hp.desc: Updated with Peter's latest version.
-
-1998-11-30  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* LICENSE (terms): Add a pointer to backend/djpeg.README.gz.
-
-	* backend/djpeg.README.gz: New file (required to comply with JPG
-	licensing restriction).
-
-	* backend/snapscan.c (sane_snapscan_start): Use INT_MAX instead
-	of non-portable MAXINT.
-	Don't include Linux-specific <values.h>.
-
-1998-11-26  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* doc/sane.tex (subsection{Device Descriptor Type}): Consistently
-	use "Noname" (instead of None/Noname) to indicate the absence of
-	a vendor.
-	(subsection{sane_strstatus}): Define how long the returned string
-	is valid.
-	(section{Code Flow}): Clarify that sane_cancel() has to be called
-	even if read returns SANE_STATUS_EOF.
-
-1998-11-22  David Mosberger-Tang  <David.Mosberger@acm.org>
-
-	* backend/ricoh.h (_4btol): Replace "__inline" by "inline".
-
-	* backend/abaton.c (sane_control_option): Assign word values to
-	s->val[foo].w not s->val[foo].  The latter compiles on gcc-2.7.2.3
-	without warning but causes an error on other compilers (e.g.,
-	egcs).
-	
diff --git a/ChangeLog-1.0.10 b/ChangeLog-1.0.10
deleted file mode 100644
index 57dee9a..0000000
--- a/ChangeLog-1.0.10
+++ /dev/null
@@ -1,890 +0,0 @@
-******  Release of sane-backends 1.0.10. End of code freeze ******
-
-2003-02-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Artec AM12e+.
-
-2003-01-31  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: New version: 1.0.10. Disabled warnings for
-	  release.
-	* doc/Makefile.in: Added plustek to list of directories.
-
-2003-01-31  Gerhard Jaeger <gerhard@gjaeger.de>
-	* doc/plustek/Plustek-USB.txt: Added comment about scanner.o
-	* backend/plustek.c backend/plustek-devs.c backend/plustek-usb.h
-	  backend/plustek-usbshading.c: Fixed major bug, that avoid proper
-	  shading on CCD-devices like HP 2200C. Fixed also CanoScan 1220
-	  settings, as the current ones didn't work
-
-2003-01-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Canon, Fijitsu and Prolink
-	  scanners.
-
-2003-01-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* frontend/saned.c: Fixed severe bug in saned that allowed a
-	remote frontend to crash saned (null pointer derefence) if no
-	scanners are connected.
-
----- CODE FREEZE FOR SANE 1.0.10 ---
--- snapshot 1.0.10-pre3
-
-2003-01-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/sane-backends.de.po po/sane-backends.es.po po/sane-backends.fr.po
-	  po/sane-backends.pt.po po/sane-backends.ru.po po/sane-backends.sv.po:
-	  Minor updates due to backend changes.
-	* TODO: Added icc problem.
-	* NEWS: Updated.
-
-2003-01-25  Jochen Eisinger <jochen.eisinger@gmx.de>
-
-	* sanei/sanei_pa4s2.c: added some #ifdefs to make it compile with
-	  the Intel C++ Compiler (icc).
-	* backend/mustek_pp.c: fixed some character encoding issues in
-	  debug messages
-	* README.linux: added a note about the Intel C++ Compiler
-
-2003-01-24  Jochen Eisinger <jochen.eisinger@gmx.de>
-
-	* backend/mustek_pp_ccd300.c: continued on the CCD low-level driver.
-	  There is still some bug in it, that keeps it from actually scanning
-	  something...
-
-2003-01-24  Jochen Eisinger <jochen.eisinger@gmx.de>
-
-	* doc/descriptions/mustek_pp.desc: added supported scanners
-
-2003-01-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/bh.c backend/coolscan.c: Minor conversion fixes (from
-	  Andrea Suatoni <a.suatoni@telefonica.net>).
-	* backend/test.c: Use "Color pattern" consistantly.
-	* acinclude.m4 aclocal.m4 configure configure.in
-	  include/sane/config.h.in: Declare prototypes for all functions that
-	  may miss on some platforms.
-	* doc/descriptions/unsupported.desc: Added Mustek parport scanners.
-	  Added more information for Primascan Colorado 2600u.
-	* TODO: Updated Irix patches and desc section.
-
-2003-01-24  Gerhard Jaeger <gerhard@gjaeger.de>
-	* doc/plustek/Plustek-USB-TODO.txt
-	  doc/plustek/Plustek-USB.txt
-	  Documentation update
-	* doc/descriptions/plustek.desc: status updates
-	* backend/plustek.conf fixed options
-	* backend/plustek.c backend/plustek-devs.c backend/plustek-usb.c
-	  backend/plustek-usbhw.c backend/plustek-usbimg.c
-	  backend/plustek-usbscan.c backend/plustek-usbshading.c
-	  backend/plustek.h backend/plustek-usb.h
-	  Minor fixes and prototype description updates, code cleanup
-
-2003-01-23  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/descriptions/epson.desc: Added Perfection 3200/GT-9800
-
-2003-01-23  Andras Major <andras@users.sourceforge.net>
-
-	* backend/doc/sane-coolscan2.man: added a .TP that mysteriously
-	  vanished
-
-2003-01-23  Andras Major <andras@users.sourceforge.net>
-
-	* backend/coolscan2.c: hack for IR readout with LS-4000.
-
-2003-01-23  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Primax/Visioneer Primascan
-	  Colorado 2600u and UMAX Astra 4500.
-
-2003-01-22  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/descriptions/epson.desc: Corrected syntax for GT-6000 entry
-
-2003-01-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/Makefile.in: Fixed regeneration of libsanei.a when the object
-	  files were changed.
-	* sanei/sanei_usb.c: Scanning for devices is now done in
-	  sanei_usb_init instead of every time when sanei_usb_find_devices is
-	  called. Also only devices that really exist are opened. These
-	  changes fixe the slow detection of devices on systems using devfs or
-	  old scanner drivers.
-
-2003-01-21  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/descriptions/epson.desc: Added "SCSI" to GT-6000 entry
-
-2003-01-21  Eddy De Greef <eddy_de_greef at tiscali dot be>
-
-	* backend/mustek_pp_cis.c: compile warning fix and minor debug
-	  message fixes.
-	* doc/sane-mustek_pp.man: updated supported scanner list and
-	  typo fixes.
-
-2003-01-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Adjusted test for sparc64 to disable
-	  SCSI generic v3.
-
-2003-01-20  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/descriptions/epson.desc: Replace :new with :alpha
-
-2003-01-19  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson_usb.c: Added USB product IDs for MFDs.
-	* doc/descriptions/epson.desc: Updated version number, added
-	  entries for MFDs.
-	* doc/sane-epson.man: Added MFDs.
-
--- snapshot 1.0.10-pre2
-
-2003-01-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx_devices.c
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES: Removed
-	  wrong "untested" flag from Mustek AE USB and Lexmark X70/X73
-	  scanners.
-	* po/sane-backends.de.po po/sane-backends.es.po po/sane-backends.fr.po
-	  po/sane-backends.pt.po po/sane-backends.ru.po po/sane-backends.sv.po:
-	  Regenerated.
-
-2003-01-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in include/sane/config.h.in sanei/sanei_scsi.c:
-	  Disable the new Linux SG interface for sparc64 to work-around 32 bit 
-	  userland / 64 bit kernel problems.
-	* doc/descriptions/unsupported.desc: Added HP ScanJet 3500c, 3530c,
-	  3570c, 3570cxi, 5500C and Microtek ScanMaker 3800. Updated link for
-	  ScanJet 4470C.
-	* TODO: Added links to hp4200 backend. Removed libusb entry, parport
-	  compilation problems, SCSI on sparc64 issue, USB on BSD problems.
-
-2003-01-16  Frank Zago  <fzago at austin dot rr dot com>
-
-	* backend/leo.c doc/descriptions/leo.desc doc/leo/leo.txt: Added
-	  another scsi string for the fs-1130.
-
-2003-01-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/microtek2.c backend/microtek2.h: Bugfix for the X12USL
-	  (solved problems >600dpi), one for lineart mode with a 6400XL
-	  and one for Scanmaker 5 (crashes at sendgamma). From Karsten Festag
-	  <karsten.festag@gmx.de>.
-
-2003-01-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/sanei_usb.c: Don't call usb_clearhalt and usb_set_altinterface
-	  to avoid errors on Mac OS X.
-	* doc/descriptions/unsupported.desc: Added HP 5490c.
-
-2003-01-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* NEWS: Updated list of backends.
-	* doc/sane-usb.man: Added remark about old name of usbfs.
-	* doc/descriptions/unsupported.desc: Added Artec Ultima 2000 (0x4001
-	  model), Canon CanoScan D660U, Compaq S200, Epson Perfection 660,
-	  HP ScanJet 4570C, Microtek ScanMaker 3630. Updated ScanJet 5400C and
-	  5470C URLs, Canon FB1210 information.
-
-2003-01-13  Jochen Eisinger <jochen.eisinger@gmx.de>
-
-	* backend/mustek_pp*, backend/Makefile: merged all mustek_pp
-	  related files into one compile unit and removed illegal symbols
-
-2003-01-13  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/descriptions/unsupported.desc: Added HP ScanJet 2300C and various chipset
-	  information for the unsupported Plustek devices  	
-	* doc/descriptions/plustek.desc: cleanup
-
-
----- FEATURE FREEZE FOR SANE 1.0.10 ---
--- snapshot 1.0.10-pre1
-
-2003-01-12  Jochen Eisinger <jochen.eisinger@gmx.de>
-
-	* doc/sane-mustek_pp.man, doc/descriptions/mustek_pp.desc,
-	  backend/mustek_pp*: replaced the old mustek_pp backend with
-	  version 12-alpha. This version fully supports CIS scanners but
-	  removes support for 600dpi CCD scanners and the 300dpi CCD
-	  support isn't yet working. In contrary to the old backend, this
-	  version is based on information provided by Mustek. For now,
-	  the backend exports lots of illegal symbols, this will be fixed
-	  before code freeze. Also the .desc file is empty and will be updated
-	  soon.
-	* AUTHORS: added Eddy De Greef who wrote the CIS hardware driver part
-
-2003-01-12  Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* backend/sharp.*: fixed a segfault, when the SCAN command returned
-          an error; optional "relaxed" handling of transparency unit errors.
-
-2003-01-12  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/descriptions/plustek.desc: Removed the unsupported stuff
-	* doc/descriptions/unsupported.desc: Removed OpticPro 16B.
-
-2003-01-12  Michael Herder  <crapsite@gmx.net>
-
-	* doc/descriptions/artec_eplus48u.desc:  Added new
-	  models.
-
-2002-01-11  Jochen Eisinger <jochen.eisinger@gmx.de>
-
-	* sanei/sanei_pa4s2.h: prepared sanei for use with fork()ing
-	  backends
-
-2003-01-11  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/descriptions/plustek.desc: Update to reflect the currently
-	  supported decvices.
-	* doc/descriptions/unsupported.desc: Added some Plustek devices.
-	  CanoScan N1220U is now supported by the Plustek backend.
-	* doc/plustek: Added this directory to store various Plustek
-	  information files.
-
-2003-01-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc
-	  doc/descriptions-external/primax.desc: Some Primax scanners (and
-	  clones) are now supported by the primax backend.
-	* backend/microtek.c backend/microtek2.conf backend/microtek2.h:
-	  OPT_THRESHOLD fix. Avoid using "_" in option names. Set more
-	  options in microtek2.conf to on by default. From Karsten Festag
-	  <karsten.festag@gmx.de>.
-	* tools/sane-desc.c: Fixed overwrite warnings. Minor DBG message fixes.
-	  Fixed priority handling (backend and manpage were overwritten even if
-	  a model had a lower priority).
-	* tools/README: Updated sane-find-scanner and sane-desc.el entries.
-	* doc/sane-gt68xx.man doc/sane-mustek_usb.man: Updated status for the
-	  BSDs.
-
-2003-01-10  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/sane-backends.pt.po: Even more Portuguese translations from
-	  Pedro Morais <morais@inocam.com>.
-	* sanei/sanei_usb.c: Comment out resetep at sane_close. This
-	  function sets th USB data toggle only on the host side.
-	* TODO: Removed microtek2 problem, updated Irix patch section and
-	  Linux/Sparc section.
-	* NEWS: Updated for 1.0.10.
-	* backend/mustek.c: Removed hardcoded option size.
-
-2003-01-10  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* TODO: Plustek backend now supports libusb, moved appropriate line
-	  to done section.
-
-2003-01-10  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/sane-plustek.man: update to reflect version change
-	* doc/descriptions/plustek.desc: Added some Canon entries, status updates
-	* backend/plustek.conf updated options
-	* backend/plustek.c backend/plustek-devs.c backend/plustek-usb.c
-	  backend/plustek-usbhw.c backend/plustek-pp.c
-	  backend/plustek-usbmap.c backend/plustek-usbimg.c
-	  backend/plustek-usbscan.c backend/plustek-usbshading.c
-	  backend/plustek.h backend/plustek-share.h backend/plustek-usb.h
-	  New version + support for libusb
-
-2003-01-09  Peter Fales  <peter@fales-lorenz.net>
-
-        * backend/dc210.c, backend/dc240.c:  Fix compile failure
-	  on OS/2.
-
-2003-01-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
-	  backend/gt68xx_high.c doc/sane-gt68xx.man
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES:
-	  Updated manpage and .desc concerning Lexmark X70. Updated manpage
-	  concerning kernel 2.4.21-pre3 containing the 1-endpoint fix. Fixed
-	  A3 USB resolution setting. Updated A3 USB margins (Pedro Morais
-	  <morais@inocam.com>). Added detection of Genius Colorpage Vivid3x.
-	  It's unknown if it works. Updated .desc file. Don't print calib line
-	  warnings by default.
-	* doc/descriptions/microtek2.desc: Updated (From Karsten Festag 
-	  <karsten.festag@gmx.de>).
-	* po/Makefile.in po/sane-backends.pt.po: Added Portuguese translation 
-	  for the gt68xx backend (from Pedro Morais <morais@inocam.com>).
-	* po/sane-backends.de.po: Added some missing translations. Removed some
-	  (wrong) fuzzy translations.
-
-2003-01-08  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* doc/descriptions/snapscan.desc:
-	  Added entries for Acer/Benq 310U, 320U, 340U and 
-	  Mitsubishi Diamondview 650U
-	* backend/snapscan.c backend/snapscan.h backend/snapscan-scsi.c
-	  backend/snapscan.conf: Backend version 1.4.18, added support for 
-	  Acer/Benq310U, fixed color correction for Agfa SnapScan 300 
-
-2003-01-08  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/hpsj5s.desc doc/descriptions-external/hp4200.desc:
-	  Use uniform model names for HP scanners.
-	* doc/descriptions/unsupported.desc: Added Canon CanoScan D1250U2 
-	  and HP ScanJet 4400C.
-	* po/artec_eplus48u.de.po po/epson.de.po po/epson.ru.po
-	  po/epson.sv.po po/gt68xx.de.po po/matsushita.fr.po
-	  po/matsushita.ru.po po/mustek.de.po po/mustek.ru.po
-	  po/mustek_usb.de.po po/mustek_usb.ru.po po/plustek.de.po
-	  po/plustek.es.po po/plustek.ru.po po/pnm.de.po po/pnm.ru.po
-	  po/sceptre.fr.po po/sceptre.ru.po po/snapscan.de.po
-	  po/snapscan.ru.po po/teco1.fr.po po/teco1.ru.po po/umax.de.po
-	  po/umax.fr.po po/umax_pp.de.po po/umax_pp.fr.po po/umax_pp.ru.po
-	  po/umax.ru.po: Remove per-backend translations. The translations
-	  are now in the per-language sane-backends.??.po files.
-	* po/saneopts.de.po po/saneopts.es.po po/saneopts.fr.po po/saneopts.ru.po
-	  po/saneopts.sv.po: Remove global saneopts translations. The translations
-	  are now in the per-language sane-backends.??.po files.
-	* TODO: Updated .desc file, mapages, sanei_usb and OS/2 entries. Removed
-	  entry about po files.
-	* po/Makefile.in: Remove sane-backends.pot from list of distributed 
-	  files. Add microtek2 files.
-	* backend/microtek2.c backend/microtek2.h:  Improved support for
-	  Scanmaker X12USL. Alpha support for Scanmaker 9800XL. Some bugfixes.
-	  (From Karsten Festag <karsten.festag@gmx.de>).
-	* po/sane-backends.de.po: Added translation for microtek2 backend.
-	  (From Karsten Festag <karsten.festag@gmx.de>).
-
-2003-01-07  Peter Fales  <peter@fales-lorenz.net>
-
-        * TODO:  Marked dc210/dc240 items as "done"
-
-2003-01-07 Oliver Rauch <Oliver.Rauch@Rauch-Domain.DE>
-	* backend/umax.c: update to build 39
-
-2003-01-07  Peter Fales  <peter@fales-lorenz.net>
-
-        * backend/dc210.c, backend/dc240.c:  Use a more portable way
-	  of sending "break" on serial ports.
-
-2003-01-07  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* doc/descriptions/hp.desc: Change HP ScanJet to ScanJet
-
-2003-01-07   Stéphane Voltz  <svoltz@wanadoo.fr>
-
-        * doc/sane-umax_pp.man: updates and fixes
-	* doc/descriptions/umax_pp.desc: change model form HP3200C to 
-	  Scanjet 3200C
-
-2003-01-07  Matthew Duggan <stauff1@users.sourceforge.net>
-
-	* backend/canon_pp-dev.c: Improve/fix detection logic.
-	* doc/descriptions/canon_pp.desc: Bump version number.
-
-2003-01-06  Peter Fales  <peter@fales-lorenz.net>
-
-        * doc/descriptions/dc25.desc, doc/descriptions/dc210.desc,
-	  doc/descriptions/dc240.desc, doc/descriptions/gphoto2.desc:
-	  Update author information
-
-        * backend/dc25.c:  Fix compiler warning 
-
-	* backend/dc210.c, backend/dc240.c, backend/dc210.conf, 
-	  backend/dc240.conf, backend/gphoto2.conf, backend/dc25.conf:
-	  Irix fixes from mailing list
-
-2003-01-05  Peter Fales  <peter@fales-lorenz.net>
-
-        * backend/dc25.c:  Mailing list fix.  Change = to == 
-	  dc25/dc20 tests.
-
-2003-01-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Added link to Irix patches. Updated .desc section.
-
-2003-01-05   Stéphane Voltz  <svoltz@wanadoo.fr>
-
-        * backend/umax_pp_low.c: small image quality improvement
-	* backend/umax_pp.conf: ppdev device is now default option
-
-2003-01-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* frontend/saned.c: Print version number.
-	* doc/descriptions/unsupported.desc: Added Genius HR7X Slim,
-	  Visioneer 6200 and Onetouch 8920.
-
-2002-12-31  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Removed one '//' comment.
-
-2002-12-31  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/onetouch8600.desc: Added (from PROJECTS).
-	* doc/descriptions/unsupported.desc: Added list of (known) scanners
-	  that are not supported by a SANE backend. There may be information
-	  about them or even a standaalone program to which the entries point.
-	* PROJECTS: Removed projects that are now in the .desc files.
-
-2002-12-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* Makefile.in: Removed configure.os2.
-	* PROJECTS: Removed HP 2200c project (now supported by plustek
-	  backend). Added "NIASH" keyword to hp3300backend.
-	* README.darwin: Removed comment about dynamic loading. Added
-	  sm3600 and fork problems.
-	* acinclude.m4 aclocal.m4 config.guess config.sub configure
-	  configure.in ltmain.sh: Update to latest libtool (1.4.3), config.sub
-	  and config.gues. This should fix the build problems on MacOS X
-	  concerning dynamic loading.
-	* backend/Makefile.in: Backends shouldn't be linked to sanei_config2 if
-	  they aren't also linked to sanei_scsi. sanei_config2 needs
-	  sanei_scsi.
-	* backend/gt68xx.c backend/gt68xx_devices.c backend/gt68xx_gt6801.c
-	  backend/gt68xx_gt6816.c backend/gt68xx_high.c backend/gt68xx_high.h
-	  backend/gt68xx_low.h doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES: Updated ScanExpress 2400 USB values. Added
-	  implementation of gt6801 lamp control for CCD scanners. Added flag for
-	  SE 2400 USB, added some quirks in gt68xx_gt6801.c. Fixed gt68xx_gt6801
-	  -> lamp control. Adjusted Plustek 1248U geometry and afe values. CCD
-	  gross calibration changed: start with the default value from module
-	  struct. Is faster now for most cases. Only 2.5 mm of calibration for
-	  GT-6801 scanners. Added "afe" option for gt68xx.conf for selecting
-	  default afe values. Removed AFE and exposure SANE options. Added
-	  documentation for afe option in gt68xx.conf. New version: 1.0-35.
-	* doc/descriptions-external/hp4200.desc 
-	  doc/descriptions-external/hpoj.desc: Use Hewlett-Packard consitantly 
-	  (instead of HP).
-	* doc/descriptions-external/scanwit.desc
-	  doc/descriptions-external/viceo.desc: Added description files for
-	  scanwit and viceo backends.
-	* doc/descriptions-external/tevion9693usb.desc: Removed (now included).
-	* backend/test.c doc/descriptions/test.desc: Make sure that frontend bugs
-	  concerning the select fd are detected.
-	* doc/sane-scsi.man: Minor formatting change.
-	* sanei/sanei_usb.c: Explicitely set first configuration. When claiming 
-	  the interface, use the interface number from bInterfaceNumber.
-	  Explicitely set the alternative setting. When closing, call clear_halt,
-	  and reset_ep, and release_interface explicitley. On errors in
-	  write/read, call clear_halt.
-	* TODO: Added sm3600 issue, htmla manpage issue, sanei_scsi stuff.
-	  Updated desc file, sanei_usb, and MacOSX  entries. Deleted sane.tex
-	  stuff (now TODO for SANE2).
-
-2002-12-28  Karl Heinz Kremer <khk@khk.net>
-
-	* Added option to display short resolution list to.
-
-2002-12-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane-scsi.man: The "scsi ..." way of specifying devices is not
-	  Linux-only. Some minor formatting updates.
-	* TODO: Added entries for "missing" scanners in desc files: snapscan
-	  and epson. Added sanei_usb issues. Updated MacOS X and OS/2 porting
-	  issues.
-	* README.darwin: Updated.
-	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
-	  backend/gt68xx_high.c backend/gt68xx_high.h backend/gt68xx_low.c
-	  backend/gt68xx_low.h doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES:
-	  Coarse calibration for first scan only" is off by default now. Added gamma
-	  table factor option (SANE_CAP_EMULATED). Setup gamma to 2.0 by default.
-	  Fixed (hopefully) sigpipe when cancelling. No geometry quantization anymore
-	  (not necessary). Plustek 1248U: do linemode for every resolution, fix color
-	  correction. Added comments for every Model member in gt68xx_devices.
-	  Added Plustek UT16B and Genius Vivid3x to .desc. Added implementation for
-	  inverted offset for CCD scanners. Added Mustek ScanExpress 2400 USB. Well,
-	  at least it's detected. Added NEW marker to .desc.
-	* doc/descriptions/artec_eplus48u.desc doc/descriptions/hpsj5s.desc
-	  doc/descriptions/teco2.desc doc/descriptions/teco3.desc:
-	  Updated NEW! markers.
-
-2002-12-07 Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* sanei/sanei_scsi.c: improved error handling
-
-2002-12-07  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Fixed problem with dropout color
-
-2002-12-06  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* backend/hp.h backend/hp.c backend/hp-scl.c backend/hp.conf
-	* doc/sane-hp.man doc/descriptions/hp.desc
-	  Add option dumb-read to work
-	  around problem with Buslogic SCSI driver
-
-2002-12-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure aclocal.m4 acinclude.m4: Fixed MacOS X LD_FLAGS bug.
-	* doc/sane-scsi.man: Removed link to ACard problem.
-	* doc/sane.tex: Updated contact information.
-	* LEVEL2: Removed. Contents is either in the SANE2 standard or in
-	  the SANE2 API TODO.
-	* Makefile.in doc/Makefile.in: Removed LEVEL2.
-
-2002-12-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane-mustek.man doc/sane-mustek_usb.man
-	  doc/descriptions/mustek.desc doc/descriptions/mustek_usb.desc:
-	  Updated links.
-	* backend/test.c po/sane-backends.de.po: Minor spelling and translation
-	  fixes.
-	
-2002-12-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/epson_scsi.c backend/sm3600.c: Move config.h include to the
-	  top of the include list to avoid compilation errors on platforms
-	  not defining u_char. Added AIX lalloca check.
-	* aclocal.m4 acinclude.m4 configure configure.in
-	  include/sane/config.h.in: Cleanup. Added some missing quotes. Better
-	  structure and comments. Tried to keep similar tests in one group.
-	  Moved more complicated tests to acinclude.m4. Added explicit test for
-	  build and host system type. When checking for programs, used $EXEEXT
-	  (hopefully fixes  OS/2 gettext misdetection). Removed obsolete
-	  macros. Removed PTAL check. Used autoconf for asm/io.h check.
-	  Shortened --enable-foo output and formatted it correctly. Trans-
-	  lations were installed even if --disable-translations was set. Don't
-	  test for msgcat anymore. Tell why translations aren't installed. Used
-	  autoconf 2.5 syntax for AC_OUTPUT and AC_CONFIG_FILES. Make
-	  sane-config executable. Print flags and installation directories
-	  near the end of configure output.
-	* po/Makefile.in: Added autoconf comment, removed MSGCAT variable.
-	* backend/dll.c doc/sane-dll.man doc/descriptions/dll.desc: Ignore
-	  comments that are in the same line as the backend entries. Minor
-	  manpage fixes. Intented according GNU coding standards.
-	* configure.os2: Removed. No longer necessary.
-
-2002-12-04  Matthew Duggan <stauff1@users.sourceforge.net>
-	* backend/canon_pp-dev.c: Don't compare firmware version numbers - 
-	  multiple versions do actually exist.
-	* doc/descriptions/canon_pp.desc: Bump version number.
-
-2002-12-03  Peter Fales  <peter@fales-lorenz.net>
-
-        * backend/gphoto2.c:  Don't display the "low resolution" option when
-	  taking a picture, because it doesn't actually do anything.
-
-2002-12-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/Makefile.in po/README sane-backends.de.po sane-backends.es.po
-	  sane-backends.fr.po sane-backends.ru.po sane-backends.sv.po:
-	  Use only one file of translated messages per language. Merged
-	  all backend files. Uses UTF-8 everywhere. Updated all files
-	  from the marked source code.
-
-2002-12-01   Stéphane Voltz  <svoltz@wanadoo.fr>
-
-        * backend/umax_pp.c: unmarked from SANE_I18N 2 options names
-
-2002-12-01  Rene Rebe <rene.rebe@gmx.net>
-	 * backend/avision.h backend/avision.c backend/avision.conf
-	   doc/descriptions/avision.desc: updated the Avision backend - 
-	   including auto-generated .desc file listing all devices
-	   also present in the avision.c device-list.
-	*  doc/descriptions/avision.desc: syntax fix
-	*  doc/sane-avision.man: updated to reflect the current backend
-	   development.
-
-2002-12-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in backend/dll.c: Add dynamic loading support
-	  for MacOS X/Darwin (from Peter O'Gorman <peter@pogma.com>).
-	* TODO: Added sp15c inclusion and low-level buffer prints. Removed
-	  avision warning, hpsj5s freeze, hp/libusb, and manpages issues.
-	  Updated MacOS X list.
-	* configure configure.in backend/Makefile.in: Use libtool -module
-	  when linking shared libs that will be loaded dynamically.
-
-2002-11-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/Makefile.in po/epson.sv.po po/saneopts.sv.po: Added Swedish
-	  translation (from Dennis Björklund <db@zigo.dhs.org>).
-
-2002-11-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in backend/canon630u.c backend/dll.c
-	  backend/gt68xx.c backend/mustek_usb.c backend/net.c backend/pnm.c
-	  backend/test.c backend/umax1220u.c backend/v4l.c doc/Makefile.in
-	  include/sane/config.h.in tools/sane-desc.c: Fixed PACKAGE_VERSION
-	  breakage. PACKAGE_VERSION was redefined by autoconf 2.5 with a
-	  different meaning. Use PACKAGE_STRING instead.
-	* backend/mustek.c doc/descriptions/mustek.desc
-	  doc/mustek/mustek.CHANGES: PACKAGE_VERSION fix. Fixed debug message
-	  in do_stop: really print exit status of reader process.
-	* doc/sane-usb.man: PACKAGEVERSION fix. Removed HP exception. Added
-	  MacOS X.
-	* doc/gamma4scanimage.man doc/sane-artec_eplus48u.man 
-	  doc/sane-config.man doc/sane-find-scanner.man doc/sane-gt68xx.man
-	  doc/sane-mustek.man doc/sane-mustek_usb.man doc/sane.man
-	  doc/saned.man doc/scanimage.man: Added missing quotes around
-	  PACKAGEVERSION
-	* doc/sane-abaton.man doc/sane-agfafocus.man doc/sane-apple.man
-	  doc/sane-artec.man doc/sane-as6e.man doc/sane-avision.man
-	  doc/sane-bh.man doc/sane-canon.man doc/sane-canon630u.man
-	  doc/sane-canon_pp.man doc/sane-coolscan.man doc/sane-coolscan2.man
-	  doc/sane-dc210.man doc/sane-dc240.man doc/sane-dc25.man
-	  doc/sane-dll.man doc/sane-dmc.man doc/sane-epson.man
-	  doc/sane-fujitsu.man doc/sane-gphoto2.man doc/sane-hp.man
-	  doc/sane-hpsj5s.man doc/sane-leo.man doc/sane-matsushita.man
-	  doc/sane-microtek.man doc/sane-microtek2.man doc/sane-mustek_pp.man
-	  doc/sane-nec.man doc/sane-net.man doc/sane-pie.man doc/sane-pint.man
-	  doc/sane-plustek.man doc/sane-pnm.man doc/sane-qcam.man
-	  doc/sane-ricoh.man doc/sane-s9036.man doc/sane-sceptre.man
-	  doc/sane-scsi.man doc/sane-sharp.man doc/sane-sm3600.man
-	  doc/sane-snapscan.man doc/sane-sp15c.man doc/sane-st400.man
-	  doc/sane-tamarack.man doc/sane-teco1.man doc/sane-teco2.man
-	  doc/sane-teco3.man doc/sane-test.man doc/sane-umax.man
-	  doc/sane-umax1220u.man doc/sane-umax_pp.man doc/sane-v4l.man:
-	  Changed "-" to "\-" in .SH NAME section (required by man 7 man).
-	  Added PACKAGEVERSION and "SANE Scanner Access Now Easy" to header.
-
-2002-11-29 Oliver Rauch <Oliver.Rauch@Rauch-Domain.DE>
-
-	* frontend/stiff.c: added fclose(icc_file)
-
-2002-11-25  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* backend/hp-device.h backend/hp-accessor.c backend/hp-scl.c
-	  backend/hp.c backend/hp-device.c backend/hp-option.c
-	  backend/hp.h backend/hp.conf backend/Makefile.in
-	  doc/sane-hp.man doc/descriptions/hp.desc
-	  Added libusb support for hp-backend
-
-2002-11-25  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* PROJECTS: Removed projects for scanners that are now supported
-	  by the plustek backend. Removed lhii backend (dead?).  Added more
-	  details for other projects. Added 5400C / 5470C project.
-
-2002-11-23  Rene Rebe <rene.rebe@gmx.net>
-
-	* backend/avision.h backend/avision.c backend/avision.conf
-	  doc/sane-avision.man: updated the Avisin backend to my todays
-	  snapshot. It know handles more scanners as well as ADF and A3
-	  size devices.
-
-2002-11-23  Max Vorobiev <pcwizard@yandex.ru>
-	* backend/hpsj5s.c: Removed default port probing.
-	
-2002-11-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane.man: Formatting fixes. Updates some backend entries and
-	  sane-find-scanner. Some clarifications.
-	* doc/scanimage.man: Use "--option arg" format for all options.
-	  Other formatting fixes.
-	* doc/gamma4scanimage.man doc/sane-config.man doc/sane-find-scanner.man
-	  doc/saned.man: Formatting updates.
-
-2002-11-22  Michael Herder <crapsite at gmx.net>
-
-          Fixed header in artec_eplus48u.de.po.
-          *po/artec_eplus48u.de.po
-
-2002-11-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/mustek_usb.desc doc/sane-mustek_usb.man
-	  doc/mustek_usb/mustek_usb.CHANGES doc/mustek_usb/mustek_usb.TODO:
-	  Minor manpage fixes. Added links to similar backends. More
-	  information about non-Linux OS.
-	* doc/sane-mustek.man: Minor fixes. Added links to ther backends
-	  providing support for Mustek scanners.
-	* backend/gt68xx.c backend/gt68xx_devices.c backend/gt68xx_gt6816.c
-	  backend/gt68xx_low.c backend/gt68xx_low.h doc/sane-gt68xx.man
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES:
-	  Changed 150 to 200 dpi for Mustek BearPaw 2400 TA. Fixed warnings
-	  in gt68xx_low.c. Used DBG instead of XDBG ing gt68xx_low.c.
-	  Minor manpage fixes. Added man page links to other backends.
-	  gt68xx_low.h: Fixed __FUNCTION__ bug on non-gcc compilers.
-	  Added more details about the BSDs in the manpage. Fixed color order
-	  for ScanExpress A3 USB.
-	* TODO: Removed tevion9693usb and umax1220u warnings entries. Added
-	  avsion warnings. Little bit of restructuring.
-
-2002-11-21  Michael Herder <crapsite at gmx.net>
-
-          Added german translation for artec_eplus48u backend.
-          *po/artec_eplus48u.de.po
-          *po/Makefile.in
-
-2002-11-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-        * doc/Makefile.in: Don't generate symlinks for libsane.so/.a, the files
-          are installed anyway. Fix symlink creation when only static libraries
-          are created.
-
-2002-11-20  Michael Herder <crapsite at gmx.net>
-
-          Added artec_eplus48u backend for the scanner Artec E+ 48U and
-          re-badged models like Tevion/Medion MD 9693, Medion MD 9705 and
-          Trust Easy Webscan 19200.
-        * backend/Makefile.in backend/dll.conf backend/artec_eplus48u.c
-          backend/artec_eplus48u.conf backend/artec_eplus48u.h
-        * doc/.cvsignore doc/Makefile.in doc/sane-artec_eplus48u.man doc/sane.man
-          doc/descriptions/artec_eplus48u.desc
-        * AUTHORS: Updated concerning artec_eplus48u.
-
-2002-11-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-        * doc/sane-usb.man: Added quick start section. New structure/order.
-          Added list of backends that don't use sanei_usb. Added headers
-          and fixed \- bug.
-        * doc/sane-find-scanner.man: Minor adjustments, added headers, fixed
-          \- bug.
-
-2002-11-18  Frank Zago  <fzago at austin dot rr dot com>
-
-        * backend/umax-usb.c: the usb support for the umax 2200 wasn't
-          using the correct sanei USB API, which broke the support for that
-          scanner. Also fixed a couple warnings and a typo.
-        * backend/sceptre.c backend/teco1.c backend/teco3.c
-          backend/matsushita.c backend/leo.c: fixed hexdump() declaration.
-        * backend/dll.c: fixed some warnings.
-
-2002-11-07   Stéphane Voltz  <svoltz@wanadoo.fr>
-
-        * backend/umax_pp_low.c: disable test facility
-
-2002-11-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-        * TODO: Added manpage issues and hpsj5s freeze problem. Removed canon.c
-          model problem.
-        * doc/Makefile.in: Added variable @PACKAGEVERSION@ for usage in
-          manpages.
-
-2002-11-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-        * doc/sane-mustek_usb.man doc/sane-usb.man: Fixed wrong .TH headers.
-
-2002-11-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-        * configure configure.in acinclude.m4 aclocal.m4
-          include/sane/config.h.in: Fix compilation on Tru64 by readding
-          the sys/bitypes.h work-around. Minimum autoconf version is 2.50 now.
-        * backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
-          backend/gt68xx_gt6801.c backend/gt68xx_gt6801.h doc/sane-gt68xx.man
-          doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES po/gt68xx.de.po:
-          Added basic support for Plustek OpticPro 1248U (from Gerhard Jaeger
-          <gerhard@gjaeger.de>). Removed 50 and 1200 dpi from Lexmark X73.
-          Backend status is BETA now.
-
-2002-11-13  Ulrich Deiters <ukd@xenon.pc.uni-koeln.de>
-
-        * modified the Canon SCSI backend (now version 1.10):
-        * backend/canon.c, canon-scsi.c: Added support of focus control for
-          the FS2710 film scanner.
-          backend/canon-sane.c: Set handler_arg in sanei_scsi_open() calls
-          to zero to avoid crashes with Mandrake Linux 9.0
-
-2002-11-12 Oliver Rauch <Oliver.Rauch@Rauch-Domain.DE>
-
-        * added several russion translations to directory po.
-          The translations have been created by
-          Vitaly Lipatov <LAV@VL3143.spb.edu>
-
-2002-11-07   Stéphane Voltz  <svoltz@wanadoo.fr>
-
-        * backend/umax_pp.c: revert a experimental change that went into
-          cvs by mistake.
-        * po/umax_pp.de.po: switch to iso-8858-1
-          
-2002-11-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-        * backend/gt68xx.c backend/gt68xx_devices.c backend/gt68xx_high.h
-          backend/gt68xx_low.h doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
-          doc/gt68xx/gt68xx.CHANGES po/Makefile.in po/gt68xx.de.po: Changed
-          option titles and descriptions to make them better readable. Added
-          translation markers for all options. Added German translation for
-          backend options. Updated manpage and .desc file concerning scanner
-          status. Added untested flag for Mustek ScanEpress A3 USB and Lexmark
-          X73.
-        * backend/mustek.c doc/sane-mustek.man doc/descriptions/mustek.desc
-          doc/mustek/mustek.CHANGES: Upload linear gamma table for Pro models
-          if custom gamma is off instead of uploading the composed gamma table.
-          That avoids applying gamm twice. Minor man page update.
-
-2002-11-05   Stéphane Voltz  <svoltz@wanadoo.fr>
-
-        * backend/umax_pp.c  backend/umax_pp_mid.c : OS/2 compile fix, indent
-          correction
-
-2002-11-03  Karl Heinz Kremer <khk@khk.net>
-
-        * sanei/sanei_usb.c: Use endpoint address with direction information
-          instead of the pipe reference. This caused problems with Darwin
-          systems.
-
-2002-11-03  Karl Heinz Kremer <khk@khk.net>
-
-        * backend/epson.c: Full support for libusb
-
-2002-11-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-        * README configure.in configure po/Makefile.in po/README:
-          Translations are now enabled by default if the gettext tools are
-          found. Use msgcat if available. Don't update the .po files
-          automatically.
-        * TODO: Added entries about canon.c model extraction bug, and sanei_usb
-          issue. Updated entries about MAcOS X support. Removed po files entry. 
-
-2002-10-31  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-        * configure configure.in: Print installation directories.
-        * backend/gt68xx.c backend/gt68xx_devices.c backend/gt68xx_high.c
-          backend/gt68xx_low.c backend/gt68xx_low.h doc/gt68xx/gt68xx.CHANGES:
-          Faster AFE calibration. Minor fixes. New version: 1.0-28.
-
-2002-10-31   Stéphane Voltz  <svoltz@wanadoo.fr>
-
-        * backend/umax_pp.c  backend/umax_pp.h  backend/umax_pp_low.h 
-          backend/umax_pp_low.c tools/umax_pp.c: add UTA detection,
-          version number updates
-        
-
-2002-10-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-        * backend/dll.conf: Removed commented out gt68xx entry.
-        * PROJECTS: Updated viceo entry.
-
-2002-10-27  Peter Fales <peter@fales-lorenz.net>
-
-        * configure, acinclude.m4, aclocal.m4 - Remove checks for 
-          specific version numbers of gphoto2 - that's not good for long 
-          term maintenance, and the API has settled down enough that all
-          recent versions (both releases and CVS) are workable for SANE.
-          It is still necessary to specify --with-gphoto2 if you want to
-          use the gphoto2 backend.
-
-2002-10-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-        * configure configure.in: Added a warning if sysconfdir is set to
-          /usr/etc.
-        * backend/test.c: Explicitely close the pipe and wait until
-          reader_process is killed.
-
-2002-10-25  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-        * backend/Makefile.in backend/dll.conf backend/gt68xx.c
-          backend/gt68xx.conf backend/gt68xx.h backend/gt68xx_devices.c
-          backend/gt68xx_generic.c backend/gt68xx_generic.h
-          backend/gt68xx_gt6801.c backend/gt68xx_gt6801.h
-          backend/gt68xx_gt6816.c backend/gt68xx_gt6816.h backend/gt68xx_high.c
-          backend/gt68xx_high.h        backend/gt68xx_low.c backend/gt68xx_low.h
-          backend/gt68xx_mid.c backend/gt68xx_mid.h
-          backend/gt68xx_shm_channel.c backend/gt68xx_shm_channel.h:
-          Added gt68xx backend for scanners based on the Grandtech GT-6801
-          and GT-8616 chips like The Mustek BearPaw CU, and TA scanners
-          and some Artec Ultima 2000 clones.
-        * doc/.cvsignore doc/Makefile.in doc/sane-gt68xx.man doc/sane.man
-          doc/descriptions/gt68xx.desc doc/descriptions-external/gt68xx.desc
-          doc/gt68xx/gt68xx.CHANGES: Added documentation for gt68xx backend.
-        * AUTHORS PROJECTS TODO: Updated concerning gt68xx.
-        * Makefile.in backend/Makefile.in doc/Makefile.in: Added some missing
-          files to DISTFILES.
-
-2002-10-24  Peter Fales  <peter@fales-lorenz.net>
-
-        * backend/gphoto2.c: Improve checks for values specified in config
-          file and generate errors when invalid values are specified.
-
-2002-10-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-        * configure configure.in: Warnings enabled again. Used extra version
-          -cvs.
-
-Older entries can be found in ChangeLog-1.0.9.
diff --git a/ChangeLog-1.0.12 b/ChangeLog-1.0.12
deleted file mode 100644
index ccc16e7..0000000
--- a/ChangeLog-1.0.12
+++ /dev/null
@@ -1,960 +0,0 @@
-******  Release of sane-backends 1.0.12. End of code freeze ******
-
-2003-05-25  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added DigitDia 3600.
-	* configure configure.in: New version: 1.0.12.
-
-2003-05-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/mustek.desc: Primax Compact 4800 SCSI is
-	  reported to work.
-	* doc/descriptions/unsupported.desc: Added more information for
-	  Artec and Visioneer/Primax scanners.
-	* TODO: Added saned + configure issue.
-
-2003-05-21   Stéphane Voltz  <svoltz@wanadoo.fr>
-	* backend/umax_pp_low.c: backed out clearing epp timeout. It prevented most
-	  common settings to use the umax_pp backend.
-
-2003-05-18  Gerhard Jaeger <gerhard@gjaeger.de>
-	* doc/sane-plustek.man: Update.
-	* backend/plustek-devs.c backend/plustek-usbshading.c
-	  backend/plustek-usb.h:
-	  Fixed critical bug in CIS device calibration and settings which causes
-	  the CanoScan 650, 1220 and 1240 not to work anymore
-	* TODO: removed line "check status of Umax 3450...".
-
----- CODE FREEZE FOR SANE 1.0.12 ---
--- snapshot 1.0.12-pre2
-
-2003-05-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* NEWS: Updated.
-	* doc/descriptions/unsupported.desc: Added Mustek ScanMagic 9636P.
-	* TODO: Added epson/saned/xsane problem.
-	* configure configure.in: Disabled compilation warnings.
-	* tools/Makefile.in: Added sane-po.awk to DISTFILES.
-
-2003-05-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Minor fix for Spot scanners.
-
-2003-05-15  Gerhard Jaeger <gerhard@gjaeger.de>
-	* TODO: status of UMAX 3450 is fixed now in .desc
-	* descriptions/plustek.desc: update
-	* doc/plustek/Plustek-USB-TODO.txt doc/plustek/Plustek-USB.txt
-	  doc/plustek/Plustek.changes: update
-	* backend/plustek-devs.c backend/plustek-pp.c backend/plustek-usb.c
-	  backend/plustek-usbhw.c backend/plustek-usbimg.c
-	  backend/plustek-usbio.c backend/plustek-usbmap.c
-	  backend/plustek-usbscan.c backend/plustek-usbshading.c
-	  backend/plustek.c backend/plustek.h backend/plustek-share.h
-	  backend/plustek-usb.h:
-	  Major bugfix release, cancel should work now, calibration for
-	  CIS devices is now fully functional
-
-2003-05-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Updates for Canon
-	  scanners. Added Spot scanners.
-	* aclocal.m4 acinclude.m4 configure: Fixed MacOS X build (patch
-	  from Mattias Ellert <mattias.ellert@tsl.uu.se>).
-	* doc/sane-gt68xx.man: Fixed wrong example.
-
-2003-05-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/Makefile.in: Added missing $(DESTDIR).
-	* TODO: Minor updates.
-
-2003-05-12  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/sane-backends.fr.po: Updated french translation (from Yann
-	  E. MORIN <yann dot morin dot 1998 at anciens dot enib dot fr>).
-	* frontends/saned.c: Replaces a strncmp() call by a macro detecting
-	  V4-mapped address. This is a lot safer than the strncmp, and doesn't
-	  break anything. Patch from Julien BLACHE <jb@jblache.org>.
-
-2003-05-11  Eddy De Greef <eddy_de_greef at tiscali dot be>
-
-	* backend/mustek_pp.[ch]: Offset correction for Mustek 600CP and
-	  added some debugging code.
-
-2003-05-09  Rene Rebe <rene.rebe@gmx.net>
-
-	* doc/sane-avision.man: fix tiny typo
-
-2003-05-08  Rene Rebe <rene.rebe@gmx.net>
-
-	* backend/avision.c doc/sane-avision.man
-	  doc/descriptions/avision.desc: update to the latest avision
-	  backend including the fix for segmentation fault when no config
-	  file is present.
-
-2003-05-08  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* acinclude.m4 aclocal.m4 configure include/sane/config.h.in:
-	  Added missing HAVE_LIBIEEE1284 macro. The test was there, but
-	  the macro wasn't set.
-	* po/sane-backends.de.po: Added some missing translations.
-	* po/sane-backends.es.po po/sane-backends.fr.po po/sane-backends.nl.po
-	  po/sane-backends.no.po po/sane-backends.pt.po po/sane-backends.ru.po
-	  po/sane-backends.sv.po: Updated for latest backend changes.
-	* backend/hp5400.c backend/hp5400.h backend/hp5400_internal.c
-	  backend/hp5400_sanei.c backend/hp5400_xfer.h: Changed license to
-	  GPL + SANE exception.
-
-2003-05-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/Makefile.in po/sane-backends.no.po: Added Norwegian
-	  translation (from Sigurd Stordal <sigurd.stordal@stud.ibg.uit.no>). 
-
-2003-05-06  Michael Herder <crapsite@gmx.net>
-
-        * doc/descriptions/artec_eplus48u.desc:
-          Added comment about different product ID of MEM 48U
-        * backend/artec_eplus48u.conf:
-          Added new model Memorex MEM 48U
-
-2003-05-05 Oliver Rauch <Oliver.Rauch@XSane.org>
-	* backend/umax.c: solved bug that broke compilation for OS2
-
-2003-05-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/sane-backends.fr.po: Updates for the French translation from
-	  Yann E. MORIN <yann dot morin dot 1998 at anciens dot enib dot fr>. 
-	* tools/check-po.awk: Added script to check the translations for 
-	  completeness (from Yann E. MORIN).
-	* tools/README: Added description of check-po.awk. Minor reordering.
-
----- FEATURE FREEZE FOR SANE 1.0.12 ---
--- snapshot 1.0.12-pre1
-
-2003-05-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* frontend/saned.c: Added implementation of poll() for systems
-	  that don't provide it (patch from Julien BLACHE
-	  <jb@jblache.org>).
-	* TODO: Removed obsololete entries.
-	* NEWS: Updated for 1.0.12.
-	* backend/ibm.c backend/ibm-scsi.c: Only disable object position
-	  command for Ricoh IS-420. 
-
-2003-05-04 Oliver Rauch <Oliver.Rauch@XSane.org>
-
-	* backend/umax.c  umax.h
-	  applied changes that replace fork() by thread for OS2
-
-2003-05-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* include/md5.h: Set fixed alignment because otherwise the MacOS X
-	  gcc doesn't like it.
-	* backend/ibm.c backend/ibm-scsi.c doc/descriptions/ibm.desc:
-	  Disabled object_position. That should fix the Ricoh IS-420.
-	* frontend/saned.c: Try to get the correct port number when
-	  /etc/services doesn't list "sane" by asking for "6566". Check
-	  result of socket(). Print ip faimily and port.
-	* configure configure.in frontend/Makefile.in tools/Makefile.in:
-	  Remove -all_load again and try to use the correct link order for
-	  libraries.
-
-2003-05-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in frontend/saned.c
-	  include/sane/config.h.in: Test for poll() and disable IPV6 if
-	  not found.
-	* include/lalloca.h: Remove test for MacOS X. That one breaks some
-	  MacOS X systems.
-	* configure configure.in frontend/Makefile.in tools/Makefile.in:
-	  Add -all_load to linker flags on MacOS X to avoid linker errors.
-	* backend/Makefile.in: Create directory for gt68xx firmware.
-
-2003-05-01 Oliver Rauch <Oliver.Rauch@XSane.org>
-
-	* backend/
-		umax-scanner.c  umax-scsidef.h  umax-uc1200se.c  umax-uc630.c
-		umax-ug630.c    umax-usb.c      umax.conf        umax.h
-		umax-scanner.h  umax-uc1200s.c  umax-uc1260.c   umax-uc840.c
-		umax-ug80.c     umax.c          umax.desc
-	  doc/sane-umax.man doc/umax/*
-
-	  update of sane-umax backend
-
-
-2003-04-30  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c backend/snapscan.h backend/snapscan-options.c
-	  backend/snapscan-scsi.c doc/descriptions/snapscan.desc: SnapScan
-	  backend 1.4.26, added support for Agfa Arcus 1200, better support 
-	  for Benq 5000.
-
-2003-04-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* lib/getopt.c: Removed #include again, breaks compilation on
-	  OS/2.
-	* config.guess config.sub: New upstream versions.
-	* acinclude.m4 aclocal.m4 configure ltmain.sh: New libtool
-	  upstream realease: 1.5.
-	* acinclude.m4 aclocal.m4 configure configure.in: Added support
-	  for -framework option and check for IOKit for MacOS X. Check for
-	  latex tools. Minimum autoconf version is 2.54.
-	* ltmain.sh: Add support for -framework option for MacOS X (from
-	  Mattias Ellert <mattias.ellert@tsl.uu.se>).
-	* sanei/sanei_scsi.c: Added SCSI support for MacOS X (from
-	  Mattias Ellert <mattias.ellert@tsl.uu.se>).
-	* include/sane/config.h.in: Added test for IOKit.
-	* README.darwin: Updated concerning SCSI support.
-	* backend/Makefile.in: Disable manual links for shared libraries.
-	  This breaks MacOS X and doesn't seem to be necessary on other
-	  platforms any more.
-	* include/lalloca.h: Don't use builtin alloca on MacOS X.
-	* tools/Makefile.in: Build sane-desc by default.
-	* tools/sane-desc.c: Fixed segfault.
-	* doc/Makefile.in: Only use latex if available.
-	* doc/descriptions/unsupported.desc: Updated info on Artec, Canon
-	  and HP scanners.
-
-2003-04-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/hp5400_internal.c backend/canon630u-common.c
-	  backend/epson_scsi.c: Minor compilation fixes for MacOS X and
-	  OS/2.
-	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
-	  doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES: Added Genius 3x as working scanner,
-	  removed testing flag. Added Artec 2000 e+ to manpage. Added
-	  detection for the Plustek OpticPro U16B.
-	* doc/descriptions/unsupported.desc: Added more information for
-	  the HP Scanjet 2300c.
-	* lib/getopt.c: Add missing includes.
-	* po/Makefile.in po/sane-backends.de.po po/sane-backends.es.po
-	  po/sane-backends.fr.po po/sane-backends.nl.po
-	  po/sane-backends.pt.po po/sane-backends.ru.po
-	  po/sane-backends.sv.po: Added hp5400 backend. Updated po files.
-	* TODO: Added entry about MacOS X SCSI patches.
-
-2003-04-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README.netbsd: Some additions concerning uscanner driver.
-	* TODO: Removed hp4200 link. Added hp5400 GPL/SANE issue. Added
-	  avision hpusbscsi documentation issue. Removed scanimage/OS/2
-	  problem.
-	* doc/sane-mustek.man: Added some more details for SCSI adapters.
-	* doc/descriptions/ibm.desc: Ricoh IS-420 doesn't seem to work
-	  out-of-the-box.
-	* doc/descriptions/unsupported.desc: Added Visioneer OneTouch 4800
-	  USB. Added more information for the Genius ColorPage HR7X Slim
-	  and Microtek Scanport 3000.
-
-2003-04-23  Frank Zago  <fzago at austin dot rr dot com>
-
-	* backend/teco2.c backend/teco2.h doc/sane-teco2.man
-	  doc/teco/teco2.txt descriptions/teco2.desc: new calibration
-	  algorithm.
-
-2003-04-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README: Removed link to (non-working) anonymous CVS. Mention CVS
-	  snapshots and beta releases instead. Rewrite the paragraph about
-	  frontends. Mention that libusb is necessary for some backends.
-	  Mention more operating systems. Added contact section (mostly
-	  copying from sane(7)). Minor formatting updates.
-	* README.freebsd: Automatic SCSI detection does work, so this part
-	  was removed. libusb is necessary for some backends. Some parport
-	  scanners seem to work.
-	* README.linux: Minor updates.
-	* README.openbsd: libusb is necessary for some backends.
-	* Makefile.in doc/Makefile.in doc/sane.man: The lists of supported
-	  devices are now generated and installed by default.
-	* NEWS: Updated for 1.0-12.
-	* doc/descriptions/unsupported.desc: Removed Epson Perfection 660
-	  (now supported by snapscan backend), Primax Jewel 4800 (teco2).
-	  Added Enhans/E-Lux j-6121 and Visioneer OneTouch 5300 USB.
-	* sanei/sanei_usb.c: Removed Frank's memleak fix. The memory is
-	  allocated only once in sanei_usb_init, not in sanei_usb_open.
-	  So releasing it in sanei_usb_close breaks backends that open
-	  devices more than once.
-	* po/sane-backends.nl.po: Updated Dutch translation (from Martin
-	  Kho <mkho@xs4all.nl> and Bertrik Sikken <bertrik@zonnet.nl>).
-
-2003-04-18  Frank Zago  <fzago at austin dot rr dot com>
-
-	* backend/teco2.c backend/teco2.conf backend/teco2.h
-	  doc/sane-teco2.man doc/descriptions/teco2.desc: added support for
-	  Relisys AVEC II S3 (VM3564) and Primax Jewel 4800 (VM356A). Patch
-	  from Gerard Klaver.
-	* sanei/sanei_usb.c: fixed a memleak.
-	* sanei/sanei_pv8630.c: added some debug traces.
-
-2003-04-18   Stéphane Voltz  <svoltz@wanadoo.fr>
-
-        * configure configure.in include/sane/config.h.in:
-	  added detection of dev/ppbus/ppi.h
-
-2003-04-18   Stéphane Voltz  <svoltz@wanadoo.fr>
-
-        * backend/umax_pp_low.c backend/umax_pp_low.h backend/umax_pp.conf:
-	  added support for /dev/ppi0 on *BSD, and a
-	* backend/umax_pp.c: configuration parsing fix
-
-2003-04-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* AUTHORS backend/Makefile.in backend/dll.conf backend/hp5400.c
-	  backend/hp5400.conf backend/hp5400.h backend/hp5400_internal.c
-	  backend/hp5400_sanei.c backend/hp5400_xfer.h doc/.cvsignore
-	  doc/Makefile.in doc/sane-hp5400.man doc/sane.man:
-	  Added hp5400 backend from Martijn van Oosterhout
-	  <kleptog@svana.org> and Thomas Soumarmon
-	  <soumarmt@nerim.net>. Changed to use sanei_usb instead of direct
-	  /dev/usb/scanner access. Added manual page. Fixed some
-	  portablility issues and some warnings. Added SANE headers.
-	* doc/descriptions/hp5400.desc doc/descriptions-external/hp5400.desc:
-	  Moved file as the backend is included now. Added new marker.
-	* doc/descriptions-external/lhii.desc: Removed. Website has been
-	  dead for years. No response from author.
-	* doc/descriptions-external/onetouch8600.desc: Removed. Website is
-	  dead. No response from author.
-	* doc/descriptions-external/hp4200.desc
-	  doc/descriptions-external/hpoj.desc
-	  doc/descriptions-external/niash.desc
-	  doc/descriptions-external/primax.desc
-	  doc/descriptions-external/scanwit.desc
-	  doc/descriptions-external/v4l2.desc
-	  doc/descriptions-external/viceo.desc: Added comments to explain
-	  the reasons for not including these backends into SANE.
-	
-2003-04-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/scanimage.man: Added EXAMPLES section.
-	* doc/descriptions/unsupported.desc: Added information about
-	  Hewlett-Packard and Mustek scanners.
-
-2003-04-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* AUTHORS backend/Makefile.in backend/dll.conf backend/ibm-scsi.c
-	  backend/ibm.c backend/ibm.conf backend/ibm.h doc/Makefile.in
-	  doc/sane.man doc/sane-ibm.man doc/.cvsignore 
-	  doc/descriptions/ibm.desc: Added IBM backend for the 
-	  IBM 2456, the Ricoh IS-420 and maybe the IS-410 and IS-430 from
-	  mf <massifr@tiscalinet.it>. Added manual page, fixed some
-	  warnings, Added detection for IS-410 and IS-430.
-	* doc/descriptions-external/ibm.desc: Removed, now included in
-	  SANE distribution.
-	* include/md5.h: Don't use __attribute__ for compilers that don't
-	  support it.
-	* doc/sane-ibm.man doc/descriptions/ibm.desc: Mention alpha
-	  quality. Add maintainer address.
-	
-2003-04-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/sane-desc.c: Fixed some HTML bugs.
-	* doc/desccriptions/unsupported.desc: Updated HP Scanjet 35XX,
-	  Medion MD 6228, and Umax Astra 4700 entries. Added some Mustek
-	  and Primax scanners.
-
-2003-04-14  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* backend/hp.c, hp-option.c: Check pointers received in
-	  sane_control_option(). Caused saned to crash on
-	  scanimage --help -d net:localhost:hp:...
-
-2003-04-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane.man: Added SEE ALSO section.
-	* backend/Makefile.in: Fixed warning for dll-preload.c.
-	* bakend/dll.c: Add casts to function calls. Without this fix, the
-	  dll backend didn't work on the m68k paltform because data and
-	  addresses are stored in differnt registers so the return values
-	  of the sane api functions were wrong. Patch from Dave Huang
-	  <khym@azeotrope.org>. Fixed some compilation warnings.
-
-2003-04-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx_devices.c doc/sane-gt68xx.man
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES: Updated
-	  Mustek BearPaw 1200 CU Plus white strip value. Set Mustek
-	  ScanExpress A3 USB to CCD. Black mark may be still wrong. Minor
-	  formatting changes in the manpage.  Decreased ScanExpress A3 USB
-	  status to alpha because of CIS/CCD change.
-	* backend/ma1509.c: Remove test for multi-pass.
-	* doc/sane.man: Added information about #sane IRC
-	  channel. Formatting changes.
-	* doc/descriptions/unsupported.desc: Added Mustek P 3600 A3 Pro.
-	* TODO: Removed license issue. Updated desc files and global
-	  variables entries. Updated v4l entry.
-	* doc/scanimage.man: --batch format doesn't work, only --batch=format.
-	
-2003-04-10  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/test.c backend/test.h doc/descriptions/test.desc: Added
-	  support for OS/2 (from Franz Bakan <fbakan@gmx.net>).
-
-2003-04-05  Nathan Rutman <nthn1@yahoo.com>
-
-	* backend/canon630u-common.c: Removed last change in offset/gain
-	  calculation, which croaked for some cases.  Give up early if we
-	  can't talk on the USB. 
-	* backend/canon630u.c: Added option to force scanner recalibration.
-
-2003-04-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/dll.c: Added some missing debug messages. Fixed a warning.
-
-2003-04-03  Eddy De Greef <eddy_de_greef at tiscali dot be>
-
-	* TODO: removed mustek_pp entry (Check that global variables are 
-	  initialized propperly
-
-2003-04-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* lib/Makefile.in: Recompile all targets if necessary.
-	* sanei/sanei_scsi.c: Fixed some warnings.
-	* include/md5.h: Declare md5_buffer.
-	* sanei/sanei_constrain_value.c: Removed unnecessary variable.
-	* backend/agfafocus.c: Fixed some warnings.
-	* backend/as6e.c: Fixed some warnings.
-	* backend/coolscan.c backend/coolscan-scsi.h: Fixed a bunch of
-	  compilation warnings.
-	* backend/djpeg.c: Fixed some warnings. 
-	* backend/dmc.c: Fixed some warnings. 
-
-2003-04-03  Eddy De Greef <eddy_de_greef at tiscali dot be>
-
-	* backend/mustek_pp.c: Fixed a potential crash bug that could be
-          triggered when calling sane_init/sane_get_devices/sane_exit 
-          multiple times, and fixed some minor bugs to pass the 
-          frontend/tstbackend.c tests.
-
-2003-04-03  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c backend/snapscan.h backend/snapscan-scsi.c
-	  backend/snapscan-options.c backend/snapscan.conf
-	  doc/descriptions/snapscan.desc:
-	  SnapScan backend 1.4.25 - added support for Epson Perfection 660,
-	  enhanced support for Acer 5000
-
-2003-04-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane-as6e.man: Added info about $PATH. Minor formatting fixes.
-	* doc/sane.man: Reorganization. Updated DEVELOPER'S DOCUMENTATION.
-	  Rewrote PROBLEMS in a more user-centric way. Added "HOW CAN YOU
-	  HELP" section. Added paragraph about SANE device lists. Updated
-	  CONTACT section. Minor additions to the gt68xx and plustek
-	  entries. Minor spelling fixes.
-	* backend/sm3600-color.c backend/sm3600-gray.c backend/sm3600-homerun.c
-	  backend/sm3600-scanmtek.c backend/sm3600-scantool.h backend/sm3600-scanusb.c
-	  backend/sm3600-scanutil.c backend/sm3600.c backend/sm3600.h:
-	  Fixed comment headers. They were copied verbatim from the dll	backend.
-	* AUTHORS backend/artec.c doc/sane-artec.man: Remove Chris Pinkham
-	  as active maintainer because his primary email address bounces,
-	  and he doesn't respond to mails to other addresses. Marked email
-	  addresses and website as dead. Fixed AT3 misdectection that was
-	  on the TODO list for some time. Initialize global variables in
-	  sane_init.
-	* acinclude.m4 aclocal.m4 configure configure.in
-	  include/sane/config.h.in frontend/saned.c: Added a switch to
-	  disable libusb. Removed switch to enable ipv6 uncondinionally.
-	  Check for sys/poll.h.
-	* sanei/sanei_usb.c: Added a function to print the buffer contents
-	  for the read and write functions. Fixed some DBGs. Fixed a wrong
-	  return value.
-	* TODO: Removed sm3600, artec and libusb configure switch entries.
-	  Updated v4l, sanei buffer print and html manpages entries.
-	  Added OS/2 crash entry.
-	* include/getopt.h lib/getopt.c lib/getopt1.c: Update to glibc
-	  2.3.1 version. This fixes a compilation warning. Further more,
-	  the code is now LGPLed.
-	* include/md5.h lib/md5.c: Update to glibc 2.3.1 version. The code
-	  is now LGPLed. Changed the K&R style and added prototypes to
-	  avoid warnings.
-
-2003-03-31  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* frontend/saned.c: Include poll.h only if new saned code is
-	  used. Fixes compilation on OS/2. Patch from Julien BLACHE
-	  <jb@jblache.org>.
-
-2003-03-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Medion MD 6228, Microtek
-	  ScanPort 3000, and PIE Primefilm 1800u.
-	* acinclude.m4 aclocal.m4 configure configure.in backend/net.c
-	  backend/net.h doc/sane-net.man doc/saned.man frontend/saned.c
-	  include/sane/config.h.in: Added support for IPv6. Updated
-	  manpages. Patch from Julien BLACHE <jb@jblache.org>.
-	* TODO: Updated net sections. Removed Irix pacht entry. Added
-	  entry about libusb switch.
-
-2003-03-28  Oliver Schirrmeister <oschirr@abm.de>
-
-	* backend/fujitsu.c backend/fujitsu-scsi.h: 
-	  now really supports the fi-4120C
-
-2003-03-26  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Added workaround for GT-8000 scanners,
-	  fixed two warnings reported by der Mouse.
-
-2003-03-24  Rene Rebe <rene.rebe@gmx.net>
-
-	* backend/Makefile.in backend/avision.c backend/avision.conf
-	  backend/avision.h doc/descriptions/avision.desc: updated
-          avision backend to latest build. This includes user-space
-	  USB support and OS/2 thread handling.
-
-2003-03-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Canon CanoScan FB620U.
-	  Added more info for HP ScanJet 3500c.
-	
-2003-03-24  Rene Rebe <rene.rebe@gmx.net>
-
-	* include/sane/sanei_usb.h sanei/sanei_usb.c: support for
-	  interrupt endpoint reads
-
-2003-03-23  Rene Rebe <rene.rebe@gmx.net>
-
-	* doc/sane-usb.man fix typo
-
-2003-03-22  Ulrich Deiters <ukd@xenon.pc.uni-koeln.de>
-
-	* backend/canon.c: Modified the option "eject after each scan" -
-	  Eject is suppressed for film scanners after preview scans.
-
-2003-03-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Canon LIDE 50, IBM
-	  ADF Color Scanner, Plustek Spectra ADF.
-
-2003-03-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/as6e.c: Fixed segmentation fault when $PATH is not set.
-
-2003-03-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/sanei_scsi.c: OS/2 specific changes: memory for SRB now is
-	  allocated using _tcalloc() instead of allocating on stack to avoid
-	  crossing 64k borders due to restrictions of 16-bit device-driver.
-	  Cosmetic changes and some casts to reduce compiler-warnings. Patch
-	  from Franz Bakan <fbakan@gmx.net>.
-	* sanei/sanei_thread.c: Increased stacksize for thread. Patch from
-	  Franz Bakan <fbakan@gmx.net>.
-
-2003-03-10  Oliver Schirrmeister <oschirr@abm.de>
-
-	* backend/fujitsu.c backund/fujitsu-scsi.h backend/fujitsu.h
-          * patch from Ron Cemer <ron@roncemer.com>
-	    fixes the broken "ADF empty" detection on the Fujitsu scanners 
-	    when connected via USB.  It also fixes a sense-request issues,
-	    which were required in order to determine whether the ADF is 
-	    empty.  It also eliminates some duplicate code blocks.
-	  * renamed some functions
-	
-2003-03-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx_devices.c backend/gt68xx_low.h
-	  doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES: Added Packard Bell Diamond 1200 Plus to
-	  .desc and manpage. New flag to avoid running stop_scan before doing
-	  a scan. The Windows firmware of the BearPaw 1200 CU Plus doesn't
-	  seem to like that.
-	* doc/descriptions/unsupported.desc: Added some Boeder, Brother, HP and
-	  Trust scanners.
-	* TODO: Removed fujitsu and ma1509 entries. Updated .desc files and
-	  global variables entry.
-
-2003-03-10  Oliver Schirrmeister <oschirr@abm.de>
-
-	* backend/fujitsu.c backund/fujitsu-scsi.h
-          displays the offending byte when something is wrong in the
-          window descriptor block.
-	
-2003-03-09  Eddy De Greef <eddy_de_greef at tiscali dot be>
-
-	* backend/mustek_pp_cis.c backend/mustek_pp_cis.h: Fixed two
-          calibration bugs: one occasionally caused overexposed images at 
-          all resolutions; the other one occasionally caused color inbalances
-          when scanning narrow areas at high resolutions.
-
-2003-03-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/sanei_scsi.c: Wait for the completion of all SCSI commands in
-	  sanei_scsi_flush_all_extended (Linux). Without this fix, especially
-	  long running commands and command queuing would cause memory
-	  corruption if the buffer was invalid after the flush command.
-	* doc/descriptions/abaton.desc: Removed link to everex (timeout).
-
-2003-03-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek.c doc/descriptions/mustek.desc
-	  doc/mustek/mustek.CHANGES: Minor debug message updates. Fixed a
-	  little bug in sane_control_option (gamma control). Removed the
-	  signal blocking again. That only hides the segfault in sanei_scsi.
-	  Check if there are documents in ADF for Paragon 2. Otherwise return
-	  error. Fix some minor issues in reading the config file.
-
-2003-03-07  Peter Fales <peter@fales-lorenz.net>
-
-	* doc/descriptions/dc210.desc, doc/descriptions/dc240.desc:
-	  Fix broken URLs to the Kodak web pages
-
-2003-03-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx_gt6801.c backend/gt68xx_gt6816.c
-	  backend/gt68xx_low.c doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES: Small requests are done with a response
-	  buffer of 8 bytes (instead of 64) now. Looks like GT-6816 based
-	  scanners return 8 bytes if the firmware is loaded and 64 bytes if
-	  it's not loaded. Changed GT-6816 firmware check to ignore errors
-	  from above change. GT-6816 scanners work with the BSDs now (at least
-	  once). Updated manpage concerning the BSDs.
-
-2003-03-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/apple.c: Added missing option size (avoids crash on network
-	  scanning). Patch from Milon Firikis <milonf@hotpop.com>.
-
-2003-03-05  Oliver Schirrmeister <oschirr@abm.de>
-	* backend/fujitsu.c, backend/fujitsu.h: renamed some variables
-	* backend/fujitsu.c: gray duplex scanning now works with the 4097D
-	  when disconnect is enabled in the scsi-controller
-	* doc/descriptions/unsupported.desc: remove fujitsu fi4120C
-	* doc/descriptions/fujitsu.desc added fi4120C, ScanParter 93GX
-
-2003-03-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* include/sane/sanei.h sanei/sanei_constrain_value.c: Added function
-	  sanei_check_value in addition to the existing sanei_constrain_value.
-	  It checks if the value of a sane option fits into the constraint but
-	  doesn't try to do any fixing/rounding.
-	* doc/sane-scsi.man: Changed the example to use /dev/sg0 instead of
-	  /dev/sge.
-	* doc/descriptions/unsupported.desc: Removed Umax AstraSlim (now
-	  supported by artec_eplus48u backend).
-
-2003-03-03  Gerhard Jaeger <gerhard@gjaeger.de>
-	* doc/plustek/Plustek-USB-TODO.txt: update
-	* backend/plustek-devs.c backend/plustek-usb.c backend/plustek-usbhw.c
-	  backend/plustek-usbimg.c backend/plustek-usbscan.c backend/plustek.c:
-	  Fixed some bugs, that avoid proper function of Genius devices and
-	  the HP2100c. Fixed also a problem, that causes permanent warmup cylces
-	  on EPSON Photo devices.
-
-2003-03-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx_devices.c backend/gt68xx_gt6801.c
-	  doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES: Make sure that the firmware for
-	  plustek-like scanners is loaded. Didn't work for Genius vivid3xe.
-	  Added both Genius scanners to man page. Removed warning from Genius
-	  Vivid3xe.
-
-2003-03-02  Michael Herder <crapsite@gmx.net>
-
-        * doc/descriptions/artec_eplus48u.desc:
-        * backend/artec_eplus48u.conf:
-          Added new model Umax AstraSlim SE
-
-2003-03-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/ibm.desc: Added Ricoh IS-430.
-	* doc/descriptions/unsupported.desc: Updated Microtek scanners. Added
-	  Umax AstraSlim SE.
-
-2003-02-28  Ulrich Deiters <ukd@xenon.pc.uni-koeln.de>
-
-	* backend/canon-sane.c: Adjusted to use the new sanei_constrain_value
-	  function; made some cosmetic changes to reduce the number of compiler
-	  warnings
-
-2003-02-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c  backend/gt68xx.conf backend/gt68xx_devices.c
-	  backend/gt68xx_low.c backend/gt68xx_low.h doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES: Added Genius Colorpage Vivid3xe. Added
-	  request_type and request fields to the command set. Request is 0x01
-	  or 0x04.
-	* doc/descriptions/unsupported.desc: Added Compaq S4 100 and Microtek
-	  Scanmaker 4800.
-	
-2003-02-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/hp5400.desc: Added description for hp5400
-	  backend. It supports the Hewlett-Packard 5400, 5470 and (maybe) 5490
-	  scanners.
-	* doc/descriptions-external/viceo.desc: Added Visioneer OneTouch 8600.
-	* doc/descriptions/unsupported.desc: Removed hp5400 series (now in
-	  hp5400.conf). Added Lexmark, Medion and Primax scanners.
-	* doc/descriptions/ma1509.desc: Added :new token.
-	* sanei/sanei_constrain_value.c: Round a word list value to the nearest
-	  entry (if necessary). Code was taken from canon backend.
-
-2003-02-26  Ulrich Deiters <ukd@xenon.pc.uni-koeln.de>
-
-	* modified the Canon SCSI backend (now version 1.12):
-	* backend/canon.c, canon-sane.c, canon.h: Added support for
-	  the FB1200S flatbed scanner.
-	* backend/canon.c: Made the sense handler generate meaningful
-	  status information for new scanner models (solved the Mandrake
-	  crash problem).
-	* backend/canon.c, canon-sane.c, canon.h: Moved model-dependent
-	  declarations and decisions to a common location.
-	* backend/canon-sane.c: Fixed the out-of-memory problem of
-	  xscanimage when doing previews with scanners using hardware
-	  scan resolutions only.
-
-2003-02-25  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/sane-backends.fr.po: Updated French translation (from Yann E.
-	  MORIN <yann dot morin dot 1998 at anciens dot enib dot fr>).
-
-2003-02-23   Stéphane Voltz  <svoltz@wanadoo.fr>
-
-        * backend/umax_pp_low.c backend/umax_pp_low.h backend/umax_pp_mid.c 
-	  backend/umax_pp_mid.h backend/umax_pp.c backend/umax_pp.h 
-	  backend/umax_pp.conf tools/umax_pp.c doc/sane-umax_pp.man: changed 
-	  highlight option to contrast, and gain to brightness.
-
-2003-02-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/Makefile.in backend/dll.conf backend/ma1509.c
-	  backend/ma1509.conf backend/ma1509.h: Added new backend ma1509 for
-	  Mustek BearPaw 1200F scanners.
-	* doc/Makefile.in doc/descriptions/ma1509.desc doc/sane-ma1509.man
-	  doc/sane.man doc/.cvsignore: Added documentation for ma1509 backend.
-	* doc/descriptions-external/ma1509.desc: Removed.
-	* AUTHORS: Added ma1509.
-	* po/Makefile.in po/sane-backends.de.po po/sane-backends.es.po
-	  po/sane-backends.fr.po po/sane-backends.nl.po po/sane-backends.pt.po
-	  po/sane-backends.ru.po po/sane-backends.sv.po: Updated for ma1509.
-	* doc/backend-writing.txt: Some parts concerning PRJECTS/.desc files
-	  are rewritten. Added information about initializing global variables
-	  and sizeof (void *) != sizeof (int) (from Martijn van Oosterhout
-	  <kleptog@svana.org>).
-
-2003-02-23  Simon Munton <simon@munton.demon.co.uk>
-        * backend/pie.c: increment BUILD (was missed in last change)
-
-2003-02-23  Simon Munton <simon@munton.demon.co.uk>
-        * backend/pie.c: fixed segmentation faults when sane_init/sane_exit is
-	  run more than once.
-
-2003-02-23   Stéphane Voltz  <svoltz@wanadoo.fr>
-
-        * backend/umax_pp_low.c backend/umax_pp_low.c: Added global vars reset.
-	  Fixed a segmentation bug when using "" as opened device name.
-
-2003-02-22  Frank Zago  <fzago at austin dot rr dot com>
-
-	* doc/sane.tex: added Relisys and Mitsubishi to the list of
-	  vendors. Bumped the revision date.
-
-	* frontend/tstbackend: added more sane_init/sane_exit tests. Added
-	  Fujistu and Relisys to the list of valid vendor names.
-
-2003-02-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx.conf doc/sane-gt68xx.man
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES:
-	  Added vid/pid 0x07b3/0x0400 to gt68xx.conf also. Added indormation
-	  about Medion 4394. Mention ma1509 backend. Fix segfault when calling
-	  sane_open with an empty device name. Explicitely initialize global
-	  variables to avoid segfaults when calling sane_init/sane_exit more
-	  than once.
-	* backend/net.c doc/descriptions/net.desc: Initialize global variables
-	  in sane_init to avoid segmentation faults when sane_init/sane_exit is
-	  run more than once.
-	* doc/descriptions-external/ibm.desc: Add Ricoh IS-420.
-	* sanei/sanei_usb.c: Call sanei_usb_init only once.
-	* backend/mustek_usb.c doc/descriptions/mustek_usb.desc
-	  doc/mustek_usb/mustek_usb.CHANGES doc/sane-mustek_usb.man: Iniatialize
-	  global variables explicitely. Mention ma1509.
-	* backend/mustek.c doc/mustek/mustek.CHANGES: Initialize global
-	  variables in sane_init.
-	* TODO: Add ma1509 backend. Add segfault when running sane_init more
-	  than once. Removed sanei_usb interface issue.
-
-2003-02-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Removed Fujitsu fi-4220C (now
-	  supported by fujitsu backend). Added Syscan Travelscan 464. Updated
-	  HP scanners.
-
-2003-02-20  Oliver Schirrmeister <oschirr@abm.de>
-        * backend/fujitsu.c: make option RIF available for 3091 and 3092, bugfix
-	* backend/fujitsu.c: set availability of options THRESHOLD und VARIANCE
-	
-2003-02-20  Oliver Schirrmeister <oschirr@abm.de>
-	* backend/fujitsu.c, backend/fujitsu.h: patch from <ron@roncemer.com>:
-	  fi4220 support
-	  USB support for scanners which send SCSI commands over usb
-
-2003-02-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/ma1509.desc: Added description of the 
-	  ma1509 backend for Mustek BearPaw 1200F scanners.
-	* doc/descriptions/unsupported.desc: Added Avision, Brother, and Umax
-	  scanners. Removed Mustek BearPaw 1200F.
-	* sanei/sanei_usb.c: Check all acceptable interfaces instead of using
-	  the first one.
-	* tools/sane-find-scanner.c: Check all interfaces. Print a more
-	  definite message when a scanner was found to avoid confusion.
-
-2003-02-18   Stéphane Voltz  <svoltz@wanadoo.fr>
-
-        * backend/umax_pp_low.c: icc compile fixes, and
-	  EPP mode setting fix for direct hardware access
-
-2003-02-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/sane-backends.fr.po: Added more French translations (from Yann E.
-	  MORIN <yann dot morin dot 1998 at anciens dot enib dot fr>).
-	* sanei/sanei_usb.c: usb_clear_halt should only be called in libusb
-	  mode.
-
-2003-02-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek.c doc/descriptions/mustek.desc
-	  doc/mustek/mustek.CHANGES: Make sure that the result of the
-	  reader_process is interpreted correctly. Block signals when waiting
-	  for a SCSI request to finish. Otherwise we may get a segfault if the
-	  reader_process is terminated while waiting.
-
-2003-02-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/doxygen-sanei.conf: Updated version.
-	* include/sane/sanei_usb.h: Fixed link to USB spec.
-	* doc/descriptions/unsupported.desc: Added Artec scanners.
-	* TODO: Updated desc file entry.
-	* backend/gt68xx.c backend/gt68xx_devices.c doc/sane-gt68xx.man
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES:
-	  List BearPaw 2400 CS Plus as supported. Make fast preview the default
-	  (otherwise BP 2400 TA Plus wouldn't work with 12/16 bits). Added
-	  vid/pid 0x07b3/0x0400, that's another Plustek OpticPro 1248U.
-
-2003-02-16  René Rebe <rene@rocklinux.org>
-
-	* backend/avision.h backend/avision.c doc/sane.man
-	  doc/descriptions/avision.desc: update to the latest Avision
-	  backend release. It includes feature and stability improvements
-	  and bug fixes. The sane man-page now mentions that the avision
-	  backend supports more than the AV 630 CS ...
-
-2003-02-15  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c backend/epson_usb.[ch]: Fix problem with 
-	  "usb <vendor> <product> syntax in config file
-
-	* backend/epson.c: Move sanei_init_usb() to sane_init(). Thanks
-	  to Ron Cemer for the patch.
-
-2003-02-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Updated Canon, Fujitsu, and
-	  Plustek entries. 
-	* TODO: Added entries about v4l, fujitsu, snapscan.
-
-2003-02-11  Peter Fales <peter@fales-lorenz.net>
-
-	* backend/dll.conf, doc/sane-gphoto2.man:  Added a commented out
-	  gphoto2 entry in dll.conf, and mentioned it in the man page.
-
-	* backend/gphoto2.c: Bug fixes.  Don't coredump if the 
-	  gphoto2.conf file is missing, and don't require a speed to
-	  be set if the usb port is used.
-	  
-2003-02-11  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* backend/hp-handle.c: Fix problem with ifdef/ifndef for threads
-
-2003-02-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* aclocal.m4 acinclude.m4 configure configure.in: Check for MacOS X
-	  native dynamic loading first before lookinf for libdl.
-
-2003-02-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* frontend/saned.c sanei/sanei_codec_bin.c sanei/sanei_wire.c: Check
-	  the IP address of the remote host before any communication occurs.
-	  Check for a errors before trsuting values that came from remote.
-	  Make sure that strings are 0-terminated.
-	* po/Makefile.in po/sane-backends.nl.po: Added dutch (nl) translations
-	  for sane-backends (from Bertrik Sikken <bertrik@zonnet.nl>).
-	* doc/saned.man: More warnings about security issues. Make more clear
-	  that -s and -d can't be used in inetd mode.
-	* PROBLEMS: Moved "memory exhausted" and missing scsi headers problems
-	  to README.linux. Removed SG_BIG_BUF problem. Rewrote Mustek "exceed
-	  the physical scan area" problem as it applies to most flatbed
-	  scanners. Added info about test backend. Added info about saned
-	  security issues.
-	* README.linux: Moved "memory exhausted" and missing scsi headers
-	  problems from PROBLEMS.
-	* TODO: Added saned info. Added artec at3 misdetection.
-	* configure configure.in NEWS: Updated version number.
-
-2003-02-09   Stéphane Voltz  <svoltz@wanadoo.fr>
-
-        * backend/umax_pp.c: fixed big bug related to color plane
-	  synchronization, which gave blur effect at > 75 dpi
-	* tools/umax_pp.c: change version number
-
-2003-02-08  Peter Fales <peter@fales-lorenz.net>
-	* backend/dc210.c, backend/dc240.c:  Fixes for Irix from
-	  Andrea Suatoni.
-
-2003-02-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* Makefile.in: Added ChangeLog-1.0.10 to DISTFILES.
-	* po/Makefile.in po/template.desc po/README: Don't generate po files
-	  with every make. That avoids recreation just because of date changes.
-	  Automatically create new languages on make update. Automatically
-	  generate list of DISTFILES. Added template for header used in new
-	  po files. Updated documentation.
-	* doc/descriptions/unsupported.desc: Added Genius Colorpage Vivid III.
-	  Added more info for Plustek OpticPro 1212U and U12/UT12.
-
-2003-02-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx_devices.c backend/gt68xx_high.c
-	  backend/gt68xx_high.h doc/descriptions/gt68xx.desc
-	  doc/descriptions/unsupported.desc doc/gt68xx/gt68xx.CHANGES:
-	  Fixed resolutions for BearPaw 1200 TA. Increase the lowest black
-	  for CCD coarse calibration. Adjusted internal gamma correction.
-	  CCD scanners use color mode for coarse+quality cal now. Preview isn't
-	  always in 8 bit mode now (can be selected by option). Upper and lower
-	  limits for coarse calibration are unified now. Added options for
-	  adjusting gain and offset.
-	* po/sane-backends.de.po po/sane-backends.es.po po/sane-backends.fr.po
-	  po/sane-backends.pt.po po/sane-backends.ru.po po/sane-backends.sv.po:
-	  Adjusted for new gt68xx options. Updated German translation for
-	  gt68xx.
-
-2003-02-04  Michael Herder <crapsite@gmx.net>
-
-        * doc/descriptions/artec_eplus48u.desc:
-	  Unified manufacturer names according to Hennings suggestion.
-
-2003-02-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane-backends.pt.po: Fixed UTF character.
-
-2003-02-02  Peter Kirchgessner <peter@kirchgessner.de>
-
-	* backend/hp.c backend/hp-handle.c: Add support for OS/2
-	  doc/descriptions/hp.desc: Version number changed
-
-2003-02-02  Jochen Eisinger <jochen.eisinger@gmx.de>
-
-	* doc/descriptions/mustek_pp.desc: cleaned up the file a little
-
-2003-02-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/gt68xx.desc doc/descriptions/unsupported.desc:
-	  Unified manufacturer names. Minor bugfixes.
-
-2003-02-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-        * configure configure.in: Warnings enabled again. Used extra version
-          -cvs.
-
-Older entries can be found in ChangeLog-1.0.10.
diff --git a/ChangeLog-1.0.13 b/ChangeLog-1.0.13
deleted file mode 100644
index a3f2705..0000000
--- a/ChangeLog-1.0.13
+++ /dev/null
@@ -1,1349 +0,0 @@
-******  Release of sane-backends 1.0.13. End of code freeze ******
-
-2003-11-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: New version: 1.0.13.
-
-2003-11-20  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* doc/descriptions/snapscan.desc: Added model "SnapScan"
-	  (Bugtrack #300286)
-
-2003-11-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/sane-backends.sv.po: Updated Swedish translation (from
-	  Mattias Ellert <mattias.ellert@tsl.uu.se>).
-
-2003-11-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in acinclude.m4 aclocal.m4: Changed check for
-	  linux/videodev.h. If that file is not compilable, we don't build
-	  the v4l backend. That's to avoid compilation errors if videov.h
-	  from Linux kernel 2.6.* is used. Include all the headers we also
-	  include in backend/v4l.c to make sure we find all problems.
-	* backend/v4l.c: Try to not include linux/videodev2.h to avoid
-	  compilation errors.
-
--- snapshot 1.0.13-pre3
----- CODE FREEZE FOR SANE 1.0.13 ---
-2003-11-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* NEWS: Updated.
-	* configure configure.in: Disabled warnings for release.
-
-2003-11-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Brother DCP 8020 and
-	  UMAX Astra 3600.
-
-2003-11-14  Eddy De Greef <eddy_de_greef at tiscali dot be>
-	* doc/sane-mustek_pp.man: added the new libieee1284 style parport
-	  names.
-
-2003-11-14  Gerhard Jaeger <gerhard@gjaeger.de>
-	* backend/plustek.c backend/plustek-usb.cal backend/plustek-usbshading.c
-	  backend/plustek-usbhw.c: Endianess fixes.
-
-2003-11-13  Eddy De Greef <eddy_de_greef at tiscali dot be>
-	* backend/mustek_pp_cis.c: accept old style parport names to
-	  ensure backward compatibility with existing mustek_pp.conf files.
-
-2003-11-13  Peter Fales <peter@fales-lorenz.net>
-	* backend/gphoto2.h:  Line beginning with "static static" was breaking
-	  compiles on some platforms.
-
-2003-11-10  Gerhard Jaeger <gerhard@gjaeger.de>
-	* backend/Makefile.in: Linking pie backend now against sanei_thread lib.
-	* backend/pie.c: Switched backend over to sanei_thread usage, to make it
-	  also work with OS/2.
-
-2003-11-08  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-options.c backend/snapscan.c
-	  Disabled quality calibration for Epson Perfection 1670 since it does
-	  not work reliably yet
-
-2003-11-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/lhii.desc: Added (back) the links to
-	  the external lhii backend that supports old handscanners.
-
--- snapshot 1.0.13-pre2
-
-2003-11-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Removed Epson Perfection
-	  1670. It's now supported by the snapscan backend.
-
-2003-11-08  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-options.c backend/snapscan-usb.c
-	  Fix TPO range for Epson 1670, fix compiler warnings on gcc 3.3
-
-2003-11-08  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-scsi.c backend/snapscan.c doc/descriptions/snapscan.desc:
-	  Final bugfixes for Epson 1670
-
-2003-11-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README.openbsd: Added info about setting permissions (Bug #300311).
-	* doc/descriptions/unsupported.desc: Added Genius and Lexmark scanners.
-
-2003-11-07  Oliver Schirrmeister <oschirr@abm.de>
-
-	* backend/fujitsu.c: Bugfix. If a scanner returned a color image
-	  in format rr...r gg.g bb...b the reader process crashed.
-	* backend/fujitsu.[ch] Bugfix. The option gamma was enabled for
-	  the fi-4120. The result was an 'invalid field in parm list'-error.
-	* doc/descriptions/fujitsu.desc: added model "fi-4530C"
-
-2003-11-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Microtek and Visioneer
-	  scanners.
-
-2003-11-04  m. allan noah <anoah at pfeiffer dot edu>
-
-	* doc/descriptions/fujitsu.desc: added model "fi-4110EOX2"
-
-2003-11-04  Gerhard Jaeger <gerhard@gjaeger.de>
-	* backend/Makefile.in: Linking coolscan now against sanei_thread lib.
-	* backend/coolscan.c backend/coolscan.h: Switched backend over to
-	  sanei_thread usage, to make it work at least with OS/2.
-	* backend/plustek-pp_misc.c backend/plustek-pp_hwdefs.h: Fixed bug
-	  in parport setup routine.
-	* sanei/sanei_pp.c: Fixed problem in sanei_pp_setmode().
-	  Fixed parport mode setting in direct mode.
-
-2003-11-02  Julien Blache <jb@jblache.org>
-	* frontend/saned.c: fixed endianness issues in
-	check_v{4,6}_in_range(), also fixed portability issues to other
-	UNIX platforms due to different representations of IPv6 addresses.
-
-2003-11-02  Gerhard Jaeger <gerhard@gjaeger.de>
-	* doc/descriptions/unsupported.desc: Added Plustek OpticSlim 2400.
-	* include/sanei/sanei_thread.h: Removed OS/2 porting section.
-	* sanei/sanei_pp.c include/sanei/sanei_pp.h:
-	  Fixed udelay stuff, documentation update.
-
-2003-11-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/Makefile.in: sanei_pp must be linked if we preload
-	  backends.
-
----- FEATURE FREEZE FOR SANE 1.0.13 ---
--- snapshot 1.0.13-pre1
-
-2003-11-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added PIE Powerslide 3600.
-	* NEWS: Updated for 1.0.13.
-
-2003-10-30  Gerhard Jaeger <gerhard@gjaeger.de>
-	* sanei/lib/sanei_pp.c: Made sanei_pp_set_datadir work in no ieee1284 mode.
-	  Fixed a minor bug in delay calculation.
-	* include/sanei/sanei_pp.h: Added some control-port definitions.
-	* backend/plustek_pp.c backend/plustek-pp*:
-	  Made PS/2 bidirectional mode work.
-	* doc/plustek/PLUSTEK-PARPORT.txt: Update.
-
-2003-10-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/Makefile.in backend/mustek.c backend/mustek.h
-	  doc/descriptions/mustek.desc doc/mustek/mustek.CHANGES:
-	  Added support for sanei_thread. Removed OS/2 specific code.
-	  Added more debug messages.
-	* doc/saned.man: Added more info about firewall trouble.
-
-2003-10-29  Gerhard Jaeger <gerhard@gjaeger.de>
-	* sanei/lib/sanei_pp.c include/sanei/sanei_pp.h:
-	  Added functions sanei_pp_set_datadir() and sanei_pp_uses_directio().
-	  Added some documentation.
-	* doc/plustek/PLUSTEK-PARPORT.txt doc/plustek/PLUSTEK-PARPORT-TODO.txt
-	  doc/plustek/PLUSTEK-USB-TODO.txt: Updates.
-	* backend/plustek_pp.c backend/plustek-pp_*: Made usage of the new
-	  sanei_pp functions, made EPP modes work with libieee1284. Also some
-	  cleanup work.
-
-2003-10-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane-scsi.man: Added hint for setting device permissions for
-	  /dev/xpt0 for FreeBSD users.
-	* AUTHORS backend/artec.c backend/artec.h doc/sane-artec.man:
-	  Fixed Chris Pinkham's email address.
-	* doc/descriptions/unsupported.desc: Added Microtek ScanMaker 4900.
-
-2003-10-28  Rene Rebe <rene@rocklinux.org>
-	* backend/avision.h backend/avision.c doc/descriptions/avision.desc
-	  backend/avision.conf AUTHORS: merge of the current Subversion
-	  revision of SANE/Avision. The fixes include: endianess fixes,
-	  calibration code, ADF detection, correct lamp warmup, gamma table
-	  for new ASICs, some workarounds for ASIC variations and the
-	  convertion to use OPT_SOURCE instead of seperate OPT_ADF and
-	  OPT_TRANS. Also fixed Bugs #300288 and #300196 and removed
-	  the conflicting Option_Valu now present in sanei_backend.h
-	* doc/sane-avision.man: made requested clarifications (Bugs #300290,
-	  #300291)
-
-2003-10-28  Gerhard Jaeger <gerhard@gjaeger.de>
-	* doc/sane-plustek.man backend/plustek.conf backend/plustek.c:
-	  Changed configuration file back to remain compatible with the old format.
-
-2003-10-27  Karl Heinz Kremer <khk@khk.net>
-	* backend/epson.c: Replaced all DBG(0, statements with
-	  DBG(1, ... to avoid logging messages the user should
-	  not see anyways.
-
-2003-10-27  Gerhard Jaeger <gerhard@gjaeger.de>
-	* sanei/lib/sanei_pp.c: Fixed OS/2 compilation problems.
-	* doc/descriptions/plustek_pp.desc:
-	  Updated status of Primax Compact 4800 Direct 30bit.
-
-2003-10-26  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* configure.in configure include/sanei/config.in.h:
-	  Added check for limits.h - HAVE_LIMITS_H.
-	* sanei/lib/sanei_pp.c include /sanei/sanei_pp.h:
-	  Added sanei_pp_init() and sanei_pp_udelay().
-	* backend/plustek_pp.c backend/plustek-pp_misc.c backend/plustek-pp_scan.h:
-	  Fixed compiler warnings, using now sanei_pp_udelay() and
-	  made the backend work with libieee1284.
-
----- BACKEND FREEZE FOR SANE 1.0.13 ---
-
-2003-10-24  Peter Kirchgessner <peter@kirchgessner.net>
-	* backend/hp.c, backend/hp-handle.c, backend/Makefile.in:
-	  second check-in: use new sanei_thread-interface for hp-backend
-
-2003-10-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/hp_rts88xx.desc: Added description
-	  file of new hp_rts88xx backend for HP 44x0 scanners (from
-	  Johannes Hub <johanneshub@foni.net>).
-	* doc/descriptions/unsupported.desc: Added Minolta DiMAGE Scan
-	  Elite 5400. Removed HP 44x0 (now supported by hp_rts88xx
-	  backend).  Updated Epson Perfection 3170. Updated Plustek
-	  S24/ST24.
-	* doc/descriptions/avision.desc doc/descriptions/canon.desc
-	  doc/descriptions/sharp.desc: Updated to new status values.
-	  Bugs: #300146, #300147, #300154.
-	* include/sane/sanei_thread.h: Updated doxygen documentation
-	  for new sanei_thread interface.
-
-2003-10-23  Frank Zago <fzago at austin dot rr dot com>
-
-	* README.windows: added note about libusb port for cygwin.
-
-2003-10-23  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek.c backend/plustek-usb.c:
-	  fixed bug, that causes CanoScan devices to use the wrong calibration
-	  functions, sanei_usb_get_vendor_product() fails.
-	* sanei/sanei_pp.c:
-	  Added sanei_pp_getmode, fixed conditional compilation stuff.
-	* include/sanei/sanei_pp.h:
-	  Added sanei_pp_getmode and SANEI_PP_MODE definitions.
-	* backend/plustek_pp.c backend/plustek-pp.h backend/plustek-pp_misc.c:
-	  Added parport-mode detection.
-
-2003-10-22  Peter Kirchgessner <peter@kirchgessner.net>
-	* backend/hp.c, backend/hp-handle.c, backend/Makefile.in:
-	  use new sanei_thread-interface for hp-backend
-
-2003-10-22  Gerard Klaver <gerard at gkall dot hobby dot nl>
-	* doc/descriptions/teco2.desc backend/teco2.conf doc/sane-teco2.man:
-	  Mustek ScanMagic 4830S added.
-	* doc/sane-teco2.man: maintainer Gerard Klaver added, text update.
-	* doc/teco/teco2.txt: data VM3564 Relisys AVEC II S3 added.
-
-2003-10-22  Julien Blache <jb@jblache.org>
-	* frontend/saned.c: replaced in_addr_t mask; by u_int32_t mask; in
-	  check_v4_in_range(). in_addr_t doesn't seem to exist on OS/2, and
-	  it's nothing more than an unsigned 32 bits integer.
-
-2003-10-22  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* configure configure.in include/sane/config.in.h: added checks for iopl.
-	* sanei/sanei_pp.c sanei/Makefile.in
-	  include/sanei/sanei_pp.h include/sanei/Makefile.in: added generic
-	  parallel-port function lib.
-	* backend/plustek-pp* backend/plustek_pp.c: major update, sanei_pp
-	  integration, compilation fixes.
-	* backend/plustek.c: fixed, the "generic disable" switch
-
-2003-10-21  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
- 	* backend/snapscan.h backend/snapscan.c backend/snapscan-option.c
-	  backend/snapscan-scsi.c backend/snapscan.conf: Bugfixes,
-	  hopefully better support for Epson 1670.
-
-2003-10-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/epkowa.desc: Added Perfection 1670 as
-	  "unsupported". Changes status of 1260 PHOTO to :basic because of
-	  broken TPU support. Fixed missing quotation mark in Perfection
-	  1200S entry.
-	* AUTHORS: Oliver Schirrmeister has a CVS account now.
-	* doc/sane-mustek_usb.man: Added workaround for hardware bug.
-
-2003-10-21  Stéphane Voltz <svoltz@wanadoo.fr>
-	* doc/sane-umax_pp.man: added help for new configuration option
-	* tools/umax_pp.c: uppded version number
-
-2003-10-20  Frank Zago <fzago at austin dot rr dot com>
-	* README.aix doc/sane-leo.man doc/sane-matsushita.man
-	  doc/sane-sceptre.man doc/sane-teco1.man doc/sane-teco2.man
-	  doc/sane-teco3.man doc/descriptions/leo.desc
-	  doc/descriptions/matsushita.desc doc/descriptions/sceptre.desc
-	  doc/descriptions/teco1.desc doc/descriptions/teco2.desc
-	  doc/descriptions/teco3.desc doc/descriptions-external/hp4200.desc:
-	  fixed urls.
-
-2003-10-19  m. allan noah <anoah at pfeiffer dot edu>
-
-	* backend/fujitsu.c: reverse previous patch. Dont blindly trust
-	  code from the backend maintainer :)
-
-2003-10-19  Julien Blache <jb@jblache.org>
-	* frontend/saned.c: added subnet support to saned ; added
-	check_v4_in_range and check_v6_in_range functions.
-	* backend/saned.conf: updated the config file.
-	* doc/saned.man: updated the manpage for saned.
-
-2003-10-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added HP ScanJet 3670.
-	* doc/descriptions-external/epkowa.desc: Added description file
-	  for the external Epson Kowa backend.
-
-2003-10-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Reflecta iScan
-	  1800. Updated information for Epson Perfection 1670.
-	* README.linux: Added information about compilation problems when
-	  Linux 2.6 is installed.
-	* tools/sane-desc.c: In error and warning messages print the name
-	  of the description file. Print warning if the status is not set
-	  for a device.
-	* backend/test.c: Reindented.
-	* AUTHORS: Nathan Ruthman has CVS access now.
-
-2003-10-17  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/descriptions/epson.desc: Fixed bug #30149 (added :status information for all scanners)
-
-2003-10-17  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* acinclude.m4 aclocal.m4 configure: Added -D_REENTRANT to compiler
-	  flags, when using pthread support.
-	* sanei/sanei_thread.c: Added SIGPIPE handling,
-	  when compiled for pthread support.
-	* backend/test.c: Removed blocking SIGPIPE, as this is now handled
-	  in sanei_thread library.
-	* backend/plustek.h backend/plustek.c backend/plustek-usbhw.c:
-	  Added checks for intervaltimer, to make it compile on OS/2.
-
-2003-10-16  m. allan noah <anoah at pfeiffer dot edu>
-
-	* backend/fujitsu.c: memset the device struct and the scsi buff
-	  when a new device is attached. Submitted by 
-	  Chris Chesney <cchesney at go-integral dot com>.
-	  Initialized a couple vars in the 3091 init routines.
-
-2003-10-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* AUTHORS: Marked maintainers that have CVS access with a
-	  (*). Added m. allan noah to fujitsu backend. Added Julien Blache
-	  and Petter Reinholdtsen to "Miscellaneous coding". Removed
-	  Petter Reinholdtsen from "CVS repository maintainer".
-	* doc/sane-usb.man: sane-find-scanner is in section 1, not 5.
-
-2003-10-15  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* include/sanei/config.h.in configure.in configure:
-	  Added test for setitimer.
-
-2003-10-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Pentax, Sicos, Syscan,
-	  and UMAX scanners.
-	
-2003-10-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx_low.c: Fixed compilation bug when debugging is
-	  disabled.
-	* backend/test.c doc/descriptions/test.desc: Fixed cancelling when
-	  threads are used. Only SIGPIPE is blocked now. Sleep indefinetly
-	  after the reader_process has finished. Minor fixes of debug
-	  messages.
-
-2003-10-13  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* sanei/sanei_thread.c include/sane/sanei_thread.h: Fixed OS/2 compilation
-	* sanei/sanei_lm983x.c include/sane/sanei_lm983x.h: Copyright update
-
-2003-10-12  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* sanei/sanei_thread.[ch]: Improved OS/2 support
-	* backend/test.c: removed OS/2 section
-
-2003-10-12  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Memorex, TCE and Optrox
-	  scanners.
-
-2003-10-10  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Canon DR-2080C. Updated
-	  some links.
-	* backend/mustek_pp_ccd.conf doc/sane-mustek_pp_ccd.man: Explained
-	  that libieee1284 device names like "parport0" can also be used.
-
-2003-10-10  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* sanei/sanei_thread.c: Fixed some compilation errors on Darwin and OS/2
-	  Fixed segfault condition in sanei_thread_waitpid
-
-2003-10-09  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* backend/hp.c backend/hp-option.c backend/hp-scl.c:
-	  Bug #300241: fix invers image on 3c/4c/6100C at 10 bit depth
-	  Redo when TEST UNIT READY failed
-	  Redo when read returns with 0 bytes (non-SCSI only)
-	* doc/sane-hp.man: Add environment SANE_HP_RDREDO, SANE_HOME_HP
-
-2003-10-09  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp.c backend/umax_pp_low.h backend/umax_pp.h
-	  backend/umax_pp_mid.c backend/umax_pp_low.c backend/umax_pp_mid.h
-	  backend/umax_pp.conf: added automatic parallel port detection,
-	  and special keyword in configuration file to use it.
-
-2003-10-08  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/Makefile.in : linking plustek_pp- and test-backend against
-	  sanei_thread
-	* backend/test.[ch]: added sanei_thread support
-	* backend/test-picture.ch: fixed compiler warnings
-	* backend/plustek.[ch] backend/plustek_pp.c backend/plustek-pp.h:
-	  changes due to the sanei_thread-lib work
-	* sanei/sanei_thread.c include/sane/sanei_thread.h: improved
-	  support of pthreads, changed behaviour of sanei_thread_kill(),
-	  added functions sanei_thread_sendsig() and sanei_thread_get_status()
-	  changed behaviour of sanei_thread_waitpid(), changed parameters
-	  of sanei_thread_begin()
-
-2003-10-08  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/canon630u.c: Workaround for bug in canon630u backend:
-	  The backend assumes that the id it gets back from sanei_usb_open
-	  is a file descriptor. It isn't. So sane_get_select_fd returns
-	  just a random number. That breaks at least saned, other
-	  frontends may not work either. This is a workaround for bug
-	  #300257.
-
-2003-10-07  m. allan noah <anoah at pfeiffer dot edu>
-
-	* backend/fujitsu.c: removed ~25 '_' from option names (#300139)
-	* backend/fujitsu.conf: added lines for known usb scanners
-
-2003-10-07  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-	* backend/snapscan.h backend/snapscan-scsi.c
-	  Updates for Epson Perfection 1670
-
-2003-10-07  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-	* backend/snapscan.h backend/snapscan.c backend/snapscan-option.c
-	  Initial support for Epson Perfection 1670, minor bugfix
-	  (#300247)
-
-2003-10-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* acinclude.m4 aclocal.m4 configure.in configure
-	  include/sane/config.h.in sanei/sanei_thread.c: More verbose help
-	  messages for --enable-fork-process. Print message about pthread
-	  support after all the tests. If libpthread isn't available, try if
-	  libc supports pthreead_*. Use macro USE_PTHREAD to check if
-	  threads are used in the code.
-	* backend/Makefile.in: Added sanei_pthread.lo to list of object
-	  files needed for preloading.
-
-2003-10-07  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* aclocal.m4 acinlcude.m4 configure configure.in: modified checks for
-	  pthread support, added switch --enable-fork-process which toggles
-	  between the usage of fork and pthread, set the default behaviour to
-	  pthread usage on Darwin
-	* include/sane/config.h: added the HAVE_LIBPTHRAD stuff
-	* sanei/sanei_thread.c include/sane/sanei_thread.h: fixed compilation issue
-	  on OS/2, added support for fork too, so that we can use sanei_thread
-	  functions in any case.
-	* backend/plustek.[ch]: changes due to the sanei_thread-lib work
-
-2003-10-06  m. allan noah <anoah at pfeiffer dot edu>
-
-	* backend/fujitsu.[ch]: Added support for color modes of fi-4x20C and
-	  fi-4340C, maybe others as well.
-
-2003-10-06  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* backend/hp.c, backend/hp-option.h: Bug #300248 fixed
-	  (correct "Negatives" in option description to "Negative")
-
-2003-10-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/Makefile.in: Remove doxygen-sanei.conf in clean target.
-	* sanei/sanei_pa4s2.c: Made some internal functions static.
-
-2003-10-06  Thomas Soumarmon <thomas.soumarmon@cogitae.net>
-
-	* backend/hp5400_*: fixed bug #300252 : added static to all non
-	  SANE specific functions + changed #include <sane/..> into
-	  #include "../include/sane/..." as mentioned in the
-	  backend-writing.txt file
-
-2003-10-05  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* aclocal.m4 configure configure.in: added checks for pthread.h and
-	  added linker option -lpthread if pthread.h is found
-	* include/sane/config.in.h: added HAVE_PTHREAD_H
-	* sanei/sanei_thread.c include/sane/sanei_thread.h: added pthread_
-	  functions to library, so every backend is able to use either fork or
-      pthread for its reader-process - see plustek backend for example
-	* backend/plustek.h backend/plustek.c: added sanei_thread stuff to support
-	  threading on MacOS X
-	* backend/plustek_pp*: some cleanup
-
-2003-10-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/microtek2.h backend/test.c include/sane/saneopts.h:
-	  Fixed some missing or duplicated spaces in option descriptions.
-	* backend/canon630u.c: Option names shouldn't be translated.
-	* backend/mustek.c: Use the same title for brightness as in other
-	  backends.
-	* po/sane-backends.de.po: Fixed minor bugs.
-	* po/sane-backends.sv.po: Updated (from Mattias Ellert
-	  <mattias.ellert@tsl.uu.se>).
-	* po/sane-backends.bg.po po/sane-backends.cs.po
-	  po/sane-backends.es.po po/sane-backends.fr.po
-	  po/sane-backends.it.po po/sane-backends.nl.po
-	  po/sane-backends.no.po po/sane-backends.pt.po
-	  po/sane-backends.ru.po: Regenerated.
-	* doc/descriptions/unsupported.desc: Added Epson Perfection 3170,
-	  Packard Bell Diamond 1200, and Visioneer PaperPort
-	  3100b. Updated Epson Perfection 1670.
-
-2003-10-04  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.[ch]: Fixed bug 300246 - Use SANE_TITLE_SCAN_SPEED
-	  (and DESC and NAME) from saneopts.h instead of my own strings.
-	  Fixed typo in gamma correction description.
-	  Start two descriptions with a capital character.
-
-2003-10-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* AUTHORS configure configure.in backend/Makefile.in backend/dll.conf
-	  backend/mustek_pp_ccd.c backend/mustek_pp_ccd.conf backend/mustek_pp_ccd.h
-	  doc/Makefile.in doc/sane.man doc/sane-mustek_pp_ccd.man
-	  doc/descriptions/mustek_pp_ccd.desc: Added back old mustek_pp
-	  backend. That backend supports Mustek CCD scanners. The backend
-	  was renamed to mustek_pp_ccd to avoid conflicts with the new
-	  mustek_pp backend for CIS scanners. The code was taken from
-	  sane-backends 1.0.9. This is only a temporary solution. The goal
-	  is to incooperate CCD and CIS support into mustek_pp.
-	* doc/sane-mustek_pp.man doc/descriptions/mustek_pp.desc: Added
-	  links to the mustek_pp_ccd backend. Removed scanners supported by
-	  mustek_pp_ccd.
-
-2003-10-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Microtek ScanMaker
-	  5900.
-	* doc/descriptions/umax1220u.desc: Converted to new
-	  format (bug #300155). Commented out unsupported UMAX Astra 2200U
-	  to avoid confusion.
-	* doc/Makefile.in: Cleanup. Removed install target for
-	  mostang.com.
-	* doc/descriptions/microtek2.desc: Converted to new
-	  format (bug #300153). Commented out ScanMaker 9600XL (was
-	  mentioned twice?).
-	* doc/descriptions/hpsj5s.desc: Converted to new format (bug
-	  #300151). Added comment about only gray mode.
-	* doc/descriptions/fujitsu.desc: Converted to new format (bug
-	  #300150).
-	* doc/descriptions/canon630u.desc: Converted to new format (bug
-	  #300148).
-
-2003-10-03  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/descriptions/epson.desc: Changed "status" information
-
-2003-10-02  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek_pp* backend/plustek-usb*: fixed some OS/2 compiling issues
-	* doc/plustek: fixed module compilation stuff and increase version number
-
-2003-10-02  Peter Fales <peter@fales-lorenz.net>
-	* backend/gphoto2.c backend/gphoto2.h: Try to handle the case where
-	  the camera has a corrupt file that can't be decoded as a JPEG
-	  image.
-
-2003-10-01  Eddy De Greef <eddy_de_greef at tiscali dot be>
-
-	* doc/sane-mustek_pp.man, doc/descriptions/mustek_pp.desc:
-	  Added Mustek 96 CP to list of supported scanners.
-
-2003-09-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Fixed links to messages in
-	  the mailing list archive.
-	* configure configure.in doc/Makefile.in doc/doxygen-sanei.conf
-	  doc/doxygen-sanei.conf.in: Automatically update the version
-	  number of SANE in the doxygen documentation.
-	* doc/backend-writing.txt doc/sane.man: Updated links to sanei
-	  documentation.
-	* doc/.cvsignore include/sane/sanei.h include/sane/sanei_scsi.h:
-	  Minor fixes for sanei documentation.
-	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
-	  backend/gt68xx_high.c doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES: Added detection of Genius Vivid 4x.
-	  It won't work out-of-the-box, however. CCD coarse calib
-	  shouldn't run into an endless loop anymore. Plustek 1248U
-	  is much faster now.
-
-2003-09-30  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/descriptions/unsupported.desc: removed OpticSlim entry
-	* doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES
-	  doc/sane-gt68xx.man backend/gt68xx.conf: added Plustek OpticSlim entry
-	* backend/gt68xx_devices.c: added settings for Plustek OpticSlim 1200
-
-2003-09-29  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/sane-plustek.man: minor update
-	* backend/plustek.c: changed version number, cleanup
-	* backend/plustek-usb*.c: cleanup
-	* backend/plustek-pp.*: cleanup
-	* backend/plustek-share.h: removed, no longer needed
-	* backend/Makefile.in: removed reference to plustek-share.h
-
-2003-09-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Enhans, Genius and UMAX
-	  scanners.
-	* backend/test.c doc/descriptions/test.desc: Some options had
-	  wrong constraints or didn't match their descriptions (bug
-	  #300235).
-
-2003-09-25  Frank Zago  <fzago at austin dot rr dot com>
-
-	* README.windows: updated status of xscanimage and XSane.
-
-2003-09-25  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/Makefile.in: Added plustek_pp.c.
-	* po/sane-backends.nl.po: Updated Dutch translation (from Martin
-	  Kho <mkho@xs4all.nl>).
-	* po/sane-backends.bg.po po/sane-backends.cs.po po/sane-backends.de.po  
-	  po/sane-backends.es.po po/sane-backends.fr.po po/sane-backends.it.po  
-	  po/sane-backends.no.po po/sane-backends.pt.po po/sane-backends.ru.po  
-	  po/sane-backends.sv.po: Regenerated.
-	* doc/Makefile.in: Fixed link to image in HTML manpages.
-
-2003-09-24  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backends/snapscan.c: check second argument of sanei_config_get_string
-	  (Bug #300198)
-
-2003-09-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Changed links to point to
-	  sane-project.org.
-	* TODO: Removed. Please use the bug tracking system at
-	  http://www.sane-project.org/bugs.html instead.
-	* README README:os2 configure configure.in: Updated contact
-	  information (website, mailing lists, bug tracker). Minor fixes.
-	* backend/mustek.c: Fixed sane-devel address.
-	* doc/backend-writing.txt doc/releases.txt: Updated contact
-	  information. Spelling fixes. Minor updates.
-	* doc/sane.man: Updated contact information. Removed contributing
-	  section (now on homepage). Spelling fixes, general updates.
-	* sane-abaton.man sane-agfafocus.man sane-apple.man sane-bh.man  
-	  sane-dc210.man sane-dc240.man sane-dc25.man sane-gphoto2.man  
-	  sane-hp.man sane-microtek2.man sane-microtek.man  
-	  sane-mustek.man sane-mustek_pp.man sane-pint.man  
-	  sane-st400.man sane-usb.man sane-v4l.man: Updated links to
-	  sane-devel and SANE homepage.
-	* sane.tex: Changed homepage and sane-devel-request address.
-	* doc/Makefile.in: Added README.windows.
-	* doc/canon/canon.install2700F.txt: Updated links.
-	* include/sane/sanei.h include/sane/sanei_usb.h: Updated links.
-	* tools/sane-desc.c: Changed links to sane-project.org. Mentioned bug
-	  tracker. Added contact link. Removed link to special USB and
-	  Parport lists (now on static web pages).
-	* tools/sane-config.in: Updated links.
-
-2003-09-24  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/sane.man, AUTHORS: added plustek_pp information
-	* doc/backend-writing.txt: Updated CHECKLIST information
-	* doc/sane-plustek.man: removed parport sections
-	* doc/sane-plustek_pp.man: removed usb sections
-	* backend/plustek.c: changed version number
-	* backend/plustek-usb*.c: minor fixes, esp. CanoScan LiDE30 gray/color bug
-	* backend/plustek-pp.*: changed file headers and copyright info
-	  applied some minor fixes
-	* doc/unsupported.desc: Added Plustek OpticPro S28 and S48
-	* Makefile.in doc/Makefile.in:
-	  removed TODO, as this file does no longer exist
-	* doc/plustek/*: changed links to www.sane-project.org (Bug #300215)
-
-2003-09-23  Frank Zago  <fzago at austin dot rr dot com>
-
-	* Makefile.in NEWS configure configure.in backend/Makefile.in
-	  backend/dll.c include/sane/config.h.in sanei/sanei_scsi.c
-	  tools/sane-find-scanner.c: cygwin port.
-
-2003-09-23  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* configure.in: added new backend plustek_pp
-	* doc/descriptions/plustek_pp.desc : added
-	* doc/plustek/*: added/updated various doc-files
-	* doc/sane-plustek_pp.man doc/Makefile.in : added new man page
-	* backend/dll.conf : added plustek_pp
-	* backend/Makefile.in : added plustek_pp files, updated plustek files
-	* backend/plustek-devs.c backend/pustek-pp.c : removed
-	* backend/plustek-usbcalfile.c backend/plustek-usbcal.c
-	  backend/plustek-usbdevs.c: new files for the plustek usb backend
-	* backend/plustek_pp.c backend/plustek_pp.conf
-	* backend/plustek-pp.h backend/plustek-pp_dac.c backend/plustek-pp_dbg.h
-	  backend/plustek-pp_detect.c backend/plustek-pp_genericio.c
-	  backend/plustek-pp_hwdefs.h backend/plustek-pp_image.c
-	  backend/plustek-pp_io.c backend/plustek-pp_map.c backend/plustek-pp_misc.c
-	  backend/plustek-pp_models.c backend/plustek-pp_motor.c
-	  backend/plustek-pp_p12.c backend/plustek-pp_p12ccd.c
-	  backend/plustek-pp_p48xx.c backend/plustek-pp_p9636.c
-	  backend/plustek-pp_procfs.c backend/plustek-pp_procs.h
-	  backend/plustek-pp_ptdrv.c backend/plustek-pp_scale.c
-	  backend/plustek-pp_scan.h backend/plustek-pp_scandata.h
-	  backend/plustek-pp_sysdep.h backend/plustek-pp_tpa.c
-	  backend/plustek-pp_types.h backend/plustek-pp_wrapper.c :
-	  new added, contains all the code necessary for controlling various Plustek
-	  ASIC 9600x/9800x based parallelport scanner
-
-2003-09-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/sane-desc.c: PATH_MAX is too small for long comments on
-	  win32. Actually return 0 if there is no second quotation mark. 
-	  Patch from Frank Zago  <fzago at austin dot rr dot com>. Check
-	  for !word everywhere to avoid segfaults when a quotation mark is
-	  missing.
-	* sanei/sanei_config.c: Actually return 0 if there is no second
-	  quotation mark. 
-	* backend/ma1509.c backend/mustek.c backend/mustek_usb.c
-	  backend/test.c doc/descriptions/ma1509.desc
-	  doc/descriptions/mustek.desc doc/descriptions/mustek_usb.desc
-	  doc/descriptions/test.desc doc/mustek/mustek.CHANGES
-	  doc/mustek_usb/mustek_usb.CHANGES: Check if
-	  sanei_config_get_string fails because of a single quotation mark
-	  in the configuration file. Update version numbers.
-
-2003-09-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/microtek.desc: Used new :status scheme. Added
-	  Vobis Highscreen Realscan and Genius Colorpage-SP2.
-	* doc/descriptions/unsupported.desc: Added HP, Microtek and UMAX
-	  scanners.
-
-2003-09-18  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/sane-umax_pp.c: fix default port address handling
-	  (patch from Malcolm Parsons <malcolm.parsons@virgin.net>)
-	* configure.in configure include/sane/config.h.in: added detection of
-	  machine/cpufunc.h and i386_set_ioperm() for FreeBSD support.
-	  
-
-2003-09-16  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* doc/sane-umax_pp_low.man: updated man page
-
-2003-09-15  Simon Munton <simon@munton.demon.co.uk>
-
-	* doc/sane-pie.man doc/descriptions/pie.desc: Updated status of ScanAce
-	  III to 'good' based on feedback from Brian Wood.
-
-2003-09-14  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: put Henning's #include change back in.
-
-2003-09-14  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c: reworked inb/out functions. The backend now
-	  works on FreeBSD.
-
-2003-09-12  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Increment only once in loop to find USB scanners,
-	  fix rounding error when calculating number of lines to scan.
-
-2003-09-12  Eddy De Greef <eddy_de_greef at tiscali dot be>
-
-	* AUTHORS, backend/mustek_pp_cis.c, backend/mustek_pp_cis.h,
-	  doc/sane-mustek_pp.man: Updated e-mail address.
-
-2003-09-12  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/.cvsignore sanei/.cvsignore: Added .libs. Sorted.
-	* doc/descriptions/unsupported.desc: Updated HP ScanJet 2300c
-	  and 2400c.
-	* backend/abaton.c backend/abaton.h backend/agfafocus.c
-	  backend/agfafocus.h backend/apple.c backend/apple.h
-	  backend/artec.h backend/artec_eplus48u.h backend/as6e.c
-	  backend/as6e.h backend/avision.h backend/bh.c backend/bh.h
-	  backend/canon.c backend/canon.h backend/coolscan.h backend/dmc.c
-	  backend/dmc.h backend/epson.c backend/epson.h backend/fujitsu.h
-	  backend/gt68xx.c backend/gt68xx_high.h backend/ibm.c backend/ibm.h
-	  backend/leo.h backend/ma1509.c backend/ma1509.h
-	  backend/matsushita.h backend/microtek.c backend/microtek.h
-	  backend/microtek2.c backend/microtek2.h backend/mustek.c
-	  backend/mustek.h backend/mustek_pp.c backend/mustek_pp.h
-	  backend/mustek_usb.c backend/mustek_usb_high.h backend/nec.c
-	  backend/nec.h backend/pie.c backend/pint.c backend/pint.h
-	  backend/plustek.h backend/qcam.c backend/qcam.h backend/ricoh.c
-	  backend/ricoh.h backend/sceptre.h backend/sharp.c backend/sharp.h
-	  backend/sm3600.c backend/sm3600.h backend/snapscan.c
-	  backend/snapscan.h backend/tamarack.c backend/tamarack.h
-	  backend/teco1.h backend/teco2.h backend/teco3.h backend/test.h
-	  backend/umax.c backend/umax.h backend/umax_pp.c backend/umax_pp.h
-	  backend/v4l.c backend/v4l.h include/sane/sanei_backend.h:
-	  Moved union Option_Value from backend header files to
-	  sanei_backend.h. No need to copy it over and over again.
-	  Changed header inclusion order in backend files to include
-	  backend.h after sanei_backend.h. Based on a patch from stef
-	  <stef-listes@wanadoo.fr>.
-
-2003-09-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Canon Lide 80, updated
-	  Canon and HP information.
-
-2003-08-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c doc/sane-gt68xx.man
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES:
-	  Added Mustek ScanMagic 1200 UB Plus. Minor bugfix.
-	* doc/descriptions/unsupported.desc: Added UMAX Astra 4450 and
-	  Mustek BearPaw 2448 TA Pro. Updated Canon CanoScan 5000F.
-
-2003-08-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/Makefile.in po/sane-backends.it.po: Added Italien translation
-	(from Luca Clemente <luca.clem@zerobase.it>).
-
-2003-08-22  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson*.[ch]: Fixed compile problem on Linux
-	  Code cleanup to get rid of compiler warnings
-
-2003-08-21  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Removed '//' comments - again ...
-	  Added EPSON KOWA copyright 
-
-2003-08-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README.darwin sanei/sanei_scsi.c: Added support for the
-	  MacOS X IOKit SCSI Architecture Model API. Added support for
-	  Firewire scanners. Patch from Guy Brooker <guy_brooker@mac.com>.
-	* TODO: Added entries for mustek patch, sanei_usb devfs trouble,
-	  and moving of Option_Value. Updated .desc file section.
-	* doc/descriptions/unsupported.desc: Updated sections about
-	  Canon, Epson, HP, Medion, Microtek, Mustek, and Xerox scanners.
-
-2003-07-22  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c backend/snapscan.h backend/snapscan-scsi.c
-	  backend/snapscan-options.c backend/snapscan.conf: Backend version
-	  1.4.27 (ID cleanup, fix for firmware download of Acer 310/320,
-	  new USB ID for Acer 310)
-
-2003-08-17  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp.c backend/umax_pp.h: revert change for UTA
-
-2003-08-15  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.[ch]: Added support for GT-30000, with support for the 
-	  ADF in simplex mode (used some code from the EPSON Kowa IScan version 
-	  of the backend)
-	* backend/epson_scsi.c: Use sanei_scsi_cmd2() to send commands to fix a problem
-	  with SBP-2 under FreeBSD
-
-2003-08-15  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp.c backend/umax_pp.h: added a check of values passed
-	  in gamma table. Fixed a bug which prevented custom gamm and UTA to be
-	  active
-	  
-2003-08-14  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/sane-plustek.man: Added debug description
-	* backend/plustek.c backend/plustek-usbhw.c backend/plustek-usbshading.c
-	  backend/plustek-usbscan.c backend/plustek-devs.c
-	  Fixed warmup bug
-	  Fixed EPSON12x0 and CanoScan hangs during init step
-	  Some fine-tuning for the CanoScan devices
-
-2003-08-10  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/descriptions/plustek.desc: Update to new keywords,
-	  added Genius Colorpage HR6X EPP
-	* TODO: moved Plustek topics to done section
-
-2003-08-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Plustek OpticSlim 1200.
-	  Updated Mustek Paragon 600 II ED/EP information.
-
-2003-07-31  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* doc/descriptions/hp.desc: Add status by model
-
-2003-07-31  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: All the unsupported entries
-	  that pointed to .txt files have links to HTML pages now.
-
-2003-07-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Minolta and Visioneer
-	  scanners. Updated Avision, Medion, and UMAX scanners.
-	* tools/check-usb-chip.c: Added test for Genesys Logig GL660 +
-	  GL646 combination. Added some more messages about what's going
-	  on.
-	* TODO: Added frontend linking issue and color management
-	  discussion. Removed sanei_jpeg move and avision patch entries.
-	  Updated global init issue and desc file entry.
-	* po/sane-backends.bg.po: Updated Bulgarian translation (from
-	  Pavel Constantinov <pavelconstantinov@bigfoot.com>).
-
-2003-07-29  Matthew Duggan <stauff1@users.sourceforge.net>
-
-	* backend/canon_pp.c: Reset globals in sane_exit.
-
-2003-07-28  Andras Major <andras@users.sourceforge.net>
-
-	* doc/descriptions/coolscan2.desc: changed IEEE1394
-	  to IEEE-1394 and changed to new status keyword scheme.
-
-2003-07-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/Makefile.in po/sane-backends.bg.po: Added Bulgarian
-	  translation (from Pavel Constantinov 
-	  <pavelconstantinov@bigfoot.com>).
-
-2003-07-28  Thomas Soumarmon <thomas.soumarmon@cogitae.net>
-	* doc/descriptions/hp5400.desc : changed status to basic
-
-2003-07-28  Thomas Soumarmon <thomas.soumarmon@cogitae.net>
-	* backend/hp5400_* : moved constant initialization to sane_init
-	  and sane_exit + removed some compilation warnings.
-
-2003-07-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* Makefile.in backend/Makefile.in doc/Makefile.in
-	  frontend/Makefile.in include/Makefile.in sanei/Makefile.in: Minor
-	  cleanup from the jpeg move. Reverted frontend link order.
-
-2003-07-26  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-usb.c backend/snapscan-usb.h:
-	  Changed license to GPL + SANE exception.
-
-2003-07-26  Peter Fales <peter@fales-lorenz.net>
-	* sanei/Makefile.in, backend/cderror.h, backend/jinclude.h,
-	  backend/dc210.c, backend/dc240.c, backend/ gphoto2.c, 
-	  backend/djpeg.c, backend/cdjpeg.h, backend/Makefile.in, configure
-	  configure.in, frontend/Makefile.in:  Move jpeg support file 
-	  to sanei directofiles to include/sane, and associated 
-	  configure changes
-
-2003-07-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* include/sane/sanei.h include/sane/sanei_codec_ascii.h
-	  include/sane/sanei_codec_bin.h include/sane/saneopts.h: Changed
-	  license to GPL + SANE exception.
-	* AUTHORS frontend/scanimage.c: Updated email address of Andreas
-	  Beck.
-	* include/lalloca.h include/lassert.h: Changed
-	  license to GPL + SANE exception.
-	* LICENSE: Clarify that not all backends us GPL + SANE exception.
-	  Fixed pointer to README.djpeg.
-	* sanei/linux_sg3_err.h: Added GPL + SANE exception license.
-
-2003-07-25  Peter Fales <peter@fales-lorenz.net>
-	* include/sane/sanei_cderror.h, include/sane/sanei_jinclude.h 
-	  include/sane/sanei_jpeg.h sanei/sanei_jpeg.c:  Install these
-	  files as copies of the ones currently in backend.  (The old
-	  files will be deleted later)
-	* Moved backend/djpeg.README to README.djpeg and added usage info
-	 
-2003-07-25  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx.conf doc/sane-gt68xx.man
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES: Added
-	  Fujitsu 1200CUS to man page, .conf and .desc. Changed .conf file
-	  to be more readable.  Added RevScan 19200i to .conf file.  Added
-	  Plustek U16B to .desc and .conf, updated UT16B.
-	* po/sane-backends.de.po: Added some translations for the HP
-	  backend. Minor header updates.
-	* po/sane-backends.cs.po po/sane-backends.es.po po/sane-backends.fr.po
-	  po/sane-backends.nl.po po/sane-backends.no.po po/sane-backends.pt.po
-	  po/sane-backends.ru.po po/sane-backends.sv.po: Regenerated to include
-	  recent changes in the backends.
-	* include/sane/sanei_scsi.h include/sane/sanei_wire.h:  Changed
-	  license to GPL + SANE exception.
-	* TODO: Added canon630u SANE_I18N and include file license
-	  problem. Updated .desc file section.
-	
-2003-07-24  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* backend/hp.c, backend/hp-option.h, backend/hp-option.c
-	  po/Makefile.in: Add support for Internationalization for hp-backend.
-
-2003-07-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/check-usb-chip.c: Added support for detecting Genesys
-	  Logic GL646. Fixed indentation.
-
-2003-07-23  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* include/sane/sanei_thread.h include/sane/sanei_usb.h: Changed
-	  license to GPL + SANE exception.
-
-2003-07-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/mustek_pp.desc: Tag CCD scanners as unsupported
-	  and mention that they work in 1.0.9 or earlier.
-
-2003-07-22  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* doc/descriptions/snapscan.desc: Updated to use new status values.
-
-2003-07-22  Matthew Duggan <stauff1@users.sourceforge.net>
-
-	* doc/descriptions/canon_pp.desc: Updated to use new status values.
-
-2003-07-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Added mustek_pp CCD support and avision patch
-	  entry. Updated .desc file section.
-	* doc/descriptions/unsupported.desc: Added more information for
-	  Canon 9900F.
-
-2003-07-21  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* doc/descriptions/umax_pp.desc: removed unwanted status line for 
-	  backend
-
-2003-07-20  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* doc/descriptions/umax_pp.desc: updated forgotten status to use new 
-	  keyword.
-
-2003-07-20  Oliver Rauch  <oliver.rauch@rauch-domain.de>
-
-	* backend/umax.c: changes for Umax UC630 3pass color scan
-	* doc/descriptopns/umax.desc: changed status
-
-2003-07-19  Frank Zago  <fzago at austin dot rr dot com>
-
-	* backend/teco2.c backend/teco2.h backend/teco2.conf: (from gerard
-	  Klaver and Michael Holler) Better detection of the
-	  scanner. Added white level. More work on some color resolutions.
-	* updated several backend descriptions file.
-
-2003-07-19  Peter Fales <peter@fales-lorenz.net>
-
-	* doc/descriptions/gphoto2.c:  Remove "status" (not used for
-	  APIs) and correct typo in comment.
-
-2003-07-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/as6e.desc doc/descriptions/bh.desc
-	  doc/descriptions/coolscan.desc doc/descriptions/nec.desc
-	  doc/descriptions/sm3600.desc doc/descriptions/st400.desc:
-	  Converted to use new :status values.
-	* doc/descriptions/unsupported.desc: Sorted (more or less)
-	  alphabetically. Added some Canon and Hewlett-Packard scanners.
-	* frontends/scanimage.c: When parsing string options whose
-	  arguments are too short, don't overwrite the remaining command
-	  line arguments. Print "[inactive]" after every inactive option.
-	* TODO: Added fujitsu patch, description file updates,
-	  close_on_exec problem. Removed scanimage bugs.
-
-2003-07-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane-find-scanner.man tools/Makefile.in
-	  tools/check-usb-chip.c tools/sane-find-scanner.c: Added support
-	  for detecting USB chipsets to sane-find-scanner.
-
-2003-07-17  Abel Deuring <a.deuring@satzbau-gmbh.de>
-
-	* sanei/sanei_scsi.c: improved SCSI error handling in
-	  sanei_scsi_cmd2 for FREEBSD_CAM_INTERFACE
-
-2003-07-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/sanei_usb.c: Enable close_on_exec in sanei_usb_open.
-
-2003-07-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Added fujitsu option and libtool problem. Updated desc
-	  file entries.
-
-2003-07-15  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* doc/descriptions/umax_pp.desc: updated to use new :status
-	  keyword.
-
-2003-07-10  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Corex and Relisys
-	  scanners. Updated Canon and HP scanners.
-	* doc/descriptions-external/primax.desc: Fixed typo.
-
-2003-07-02  Thomas Soumarmon <thomas.soumarmon@cogitae.net>
-
-	* backend/hp5400_internal.c: Added version string for v0.87
-	which has been reported to work ok. Use of a list of versions
-	instead of several constants.
-
-2003-07-02  Peter Fales <peter@fales-lorenz.net>
-
-	* backend/gphoto2.c:  Suppress the "bad parameter" message printed
-	  when a camera is not connected, by using Debug level 1
-
-2003-07-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Memorex, Visioneer and
-	  Xerox scanners. Updated information for Visioneer scanners.
-	
-2003-06-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Visioneer OneTouch 5800
-	  USB.
-	* doc/doxygen-sanei.conf: Update version.
-
-2003-06-25  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README.darwin: Mention some more working scanners.
-	* doc/descriptions/unsupported.desc: Added Brother and Microtek
-	  scanners.
-
-2003-06-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/sane-desc.c: Mention backend name in warnings and errors.
-
-2003-06-20  Michael Herder <crapsite@gmx.net>
-
-	* doc/descriptions/artec_eplus48u.desc: Updated status fields
-
-2003-06-19  Peter Fales <peter@fales-lorenz.net>
-
-	* doc/descriptions/dc25.desc, dc240.desc: Updated status fields
-
-2003-06-19  Simon Munton <simon@munton.demon.co.uk>
-
-	* doc/descriptions/pie.desc: Updated status fields
-
-2003-06-19  Eddy De Greef <eddy_de_greef at tiscali dot be>
-
-	* doc/descriptions/mustek_pp.desc: Updated status fields of CIS type
-	  scanners.
-        
-2003-06-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions.txt: Changed unmaintained tag to lowercase.
-	* doc/descriptions/template.desc. 
-	  doc/descriptions-external/template.desc.: Updated according to 
-	  descriptions.txt.
-	* doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES: Added RevScan 19200i. Updated
-	  device status entries.
-	* doc/descriptions/abaton.desc doc/descriptions/agfafocus.desc
-	  doc/descriptions/apple.desc doc/descriptions/artec.desc
-	  doc/descriptions/dc210.desc doc/descriptions/dll.desc
-	  doc/descriptions/dmc.desc doc/descriptions/ibm.desc
-	  doc/descriptions/ma1509.desc doc/descriptions/mustek.desc
-	  doc/descriptions/mustek_usb.desc doc/descriptions/net.desc
-	  doc/descriptions/pint.desc doc/descriptions/pnm.desc
-	  doc/descriptions/qcam.desc doc/descriptions/ricoh.desc
-	  doc/descriptions/s9036.desc doc/descriptions/sp15c.desc
-	  doc/descriptions/tamarack.desc doc/descriptions/test.desc
-	  doc/descriptions/v4l.desc: Updated to new status system.
-	  Added "unmaintained" where appropriate. The status values are
-	  sometimes guessed from the documentation.
-	* doc/descriptions/unsupported.desc: Added Benq parport scanners.
-	* doc/descriptions-external/hp4200.desc
-	  doc/descriptions-external/hpoj.desc
-	  doc/descriptions-external/niash.desc
-	  doc/descriptions-external/primax.desc
-	  doc/descriptions-external/scanwit.desc
-	  doc/descriptions-external/v4l2.desc
-	  doc/descriptions-external/viceo.desc: Updated to new status
-	  system. The status values are sometimes guessed from the
-	  documentation.
-
-2003-06-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/sane-desc.c: Changed to use the new status system for
-	  devices: unsupported, untested, minimal, basic, good, complete.
-	  The old backend and device statuses are translated. Removed
-	  the option to generate one big table of backends (wasn't used
-	  anyway).
-	* doc/descriptions.txt: Explained the new status values. Removed
-	  reference to emacs-lisp code for generation of HTML
-	  files. Explained unsupported.desc.
-	* tools/sane-desc.el.in tools/sane-desc-ext.el: Removed because
-	  these emacs-lisp scripts haven't been used for some time now.
-	  Use sane-desc.c instead.
-	* configure configure.in tools/.cvsignore tools/Makefile.in
-	  tools/README: Removed references to sane-desc.el.
-	* Makefile.in: Added ChangeLog-1.0.12 to DISTFILES.
-
-2003-06-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README.darwin: Minor updates.
-	* TODO: Added v4l2 problem, desc file issues. Removed sm3600 
-	  MacOS	X problem + printing backends in configure.
-	* doc/descriptions/unsupported.desc: Added Canon D2400UF
-	  and IS 12.
-
-2003-06-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added link for HP 5550c.
-	* doc/descriptions/hp5400.desc doc/descriptions/ma1509.desc:
-	  Removed :new marker.
-	* doc/descriptions/tamarack.desc: Removed link to
-	  www.tamarack.net. Hostname is no longer in DNS.
-
-2003-06-11  Oliver Schirrmeister <oschirr@abm.de>
-
-	* backend/fujitsu.c: fixed bug in that code when a scanner is 
-	  disconnected (anoah at pfeiffer dot edu)
-	
-2003-06-10  Michael Herder <crapsite@gmx.net>
-
-	* po/Makefile.in: Added Czech translation
-	* po/sane-backends.cs.po: Added Czech translation provided
-	  by Josef <joeprusa at volny dot cz>
-
-2003-06-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Canon 8000F. More info
-	  for Avision/Umax scanners.
-
-2003-05-27  Frank Zago  <fzago at austin dot rr dot com>
-
-	* backend/teco2.c: fixed a bug regarding color shifting above X
-	  max resolution. Added more working resolutions for the VM3575.
-
-2003-06-05  Thomas Soumarmon <thomas.soumarmon@cogitae.net>
-	* hp5400 backend : synchronized sourceforge CVS with SANE CVS,
-	  details below
-	  added :
-	   backend/hp5400_debug.c
-	   backend/hp5400_debug.h
-	   backend/hp5400_sane.c
-	   backend/hp5400_sanei.h
-	   backend/hp5400_internal.h
-	  modified :
-	   backend/hp5400.c
-	   backend/hp5400.h
-	   backend/hp5400_internal.c
-	   backend/hp5400_sanei.c
-	   backend/hp5400_xfer.h	
-	   	to compile and run (on linux 2.4.21) as SANE backend and
-		in the corresponding hp5400backend sourceforge project
-
-2003-06-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Removed saned issues.
-	* doc/descriptions/unsupported.desc: Added Microtek 336 CX.
-	* configure configure.in backend/Makefile.in: The list of backends
-	  that are built is now in configure.in. Print backends that are
-	  built. Allow manually setting the backends.
-
-2003-06-05  Jochen Eisinger <jochen.eisinger@gmx.de>
-
-	* include/sane/sanei_pa4s2.h, sanei/sanei_pa4s2.c: New sanei_pa4s2
-	  version supporting both raw IO and libieee1284. If you don't
-	  have libieee1284 installed, you need to enable raw IO when
-	  running configure
-
-2003-06-06  Oliver Schirrmeister <oschirr@abm.de>
-
-	* backend/fujitsu.h backend/fujitsu.c doc/descriptions/fujitsu.desc:
-	  remove SP15 code
-	  sane_open actually opens the device you request
-	  from (anoah at pfeiffer dot edu)
-
-2003-06-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES: Don't check if the firmware is
-	  loaded. The check seems to confuse the USB system on some UHCI
-	  chips.
-
-2003-06-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/sanei_scsi.c: Fixed C++-like code for MacOS X (patch from
-	  Mattias Ellert <mattias.ellert@tsl.uu.se>).
-	* acinclude.m4 aclocal.m4 configure frontend/saned.c
-	  include/sane/config.h.in: Check if ss_family or __ss_family is
-	  in struct sockaddr_storage. Otherwise diasbale ipv6. Patch from
-	  Julien BLACHE <jb@jblache.org>.
-
-2003-06-03  Oliver Schirrmeister <oschirr@abm.de>
-
-	* backend/fujitsu.c, backend/fujitsu.h: separated the 4x20 
-	  into another model and color support for the 4x20
-
-2003-06-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/Makefile.in: hp5400 doesn't need sanei_config2.
-
-2003-05-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/sane-backends.fr.po: Fixed two wrong codings of accented
-	  characters.
-	* backend/net.c: Fixed bug concerning hosts that have both IPv6
-	  and IPv4 addresses but only accept connections on IPv4. Patch
-	  from Julien BLACHE <jb@jblache.org>.
-	* doc/descriptions/net.desc: Mention IPv6. Bump version number.
-
-2003-05-27  Frank Zago  <fzago at austin dot rr dot com>
-
-	* PROJECTS: Changed entry for win32 SANE project.
-
-2003-05-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-	
-	* doc/descriptions/unsupported.html: Added link for Umax astra 4700.
-
-2003-05-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Don't disable IPv6 if poll is not
-	  found.
-	* frontend/saned.c: Use u_int_* instead of uint_*. That fixes
-	  compilation for MacOS X (hopefully).
-	* doc/Makefile.in: Add option -nodepage to man2html to avoid
-	  missing lines in the html output.
-	* doc/descriptions/unsupported.html: Added link for Spot scanners.
-
-2003-05-25  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Warnings enabled again. Added -cvs to
-	  version.
-
-Older entries can be found in ChangeLog-1.0.12.
diff --git a/ChangeLog-1.0.14 b/ChangeLog-1.0.14
deleted file mode 100644
index d8150a9..0000000
--- a/ChangeLog-1.0.14
+++ /dev/null
@@ -1,899 +0,0 @@
-******  Release of sane-backends 1.0.14. End of code freeze ******
-
-2004-04-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added link to more info about
-	  Microtek ScanMaker 3630.
-	* NEWS: Updated for release.
-	* backend/sm3600.h: Added last minute fix to avoid compilation
-	  trouble with gcc 3.4.
-	* configure configure.in: New version: 1.0.14.
-
-2004-04-29  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.conf doc/descriptions/snapscan.desc
-	  Added Benq 640BT, changed status of Epson 1670 to "good"
-
-2004-04-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/sane-backends.sv.po: Updated Swedish translation (from
-	  Mattias Ellert <mattias.ellert@tsl.uu.se>).
-
----- CODE FREEZE FOR SANE 1.0.14 ---
--- snapshot 1.0.14-pre3
-
-2004-04-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Lexmark X5130, UMAX
-	  Astra 4000 and 4600.
-	* doc/descriptions-external/genesys.desc: Removed comments from
-	  some scanners as the chipset is known now.
-	* configure configure.in: Disabled compilation warnings.
-
-2004-04-24  Jochen Eisinger <jochen@penguin-breeder.org>
-
-	* doc/sane-usb.man: added comment about devmode not working
-	  with current (2.6.3-2.6.5) 2.6 kernels
-
-2004-04-23  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/dll.c: Fixed dynamic loading of backend libraries
-	  on OS/2. Patch from Franz Bakan <fbakan@gmx.net>.
-
-2004-04-23  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/sane-u12.man doc/plustek/Plustek-USB.changes: updates.
-
-2004-04-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx_devices.c
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES:
-	  Minor fixes for Mustek BearPaw 2448 TA Plus.
-	* doc/descriptions/unsupported.desc: Added Canon IS-32.
-
-2004-04-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* acinclude.m4 aclocal.m4 configure: Don't use -ansi on MacOS X.
-
-2004-04-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* acinclude.m4 aclocal.m4 configure: If the test for gphoto2-config
-	  fails, don't call it later.
-
--- snapshot 1.0.14-pre2
-
-2004-04-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* NEWS: Added some more updated backends and danish translation.
-	* tools/hotplug/libsane.usermap: Added Epson Stylus CX5400 and
-	  Nikon Coolscan 5000 ED. Minor documentation updates.
-
-2004-04-15  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-mutex.c: Fixed compilation problem on OS/2
-	  (Thanks to Franz Bakan).
-	* configure.in configure: SnapScan backend now compiled in by 
-	  default on OS/2
-      
-2004-04-15  Marian Eichholz <eichholz@computer.org>
-
-	* backend/sm3600.h backend/sm3600-scanmtek.c
-	  backend/sm3600-color.c backend/sm3600-gray.c
-	  backend/sm3600-homerun.c: Many fixes for MacOS-X problems pointed
-	  out by Mattias Ellert, thanks: Waiting longer for DoJog() command
-	  completion, new function for transmitting the line gain correction
-	  data with correct endianess, Chassis-Gray-Level lowered.
-	* backend/sm3600.c : Fixed off-by-one-error in p->lines
-          backend/sm3600-scanmtek: Fixed just broken UploadGainCorrection()
-
-2004-04-14  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.conf: Added "usb" entry for libusb
-
-2004-04-14  Rene Rebe <rene@rocklinux.org>
-
-	* backend/avision.h, backend/avision.c: the current development state,
-	  including cleanups, code refactoring, dynamic color and scan source
-	  list creation, implemented ADF mirroring needed for some ASICs ,
-	  some scan window scaliing fixes for some ASICs, added 16bit gray
-	  and color support, fixed a tiny big-endian issue, fixed command
-	  error reporting for some ASICs, improved inquiry logging and some
-	  tiny fixes for film-scanners.
-
-2004-04-14  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek_pp.c backend/plustek-pp_sysdep.h
-	  backend/plustek-pp_scan.h backend/plustek-pp_ptdrv.c
-	  backend/plustek-pp_misc.c: Fixed Kernel 2.6 compilation problems.
-	* doc/plustek/Makefile.kernel24 doc/plustek/Makefile.kernel26
-	  doc/plustek/MakeModule.sh: added to make kernel-module
-	  compilation easier.
-	* doc/plustek/BUILD doc/plustek/VERSION0
-	  doc/plustek/Plustek-PARPORT.txt doc/sane-plustek.man: update.
-	* backend/u12.c backend/u12-hw.c backend/u12-if.c: minor fixes.
-	* doc/u12/U12.changes doc/u12/U12.todo: update.
-	* doc/descriptions/u12.desc: added RevScan Orange R48Ti.
-	* sanei/sanei_thread.c: fixed some warning conditions.
-
-2004-04-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/Makefile.in po/sane-backends.da.po: Added Danish translation
-	  (from  Mogens Jaeger <mogensjaeger@get2net.dk>).
-
-2004-04-12  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README.windows: Mentioned C++ misdetection trouble.
-	* tools/Makefile.in: In make distclean also clean subdirectories.
-
-2004-04-11  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson_usb.c: Added missing device IDs for current MFDs
-
----- FEATURE FREEZE FOR SANE 1.0.14 ---
--- snapshot 1.0.14-pre1
-
-2004-04-10  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* japi/.cvsignore: Updated.
-	* japi/Jscanimage.java japi/Sane.c: Fixes from  David Neary
-	  <David@phenix.fr> to make japi work with current jdks. More
-	  work and documentation is still needed.
-	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
-	  doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES: Minor fixes for Mustek A3 USB,
-	  Genius ColorPage Vivid4 and Mustek BearPaw 2448 CS/TA Plus.
-	* Makefile.in tools/Makefile.in: Added some missing files to
-	  DISTFILES.
-
-2004-04-10  Jochen Eisinger <jochen@penguin-breeder.org>
-
-	* tools/sane-find-scanner.c, doc/sane-mustek_pp.man,
-	  doc/sane-find-scanner.man: added support for detecting
-	  mustek parallel port scanners.
-
-2004-04-09  Gerhard Jaeger <gerhard@gjaeger.de>
-	* backend/plustek.c: Fixes bug #300620.
-	* sanei_thread.c: Fixes bug-reports #300617 & #300618,
-	  all reports and patches or patch-ideas by Mattias Ellert.
-
-2004-04-09  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-usb.c backend/snapscan-mutex.c
-	  backend/Makefile.in: Use own file for mutex implementation
-	  to allow for easier porting to other platforms
-	  backend/snapscan-sources.c backend/snapscan.c:
-	  Bugfixes for pthread implementation
-
-2004-04-08  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c backend/snapscan-sources.c
-	  backend/snapscan.h backend/Makefile.in:
-	  Use sanei_thread functions instead of forking
-	* backend/snapscan-options.c: Change title and description
-	  for OPT_HIGHQUALITY to use existing i18n translations
-	* backend/snapscan-usb.c: Use urb counting
-	  (thanks to Jose Alberto Reguero)
-
-2004-04-06  Gerard Klaver   <gerard at gkall dot hobby dot nl>
-
-	* backend/test.c changed some option group headers to advanced option
-	  menu.
-	
-2004-04-06  Jochen Eisinger <jochen@penguin-breeder.org>
-
-	* sanei/sanei_pa4s2.c include/sane/sanei_pa4s2.h, backend/mustek_pp.c:
-	  fixed compiler warnings
-
-2004-04-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
-	  backend/gt68xx_mid.c doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES:
-	  Added BGR color order for pixel mode. Plustek OpticPro U16B works
-	  in color mode now. Made 600 dpi mode for Mustek BearPaw 2400 TA
-	  Plus a bit faster. Changed Mustek ScanExpress A3 linedistance
-	  correction. Added detection of Visioneer Onetouch 7300.
-	* doc/descriptions/unsupported.desc: Removed Canon D660. Now
-	  supported by plustek backend.
-
-2004-04-04  Gerhard Jaeger <gerhard@gjaeger.de>
-	* doc/descriptions/plustek.desc: added Canon D660U.
-	* doc/plustek/Plustek-USB.changes doc/plustek/Plustek-USB-TODO.txt
-	  doc/plustek/Plustek-USB.txt: update
-	* po/sane-backends.*.po: new strings, as the plustek backend has changed.
-	* backend/plustek.[ch], plustek-usb.[ch], plustek-usb.cal.c,
-	  plustek-usbdevs.c, plustek-usbhw.c, plustek-usbimg.c,
-	  plustek-usbshading.c: added Canon D660U support, cleanup, bug-fixing.
-	* backend/plustek.conf: added red_lampoff, green_lampoff and blue_lampoff
-	  parameters.
-
-2004-04-02  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c backend/snapscan-options.c 
-	  backend/snapscan-scsi.c:
-	  Various bugfixes for gamma correction (Thanks to Robert Tsien)
-	* po/sane-backends.de.po: Fix translation for "gamma table"
-
-2004-04-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* NEWS: Updated for sane-backends 1.0.14.
-	* README.linux: Added some hints about setting permissions with
-	  libusb on Linux 2.6. Removed some obsolete paragraphs.
-	* config.guess config.sub: Updated from stable libtool.
-	* doc/descriptions/unsupported.desc: Added Relisys Episode scanner.
-
-2004-03-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/sanei_scsi.c: Increased SCSI buffer size on MacOS X.
-	  Patch from Mattias Ellert, bug #300601.
-
-2004-03-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx_devices.c
-	  backend/gt68xx_gt6801.c backend/gt68xx_gt6816.c
-	  backend/gt68xx_high.c doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES: Plustek U16B: Added 
-	  GT68XX_FLAG_SE_2400. Fixed color order.Increased debug 
-	  level for setup_scan. Fixed CCD ocarse calibration.
-	* doc/descriptions/microtek.desc: Added Agfa Studiostar.
-	* doc/descriptions/unsupported.desc: Added Avigramm Minidoc,
-	  Medion MD 41260, and Nikon LS 50 ED. Removed Genius Colorpage
-	  Vivid III as it may work with the u12 backend.
-
-2004-03-27  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* backend/hp.c, hp-scl.c, hp.h, doc/sane-hp.man,
-	  doc-descriptions/hp.desc: Fix problem with USB-connections
-	  on Linux 2.6.x. Add environment SANE_HP_KEPPOPEN... and
-	  don't close connections for USB.
-
-2004-03-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Tevion MD 40420. Moved
-	  Plustek OpticPro S(T)28 to genesys.desc.
-	* doc/descriptions-external/genesys.desc: Moved Plustek OpticPro
-	  S(T)28 to genesys.desc.
-
-2004-03-22  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.h Added detection for Epson 660 by USB ID
-	  since new models use new ID strings.
-
-2004-03-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-	
-	* backend/mustek.c doc/descriptions/mustek.desc
-	  doc/mustek/mustek.CHANGES: Added detection of Mustek ScanExpress
-	  1200 FS.
-	* doc/descriptions/unsupported.desc: Added some Microtek and Agfa
-	  scanners.
-
-2004-03-19  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/descriptions/epson.desc: Added Perfection 4870 and CX-6400
-	* doc/descriptions/unsupported.desc: Removed CX-6400
-
-2004-03-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
-	  backend/gt68xx_high.c backend/gt68xx_low.h doc/sane-gt68xx.man
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES: Genius
-	  Vivid 4xe now has color order RGB. Removed 50 dpi for Mustek
-	  BearPaw 2448 as that resolution doesn't work. Make sure that the
-	  lamp of the Mustek A3 USB gets warmed up. It's a CIS scanner with
-	  a lamp. That code is untested. Full scan starts scanning from the
-	  start position of the white strip now. Added detection for Genius
-	  Vivid 1200 EX. Fixed product id of Mustek BearPaw 2448 TA
-	  Plus. Other minor updates.
-
-2004-03-15  Oliver Rauch <oliver.rauch@rauch-domain.de>
-	* backend/umax: bugfix for sense_handler and do_calibration
-
-2004-03-15  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c backend/umax_pp_low.h backend/umax_pp_mid.c
-          backend/umax_pp.c tools/umax_pp.c:   Added ppdev support for 610P
-          detection. Fixed scan area overflow at >= 600 dpi. Fixed ppdev
-	  data direction setting. Fixed direct hardware ECP mode for 1220P.
-
-2004-03-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/README tools/hotplug/README tools/hotplug/libsane.usermap
-	  tools/hotplug/libusbscanner: Added scanner ids (from Marcel
-	  Pol). Added more documentation. Added "chmod a+rw" alternative.
-	* doc/descriptions-external/genesys.desc: Added Plustek OpticPro
-	  ST48.
-	* doc/descriptions/unsupported.desc: Added Mustek A3 EP. Removed
-	  Plustek OpticPro ST48.
-
-2004-03-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Vantas 3000. Added some
-	  links.
-
-2004-03-09  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c backend/umax_pp_low.h backend/umax_pp_mid.c
-          doc/sane-umax_pp.man doc/descriptions/umax_pp.desc tools/umax_pp.c:
-	  finished ECP support for 1220P/2000P. Added scanner detection and
-	  low-level communication for 610P.
-
-2004-03-08  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/check-usb-scanner.c: GL841 max packet size can be 512
-	  bytes on USB 2.0.
-	* doc/sane-usb.man: The Linux scanner module was removed. The
-	  devmode trick in fstab doesn't work anymore. We now have a
-	  hotplug script.
-	* doc/descriptions/unsupported.desc: Moved all scanners that may
-	  be supported by the genesys backend to genesys.desc. Added Agfa
-	  1212 P.
-	* doc/descriptions-external/genesys.desc: Moved all scanners that may
-	  be supported by the genesys backend to genesys.desc. Added links
-	  to scanner pages.
-
-2004-03-04  Oliver Schirrmeister <oschirr@abm.de>
-	* backend/fujitsu.c 
-          enabled dropoutcolor for fi4x20C
-2004-03-04  Oliver Schirrmeister <oschirr@abm.de>
-	* backend/fujitsu.c 
-          enabled dropoutcolor for fi4530C
-
-2004-03-03  Gerhard Jaeger <gerhard@gjaeger.de>
-	* doc/descriptions/unsupported.desc: Updated Plustek section.
-	* doc/descriptions-external/genesys.desc: updated list of scanners
-	  that should be supported by the genesys backend.
-
-2004-03-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* frontend/saned.c: Added checks for bad handles for
-	  SANE_NET_CLOSE and SANE_NET_CANCEL. This is intended to stop
-	  saned from segfaulting when a bad handle is used.
-
-2004-03-02  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Added D8 function level for RX-500
-
-2004-03-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek_usb.c backend/mustek_usb_low.c
-	  backend/mustek_usb_low.h doc/sane-mustek_usb.man
-	  doc/mustek_usb/mustek_usb.CHANGES doc/mustek_usb/mustek_usb.TODO:
-	  Added workaround for toggle = data0 chipset bug.
-	  Fixes bug #300323.
-	* doc/descriptions/unsupported.desc: Added link for HP ScanJet
-	  8290. Added Logitec PageScan Color.
-
-2004-03-01  Frank Zago  <fzago at austin dot rr dot com>
-
-	* doc/descriptions-external/genesys.desc: created list of scanners
-	  that should be supported by the genesys backend.
-	* doc/leo/leo.txt: doc update.
-
-2004-03-01  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/sane-epson.man: Corrected default function level from B5 to B3
-
-2004-02-28  Frank Zago  <fzago at austin dot rr dot com>
-
-	* tools/check-usb-chip.c: Added test for GL646 used in HP scanners.
-
-2004-02-28  Julien Blache <jb@jblache.org>
-	* tools/hotplug: added the hotplug script used by the Debian
-	package, with a quick README.
-	* tools/README: updated to mention the hotplug/ directory.
-
-2004-02-27  Matthew Duggan <stauff1@users.sourceforge.net>
-
-	* backend/canon_pp.c: Add more debug output to help resolve bug #300524
-
-2004-02-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/scanimage.man frontend/scanimage.c: Added support for asking
-	  for pressing a key before scanning a page in a batch scan. Patch
-	  from Dominik Fischer <dom_fischer@web.de>.
-
-2004-02-20  Oliver Schirrmeister <oschirr@abm.de>
-
-	* backend/fujitsu.c backend/fujitsu.h backend/fujitsu-scsi.h:
-          merged the 3092 and the 3091 functions
-          inverted the image in mode color and grayscale
-          jpg hardware compression support (fi-4530C)
-
-
-2004-02-20  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.h backend/umax_pp_low.c backend/umax_pp.conf
-	  backend/umax_pp.c tools/umax_pp.c: added initial ECP support for
-	   scanner, laid groundwork for 610P support.
-
-2004-02-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added HP ScanJet 4670 and
-	  Tamarack Artiscan 9600 pro 36. Removed Plustek OpticSlim 2400.
-	* doc/descriptions/umax1220u.desc: Added UMAX Astra 1600U as this
-	  scanner is reported to work as "well" as the 2000U.
-
-2004-02-11  Frank Zago  <fzago at austin dot rr dot com>
-	* backend/matsushita.c backend/matsushita.conf
-	  doc/sane-matsushita.man doc/descriptions/matsushita.desc: added
-	  partial support for models KV-SS55EX, KV-S2025C, KV-S2045C and
-	  KV-S2065L.
-
-2004-02-08  Karl Heinz Kremer <khk@khk.net>
-	* backend/epson*.[ch]: Reformat source code to get rid of different coding styles
-	  used over the years (and by different authors). 
-
-2004-02-08  Frank Zago  <fzago at austin dot rr dot com>
-	* README.windows: added info about USB scanners.
-
-	* backend/teco1.c backend/teco1.conf backend/teco1.h
-	  doc/sane-teco1.man doc/descriptions/teco1.desc: added new
-	  scanner Relisys RELI 4816, marked Relisys AVEC 2412 as tested.
-
-2004-02-08  Oliver Rauch <oliver.rauch@rauch-domain.de>
-	* backend/umax: bugfix for DOR mode, sane-umax-build-43
-	* doc/umax/umax.CHANGES updated
-
-2004-02-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
-	  backend/gt68xx_high.c doc/sane-gt68xx.man
-	  doc/descriptions/gt68xx.desc: Added basic support for Plustek
-	  OpticSlim 2400. Fixed calibration debug output.
-
-2004-02-07  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.h, backend/epson_usb.h: Increase timeout for lamp warmup
-	  from 60 to 120 seconds
-
-2004-02-07  Eddy De Greef <eddy_de_greef at tiscali dot be>
-
-	* backend/mustek_pp_cis.c: cleaned up debug code
-	* backend/mustek_pp_decl.h, backend/mustek_pp_drivers.h: bumped
-	  version number.
-	* backend/mustek_pp.conf: fixed mistakes in examples
-
-2004-02-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-	
-	* doc/descriptions/unsupported.desc: Added Genius Colorpage Vivid
-	  1200EX and Mustek Paragon 800 II EP.
-
-2004-02-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/sanei_usb.c: Fixed inconsistent error message (patch from 
-	  Mattias Ellert <mattias.ellert@tsl.uu.se>).
-
-2004-02-01  Gerhard Jaeger <gerhard@gjaeger.de>
-	* sanei/sanei_thread.c: added Mattias Ellerts' patch to make
-	  sanei_thread_kill work on MacOSX.
-
-2004-02-01 Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Added D7 function level as copy of D1 for CX-6400
-	* backend/epson_usb.c: Added IDs for CX-6400 and Perfection 4870
-
-2004-02-01 Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-options.c: Remove non-working resolutions
-	  for Epson Perfection 1670
-	* doc/descriptions/snapscan.desc: Add Guillemot Maxi A4 36 bit
-
-2004-01-31  Matthew Duggan <stauff1@users.sourceforge.net>
-
-	* backend/canon_pp.c: Remove more compile warnings.
-
-2004-01-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Mustek BearPaw 4800TA Pro II.
-
-2004-01-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek_scsi_pp.c: Use gettimeofday() instead of
-	ftime(). Bug #300482.
-
-2004-01-21  Gerhard Jaeger <gerhard@gjaeger.de>
-	* backend/test.c: reader_process terminates now, when running as
-	  thread.
-	* backend/u12.c backend/u12-hw.c backend/u12-if.c backend/u12-io.c
-	  backend/u12-map.c backend/u12-motor.c backend/u12-shading.c
-	  backend/u12-tpa.c backend/u12.h backend/u12.conf: major update, compilation
-	  fixes.
-
-2004-01-19  Gerhard Jaeger <gerhard@gjaeger.de>
-	* doc/u12/U12.changes: update.
-	* doc/u12/U12.todo: initial checkin.
-	* backend/plustek-usb.c: cleanup.
-	* backend/u12.c backend/u12-ccd.c backend/u12-hw.c backend/u12-if.c
-	  backend/u12-image.c backend/u12-io.c: activated cancel function,
-	  added lamp off timer function, cleanup, stability fixes.
-
-2004-01-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
-	  doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES: Debug options are only enabled if the
-	  debug level is 1 and higher. Added product id 0x0402 for Plustek U16B.
-
-2004-01-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/gamma4scanimage.man: scanimage is in section 1.
-	* doc/descriptions/unsupported.desc: Added Lexmark X74.
-
-2004-01-15  Eddy De Greef <eddy_de_greef at tiscali dot be>
-
-	* backend/mustek_pp.c, backend/mustek_pp_cis.c: Bug fix: make sure
-	  that the child process releases the parallel port under all
-	  circumstances. Otherwise, the parent process may no longer be
-	  able to control the scanner and the lamp stays on and doesn't
-	  return home.
-
-2004-01-15  Gerard Klaver <gerard at gkall dot hobby dot nl>
-
-	* include/sane/saneopts.h: Added options WHITE_LEVEL_R, WHITE_LEVEL_G,
-	                           and WHITE_LEVEL_B.
-	* doc/sane-teco2.man: changed --white-level to white-level-r, -g, -b
-	                      update text
-	* backend/teco2.c: changed WHITE_LEVEL to WHITE_LEVEL_R, _G and _B,
-	                   changed calibration part for the VM3564, VM356A and
-	                   VM3575 (subtract highest and lowest value and then
-	                   divide).
-	* backend/teco2.h: changed WHITE_LEVEL to WHITE_LEVEL_R, _G, _B.
-
-2004-01-14  Gerhard Jaeger <gerhard@gjaeger.de>
-	* backend/u12.c: Fixed preview bug.
-
-2004-01-14  Gerhard Jaeger <gerhard@gjaeger.de>
-	* descriptions/u12.desc: fixed wrong man-page reference, status updates.
-	* backend/u12.c backend/u12.h backend/u12-hwdef.h backend/u12-scanner.h
-	  backend/u12-*.c: bump up version, fixed device autodetection and corrupted
-	  pictures, improved model-detection.
-
-2004-01-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added several Canon, HP,
-	  Plustek, and UMAX scanners.
-	* doc/descriptions-external/epkowa.desc: Epson 1670 is supported
-	  by SnapScan backend now.
-	* doc/descriptions/gt68xx.desc doc/sane-gt68xx.man: Added Packard
-	  Bell Diamond 2450.
-
-2004-01-13  Karl Heinz Kremer <khk@khk.net>
-	*  backend/epson-usb.c: Added product ID for RX-500
-
-2004-01-13  Gerhard Jaeger <gerhard@gjaeger.de>
-	* doc/sane-plustek_pp.man: added missing explanation. Bug #300441.
-	* include/sane/sanei_thread.h: updated copyright info.
-	* sanei/sanei_thread.c: fixed return value handling for sanei_wait_pid().
-
-2004-01-12  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Fixed bug # 300444 - Changed OPT_CCT_( desc. string.
-
-2004-01-12  Oliver Rauch <oliver.rauch@rauch-domain.de>
-	* backend/umax backend/Makefile.in: repleaced fork routines by sanei_thread
-	* doc/umax/umax.CHANGES updated
-
-2004-01-12  Matthew Duggan <stauff1@users.sourceforge.net>
-
-	* backend/canon_pp-dev.c backend/canon_pp-io.c backend/canon_pp.c
-	  backend/canon_pp.h: Fix various compile warnings (Bug #300407).
-	  Also fix bug in parsing config file.
-	* doc/descriptions/canon_pp.desc: Bump version number.
-
-2004-01-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/sane-desc.c: When generating HTML anchor names, make sure
-	  they are unique. Bug #300439.
-	* doc/descriptions/qcam.desc doc/descriptions/unsupported.desc:
-	  Fixed some broken links.
-
-2004-01-10  Julien BLACHE <jb@jblache.org>
-	* sanei/sanei_pa4s2.c: libieee1284 support for scsi_pp functions.
-	This is untested but should work.
-
-2004-01-10  Oliver Rauch <oliver.rauch@rauch-domain.de>
-	* doc/umax: corrected links in umax documentations
-
-2004-01-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane-config.man: Only one option can be used at the same
-	  time.
-	* doc/descriptions/unsupported.desc: Added HP Scanjet 4600 and
-	  Quato scanners. Updated Epson 1270.
-
-2004-01-09  Gerhard Jaeger <gerhard@gjaeger.de>
-	* doc/u12/U12.changes: initial checkin.
-	* doc/sane-u12.man doc/sane-plustek.man doc/sane-plustek_pp: added
-	  ENVIRONMENT information and did some minor updates.
-	* descriptions/plustek_pp.desc descriptions/u12.desc: status updates.
-	* po/sane-backends.de.po: fixed wrong translation.
-	* doc/plustek/Plustek-USB.changes: update.
-	* doc/plustek/Plustek-PARPORT-TODO.txt: update.
-	* doc/Makefile.in: added u12 subdirectory.
-	* backend/plustek.[ch] backend/plustek-usb*.[ch]: copyright updates
-	  and some changes concerning the CanoScan lamp calibration.
-	* backend/u12.[ch] backend/u12-*.[ch]: copyright updates.
-	* backend/plustek_pp.[ch] backend/plustek-pp*.[ch]: copyright updates
-	  and minor fixes.
-
-2004-01-08  Oliver Rauch <oliver.rauch@rauch-domain.de>
-	* backend/umax.c: changed order of includes because of compilation error
-
-2004-01-07  Oliver Rauch <oliver.rauch@rauch-domain.de>
-	* backend/umax.c: disabled quality calibration for Astra 2200 SU via USB
-
-2004-01-05  Gerhard Jaeger <gerhard@gjaeger.de>
-	* configure configure.in: added new u12 backend.
-	* AUTHORS: added myself as u12 backend author.
-	* backend/Makefile.in: added new backend u12.
-	* backend/u12.c backend/u12.h backend/u12-scanner.h backend/u12-hwdef.h
-	  backend/u12.conf backend/u12-shading.c backend/u12-tpa.c 
-	  backend/u12-ccd.c backend/u12-hw.c backend/u12-if.c backend/u12-image.c
-	  backend/u12-io.c backend/u12-map.c backend/u12-motor.c:
-	  initial checkin.
-	* backend/dll.conf: added u12 backend.
-	* doc/sane-u12.man: initial checkin.
-	* doc/sane.man doc/Makefile.in: added man-page for u12 backend.
-	* doc/descriptions/u12.desc: added descitpion for u12 backend.
-	* doc/descriptions/unsupported.desc: removed Plustek OpticPro U12, UT12,
-	  1212U, Genius Colorpage Vivid III, as they should be supported now.
-
-2004-01-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
-	  backend/gt68xx_gt6801.c doc/sane-gt68xx.man
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES: Fixed a
-	  bug in the stop scan function for Plustek U16b. Added support
-	  for Genius Vivid4xe.
-	* doc/descriptions/unsupported.desc: Added Visioneer 8820 and TCE S450.
-	
-2003-12-31  Henning Meier-Geinitz <henning@meier-geinitz.de>
-	
-	* doc/descriptions/unsupported.desc: Added HP and Epson scanners.
-
-2003-12-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/check-usb-chip.c: Added test for Genesys Logic GL841.
-
-2003-12-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Updated/added several Medion
-	  scanners.
-	* backend/as6e.c backend/coolscan.c backend/dll.c backend/ibm.c
-	  backend/microtek2.c backend/mustek_scsi_pp.c
-	  backend/mustek_usb_high.c backend/mustek_usb_low.c
-	  backend/mustek_usb_mid.c backend/nec.c backend/net.c
-	  backend/qcam.c backend/ricoh-scsi.c backend/s9036.c
-	  backend/sp15c-scsi.h backend/sp15c.c backend/sp15c.h
-	  backend/st400.c backend/tamarack.c backend/tamarack.h
-	  sanei/sanei_scsi.c tools/check-usb-chip.c: Silenced some
-	  compilation warnings.
-
-2003-12-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README.darwin: Mentioned libusb problems. Updated fork section.
-
-2003-12-25  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/niash.desc: Added information that
-	  this backend will be included soon. Fixed "Snapscan" to
-	  "SnapScan" (bug #300394).
-	* backend/mustek_scsi_pp.c backend/mustek_scsi_pp.h
-	  backend/Makefile.in  backend/mustek.c
-	  backend/mustek.conf backend/mustek.h doc/sane-mustek.man
-	  doc/sane.man doc/descriptions/mustek.desc
-	  include/sane/sanei_pa4s2.h sanei/sanei_pa4s2.c: Added support
-	  for Mustek Paragon 600 II EP (SCSI-over-parallel port). This is
-	  based on a patch from James Perry. Support for libiee1284 is
-	  missing until now. Closes bug #300143.
-	* AUTHORS: Added James Perry.
-	* doc/descriptions/unsupported.desc: Removed Mustek Paragon 600 II
-	  EP/ED. Added Genius Colorpage-EP.
-	* README: Updated concerning libieee1284.
-
-2003-12-23  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added more information about
-	  the Benq Scanprisa 640P, Boder SmartSCan Office, and Trust
-	  CombiScan 19200.
-
-2003-12-22  Gerard Klaver <gerard at gkall dot hobby dot nl>
-
-	* tools/check-usb-chip.c: Added patch for test ICM532B.
-
-2003-12-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/test.c doc/descriptions/test.desc: Fixed initial value
-	  for --fixed-constraint-range (bug #300388).
-	* include/sane/sanei_usb.h: Include stdlib.h for size_t.
-	* sanei/sanei_constrain_value.c: Fixed overflow (bug #300389).
-	* acinclude.m4 aclocal.m4 configure configure.in backend/v4l.c
-	  backend/v4l.h doc/descriptions/v4l.desc: Don't include
-	  linux/videodev.h kernel header anymore. Use own defines
-	  instead. Fixes bug #300324.
-
-2003-12-18  Gerhard Jaeger <gerhard@gjaeger.de>
-	* doc/sane-plustek.man: new version, minor fixes
-	* doc/descriptions/plustek.desc: new backend version
-	* backend/plustek-pp*: cleanup work
-	* backend/plustek-usb*: new version 0.47, added support for model overide
-	  when one manufacturer uses the same model-id for various devices.
-
-2003-12-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Canon 3200F.
-	* backend/gt68xx_gt6801.h: Made internal function static.
-	
-2003-12-15  Oliver Schirrmeister <oschirr@abm.de>
-	* backends/fujitsu.[hc]: Bugfix: The options pagewidth and
-	  pageheight were disabled for the fi4530
-         
-2003-12-15  Eugene Weiss <eweiss@sbcglobal.net>
-	*  backend/as6e.c:  fixed bugs 300123 and 300133.
-
-2003-12-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added some scanners.
-	* doc/sane-mustek_pp_ccd.man: Removed (now again in mustek_pp backend).
-
-2003-12-15  Oliver Schirrmeister <oschirr@abm.de>
-	* backends/fujitsu.[hc]:
-         - Bugfix: set default threshold range to 0..255 There is a problem
-           with the M3093 when you are not allows to set the threshold to 0.
-         - Bugfix: set the allowable x- and y-DPI values from VPD. Scanning
-           with x=100 and y=100 dpi with an fi4120 resulted in an image
-           with 100,75 dpi.
-         - Bugfix: Set the default value of gamma to 0x80 for all scanners
-           that don't have build in gamma patterns.
-         - Bugfix: fi-4530 and fi-4210 don't support standard paper size
-           spezification. Disabled this option for these scanners.
-
-2003-12-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* AUTHORS: Eugene S. Weiss has CVS write access now.
-	* doc/descriptions/unsupported.desc: Added and updated some
-	  scanners. 
-	* tools/sane-find-scanner.c: Actually use the number of the alt
-	  setting when printing descriptors. Fixes bug #300383 found by
-	  Gerard Klaver.
-	* backend/gt68xx.c backend/gt68xx_devices.c doc/sane-gt68xx.man
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES:
-	  Updated code for Genius Vivid 4x and Mustek ScanExpress A3 USB.
-	  Added Genius Colorpage Vivid3 V2 and Googlegear 2000 as
-	  supported devices.
-	* backend/artec.c: Check for NULL before accessing a pointer. This
-	  may fix a segmentation fault mentioned in bug #300339. Also a
-	  compilation warning was fixed.
-
-2003-12-13  Julien BLACHE <jb@jblache.org>
-	* fronted/saned.c: use strcasecmp() instead of strcmp() when
-	matching IPv6 addresses.
-
-2003-12-12  Michael Herder  <crapsite at gmx.net>
-	* backend/artec_eplus48u.c  backend/artec_eplus48u.h
-	  backend/artec_eplus48u.conf: added experimental
-	  support for the Artec E+ Pro
-	  fixed sane-Bugs-300261 (doesn't compile when
-	  NDEBUG is defined)
-
-2003-12-09  Allan Noah <anoah at pfeiffer dot edu>
-	* doc/desc/{fujitsu|ma1509}.desc: move fujitsu fi-4110eox2 section
-
-2003-12-09  Allan Noah <anoah at pfeiffer dot edu>
-	* backend/fujitsu.c: count USB packets to prevent timeouts, perhaps
-          due to DATA0/1 toggle problems in certain scanners
-
-2003-12-07  Peter Fales <peter@fales-lorenz.net>
-	* acinclude.m4, aclocal.m4, configure:  remove "enabling GPHOTO2"
-	  messages printed by configure
-
-2003-12-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added some scanners.
-
-2003-12-06  Peter Fales <peter@fales-lorenz.net>
-	* acinclude.m4, aclocal.m4, configure:  gphoto2 backend is now 
-	  enabled by default if gphoto2-config is found.   Use
-	  "--with-gphoto2=no" to disable it.
-
-2003-12-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in include/sane/config.h.in
-	  sanei/sanei_scsi.c: sanei_scsi.c should now compile with the new
-	  and old SCSI API of MacOS X. Patch from Mattias Ellert
-	  <mattias.ellert@tsl.uu.se>.
-	* doc/descriptions/unsupported.desc: Added several scanners.
-	* AUTHORS:  Matthew Marjanovic and Marian Eichholz both have CVS
-	  access now.
-	* sanei/sanei_usb.c: Check for /dev/uscanner* for NetBSD and
-	  OpenBSD. Patch from bug tracker #300373.
-
-2003-12-01  Nathan Rutman <nthn1@yahoo.com>
-
-	* backend/canon630u.c: Change default scan size to full platen,
-	  removed compiler warnings, made HMG's fix for bug #300257
-	  permament.
-	* doc/sane-canon630u.man: cleanup
-	
-2003-12-01  Jochen Eisinger <jochen@penguin-breeder.org>
-
-	* backend/mustek_pp_ccd300.c: Fixed horizontal offset of scan area
-	  and scaling for color scans
-	
-2003-11-27  Karl Heinz Kremer <khk@khk.net>
-	
-	* doc/descriptions/epson.desc: Changed status for CX3200 and
-	  CX5200 from untested to good
-
-2003-11-28  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c: Download gamma table twice for
-	  Epson Perfection 1670
-
-2003-11-27  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek.changes: moved to Plustek-USB.changes
-	* doc/plustek/Plustek-PARPORT.changes: added
-	* doc/plustek/Plustek-USB.txt doc/sane-plustek.man
-	  doc/sane-plustek_pp.man: Update
-
-2003-11-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Epson CX6400. Removed
-	  Packard Bell Diamond 1200. Updated HP ScanJet 8200.
-	* Makefile.in doc/descriptions/releases.txt: Generate md5 hash
-	  when making the a release.
-
-2003-11-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* AUTHORS: Michael Herder has CVS access now.
-	* doc/descriptions/unsupported.desc: Added Biolux 654. Updated HP
-	  Photosmart entries. Removed Mustek BearPaw 2448 TA Plus (now
-	  listed by gt68xx.desc).
-
-2003-11-23  Jochen Eisinger <jochen@penguin-breeder.org>
-
-	* backend/mustek_pp_ccd300.c: forgot parameters to wait_bank_change
-	* include/sane/sanei_pa4s2.h: fixed function prototype
-
-2003-11-23  Jochen Eisinger <jochen@penguin-breeder.org>
-
-	* doc/descriptions/mustek_pp.desc: changed :beta to :good
-
-2003-11-23  Jochen Eisinger <jochen@penguin-breeder.org>
-
-	* backend/mustek_pp.c, sanei/sanei_pa4s2.c: added support for auto 
-	  probing of the port
-	* configure{.in}, backend/mustek_pp_ccd.*, backend/Makefile.in,
-	  backend/dll.conf, doc/sane-mustek_pp_ccd.man, doc/sane.man, 
-	  doc/Makefile.in, doc/descriptions/mustek_pp_ccd.desc: mustek_pp_ccd 
-	  backend removed
-	* backend/mustek_pp.conf, mustek_pp_ccd300.[ch], 
-	  doc/sane-mustek_pp.man, doc/descriptions/mustek_pp.desc: fixed CCD
-	  support for mustek_pp backend
-	* backend/mustek_pp_null.c: beautified debug scanner name
-
-2003-11-23  René Rebe <rene@rocklinux.org>
-
-	* backend/avision.c backend/avision.h: the current development state,
-          including cleanups, code refactoring and nearly complete HP
-          53xx/75xx ADF support
-
-2003-11-23  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Warnings enabled again. Added -cvs to
-	  version.
-	* doc/releases.txt: Updated information about diffs.
-	* doc/descriptions/unsupported.desc: Added HP and Mustek scanners.
-	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
-	  backend/gt68xx_gt6801.c backend/gt68xx_gt6801.h backend/gt68xx_low.c
-	  backend/gt68xx_low.h doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES: Added Mustek BearPaw 2448 TA
-	  Plus. Added special command set for Plustek U16B. Added
-	  Plug-n-Scan 2400 M(T) to list of devices. No positive report yet.
-          Used request for memory writes and reads instead of a fixed
-	  value of 0x04. Set Genius Vivid4x to GT6816. Untested. All
-	  changes have not been	tested on their respective scanners yet.
-	  New version: 1.0.50.
-
-Older entries can be found in ChangeLog-1.0.13.
diff --git a/ChangeLog-1.0.15 b/ChangeLog-1.0.15
deleted file mode 100644
index 6c2c351..0000000
--- a/ChangeLog-1.0.15
+++ /dev/null
@@ -1,1027 +0,0 @@
-******  Release of sane-backends 1.0.15. End of code freeze ******
-
-2004-11-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/brother.desc: One more report about a
-	  working scanner. Added link.
-	* doc/descriptions/unsupported.desc: Added some scanners.
-	* configure configure.in: New version: 1.0.15.
-
-2004-11-07  Giuseppe Sacco <eppesuig@debian.org>
-
-	* New italian translation update
-
-2004-11-01  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* doc/descriptions/snapscan.desc: Status update for Epson scanners
-
----- CODE FREEZE FOR SANE 1.0.15 ---
--- snapshot 1.0.15-pre2
-
-2004-10-31  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx_high.h doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES: Removed unused gain and offset
-	  options.
-	* NEWS: Added (planned) release date.
-	* configure configure.in: Disabled compilation warnings.
-
-2004-10-31  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek.c: Additional debug output.
-	* backend/plustek-usbscan.c: Fixed a warning condition.
-
-2004-10-30  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek.c: Bumped release number.
-	* backend/plustek-usbscan.c: Fixed a bug in buffer calculation
-	  for CIS devices.
-	* doc/plustek/Plustek-USB.changes: Update.
-
-2004-10-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc
-	  doc/descriptions-external/hp_rts88xx.desc: Moved HP 35xx
-	  scanners to hp_rts88x backend. Updated status settings and URL
-	  (from johanneshub@foni.net). Updated link to Tamarack 9600 project.
-	* doc/descriptions-external/brother.desc: Seems to work in version
-	  0.0.12 at least for one scanner.
-
-2004-10-27  Ullrich Sigwanz <usigwanz@freesurf.ch>
-
-	* backend/niash_core.c backend/niash.c: moving critical timing
-          for backward movement to niash_core
-          
-2004-10-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc
-	  doc/descriptions-external/genesys.desc: Moved Plustek OpticFilm
-	  7200 to genesys.desc (GL841 chipset). Added UMAX Astra 3400
-	  (0x50 model). Added Xerox WorkCentre M15i.
-
-2004-10-23 Giuseppe Sacco <eppesuig@debian.org>
-
-	* Updated italian translation.
-
-2004-10-21  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* backend/gt68xx.c backend/mustek.c: Remove an extra "in".
-	* po/*.po: Fixing fuzzy translations (and some others).
-
-2004-10-21  Rene Rebe <rene@exactcode.de>
-
-	* backend/avision.h backend/avision.c: update of the scanner ID table,
-	  wait_4_light bugfixes, fixed color packing, fixed 16bit modes
-	  (especially for big-endian systems), avoid 16bit modes for default
-	  modes, fixed gamma-table for some models as well as spelling on the
-	  way
-
-2004-10-20  Rene Rebe <rene@exactcode.de>
-
-	* backend/avision.c doc/descriptions/avision.desc doc/sane-avision.man:
-	  substituted my mail address and web-site to a new one - due to
-	  leaving the rocklinux project
-
-2004-10-19  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek.c: Using now the same strings for gain and offset 
-	  like the umax_pp backend (bug #300962).
-	* doc/plustek/Plustek-USB.changes: Update.
-	* po/*.po: Update due to changes in the Plustek backend.
-	* po/sane-backends.de.po: Fixed gain translation.
-
-2004-10-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/sane-find-scanner.c: When getting string descriptors, ask
-	  for the length of the descriptor first (bug #301001).
-
-2004-10-18  Ullrich Sigwanz <usigwanz@freesurf.ch>
-
-	* backend/niash_core.c: 
-	* backend/niash.c: correcting vertical scanning start 
-	  point for changed max. page height
-
-2004-10-17  Ullrich Sigwanz <usigwanz@freesurf.ch>
-
-	* backend/niash_core.c: using exact number of lines for a scan
-
----- FEATURE FREEZE FOR SANE 1.0.15 ---
--- snapshot 1.0.15-pre1
-
-2004-10-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Olivetti Job-Jet M400.
-
-2004-10-17  Julien Blache <jb@jblache.org>
-	* tools/hotplug/libsane.usermap: Added Epson Perfection 2480.
-
-2004-10-16  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson_usb.c: Added USB ID for Expression 10000XL
-
-2004-10-16  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* ltmain.sh: backport -framework support from libtool 2.0
-	* README.darwin: sane-find-scanner now works for SCSI, so removed
-	  statement that said it didn't. More libusb info, and link to libusb
-	  patch
-
-2004-10-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* frontend/saned.c: Fixed NULL string crash.
-	* README.linux: Added some more details about hotplug and Gentoo
-	  problems.
-	* NEWS: Updated for 1.0.15.
-
-2004-10-17  Ullrich Sigwanz <usigwanz@freesurf.ch>
-
-	* backend/niash_core.c: rewrote buffer portioning
-	* backend/niash_core.c (2): updated debug info 
-	* backend/niash.c: Enabling support of full DIN A4 size
-
-2004-10-16  Oliver Rauch <Oliver.Rauch@Rauch-DOmain.DE>
-
-	* backend/umax.c: added default options for Linotype OPAL2
-
-2004-10-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added various scanners.
-	* po/sane-backends.da.po: Updated Danish translation (from Mogens
-	  Jaeger <mogensjaeger@get2net.dk>). 
-	
-2004-10-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* include/sane/sanei_wire.h sanei/sanei_wire.c: Limit the total
-	  amount of memory used for arrays and pointers while decoding the
-	  wire to 1 MB (bug #300158). Run "make clean" before "make"!
-
-2004-10-14  Ullrich Sigwanz <usigwanz@freesurf.ch>
-
-	* backend/niash.c: removing a non-ANSI conform comma.
-	  adapting the gammma conversion.
-
-2004-10-14  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* sanei/sanei_thread.c: Added missing pthread_detach() so the
-	  thread resources could be reused again.
-
-2004-10-13  Ullrich Sigwanz <usigwanz@freesurf.ch>
-
-	* backend/niash.c: Proper resource handling in sane_cancel.
-
-2004-10-12  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek.c: Fixed warning condition.
-	* backend/plustek-usbhw.c: Cleanup.
-
-2004-10-12 Giuseppe Sacco <eppesuig@debian.org>
-
-	* Updated italian translation.
-	* Added a "translators" section in AUTHORS
-
-2004-10-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* acinclude.m4 config.guess config.sub configure ltmain.sh: Update
-	  to libtool 1.5.10.
-	* doc/descriptions/unsupported.desc: Added link to
-	  Microtek Filmscan 35. 
-	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_high.c
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES:
-	  Fixed typos. Added Packard Bell Diamond 2450 to .conf and
-	  changed status to "good". Avoid error message when closing
-	  scanner. Don't print max_white warning when debugging is not
-	  enabled.
-	* po/sane-backends.bg.po po/sane-backends.cs.po po/sane-backends.da.po
-	  po/sane-backends.de.po po/sane-backends.es.po po/sane-backends.fi.po
-	  po/sane-backends.fr.po po/sane-backends.it.po po/sane-backends.nl.po
-	  po/sane-backends.no.po po/sane-backends.pt.po po/sane-backends.ru.po
-	  po/sane-backends.sv.po: Recreated. Fixed
-	  some fuzzy texts and added some translations to .de.po.
-	* tools/check-usb-chip.c: Workaround for GT6816 detection problem
-	  on BSDs.
-
-2004-10-11  Oliver Schirrmeister (oschirr@abm.de)
-
-	* backend/fujitsu.c: bugfix: 3091 did not work (15.12.2003)
-	  M4099 supported (bw only)
-	  enables brightness 
-
-2004-10-10  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/test.c: Fixed typo.
-	* README.solaris: Added details on building SANE on Solaris/x86
-	  (from Tomasz Orlinski <tomasz.orlinski@wp.pl>).
-
-2004-10-10  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* backend/Makefile.in: fix niash dependencies
-
-2004-10-08  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp.c backend/umax_pp_low.c: 610P shading
-	  calibration improvements. 1220P offset and gain fixes.
-	  Code cleanups.
-
-2004-10-08  Ullrich Sigwanz <usigwanz@freesurf.ch>
-
-	* backend/niash.c: Added grayscale and lineart support
-	* backend/niash_core.c: corrected bug in line-weight in
-	  function _UnScrambleLine
-	* doc/descriptions/niash.desc: changed status to complete
-	  removed the color only comment
-  
-2004-10-06  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek.c backend/u12.c backend/plustek_pp.c: 
-	  Using now the well known MODE definitions.
-	* backend/plustek.h backend/plustek-usb.h: Cleanup.
-	* doc/plustek/Plustek-USB.changes 
-	  doc/plustek/Plustek-Parport.changes doc/u12/U12.changes: 
-	  Update.
-	* po/*.po: Update.
-
-2004-10-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/microtek2.h doc/descriptions/microtek2.desc: New
-	  version: 0.96. Added Genius ColorPage-EP (from Karsten Festag
-	  <karsten.festag@gmx.de>). 
-	* doc/descriptions/unsupported.desc: Added link to artiscan 9600
-	  project. Removed Genius ColorPage-EP.
-	* configure.in include/sane/config.h.in: Removed dangling
-	  quotation mark.
-	* backend/sp15c.c: Don't eject medium twice after each page.
-
-2004-10-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/sane-find-scanner.c: Fixed compilation problem when
-	  compiled without libusb support. Print sane-backends version
-	  number. Print if built without libusb.
-	
-	* backend/microtek2.c backend/microtek2.h: Added backend version
-	  200410042220 from Karsten Festag <karsten.festag@gmx.de>.  While
-	  attaching devices only read attributes from source 0 (=
-	  MD_SOURCE_FLATBED), others give wrong results. Better handling of
-	  different shading depths. Including model ColorPage-EP. Workaround
-	  for firmware bug for V300 (FW < 2.70). Workaround for firmware bug
-	  with odd pixel numbers. Bugfix for lamp switching when using
-	  LightLid35 Transparency Adaptor.
-
-	* tools/check-usb-chip.c: Added test for interface 1 and
-	  altsetting 2 for GT-8911. Unified ouitput. Formatting updates.
-
-2004-10-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane-find-scanner.man tools/check-usb-chip.c
-	  tools/sane-find-scanner.c: sane-find-scanner can now load USB
-	  descriptors from /proc/bus/usb/devices dumps (e.g. from the
-	  unsupported scanner web pages). Minor modifications to some of
-	  the chipset tests.
-	
-2004-10-04  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* backend/hp.h backend/hp.c backend/hp-scl.c:
-	  Fixed bug #300973 (renamed global function hp_init_openfd
-	  to sanei_hp_init_openfd
-
-2004-10-04  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek.c: Fixed bug #300963.
-	* doc/plustek/Plustek-USB.changes: Update.
-	* po/*.po: Update.
-
-2004-10-03  Thomas Soumarmon <thomas.soumarmon@cogitae.net>
-
-	* backend/hp5400_debug.c backend/hp5400_debug.h 
-	  backend/hp5400_internal.c backend/hp5400_sane.c: 
-	  removing more hp5400 compilation warnings
-
-2004-10-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Nikon LS-5000 ED (bug
-	  #300972). 
-	* include/sane/saneopts.h: Added option for turning off the
-	  scanner's lamp on exit (bug #300963).
-	* backend/gt68xx.c backend/gt68xx_high.h: Used new lamp option
-	  from saneopts.h (bug #300963).
-	* backend/net.c doc/descriptions/net.desc: Check for (size_t) -1
-	  doesn't work on 64 bit platforms as size_t is 64 bits there
-	  while the length of a data block is defined as 32 bits in the
-	  SANE network standard (bug #300837).
-	* backend/microtek2.c backend/microtek2.h: Fixed some warnings
-	  (bug #300823). Fixed Microtek Phantom C6 scanning on big endian
-	  platforms. Based on patch from Matijs van Zuijlen in Debian bug
-	  tracking system (#274523).
-	* sanei/sanei_auth.c sanei/sanei_lm983x.c sanei/sanei_wire.c
-	  backend/artec.c backend/artec_eplus48u.c backend/as6e.c
-	  backend/avision.c backend/canon-sane.c backend/canon-scsi.c
-	  backend/canon.c backend/canon630u-common.c backend/dc25.c
-	  backend/epson.c backend/fujitsu.c backend/gt68xx_low.c
-	  backend/hp5400_internal.c backend/hp5400_sanei.c
-	  backend/ma1509.c backend/microtek.c backend/microtek2.c
-	  backend/mustek.c backend/mustek_scsi_pp.c backend/nec.c
-	  backend/net.c backend/pie.c backend/sharp.c
-	  backend/snapscan-scsi.c backend/snapscan-sources.c
-	  backend/snapscan-usb.c backend/snapscan.c backend/teco3.c
-	  backend/test.c backend/umax-usb.c backend/umax1220u-common.c:
-	  64 bit platform fixes (bug #300799).
-	* backend/Makefile.in tools/Makefile.in: Fixed DESTFILES.
-
-2004-10-02  Thomas Soumarmon <thomas.soumarmon@cogitae.net>
-
-	* backend/hp5400_internal.c backend/hp5400_internal.h
-	  backend/hp5400_sanei.c backend/hp5400_sanei.h
-	  backend/hp5400_sane.c: 
-	  removing some compilation warnings
-
-2004-10-02  Thomas Soumarmon <thomas.soumarmon@cogitae.net>
-	
-	* backend/hp5400_internal.c: hp5400 version mathing test
-          has been removed by default.
-          To enable it :
-          CFLAGS="-DSTRING_VERSION_MATCH" ./configure
-
-2004-10-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added several
-	  scanners. Removed Genius Vivid 1200 XE (actually supported by
-	  gt68xx backend).
-	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
-	  doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES: Updates of supported scanners.
-
-2004-10-01  Oliver Rauch <Oliver.Rauch@Rauch-DOmain.DE>
-
-	* backend/umax-scanner.c, umax.conf and umax.desc:
-	  added "LinoHell", "OPAL2 " as supported device
-
-2004-09-28  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* po/sane-backends.sv.po: Updated Swedish translation file
-
-2004-09-27  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* doc/descriptions/unsupported.desc doc/descriptions/snapscan.desc:
-	  Changed entry for Epson 2580 (should work with SnapScan backend).
-
-2004-09-21  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/descriptions/unsupported.desc: fixed Plustek entries.
-
-2004-09-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Compeye Simplex 1236C.
-
-2004-09-14  Karl Heinz Kremer <khk@khk.net>
-	
-	* backend/epson_usb.c: add USB device ID for CX6400 back in
-	* backend/epson.c: disable "feed" command for Perfection 1640 w/ ADF
-
-2004-09-08  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes: Update.
-	* doc/descriptions/unsupported.desc: Added Microtek Scanmaker 5700,
-	  ArtixScan 4000tf and Medion MD41985.
-
-2004-09-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure: Regenerated.
-	* doc/descriptions/unsupported.desc
-	  doc/descriptions-external/genesys.desc: Moved HP 35xx series to
-	  unsupported.desc because these scanners use a RTS8801 chip (no
-	  Genesys chipset).
-	
-2004-09-06  Jochen Eisinger <jochen@penguin-breeder.org>
-
-	* backend/mustek_pp.c: clarify error message
-	* configure.in: only build the mustek_pp backend, if parallel
-	  port support of any kind is present
-
-2004-09-06  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek.c: Bumped build number.
-	* backend/plustek-usbdevs.c: Fixed bug #300913.
-	
-2004-09-05  Julien Blache <jb@jblache.org>
-
-	* More auth_callback() fixes, although they're not critical.
-
->>>>>>> 1.2283
-2004-09-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Lexmark X1130, Dell
-	  1600n. Removed Canon LiDE 35 (now in genesys.desc) and Epson
-	  Perfection 2480 (now in snapscan.desc).
-	* doc/descriptions-external/genesys.desc: Added Canon LiDE 35.
-	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
-	  backend/gt68xx_low.h backend/gt68xx_low.h
-	  backend/gt68xx_shm_channel.c
-	  doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES: Fixed firmware name for Mustek 1248
-	  UB. Changed status to basic. Removed "unsupported" warning.
-	  Added workaround for shared memory compilation problem on
-	  Windows. It's now possible to add a new vendor/product id line
-	  to gt68xx.conf to test yet unsupported scanners without changing
-	  the source code.
-	* frontend/.cvsignore: Added tstbackend.
-	
-2004-09-02  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c backend/snapscan-scsi.c backend/snapscan-options.c
-	  backend/snapscan.h backend/snapscan.conf doc/descriptions/snapscan.desc:
-	  Added support for Epson 2480
-
-2004-09-01  Julien Blache <jb@jblache.org>
-
-	* frontend/saned.c: auth_callback(): arrays are passed as
-	pointers, declaring parameters as arrays of fixed size is
-	useless. memset() the correct length, not sizeof(pointer).
-	Caught while testing splint on the SANE sources.
-
-2004-08-30  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/descriptions/unsupported.desc: Added Canon LiDE35.
-	* sanei/sanei_usb.c: Fixed memory leak.
-
-2004-08-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Epson 2580 and Nikon
-	  LS-50.
-	* doc/descriptions-external/brother.desc: Added more clear comments.
-
-2004-08-28  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp.c:
-          option parsing fix
-	* backend/umax_pp_low.c:
-          minor 1220P calibration fixes
-
-2004-08-25  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* tools/umax_pp.c backend/umax_pp.c backend/umax_pp.conf
-	  backend/umax_pp.h backend/umax_pp_low.c backend/umax_pp_low.h
-	  backend/umax_pp_mid.c backend/umax_pp_mid.h doc/sane-umax_pp.man:
-	  rename 'contrast' to 'offset' and 'highlight' to 'gain'. Translations
-	  will need to be updated. Beginning of 610/1220P codepath merge.
-
-2004-08-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Epson 2480 and Microtek
-	  Filmscan 35.
-
-2004-08-23  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/sane-find-scanner.c: Worked around a cygwin libusb
-	  compatibility problem (patch from Giuseppe Sacco eppesuig
-	  at users.alioth.debian.org).
-
-2004-08-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/gt68xx.desc doc/descriptions/unsupported.desc:
-	  Updated.
-
-2004-08-18  Julien Blache <jb at jblache dot org>
-	* tools/hotplug/libsane.usermap: committed patch from Aurélien
-	Jarno adding USB IDs for Epson Stylus CX6400 (and doing
-	s/EPSON/Epson/ on one entry to maintain consistency).
-
-2004-08-14  Frank Zago  <fzago at austin dot rr dot com>
-
-	* frontend/tstbackend: fixed a couple bugs.
-
-2004-08-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/Makefile.in po/sane-backends.fi.po: Added Finnish translation
-	 (from Harri Järvi <harri.jarvi@ajatus.org>).
-
-2004-08-08  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
-	  doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES tools/hotplug/libsane.usermap:
-	  Added Mustek ScanExpress 1248 UB and new version of Mustek
-	  BearPaw 1200 CU Plus.
-	* doc/descriptions/unsupported.desc: Added Lexmark and Xerox scanners.
-
-2004-08-05  Gerard Klaver <gerard at gkall dot hobby dot nl>
-
-	* backend/teco2.c backend/teco2.h: changed to SANE_VALUE_SCAN_MODE_LINEART, _GRAY, and _COLOR,
-	* backend/teco2.c: changed use of %d to %ld (when bytes values are displayed)
-
-2004-08-04  Julien Blache <jb at jblache dot org>
-	* tools/hotplug/libsane.usermap: added HP ScanJet 5300C.
-
-2004-08-04  Gerard Klaver <gerard at gkall dot hobby dot nl>
-
-	* AUTHORS: corrrection for teco2
-	* doc/descriptions/teco2.desc: url and status change
-	* doc/sane-teco2.man: update info
-	* backend/teco2.c: - added for the VM6575 a WHITE_LEVEL_R, _G an _B
-	  slider opion
-	  -changed for the VM656A and VM6575 and VM6586 the calibration part
-	  (subtract highest and lowest value and then divide).
-	  -default SANE_TECO_CAL_ALGO value is now 1 for the VM3564 and
-	  VM6575.
-	  - preview value is now 75 dpi for the VM6575
-
-2004-08-04  Oliver Rauch <Oliver.Rauch@Rauch-DOmain.DE>
-	* doc/umax/umax.FAQ: corrected bug about dtc3181e scsi controller
-
-2004-08-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* aclocal.m4 configure include/sane/config.h.in: Regenerated to
-	  include updates from niash and resource manager inclusion.
-	* doc/sane.man doc/sane-niash.man: Minor documentation updates.
-	* doc/descriptions-external/niash.desc: Removed (backend now included).
-
-2004-08-03  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* AUTHORS: Added niash backend maintainer and author.
-	* configure.in: Added niash backend.
-	* backend/dll.conf: Added niash backend.
-	* backend/Makefile.in: Added niash backend files and target.
-	* backend/niash.c backend/niash_core.c backend/niash_core.h
-	  backend/niash-xfer.c backend/niash-xfer.h backend/niash-types.h: 
-	  Niash backend files, initial checkin.
-	* doc/sane-niash.man, doc/descriptions/niash.desc, doc/niash/niash.TODO: 
-	  Initial checkin.
-	* doc/Makefile.in: Added niash documentation stuff.
-	* doc/sane-man: Added niash manpage.
-	* po/Makefile.in: Added niash source file.
-	* po/sane-backends.de.po: Updated and completed niash backend translation.
-	* po/sane-backends.*.po: Added niash strings.
-	* backend/plustek.c: Small cleanup.
-
-2004-07-31  Julien Blache <jb at jblache dot org>
-
-	* frontend/scanimage.c: Added the possibility to cleanly stop a
-	batch by pressing Ctrl+D when using --batch-prompt.
-
-2004-07-28  Gerard Klaver <gerard at gkall dot hobby dot nl>
-
-	* doc/descriptions/unsupported.desc: Added Logitech PageScan USB and
-	  Grandtek Scopecam 
-
-2004-07-26  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* sanei/sanei_usb.c sanei/sanei configure configure.in: Added 
-	  resource manager library support.
-	* backend/plustek.[ch] backend/plustek-usbdevs.c backend/plustek-usbhw.c
-	  backend/plustek-usbshading.c backend/plustek.conf: Added speedup 
-	  parameters and TPA autodetection for UMAX3400/3450, added 
-	  disableSpeedup option.
-	* doc/plustek/Plustek-USB-TODO.txt doc/plustek/Plustek-USB.changes
-	  doc/descriptions/plustek.desc: Updated.
-
-2004-07-21  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c backend/umax_pp.c tools/umax_pp.c:
-	  fixed a 610P initialization bug that shown up when changing from color
-	  to grey mode. Changed version numbers.
-
-2004-07-18  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/descriptions/epson.desc: Added CX-5400, RX-500 and RX-600; updated version 
-	* doc/descriptions/unsupported.desc: Removed RX-500
-
-2004-07-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/epkowa.desc: Added Epson Perfection
-	  3170 Photo as it's reported to work with that backend.
-	* doc/descriptions/unsupported.desc: Added some scanners. Removed
-	  Epson Perfection 3170 (now in epkowa).
-
-2004-07-16  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Makefile.module doc/plustek/BUILD 
-	  doc/plustek/VERSION0 doc/plustek/VERSION1: Removed, no longer needed.
-	* doc/plustek/Makefile.kernel2x doc/plustek/MakeModule.sh:
-	  Getting version information now out of the backends main file.
-	* doc/plustek/Plustek_PARPORT.changes: Updated.
-	* doc/descriptions/plustek_pp.desc: Updated.
-	* doc/sane-plustek.man: Fixed typo.
-	* backend/plustek-pp.[ch], backend/plustek-pp_*.[ch]: 
-	  Added DevFS support for kernel 2.6, removed floating point 
-	  operations (Thanx to Rafal Rzepecki), bumped up build number,
-	  cleanup work.
-	* doc/plustek/Plustek_USB.changes: Updated.
-	* backend/plustek.c: Bumped up build number
-	* backend/plustek-usbshading.c: Improved autowarmup, cleanup work.
-	* backend/plustek-usb.h backend/plustek-usbdevs.c 
-	  backend/plustek-usbhw.c backend/plustek-usnscan.c: Improved
-	  fastforward stuff, cleanup work.
-	* sanei/sanei_lm983x.c: Cleanup work.
-
-2004-07-15  Rene Rebe <rene@rocklinux.org>
-
-	* include/sane/sane.h: added extern "C" for compilation with a C++
-	  compiler
-
-2004-07-12  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane-coolscan2.man doc/sane-microtek2.man: Fixed 
-	  manual page problems.
-
-2004-07-10  Gerard Klaver <gerard at gkall dot hobby dot nl>
-
-	* tools/check-usb-chip.c: Added check for the GT-8911.
-
-2004-07-10  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/check-usb-chip.c: Also check the number of interfaces for
-	  the GT-6816 to avoid conflicts with other GT chips.
-
-2004-07-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/brother.desc: New file. Added the
-	  scanners listed on the brother backend page. Used "untested"
-	  status as we don't have confirmation that the backend actually
-	  works.
-	* tools/hotplug/libsane.usermap: Added Mustek ScanExpress 1248UB.
-	* tools/sane-desc.c: XML mode updates (patch from Jose Gato
-	  <jgato@gsyc.escet.urjc.es>).
-	* doc/descriptions/ma1509.desc: Removed dead link.
-
-2004-07-05  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/descriptions/plustek.desc: Changed status of CanoScan D660U.
-	* doc/plustek/Plustek-USB*: Update.
-	* backend/plustek.c: Bumped up build number.
-	* backend/plustek-usb.[ch] backend/plustek-usbdevs.c 
-	  backend/plustek-usbhw.c backend/plustek-usbimg.c 
-	  backend/plustek-usbmap.c backend/plustek-usbscan.c: Added support
-	  for binary scanning for the CanoScan D660U, cleanup work.
-
-2004-07-03  Peter Fales <peter@fales-lorenz.net>
-
-	* acinclude.m4, aclocal.m4, configure, tools/sane-config.in: 
-	  When using pkg-config to get library flags for gphoto2, any
-	  extra flags (such as -L) must be passed to sane-config.in so
-	  that it can find the libraries in a non-standard location.
-	  (Bug #300686)
-
-2004-07-02  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* po/*.po: Updated according to changes in the plustek backend.
-	* backend/plustek.c backend/plustek-usb*: Major update, see
-	  doc/plustek/Plustek-USB.changes.
-	* doc/sane-plustek.man: Update.
-	* doc/plustek/Plustek-USB.changes: Update.
-	* doc/descriptions/plustek.desc: Removed unsupported devices, 
-	  updated some states.
-	* doc/descriptions/plustek_pp.desc: URL update.
-	* doc/descriptions/u12.desc: URL update, changed state of backend.
-	* doc/sane-plustek_pp.man: URL update.
-	* doc/sane-u12.man: URL update.
-
-2004-06-30  Frank Zago  <fzago at austin dot rr dot com>
-
-	* backend/leo.c doc/descriptions/leo.desc: added support for 
-	  Genius FS-1130 Colorpage Scanner.
-
-2004-06-30  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Makefile.kernel26: fixed floating point issues 
-	  for SuSE kernels.
-
-2004-06-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Microtek and Xerox
-	  scanners.
-	* tools/sane-desc.c: Added xml output (patch from 
-	  jose <jgato@lambdaux.com>). Other minor fixes.
-	
-2004-06-28 m. allan noah <anoah at pfeiffer dot edu>
-
-	* backend/fujitsu.c: use model code instead of string compare
-	   submitted by: stan at saticed.me.uk
-
-2004-06-21  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/descriptions/unsupported.desc: removed Compac S4 100 
-	  (supported by the Plustek backend), added various Plustek
-	  devices, changed OpticPro m12 to OpticSlim M12
-
-2004-06-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/microtek2.c: Fixed some (but not all) MIN related
-	  compilation warnings (bug #300823).
-	* tools/sane-find-scanner.c: Look for NetBSD uscanner devices (bug
-	  #300815).
-
-2004-06-22  Rene Rebe <rene@rocklinux.org>
-
-	* backend/avision.c, backend/avision.h, doc/sane-avision.man:
-	  Fixed compilation warning (Bug #300399) and added a force-a3
-	  option, needed for A3 scanner returning bogus scan area definitions
-
-2004-06-21  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* po/*.po: Updated according to upcomming changes in the plustek backend.
-
-2004-06-20  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* aclocal.m4, configure, sane/config.h.in, backend/Makefile.in, 
-	  backend/agfafocus.c, backend/artec_eplus48u.c, backend/avision.c,
-	  backend/coolscan.c, backend/fujitsu.c, backend/pie.c,
-	  backend/plustek.c, backend/plustek_pp.c, backend/sp15c.c,
-	  backend/tamarack.c, backend/u12.c
-	* Fixing bug #300602 for the following backends: agfafocus,
-	  artec_eplus48u, avision, coolscan, fujitsu, pie, plustek,
-	  plustek_pp, sp15c, tamarack and u12
-	* Migrating the avision backend to sanei_threads (bug #300631)
-
-2004-06-19  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* backend/gt68xx.c po/sane-backends.bg.po po/sane-backends.cs.po
-	  po/sane-backends.da.po po/sane-backends.de.po
-	  po/sane-backends.es.po po/sane-backends.fr.po
-	  po/sane-backends.it.po po/sane-backends.nl.po
-	  po/sane-backends.no.po po/sane-backends.pt.po
-	  po/sane-backends.ru.po po/sane-backends.sv.po
-	* Option names should not be tagged for localization
-	* Fixing some typos
-	* New localizable strings from the gt68xx backend (pofiles regenerated)
-	* Swedish translation updated
-
-2004-06-19  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* sanei/sanei_scsi.c, tools/sane-find-scanner.c
-	* SCSI scanners can now be selected by LUN on MacOS X
-	* sane-find-scanner now finds SCSI scanners on MacOS X
-	* making some sanei_scsi internal functions static
-
-2004-05-30  Peter Fales <peter@fales-lorenz.net>
-
-	* acinclude.m4, aclocal.m4, configure.in, configure
-	In addition to using pkg-config to find the gphoto2 library flags,
-	we should check to see whether it's actually possible to link
-	a program using those flags.
-
-2004-06-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/gt68xx/gt68xx.TODO: New file. Lots of bugs and missing
-	  features for the gt68xx backend.
-	* backend/gt68xx.c backend/gt68xx_devices.c backend/gt68xx_generic.c
-	  backend/gt68xx_gt6801.c backend/gt68xx_gt6801.h backend/gt68xx_gt6816.c
-	  backend/gt68xx_high.c backend/gt68xx_high.h backend/gt68xx_low.c
-	  backend/gt68xx_low.h backend/gt68xx_mid.c doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES: Updated to backend version 61. Lots
-	  of fixes for coarse calibration, scanning speed and several
-	  scanners. For details, see gt68xx.CHANGES.
-
-2004-06-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/.cvsignore: Added *.8.
-
-2004-06-17  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c doc/descriptions/umax_pp.desc 
-	  doc/sane-umax_pp.man:
-	  fixed overflows in 610P shading calibration coefficients,
-	  minor man update, 610P status change from minimal to good
-
-2004-06-16  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.h backend/snapscan.c backend/snapscan-usb.c: 
-	  Don't enforce even number of URB packages on 1212u_2 since
-	  it causes problems. See bug #300753.
-
-2004-06-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/snapscan.c: Only use __attribute__ if gcc is used for
-	  compilation. Some other compilers don't know __attribute__ and
-	  therefore can't compile sane-backends without this fix. See
-	  bug #300803.
-
-2004-06-15  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.h backend/umax_pp_low.c backend/umax_pp_mid.c:
-	  610P gray level shading calibration fix. Added timer to let 610P
-	  ASIC to settle down after probing.
-
-2004-06-13  Julien Blache <jb@jblache.org>
-
-	* doc/Makefile.in: saned is in /usr/sbin, its manpage should go to
-	section 8. Fixed everything referring to saned(1) to refer to saned(8).
-
-2004-06-13  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* doc/descriptions/unsupported.desc: Added NEC Petiscan as unsupported
-
-2004-06-13  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/sane_usb.c: Added Perfection 1650 back in that was removed by
-	  mistake and finally removed Perfection 1250. 
-
-2004-06-12  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c tools/umax_pp.c: final fixes for 610P color
-	  scanning, parallel port autodetection for the umax_pp tool.
-
-2004-06-10  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/mustek_usb.desc: Fixed version number.
-
-2004-06-08  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek-pp_misc.c: fixed multiple parport problem for kernel 2.6.x.
-	* backend/plustek_pp.c: bumped up version number.
-	* doc/plustek/BUID: bumped up build number.
-
-2004-06-08  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/RenSaneDlls.cmd: Fixed newlines.
-	* README.netbsd: Mention SCSI buffer size problems and uk/ss files
-	  issue.
-	* backend/mustek.c doc/descriptions/mustek.desc
-	  doc/mustek/mustek.CHANGES: Reduced scan area of Mustek Paragon
-	  1200 A3 Pro. Removed warning message. Increased support level to
-	  complete.
-	* tools/hotplug/libsane.usermap: Added another variant of a
-	  Plustek OpticPro 1248U.
-	* doc/descriptions/unsupported.desc: Added Syscan TravelScan FS-531.
-
-2004-06-06  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson_usb.c: remove product IDs for Perfection 1250 and 1260
-
-2004-06-06  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-usb.c: Don't use shared memory on OS/2 and
-	  when using pthreads.
-
-2004-06-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/hotplug/libsane.usermap: Added Mustek BearPaw 2448 Plus
-	  and Plustek OpticPro U16B.
-
-2004-06-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/README tools/RenSaneDlls.cmd: Added REXX script to convert
-	  backend-DLL-filenames according to 8.3 naming convention
-	  necessary for DLLs on OS/2 (from Franz Bakan).
-
-2004-06-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/net.c doc/sane-net.man doc/saned.man frontend/saned.c:
-	  Changed service name from "sane" to "sane-port". This is the
-	  IANA registered service name for port 6566 (bug #300758).
-
-2004-06-02  Oliver Schirrmeister <oschirr@abm.de>
-
-	* fujitsu.c
-	bugfix: It is possible to read duplex color now.
-
-2004-05-31  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* AUTHORS: Mattias Ellert has CVS write access now.
-
-2004-05-30  Peter Fales <peter@fales-lorenz.net>
-	* acinclude.m4, aclocal.m4, configure.in, configure
-	Use pkg-config rather than gphoto2-config to get gphoto
-	build parameters (bug #300686)
-
-2004-05-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/v4l.c: Used SANE_VALUE_SCAN_MODE_* constants.
-	* doc/descriptions-external/viceo.desc: Mention special kernel patch.
-
-2004-05-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/sp15c.c: Fixed the fix of the sanei_thread fix 
-	 (from Mattias Ellert).
-
-2004-05-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README.hp-ux: Mention trouble with higher optimization levels
-	  (from Ulrich Deiters <ukd@xenon.pc.Uni-Koeln.DE>).
-	* doc/descriptions/unsupported.desc: Added Dell A920, Microtek
-	  1850S and Plustek OpticPro m12. Removed HP,Scanjet 2300 (already
-	  in genesys.desc).
-	* backend/sp15c.c: Fixed sanei_thread fix (bug #300634, by Mattias
-	  Ellert).
-
-2004-05-27  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c backend/snapscan-usb.c: Use shared
-	  memory for urb counters
-
-2004-05-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/dll.c doc/descriptions/dll.desc: Work around 8 char
-	  limit for dynamic loading on OS/2 (patch from Franz Bakan
-	  <fbakan@gmx.net>).
-
-2004-05-24  m. allan noah <anoah at pfeiffer dot edu>
-	* backend/fujitsu.[ch]: apply Mattias Ellert's thread patch
-	                        split packet counter into r and w
-
-2004-05-23  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/check-usb-scanner.c: Detect GL660+GL646 on USB2 also.
-	  Fixed Mustek MA1017 scanner freeze problem.
-	* backend/Makefile.in backend/agfafocus.c backend/agfafocus.h
-	  backend/microtek2.c backend/microtek2.h backend/sp15c.c
-	  backend/sp15c.h backend/tamarack.c backend/tamarack.h:
-	  Use sanei_thread instead of fork() in the unmaintained backends.
-	  Patches from Mattias Ellert (bugs: 300635, 300634, 300633, 300629).
-
-2004-05-21  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* sanei/sanei_pp.c: fixed compilation problem on HP-UX.
-
-2004-05-21  Ulrich Deiters <ukd@xenon.pc.uni-koeln.de>
-
-	* backend/canon.c, canon-sane.c, canon.h: removed an option
-	  (OPT_PAGE) that conflicted with some frontends
-
-2004-05-18  Ulrich Deiters <ukd@xenon.pc.uni-koeln.de>
-
-	* backend/canon.c, canon-sane.c: memory leak and bug fixed
-	  in slide scanner code
-
-2004-05-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added more Canon cartridge
-	  scanners. Updated Visioneer Paperport 3100b.
-
-2004-05-18  Michael Herder <crapmail@nurfuerspam.de>
-
-	* backend/Makefile.in: 
-	  adjusted for use with sanei_thread and artec_eplus48u backend
-	  (thanks Mattias Ellert)
-
-2004-05-16  Oliver Rauch <Oliver.Rauch@Rauch-DOmain.DE>
-
-	* sanei/sanei_config.c: added DIR_SEP=";" and PATH_SEP="\\"
-	  for windows (when windows.h) is available
-
-	* backend/dll.c: added DIR_SEP definitions from sanei_config.c
-	  and replaced relevant ":" by DIR_SEP
-
-2004-05-15  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/BUID: bumped up build number.
-	* doc/plustek/Plustek-PARPORT.changes: update
-	* backend/plustek-pp_misc.c: fixed kernel 2.6 issue.
-	  fixed also Bug #300698.
-
-2004-05-15  Michael Herder <crapmail@nurfuerspam.de>
-
-	* backend/artec_eplus48u.c backend/artec_eplus48u.h: 
-	  applied patch from Mattias Ellert (thanks), which adds support
-	  for sanei_thread
-
-2004-05-15  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c backend/umax_pp.c tools/umax_pp.c: fixed 
-	  origin shift bug for 610P. Added on guard against configuration
-	  that can put several 'port' option in conf file.
-
-2004-05-13  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c backend/umax_pp.c tools/umax_pp.c: fixed 
-	  data lines reordering for 610P
-
-2004-05-12  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sane-backends.lsm: Updated FTP server link to ftp.sane-project.org.
-
-2004-05-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* Makefile.in: Remove autoconf temp files and some japi stuff in
-	  distclean target.
-
-2004-05-10  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c : fixed 300x600 dpi scans, direct
-          hardware access and timing issues for 610P
-
-2004-05-06  Jochen Eisinger <jochen@penguin-breeder.org>
-
-	* tools/hotplug/libusbscanner: latest hotplug doesn't set
-	  DEVICE on 2.6.x kernels. Added a workaround
-
-2004-05-05  Matthew Duggan <stauff1@users.sourceforge.net>
-
-	* include/sane/saneopts.h: Added SANE_VALUE_SCAN_MODE_* strings.
-	* backend/canon_pp.c: Used them.
-
-2004-05-01  Jochen Eisinger <jochen@penguin-breeder.org>
-
-	* tools/hotplug/libsane.usbmap: removed empty lines, latest
-	  hotplug cannot cope with them
-	
-2004-03-15  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c backend/umax_pp_low.h backend/umax_pp_mid.c
-	  backend/umax_pp_mid.h backend/umax_pp.c backend/umax_pp.h 
-	  tools/umax_pp.c:   added support for 610P
-
-2004-05-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Warnings enabled again. Added -cvs to
-	  version.
-	* Makefile.in: Added Changelog-1.0.14 to DISTFILES.
-
-Older entries can be found in ChangeLog-1.0.14.
diff --git a/ChangeLog-1.0.16 b/ChangeLog-1.0.16
deleted file mode 100644
index 95329f4..0000000
--- a/ChangeLog-1.0.16
+++ /dev/null
@@ -1,944 +0,0 @@
-******  Release of sane-backends 1.0.16. End of code freeze ******
-
-2005-08-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: New version 1.0.16.
-
-2005-08-05  St�hane Voltz <stefdev@modulonet.fr>
-
-	* backend/genesys.c: Fixed endianess issue in slope table
-	  generation. Tested ok on x86 architecture.
-
-2005-08-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/sane-backends.da.po: Updated Danish translation (from
-	  Mogens Jaeger <mogensjaeger@get2net.dk).
-
-2005-08-02  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* po/sane-backends.sv.po: Update Swedish translation
-
-2005-08-01  Eddy De Greef <eddy_de_greef at tiscali dot be>
-
-	* doc/sane-mustek_pp.man: updated URL for additional CIS driver info.
-
-2005-07-31  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* NEWS: Updated.
-
----- CODE FREEZE FOR SANE 1.0.16 --- 
-
-2005-07-31  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Disabled compilation warnings.
-
-2005-07-30  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson_usb.c: Applied Olaf Meuwissen's patch to add
-	  new device IDs. 
-
-2005-07-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Xerox Workcentre
-	  470cx. Added link for Canon DR-2080C.
-	* backend/Makefile.in: libsane and documentation is installed
-	  correctly again.
-	* acinclude.m4 configure configure.in: Avoid error messages in
-	  locking test. Make sure that io/cam/cam.h header file will be
-	  detected correctly. 
-
-2005-07-29  Gerard Klaver <gerard at gkall dot hobby dot nl>
-
-	* doc/sane-teco2.man: text update
-	  doc/descriptions/teco2.desc: update status VM3564
-	  doc/teco/teco2.txt: text added
-	  backend/teco2.c: removed teco_request_sens command for VM3564 (bug)
-	  backend/teco2.h: text update
-
-2005-07-29  Julien Blache <jb@jblache.org>
-	* tools/hotplug/libsane.usermap: Added various Epson IDs from Olaf
-	Meeuwissen; reodered some misplaced Epson entries.
-
-2005-07-29  Julien Blache <jb@jblache.org>
-	* tools/hotplug/libsane.usermap: Added Visioneer OneTouch 7300
-	(0x0444,0x0211), from Derek J Frye.
-
-2005-07-25  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/descriptions-external/epkowa.desc: Updated according to
-	  the info provided by  Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>
-
-2005-07-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/brother2.desc: Brother DCP 7025 is
-	  reported to work (bug #301960).
-	* doc/descriptions-external/hp_rts88xx.desc: Moved unsupported
-	  devices to unsupported.desc.
-	* doc/descriptions-external/hp3770.desc
-	  doc/descriptions-external/hp8200.desc: Added external hp3770 and
-	  hp8200 backends.
-	* doc/descriptions/unsupported.desc: Added unsupported scanners
-	  from hp_rts88xx.desc. Removed HP ScanJet 3770 (now in hp3770
-	  backend). Added Lexmark X75 PrinTrio.
-	
-2005-07-22  Giuseppe Sacco <eppesuig@debian.org>
-
-	* italian translation update
-
-2005-07-22  Julien Blache <jb@jblache.org>
-	* tools/hotplug/libsane.usermap: Added HP ScanJet 7400C (0x03f0,
-	0x0801), from Thomas Nadolny.
-
-2005-07-21  Gerhard Jaeger <gerhard@gjaeger.de> 
-
-	* doc/plustek/Plustek-USB.changes: Update.
-	* backend/plustek.c: Bumped build number.
-	* backend/plustek-usbcal.c: Fixed lampsettings for CIS devices.
-
-2005-07-15  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-options.c: Change TPO range for Epson 2480/2580 to 
-	  55x80mm^2 which is the working range for the 2580. Reenabled 
-	  2400 DPI for 2480/2580.
-
-2005-07-15  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-mutex.c backend/snapscan-usb.c: Changes to support 
-	  SANE on ZETA.
-	* backend/snapscan-scsi.c: Fix compiler warnings.
-
----- FEATURE FREEZE FOR SANE 1.0.16 ---
-
-2005-07-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* Makefile.in backend/Makefile.in tools/Makefile.in: Make sure
-	  that all the necessary files will be in the distribution .tar.gz
-	  file.
-	* sanei/sanei_scsi.c: Removed "const" to make gcc on OS/2 happy.
-	* NEWS: Updated.
-
-2005-07-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/sp15c.c: Better 4->8 bit depth expansion algorithm (from 
-	  Mattias Ellert <mattias.ellert@tsl.uu.se>).
-	* sanei/sanei_usb.c: Fixed comment (we still use 30 seconds USB
-	  timeout by default).
-	* README.zeta configure configure.in Makefile.in backend/Makefile.in
-	  backend/artec_eplus48u.h backend/dll.c backend/plustek-pp_scan.h
-	  doc/Makefile.in frontend/saned.c include/sane/config.h.in
-	  po/Makefile.in sanei/sanei_config.c sanei/sanei_config2.c
-	  sanei/sanei_init_debug.c sanei/sanei_pio.c sanei/sanei_thread.c
-	  sanei/sanei_usb.c: Changes to support SANE on ZETA. Not all
-	  patches have been applied yet, but it's a start. The backends
-	  are not installed as shared libs but as add-ons, which are shared libs
-	  but in a specific folder in [/system|~]/config/add-ons/ named SANE/.
-	  The install target has been changed to account for this,
-	  Some files don't exist in BeOS/ZETA (ipc.h, ...).
-	  Backend function names get a prefix, I suppose to avoid namespace clashes.
-	  Though we do have a libdl to implement dl_open, the native way is prefered.
-	  Added a --with-docdir= configure arg.
-	  BeOS has a broken get[name|addr]info() from bind. This is fixed in ZETA R1.
-	  libtool needs -no-undefined. Various VPATH fixes.
-	  Check for <be/drivers/USB_scanner.h>, but not used yet.
-	  No S_IFSOCK (sockets are fds to /dev/net/api). Stub pio code, untested.
-	  Patch from Fran�is Revol <revol@free.fr>.
-
-2005-07-15  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* doc/descriptions/snapscan.desc:
-	  updated comments for Epson 1670, 2480 and 2580
-
-2005-07-15  Rene Rebe <rene@exactcode.de>
-
-	* backend/avision.h, backend/avision.c, doc/sane-avision.man,
-	  doc/descriptions/avision.desc: updated the Avision backend with the
-	  latest off-site maintained version: fixed segmentation faults for
-	  some modes, many many new devices, two different duplex modes
-	  are supported, vast speedup of multi page batch scans, buttons as well
-	  a 7-segment LED readout and some quirks for old scanners not filling
-	  all fields
-
-2005-07-15  Rene Rebe <rene@exactcode.de>
-
-	* include/sane/sanei_usb.h sanei/sanei_usb.c: Added support to set
-	  the USB timeout.
-
-2005-07-10  Henning Meier-Geinitz <henning@meier-geinitz.de>
-	
-	* backend/gt68xx.c backend/gt68xx_devices.c
-	  backend/gt68xx_generic.c backend/gt68xx_high.c
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES
-	  doc/gt68xx/gt68xx.TODO: Changed resolution from 75 to 100 dpi
-	  and changed 16 bit/color to 12 based on a user report for the
-	  Visioneer OneTouch 7300. Updated .desc. Moved check for stable
-	  lamp to its own function. Mustek ScanExpress A3 USB: Use CIS
-	  calibration. Use lamp warmup. Fixed CCD on GT6801 scanning (color
-	  scanning was broken due to a change in motormode_2. 
-
-2005-07-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/Makefile.in po/sane-backends.bg.po po/sane-backends.cs.po
-	  po/sane-backends.da.po po/sane-backends.de.po
-	  po/sane-backends.es.po po/sane-backends.fi.po
-	  po/sane-backends.fr.po po/sane-backends.it.po
-	  po/sane-backends.nl.po po/sane-backends.no.po
-	  po/sane-backends.pl.po po/sane-backends.pt.po
-	  po/sane-backends.ru.po po/sane-backends.sv.po: Updated Danish
-	  translation (from Mogens Jaeger <mogensjaeger@get2net.dk>). Made
-	  sure that no errors occur because xgettext/xmsgfmt think that
-	  "%" is a C format string. Regenerated all po files. 
-
-	* configure configure.in include/sane/config.h.in: Make sure that
-	  getopt is not built on OS/2 (from Franz Bakan <fbakan@gmx.net>).
-
-2005-07-07  Frank Zago
-
-	* AUTHORS backend/leo.c backend/leo.h backend/matsushita.c
-	  backend/matsushita.h backend/sceptre.c backend/sceptre.h
-	  backend/teco1.c backend/teco1.h backend/teco2.c backend/teco2.h
-	  backend/teco3.c backend/teco3.h frontend/tstbackend.c: new
-	  email address.
-	
-2005-07-07  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes: Update.
-	* backend/plustek.c: Fixed scanarea calculation.
-	* backend/plustek-usbshading.c: Fixed fine-white calibration.
-
-2005-07-05  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/descriptions-external/epkowa.desc: Updated according to
-	  the info provided by  Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>
-
-2005-07-04  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes: Update.
-	* backend/plustek.[ch] backend/plustek-usbscan.c 
-	  backend/plustek-usbshading.c backend/plustek-usbdevs.c
-	  backend/plustek-usbdevs.c backend/plustek-usbimg.c
-	  backend/plustek-usbmap.c backend/plustek-usbhw.c
-	  backend/plustek-usbcal.c backend/plustek-usb.[ch]:
-	  Added button support, did some cleanup, added IPC between
-	  reader- and parent-process.
-
-2005-07-04  ULrich Deiters <ulrich.deiters@uni-koeln.de>
-
-	* inserted a definition for SSIZE_MAX in backend/canon.h
-
-2005-07-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/sm3600.c: Don't check the result of
-	  usb_find_busses(). Based on patch from Julien BLACHE
-	  <jb@jblache.org>. 
-	* doc/descriptions/genesys.desc: Used
-	  "Medion/Lifetec/Tevion/Cytron" as manufacturer as in the other
-	  backends. Used "ScanJet 2300C" as model name as in other
-	  backends.
-	* doc/descriptions/unsupported.desc: Added links to scanners with
-	  GL646 and GL841 chipsets. Moved all unsupported scanners from
-	  doc/descriptions-external/genesys.desc to unsupported.desc. Minor
-	  fixes for other scanners.
-	* doc/descriptions-external/genesys.desc: Removed. Scanners have
-	  been moved to doc/descriptions/genesys.desc and
-	  doc/descriptions/unsupported.desc.
-	* doc/sane-genesys.man: Typo/formatting fixes.
-	* NEWS: Updated for sane-backends 1.0.16.
-
-2005-07-01  Ulrich Deiters <ulrich.deiters@uni-koeln.de>
-
-	* restored the actual version of the Canon-SCSI backend
-	  (backend/canon.c, canon-sane.c canon-scsi.c canon.h)
-
-2005-06-30  St�hane Voltz <stefdev@modulonet.fr>
-
-	* configure.in AUTHORS backend/dll.conf doc/sane.man doc/Makefile.in 
-	  po/Makefile.in : Fixed forgotten modifications when adding the
-	  genesys backend
-
-2005-06-30  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* tools/RenSaneDlls.cmd backend/dll.c: Fixed OS/2 restriction for 
-	  dlopening DLLs on OS/2, as it only works for 7.3 filenames for 
-	  some reason (patches by Franz Bakan <fbakan@gmx.net>.
-
-2005-06-27  St�hane Voltz <stefdev@modulonet.fr>
-
-	* configure doc/sane-genesys.man doc/sane-genesys.man doc/Makefile.in
-	  doc/descriptions/genesys.desc doc/descriptions/unsupported.desc
-	  backend/genesys_low.h backend/genesys_devices.c
-	  backend/genesys_gl841.c backend/genesys_gl646.c backend/genesys.h
-	  backend/genesys.conf backend/genesys.c backend/Makefile.in
-
-2005-06-27  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek.c: Fixed "double free" problem in sane_exit.
-	* doc/plustek/Plustek-USB.changes: Update.
-
-2005-06-26  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* po/sane-backends.sv.po: Update Swedish translation
-	* tools/Makefile.in: link sane-desc to $(LIBLIB)
-
-2005-06-12  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Removed Samsung SCX-4216F
-	  (supported by samsung backend). Dell 1600n has also network
-	  connection. 
-	* doc/descriptions-external/brother.desc: Removed misleading
-	  comment. 
-	* doc/descriptions-external/samsung.desc: Added several models,
-	  updated others.
-	* doc/descriptions.txt: Added "Ethernet" to list of possible
-	  interfaces. 
-	
-2005-06-12  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Canon CanoScan LiDE
-	  500F.
-	
-2005-06-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Genius ColorPage-SF600.
-	* doc/descriptions-external/brother2.desc: New. Listed scanners
-	  supported by the new external brother2 backend.
-	* doc/descriptions-external/brother.desc: Fixed comments.
-
-2005-05-30  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/descriptions/epson.desc: Added CX-4600
-
-2005-05-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/samsung.desc: Status of Samsung
-	  SCX-4100 is "good" asit's reported to work.
-	* doc/sane-usb.man doc/sane.man: Updated, mostly concerning kernel
-	  scanner driver (deprecated). Minor fixes.
-	* backend/gt68xx.c backend/gt68xx_devices.c backend/gt68xx_high.c
-	  backend/gt68xx_low.h doc/sane-gt68xx.man
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES
-	  doc/gt68xx/gt68xx.TODO:
-	  Start exposure with the settings from the scanner entry. CIS
-	  Calibration and exposure uses a broader spectrum now. Expsoure
-	  limit is increased to 50 loops. Genius Vivid 4x is reported to
-	  work so the UNTESTED label is removed now. Visioneer 7300 is
-	  reported to work so the UNTESTED label is removed now. Genius
-	  ColorPage Vivid 1200XE: Removed UNTESTED label. Fixed
-	  resolutions. Adjusted margins. Fixed color order. Fixed
-	  linedistance. Adjusted AFE. Mustek ScanExpress 1248 UB: Fixed
-	  margins. Adjusted AFE. Adjusted exposure. Adjusted
-	  gamma. Changed status to "complete". Mustek BearPaw 2400 CU
-	  Plus: Adsusted exposure and AFE parameters. Hopefully stripes
-	  and similar trouble are gone now. Mustek BearPaw 1200 CU:
-	  Increased exposure to avoid vertical lines. Updated manual page.
-
-2005-05-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Avision DS310F. Added link
-	  for the UMAX Astra 4000. Fixed missing link for Genius
-	  ColorPage-Slim 1200 USB2.
-	
-2005-05-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/net.tex doc/sane.tex: Mention RPC codes explicitely and
-	  explain what request and reply means. based on patch from
-	  Johannes Berg <johannes@sipsolutions.net>. 
-
-2005-05-25  Jochen Eisinger <jochen@penguin-breeder.org>
-
-	* doc/descriptions/mustek_pp.desc: added scanner
-
-2005-05-23  Julien Blache <jb@jblache.org>
-	* doc/sane-find-scanner.man, doc/gamma4scanimage.man: spelling
-	  fixes from A Costa.
-
-2005-05-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Konica Minolta Dimage
-	  5400 2. Fixed bus type for Mustek 800 II EP.
-	* doc/descriptions-external/genesys.desc: Changed status of Medion
-	  MD 6471 to "basic".
-
-2005-05-22  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-options.c:
-	  Disabled 2400 DPI for Epson 2480 due to user report of
-	  broken scanner
-
-2005-05-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx_devices.c
-	  backend/gt68xx_generic.c backend/gt68xx_generic.h
-	  backend/gt68xx_gt6801.c backend/gt68xx_gt6801.h
-	  backend/gt68xx_gt6816.c backend/gt68xx_gt6816.h
-	  backend/gt68xx_high.c backend/gt68xx_high.h backend/gt68xx_low.c
-	  backend/gt68xx_low.h backend/gt68xx_mid.c
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES
-	  doc/gt68xx/gt68xx.TODO:
-	  Mustek BearPaw 1200 CU Plus model 0x21b works now. Fixed
-	  firmware and offset settings. Calibration is not completely ok
-	  yet, however.  Code cleanup for setup_scan (only one function
-	  for all chipsets).  Simplified line mode/pixel mode setting 
-	  Updated TODO.  Mustek BearPaw 2448 TA Plus is now only
-	  "basic". Too much trouble for "good".  Removed option "fast
-	  preview". By default for preview mode 8 bits/pixel are used.  
-	  Fixed indentation.  Full scan really scans from y=0 on gt6816
-	  scanners now.
-	* po/sane-backends.bg.po po/sane-backends.cs.po
-	  po/sane-backends.da.po po/sane-backends.de.po
-	  po/sane-backends.es.po po/sane-backends.fi.po
-	  po/sane-backends.fr.po po/sane-backends.it.po
-	  po/sane-backends.nl.po po/sane-backends.no.po
-	  po/sane-backends.pl.po po/sane-backends.pt.po
-	  po/sane-backends.ru.po po/sane-backends.sv.po: Regenerated
-	  translation files. Updated German translation.
-
-2005-05-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/backend-writing.txt: Minor updates and line-wrap fixes.
-	* doc/descriptions/unsupported.desc: Added Kodak i30 and Minolta
-	  Dual Scan IV. Updated link to Konica Minolta website.
-
-2005-05-15  frank  <sane at zago net>
-
-	* tools/Makefile.in: remove superflous libraries for sane-desc 
-	* doc/descriptions/matsushita.desc: changed some scanner status from
-	  good to minimal
-	* doc/descriptions/unsupported.desc: added a few Panasonic scanners.
-
-2005-05-13  Julien Blache <jb@jblache.org>
-	* tools/hotplug/libsane.usermap: Added Epson Stylus RX620
-	  (04b8/0811). From Mike Talbot.
-
-2005-05-11  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek-pp_misc.c: Applied patch (see bug #301605).
-	* doc/plustek/Plustek-PARPORT.changes: Update.
-	* backend/plustek-pp.c: Bumped build number.
-
-2005-05-10  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* sanei/sanei_access.c: Added PATH_MAX, in case it's not defined 
-	  by any header (i.e. OS/2).
-
-2005-05-07  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* README.darwin: updated the section about libusb, since all known
-	  bugs have now been fixed in the libusb CVS.
-
-2005-05-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx_devices.c
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES
-	  doc/gt68xx/gt68xx.TODO: Plustek OpticSlim 2400: Fixed list of
-	  resolutions. That fixed the preview. Removed "untested"
-	  warning. Adjusted scan area.  Updated gt68xx.TODO.  Find firmwares
-	  independent of capitalization (bug #301580).
-
-2005-05-07 Julien Blache <jb@jblache.org>
-
-	* tools/hotplug/libsane.usermap: Added Microtek ScanMaker 3700
-	  (05da/40cb). From Ian Beckwith.
-
-2005-05-06 Gerard Klaver <gerard at gkall dot hobby dot nl>
-
-	* backend/qcam.c -indent -gnu, bugreport 300128 free (devlist) added,
-	  DEBUG output added and some small fixes.
-	
-2005-05-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Dell 922.
-	* backend/mustek.c backend/mustek.h doc/descriptions/mustek.desc
-	  doc/mustek/mustek.CHANGES: Added options to set the time after
-	  which the lamp of the A3 Pro is shut off and to shut it off
-	  immediately.
-	
-2005-05-02  Peter Fales  <peter@fales-lorenz.net>
-
-	* backend/gphoto2.c: Fix core dump when no port is specified in 
-	  the gphoto2 config  file.  (bug #301552)
-
-2005-04-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/sp15c.desc: Added ScanPartner 600C (bug
-	  #301528). 
-	* doc/descriptions/unsupported.desc: Removed several Brother
-	  scanner which are supported by the brother backend now.
-	* doc/descriptions-external/brother.desc: Fixed link.
-
-2005-04-28  Julien Blache <jb@jblache.org>
-
-	* backend/v4l.c: duplicate capability.name in attach() so that
-	  each device is listed with its actual name, not with the name of
-	  the last discovered device. Reported by Andreas Hartmann.
-
-2005-04-28  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* frontend/scanimage.c: Added missing braces
-
-2005-04-27  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/descriptions/plustek.desc: Added UMAX Astranet ia101.
-
-2005-04-26  Julien Blache <jb@jblache.org>
-
-	* tools/hotplug/libsane.usermap: Added Epson Stylus CX3650
-	  (04b8/080e), from Daniel Sobe.
-
-2005-04-25  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* include/sane/sanei_pp.h, sanei/sanei_pp.c: Added outb_eppdata
-	  functionality (thanks to Anderson Lizardo).
-	* backend/plustek-pp_procs.h, backend/plustek-pp_io.c,
-	  backend/plustek-pp_misc.c: Fixed compilation problem for kernel
-	  module with gcc-3.4 compiler.
-	* doc/plustek/Plustek-PARPORT.changes: Update.
-	* backend/plustek-pp.c: Bumped build number.
-
-2005-04-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/hotplug/libsane.usermap: Fixed Minolta Scan Dual III entry
-	  (bug #301512).
-	* doc/descriptions/mustek.desc: Added Mustek TwainScan II SP (bug
-	  #301217). 
-	* doc/descriptions-external/viceo.desc: Added Primax Colorado 2200
-	  USB.
-	* doc/descriptions/unsupported.desc: Added Canon PIXMA MP110.
-	* AUTHORS: Marked Kazuya Fukuda as active.
-	
-2005-04-23  Julien Blache <jb@jblache.org>
-
-	* LICENSE: Add an FAQ section.
-	* tools/hotplug/libsane.usermap: Added Genius ColorPage Vivid3xe
-	  (0458/2017), from Ramiro Aceves through Debian BTS.
-
-2005-04-18  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek-usbhw.c, backend/plustek-usbscan.c: Fixed
-	  problem, that has been reported in conjunction with backtracking
-	  and sensor-speedup option.
-	* doc/plustek/Plustek-USB.changes: Update.
-	* backend/plustek.c: Bumped build number.
-
-2005-04-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc
-	  doc/descriptions-external/genesys.desc: Added and updated
-	  several scanners.
-
-2005-04-15 Gerard Klaver <gerard at gkall dot hobby dot nl>
-
-	* sanei/sanei_usb.c More debug info for control and isochronous mode
-	  Detection added for endpoints for  configurations, interface and
-	  altsetting numbers > 0
-	  Routine added for changing configuration, interface or altsetting
-	  number
-	  sanei_usb_set_configuration
-	  sanei_usb_claim_interface
-	  sanei_usb_release_interface
-	  sanei_usb_set_altinterface
-	* include/sane/sanei_usb.h headers and text added for
-	  sanei_usb_set_configuration
-	  sanei_usb_claim_interface
-	  sanei_usb_release_interface
-	  sanei_usb_set_altinterface
-	* frontend/scanimage.c added -B option buf size
-	  split up printf command to remove warning ISO C89
-	  patch for bugreport 300160, ranges for width and height are wrong
-	* doc/scanimage.man added text -B option buf size
-	
-2005-04-13  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* backend/hp-option.c: Add missing SANE_I18N
-	* po/sane-backends.*.po: Regenerate .po files accordingly
-	* po/sane-backends.sv.po: Update Swedish translations
-
-2005-04-12  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* Various man page fixes: sane-agfafocus.man, sane-apple.man,
-	  sane-artec.man, sane-artec_eplus48u.man, sane-avision.man,
-	  sane-bh.man, sane-canon_pp.man, sane-coolscan.man,
-	  sane-coolscan2.man, sane-dll.man, sane-epson.man, sane-fujitsu.man,
-	  sane-hp.man, sane-leo.man, sane-matsushita.man, sane-microtek2.man,
-	  sane-mustek.man, sane-mustek_pp.man, sane-mustek_usb.man,
-	  sane-nec.man, sane-niash.man, sane-pie.man, sane-plustek.man,
-	  sane-plustek_pp.man, sane-sceptre.man, sane-scsi.man, sane-sharp.man,
-	  sane-sm3600.man, sane-sm3840.man, sane-sp15c.man, sane-teco1.man,
-	  sane-teco2.man, sane-teco3.man, sane-test.man, sane-u12.man,
-	  sane-umax.man, sane-umax1220u.man, sane-umax_pp.man, sane.man,
-	  saned.man
-
-2005-04-11  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* acinclude.m4, configure.in, configure: the locking feature will
-	  now be disabled, when the selected group could not be set.
-	  The configuration script should not fail any longer.
-
-2005-04-10  Julien Blache <jb@jblache.org>
-
-	* backend/hp5400_xfer.h, backend/hp5400_sanei.c, backend/hp5400.c:
-	  make non-SANE-standard functions static.
-
-2005-04-10  Jochen Eisinger <jochen@penguin-breeder.org>
-
-	* backend/mustek_pp.c, backend/mustek_pp.conf, sanei/sanei_pa4s2.c,
-	  include/sane/sanei_pa4s2.h, doc/sane-mustek_pp.man: added global
-	  option "no_epp" to work around a known bug in the linux parport
-	  code.
-
-2005-04-02  Julien Blache <jb@jblache.org>
-
-	* doc/sane.man: typo fix from A Costa.
-
-2005-04-01  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* README: Added some info about the --enable-locking switch.
-	* doc/descriptions/unsupported.desc
-	  doc/descriptions-external/genesys.desc: Moved some Plustek
-	  devices over to the genesys descriptions.
-	* tools/hotplug/libsane.usermap: Added some Plustek devices.
-	* mkinstalldirs: Added -o and -g options for changing the
-	  owner and group of an installed directory.
-	* acinclude.m4, configure.in, configure: Added --enable-locking
-	  and --with-group to enable device locking via sanei_access-lib
-	  and to specify the group of the locking directory.
-	* include/sane/config.h.in: ENABLE_LOCKING has been added
-	  by automake/autoconf.
-	* backend/Makefile.in: Added installation of 
-	  $(localstatesanedir)/lock/sane, were the lockfile should go to.
-	  Also added linking of sanei_access to the plustek backend.
-	* include/Makefile.in: Added sane/sanei_access.h.
-	* sanei/Makefile.in: Added sanei_access.c.
-	* include/sane/sanei_access.h sanei/sanei_access.c: Initial checkin.
-
-2005-03-31 Julien Blache <jb@jblache.org>
-
-	* doc/scanimage.man: fix typos, patch from A Costa.
-
-2005-03-20 Earle F. Philhower III <earle@ziplabel.com>
-
-	* backend/sm3840_scan.c: Big-endian graymode fix
-
-2005-03-17 Gerard Klaver <gerard at gkall dot hobby dot nl>
-
-	* doc/descriptions-external/samsung.desc added
-
-2005-03-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Removed Microtek ScanMaker
-	  4800 (supported by sm3840 now).
-
-2005-03-16  Earle F. Philhower III <earle@ziplabel.com>
-	* backend/sm3840.c backend/sm3840_scan.c backend/sm3840.conf
-	  backend/Makefile.in doc/descriptions/sm3840.desc
-	  doc/sane-sm3840.man: Added ScanMaker 4800 USB ID and
-	  documentation, fixed PPC endianness problems, fixed
-	  Makefile dependencies for sm3840 driver
-
-2005-03-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc
-	  doc/descriptions-external/genesys.desc: Added and updated
-	  various scanners. 
-
-2005-03-04  Gerard Klaver <gerard at gkall dot hobby dot nl>
-
-	* doc/sane-teco2.man: text update
-	  backends/teco2: use of __unused__
-
-2005-03-03  Julien Blache <jb@jblache.org>
-
-	* tools/hotplug-ng/libsane.hotplug: add missing quote in the grep line.
-
-2005-03-02  Julien Blache <jb@jblache.org>
-
-	* tools/hotplug-ng/libsane.hotplug: allow for several spaces
-	  between fields in the db file.
-
-2005-02-28  Julien Blache <jb@jblache.org>
-
-	* tools/hotplug-ng/libsane.hotplug: replace \t by [[:space:]] when
-	  grepping for the device in the db file.
-
-2005-02-21  Julien Blache <jb@jblache.org>
-
-	* tools/hotplug-ng: added new hotplug/hotplug-ng hook, with
-	scripts and documentation.
-
-2005-02-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Removed Genius
-	  ColorPage-Vivid Pro II, now in external backend. Added Visioneer
-	  9000.
-	* AUTHORS configure configure.in backend/Makefile.in
-	  backend/dll.conf backend/sm3840.c backend/sm3840.conf
-	  backend/sm3840.h backend/sm3840_lib.c backend/sm3840_lib.h
-	  backend/sm3840_params.h backend/sm3840_scan.c doc/Makefile.in
-	  doc/sane-sm3840.man doc/sane.man doc/descriptions/sm3840.desc:
-	  Added sm3840 backend (from "Earle F. Philhower, III"
-	  <earlephilhower@yahoo.com>).
-	* doc/descriptions-external/sm3840.desc: Removed (backend included
-	  in SANE).
-	* NEWS: Updated.
-
-2005-02-14  Gerhard Jaeger <gerhard@gjaeger.de>
-
-*	doc/descriptions-external: Added new external backend geniusvp2.
-
-2005-02-10  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/descriptions/epson.desc: Added CX-3600 and 3650
-	  doc/sane-epson.man, backend/epson.conf: Added information about
-	  GT-6500 (bug #301100)
-
-2005-02-08  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.h backend/snapscan.conf
-	  Added IDs for Benq 5250C and 5000S
-
-2005-02-08  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* sanei/sanei_pp.c: Cleanup, uses now static array for parport
-	  management instead of dynamically allocated. Fixes at least a
-	  potential memory leak.
-
-2005-02-06  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* doc/descriptions/unsupported.desc doc/descriptions/snapscan.desc:
-	  Renamed "Benq" to "Benq (Acer)" for better access through the
-	  scanner search engine. Fixes bug #301158
-
-2005-02-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added several scanners. Minor
-	  fixes.
-	* doc/descriptions-external/sm3840.desc: Added new external
-	  backend sm3840.
-	* doc/descriptions-external/brother.desc: Updated status.
-	* po/Makefile.in po/sane-backends.pl.po: Added Polish translation
-	  (from Jerzy Szczudlowski
-	  <jerzy-guest@users.alioth.debian.org>). See bug #301054.
-	   
-2005-02-04  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* tools/hotplug/libsane.usermap: Added Epson CX6600 based on patch
-	  submitted by Aurelien Jarno <lists@aurel32.net>.
-
-2005-02-03  Ulrich Sigwanz <usigwanz@freesurf.ch>
-
-	* backend/niash_xfer.c:
-	* tools/hotplug/libsane.usermap:
-	  added ID for Silitek-HP-ScanJet-3400c-Clone
-          
-2005-01-19  Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* backend/coolscan.c: added initilization of dev->scanning = SANE_FALSE
-
-2005-01-18  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.h: Added ID for Benq 5250C
-
-2005-01-16  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson_usb.c: Added IDs for RX-425 (from bug report #301114)
-	* doc/descriptsions/epson.desc: Added RX-425
-
-2005-01-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added UMAX Astraslim
-	  6000. Added Trust SCSI Scan 19200 -Excellence Series-. Added
-	  ColorPage-Vivid Pro II. 
-	* tools/hotplug/libsane.usermap: Added Epson Stylus RX425 based on
-	  bug report #301114.
-	* doc/sane-agfafocus.man doc/sane-artec.man: Fixed some macros
-	  (patch from esr@thyrsus.com).
-
-2005-01-12  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Genius ColorPage-Slim
-	  1200 USB2.
-	* doc/descriptions-external/genesys.desc: Added Canon Lide 40.
-	* doc/descriptions-external/brother.desc: Added several scanners
-	  and updated the status of others based on user comments.
-
-2005-01-12  Julien Blache <jb@jblache.org>
-
-	* tools/hotplug/libusbscanner: use sysfs to get the device number,
-	  instead of guessing (it ended up being wrong in a number of
-	  cases...). Fix from Ubuntu, transmitted by Martin Pitt.
-
-2005-01-12  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes: Update.
-	* backend/plustek.c: Bumped build number. Copyright Update.
-	* backend/plustek-usbscan.c backend/plustek-usbshading.c: 
-	  Using now PhyDpi.y as selector for the motor MCLK setting. 
-	  Copyright Update.
-	* backend/plustek-usbdevs.c: 
-	  Tweaked motor settings for EPSON and CANON1200. Copyright Update.
-	* backend/plustek-*.[ch]: Copyright Update.
-
-2005-01-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Guillemot scanner.
-
-2005-01-09  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: "flaming hack to get USB scanners working without timeouts 
-	  under linux" submitted by "Steve" (in comment to bug #300830)
-	* doc/descriptions/epson.desc, doc/sane-epson.man: 
-	  Added SCSI version of GT-5000 to supported list.
-
-2004-12-29  Julien Blache <jb@jblache.org>
-	* tools/sane-find-scanner.c: Added a hint about switching the
-	  scanner on and connecting it to the computer before doing
-	  anything.
-
-2004-12-26  Gerard Klaver <gerard at gkall dot hobby dot nl>
-
-	* doc/descriptions-external/hpaio.desc join two lines so html
-	  conversion possible
-	  doc/descriptions-external/stv680.desc added two webcams with
-	  different usb vid and pid 
-	  
-2004-12-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added several scanners.
-
-2004-12-18  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c backend/epson_usb.c: Added USB IDs for
-	  CX-3650 and CX-4600 and updated version number.
-
-2004-12-15  Gerard Klaver <gerard at gkall dot hobby dot nl>
-
-	* doc/descriptions-external/hpaio.desc stv680.desc 
-	  Info new external backends
-	  
-2004-12-01  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c backend/snapscan-scsi.c backend/snapscan-options.c:
-	  Added quality calibration for Epson 2480 (implementd by Simon Munton)
-
-2004-12-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx_devices.c: Disabled stop_scan command for Mustek
-	  BearPaw 2448 TA Plus.
-
-2004-12-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane-gphoto2.man doc/sane-microtek2.man: Fixed minor
-	  glitches based on patch from Eric S. Raymond <esr@thyrsus.com>.
-	* doc/descriptions/unsupported.desc: Added Benq 320p.
-
-2004-12-04  Julien Blache <jb@jblache.org>
-	* tools/hotplug/libsane.usermap: Added Epson Perfection 4870
-	  Photo, vendor 0x04b8 product 0x0128.
-
-2004-12-01  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c: Applied fix for allocation of gamma tables
-	  (thanks to Simon Munton)
-
-2004-12-01  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* doc/descriptions/unsupported.desc: removed Epson Perfection 1270
-
-2004-12-01  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.h backend/snapscan.c backend/snapscan-scsi.c 
-	  backend/snapscan-options.c doc/descriptions/snapscan.desc: 
-	  Added support for Epson Perfection 1270
-
-2004-12-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/umax1220u.desc doc/descriptions/unsupported.desc
-	  doc/descriptions-external/genesys.desc: Added several scanners. Moved
-	  UMAX 2100U to umax1220u.desc. Moved Plustek S(T)12 to unsupported.desc.
-
-2004-11-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/brother.desc. Updated comments. 9160 works.
-
-2004-11-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Updated/added several scanners.
-
-2004-11-21  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek-usb.c: Fixed problem, when builing supported
-	  and connected device list.
-
-2004-11-19  Rene Rebe <rene@exactcode.de>
-
-	* sanei/sanei_usb.c configure.in: use usb_interrupt_read instead of
-	  usb_bulk_read for sanei_usb_read_int. Fixes bug #300878. Added a
-	  missing DBG output in sanei_usb_read_int. Check for
-	  usb_interrupt_read to make sure, we have at least version 0.1.8.
-
-2004-11-19  Rene Rebe <rene@exactcode.de>
-
-	* backend/avison.c doc/descriptions/avision.desc
-	  doc/descriptions/unsupported.desc: just added new IDs including
-	  moving the HP 82xx to the avision backend
-
-2004-11-19  Gerhard Jaeger <gerhard@gjaeger.de>
-	
-	* backend/plustek.c backend/plustek-usb*: Major update, see
-	  doc/plustek/Plustek-USB.changes. Esp. improved support for multiple
-	  devices and autodetection.
-	* doc/plustek/Plustek-USB.changes: Update.
-	* doc/descriptions/plustek.desc: Updated release number.
-
-2004-04-15  St�hane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c: non i386 linux compilation fix,
-          1220P gray levels scan hang fix, 1220P color calibration tuning.
-
-2004-11-14  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* snapscan-sources.c: Applied patch by Julien Blache to change
-	  ch_past_init from SANE_Int to SANE_Bool
-
-2004-11-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx_devices.c
-	  backend/gt68xx_gt6801.c backend/gt68xx_gt6816.c
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES: Fixed test
-	  to move home sensor at the start of scan.  Fixed gray mode
-	  linemode test. That stopped e.g. the Plustek OpticPro U 16 B from
-	  working in gray mode.
-
-2004-11-13  Frank Zago <fzago at austin dot rr dot com>
-
-	* include/sane/sanei_backend.h: Added compiler attribute __unused__ 
-	  for unused variables/functions.
-
-	* backend/leo.c backend/teco3.c backend/matsushita.c
-	  backend/sceptre.c backend/teco1.c: use __unused__
-	* sanei/sanei_wire.c sanei/sanei_pa4s2.c sanei/sanei_scsi.c: 
-	  fixes for 64 bits platforms.
-	* backend/sp15c-scsi.h backend/sp15c.h backend/dc210.c backend/dc210.h:
-	  fixes some warnings.
-	
-2004-11-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/v4l.c: 64 bit fix from Frank Zago <fzago at austin dot
-	  rr dot com>.
-
-2004-11-13  Julien Blache <jb@jblache.org>
-
-	* tools/hotplug/libsane.usermap: Added Epson Stylus Photo RX500,
-	  Epson Stylus Photo RX600 and Minolta Scan Dual II.
-
-2004-11-10  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* snapscan-sources.c: First implementation of deinterlacer for epson
-	  scanners at high resolutions (thanks to Brad Johnson)
-
-2004-11-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Updated version. Enabled compilation
-	  warnings.
-	* doc/releases.txt: Updated according to current practice.
-
-Older entries can be found in ChangeLog-1.0.15.
diff --git a/ChangeLog-1.0.17 b/ChangeLog-1.0.17
deleted file mode 100644
index 4cc0ed4..0000000
--- a/ChangeLog-1.0.17
+++ /dev/null
@@ -1,1011 +0,0 @@
-******  Release of sane-backends 1.0.17. End of code freeze ******
-
-2005-12-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added link to Lexmark X6170.
-	* doc/descriptions/gt68xx.desc: Added Trust Direct WebScan 19200
-	  (reported on sane-devel).
-	* backend/Makefile.in: Added missing genesys_conv.c and
-	  genesys_conv_hlp.c to DISTFILES. Without this change the files
-	  wouldn't be part of the archive.
-	* configure configure.in: Disabled compilation warnings. Increased
-	  version number.
-
-2005-12-17  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/descriptions/epson.desc: Added a few new scanners based on 
-	  messages to the sane-devel mailing list. 
-
-2005-12-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* NEWS: Updated for release.
-
----- CODE FREEZE FOR SANE 1.0.17 ---
-
-2005-12-10  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/hp3500.desc: Added .desc file for new
-	  external backend hp3500 which provides support for the HP ScanJet
-	  3500 series (from Troy Rollo <sane@troy.rollo.name>).
-	* doc/descriptions/unsupported.desc: Removed HP 3500, 3530, and
-	  3570 (now in hp3500.desc).
-
-2005-12-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/brother-mfc4600.desc: Added .desc file
-	  for (older) external backend for Brother MFC 4600 (USB version).
-	* doc/descriptions/unsupported.desc: Added Lexmark X6170. Removed
-	  Brother MFC 4600 USB.
-	* backend/gt68xx.c backend/gt68xx_devices.c backend/gt68xx_high.c
-	  backend/gt68xx_low.c doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES doc/gt68xx/gt68xx.TODO: Silenced
-	  non-fatal warnings/error messages. Several fixes for avoiding
-	  freezes/timeouts after cancelling a scan. Several fixes for
-	  warming up of lamp. Decreased scan width of Plustek OpticPro
-	  1248U. 
-
-2005-12-08  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek-pp_tpa.c backend/u12-tpa.c: Fixed nasty
-	  compiler warnings.
-
-2005-12-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Brother
-	  MFC-7300c. Removed Primax Colorado 2400U (now in
-	  primascan.desc).
-	* doc/descriptions-external/primascan.desc: New external backend
-	  for Primax Colorado 2400U.
-
-2005-12-07  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* sanei/sanei_acces.c: Fixed problem, when the device name contains 
-	  one or more path-separators. These characters are now converted.
-	  The problem occurs on 2.4 based installations as well as on OpenBSD.
-
-2005-12-06  Stephane Voltz <stefdev@modulonet.fr>
-
-	* backend/genesys_gl646.c: removed forgotten left-over of
-	  an experiment .
-
-2005-12-06  Stephane Voltz <stefdev@modulonet.fr>
-
-	* backend/genesys_gl646.c: added AF init in powersave, fixed
-	  long-standing bug related to a data read timeout between 
-	  distinct scanning sessions
-
-2005-12-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/genesys.conf: Enabled Canon LiDE 60 which was disabled
-	  for safety reasons. Bugs are fixed now.
-	* doc/descriptions/genesys.desc: Changed status of Canon LiDE 50
-	  and 60 to "good". Added comment for untested LiDE 40 to report any
-	  success/failure.
-	* AUTHORS: Marked Fred Odendaal as active maintainer.
-	* tools/hotplug/libsane.usermap: Added Epson Perfection 3490.
-
-2005-12-05  Rene Rebe <rene@exactcode.de>
-
-	* backend/avision.c backend/avision.conf doc/sane-avision.man:
-	  fixed more typos in comments and debug output, removed obsolete
-	  options from the parser, example avision.conf and manual page.
-	  Fixed 12 Bit gray and color modes to actually work as well as
-	  software CCD line-difference correction. Minimal scan resolutions
-	  have been slightly adapted for some ASICs.
-
-2005-12-05  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-
-	* backend/genesys.c: removed usage of current_setup in functions
-	  where it is not necessarily initialized. Modified shading
-	  calibration to not use fixed stripe sizes. Fixed memory
-	  corruption while calculating shading data. Fixed read sizes to
-	  be multiples of 256. Fixed stagger/line distance
-	  correction. Fixed line shrinking to correctly update data
-	  buffers. Bumped BUILD number.
-	* backend/genesys.c backend/genesys_conv.c: Added gray to lineart
-	  conversion.
-	* backend/genesys.c backend/genesys_conv_hlp.c: Modified calling
-	  parameters to stagger/line distance correction filter to better
-	  describe its inner working.
-	* backend/genesys_devices.c: Slowed down motor timings for 
-	  LiDE 35/40/50/60. Removed untested message for LiDE 35/40/50/60.
-	* backend/genesys_gl646.c: Fixed bug for odd pixel count. Added
-	  support for gray to lineart conversion.
-	* backend/genesys_gl841.c: Fixed words_per_line calculation. Added
-	  support for gray to lineart conversion(not used). Fixed problem
-	  with scanners not backtracking while scanning calibration area
-	  leading to scanning part of document area.
-
-2005-12-05  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c backend/snapscan-scsi.c: small bugfix for Benq5150
-
-2005-12-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Canon PIXMA MP170.
-
-2005-12-04  Rene Rebe <rene@exactcode.de>
-
-	* backend/avision.c backend/avision.h: updated the Avision backend
-	  from BUILD 167 to 179, including support for HP 5370, AV600U,
-	  AV210C2, AV220C2,  et. al. The USB i/o paths got hardened, and a
-	  lot of fixes as well es enhancements and optimizations where added
-	  and a lot of typos, mostly in debug output and comments, got fixed.
-	  The "Line Art" mode was renamed to "Lineart" to match the other
-	  backends.
-
-2005-12-03  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson_usb.c: Added id for CX4200
-
-2005-12-04  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.h backend/snapscan.c backend/snapscan-scsi.c
-	  backend/snapscan-options.c: Some fixes for Benq 5150
-
-2005-12-03  Peter Fales <peter@fales-lorenz.net>
-	* backend/gphoto2.c: Cosmetic changes to debug messages
-
-2005-12-02  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-sources.c: Another fix for lineart mode for the 
-	  Epson 3490 @ 3200 DPI - this time tested
-	* backend/snapscan.c: Change version number to 1.4.50
-
-2005-12-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-	
-	* doc/descriptions/unsupported.desc: Added link for Corex Cardscan
-	  500.
-
-2005-11-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added UMAX Astra 4100.
-	* tools/hotplug/libsane.usermap: Added Epson Stylus CX4200.
-
-2005-11-28  Jochen Eisinger <jochen@penguin-breeder.org>
-
-	* sanei/sanei_pa4s2.c: incorrect test of a bit mask.
-
-2005-11-28  Stephane Voltz <stefdev@modulonet.fr>
-
-	* backend/umax_pp_low.c: ifdef'ed forgottent debug statements
-
-2005-11-28  Stephane Voltz <stefdev@modulonet.fr>
-
-	* backend/umax_pp_low.c: fixed 'blue tint' on scanning area border
-	  by increasing shading coefficient on dark areas
-
-2005-11-26  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-sources.c: Fix lineart mode for Epson 3490
-	* doc/descriptions/snapscan.desc: Update status for Benq 5000
-
-2005-11-26  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-scsi.c: Fix for Benq 5000
-	* backend/snapscan.conf: Replace esfw52.bin with dummy filename entry
-
-2005-11-25  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* backend/artec_eplus48u.conf, backend/snapscan.conf: Use default
-	  firmware dirs in config files
-	* doc/sane-artec_eplus48u.man, doc/sane-snapscan.man: Use default
-	  firmare dirs in man pages
-
-2005-11-25  Ulrich Deiters <ulrich.deiters@uni-koeln.de>
-
-	* backend/canon-sane: fixed usage of an uninitialized variable
-
-2005-11-25  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/sane-backends.da.po: Updated Danish translation (from Mogens
-	  Jaeger <mogensjaeger@get2net.dk>). 
-
-2005-11-25  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-sources.c: Fix for grayscale / linart for Epson 3490
-	  at 3200 DPI
-
-2005-11-25  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* po/sane-backends.ru.po: Fixing some fuzzies
-
-2005-11-24  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* doc/gamma4scanimage.man, doc/sane-abaton.man, doc/sane-agfafocus.man,
-	  doc/sane-apple.man, doc/sane-artec.man, doc/sane-avision.man,
-	  doc/sane-bh.man, doc/sane-canon.man, doc/sane-canon630u.man,
-	  doc/sane-config.man, doc/sane-coolscan.man, doc/sane-coolscan2.man,
-	  doc/sane-dc210.man, doc/sane-dc240.man, doc/sane-dc25.man,
-	  doc/sane-dmc.man, doc/sane-epson.man, doc/sane-find-scanner.man,
-	  doc/sane-fujitsu.man, doc/sane-genesys.man, doc/sane-gphoto2.man,
-	  doc/sane-gt68xx.man, doc/sane-hp.man, doc/sane-hp4200.man,
-	  doc/sane-hp5400.man, doc/sane-ibm.man, doc/sane-leo.man,
-	  doc/sane-lexmark.man, doc/sane-ma1509.man, doc/sane-matsushita.man,
-	  doc/sane-microtek.man, doc/sane-microtek2.man, doc/sane-mustek.man,
-	  doc/sane-mustek_pp.man, doc/sane-mustek_usb2.man, doc/sane-nec.man,
-	  doc/sane-net.man, doc/sane-niash.man, doc/sane-pint.man,
-	  doc/sane-plustek.man, doc/sane-plustek_pp.man, doc/sane-ricoh.man,
-	  doc/sane-s9036.man, doc/sane-sceptre.man, doc/sane-sharp.man,
-	  doc/sane-snapscan.man, doc/sane-sp15c.man, doc/sane-st400.man,
-	  doc/sane-tamarack.man, doc/sane-teco1.man, doc/sane-teco2.man,
-	  doc/sane-teco3.man, doc/sane-u12.man, doc/sane-umax1220u.man,
-	  doc/sane-umax_pp.man, doc/sane-usb.man, doc/sane-v4l.man,
-	  doc/sane.man, doc/saned.man, doc/scanimage.man: man page fixes
-
-2005-11-23  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-options.c: Disable bilevel colour / halftoning
-	  for Epson 3490
-
-2005-11-23  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* backend/Makefile.in: added "artec_eplus48u" to FIRMWARE_DIRS
-
-2005-11-22  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* po/sane-backends.sv.po: Updated Swedish translation
-	* sanei/sanei_scsi.c: Added some debugging. Fixed some varnings
-
----- FEATURE FREEZE FOR SANE 1.0.17 ---
-
-2005-11-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/genesys.c backend/genesys_devices.c
-	  backend/genesys.conf: Bumped build number. Changed scanner's
-	  name to Canon LiDE 35/40/50. Added Canon LiDE LiDE 60. This scanner
-	  is still commented out in genesys.conf. Removed comment sign for
-	  Canon LiDE 35/40/50 in genesys.conf.
-	* doc/descriptions/genesys.desc: Added Canon LiDE 35, 40, 50, 60.
-	* doc/sane-genesys.man: Updated concerning gl841 scanners.
-	* doc/descriptions/unsupported.desc: Moved Canon LiDE 35/40/50/60
-	  to genesys.desc. Added Canon Pixma MP150, Tevion MD 90070 and
-	  Primax Colorado 1200p.
-	* tools/hotplug/libsane.usermap: Added Plustek Opticslim 2400 ids
-	  (from Jan Matousek).
-	* NEWS: Updated.
-
-2005-11-19  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-
-        * backend/genesys_gl841.c backend/genesys_devices.c: 
-          Added support for Canon LiDE 35/40/50
-        * backend/genesys.c backend/genesys_low.h 
-	  backend/genesys_gl646.c: Reworked data conversion 
-          process to convert CIS data, added new slope 
-	  generation variant
-	* backend/genesys_conv.c backend/genesys_conv_hlp.c: 
-          Moved conversion filter functions out of 
-          backend/genesys.c
-
-2005-11-18  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-options.c: Disable 2400 DPI for 
-	  Epson 3490, use 1600 DPI instead
-
-2005-11-17  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-PARPORT.changes: Update.
-	* backend/plustek_pp.c backend/plustek-pp.h 
-	  backend/plustek-pp_ptdrv.c backend/plustek-pp_wrapper.c:
-	  Fixed sizeof(long) issue for 64bit platforms, see 
-	  bugreport #302195.
-	* backend/plustek_pp.conf: Default config now only tries to
-	  access parport using libieee1284.
-
-2005-11-15  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c backend/snapscan-options.c 
-	  backend/snapscan-scsi.c: Enabled quality calibration for the 
-	  Epson 3490
-	* doc/descriptions/snapscan.desc: Changed status for Epson Perfection
-	  3490 (good) and 3590 (basic)
-
-2005-11-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added HP Scanjet 4890. Added
-	  several Optrox scanners.
-	* doc/descriptions-external/brother.desc: Marked status of
-	  MFC-9880 as "unsupported" based on a user's report.
-
-2005-11-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added IOmagic MobileScan
-	  USB. Mentioned chips used in the Artec AM12E+.
-	* doc/descriptions-external/hp3770.desc
-	  doc/descriptions-external/hp8200.desc: Added clarification
-	  concerning status of these backends.
-
-2005-11-10  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-	* backend/snapscan.c backend/snapscan-sources.c: Added 
-          deinterlacing for Epson 3490
-	* backend/Makefile.in: added "snapscan" to FIRMWARE_DIRS
-
-2005-11-07  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.c: M3091/2 lie about gamma dl capability
-
-2005-11-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/microtek2.desc: Fixed "unmaintained"
-	  marker. Added Microtek Scanmaker V6UPL (bug #302464).
-	* tools/check-usb-chip.c: Added detection of rts8822l-01h chipset
-	  (patch from Jonathan Bravo Lopez <JKD@JKDSoft.cjb.net>).
-
-2005-11-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/epkowa.desc: Disabled man page link
-	  (points to nowhere). Bug #302463.
-	* doc/descriptions/unsupported.desc: Added Canon PIXMA MP130.
-	* doc/sane-hp.man doc/sane-microtek2.man: Fixed links to ppscsi.
-
-2005-11-02  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* sanei/sanei_usb.c: Fixed output of transfer buffer for 
-	  usb_read_bulk in OS/2.
-	* backend/snapscan.c backend/snapscan-scsi.c: Fixes for Benq 5000
-	* backend/snapscan-usb.c: Avoid recursive calls of usb_sense_handler
-
-2005-11-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/sanei_usb.c: Added support for detecting vendor and
-	  product id with FreeBSD kernel scanner driver (based on patch in
-	  FreeBSD ports).
-	* README.freebsd: Updated information about USB scanners.
-
-2005-10-31  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c backend/snapscan-scsi.c backend/snapscan.h
-	  backend/snapscan-options.c doc/descriptions/snapscan.desc:
-	  Distinguish between 5000/5000E/5000U
-	* backend/snapscan-sources.c: Enable deinterlacer for 5000E/5000U
-	  for 1200 DPI
-	* backend/snapscan.conf: Fix names for 5000/5000E/5000U
-
-2005-10-30  Giuseppe Sacco <eppesuig@debian.org>
-
-	* po/*it.po: Updated italian translation
-
-2005-10-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/artec_eplus48u.conf
-	  doc/descriptions/artec_eplus48u.desc: Added support for Trust
-	  240H Easy Webscan Gold to artec_eplus48u backend.
-	* Makefile.in acinclude.m4 configure configure.in
-	  backend/Makefile.in frontend/Makefile.in lib/Makefile.in
-	  sanei/Makefile.in tools/Makefile.in: 
-	  Run "makedepend" if it's available. This way "make" builds
-	  backends correctly even if only included files (e.g. headers) are
-	  changed. Don't be too verbose when running makedepend.
-	  Create links libsane-*.so.1 to the real library files if the
-	  links are not there. This fixes dynamic loading on OpenBSD. The
-	  links are not created for MacOS X as they don't work there.
-	  Remove any libsane.* links in /usr/local/lib/sane. Such links
-	  are created by libtool. As they point to libsane-v4l.so,
-	  scanimage -L doesn't find any scanner in case of ld.so
-	  misconfigurations. 
-	  The install target is much quiter now and prints the libtool
-	  message only once now.
-	* README.openbsd: Removed comment about broken library links.
-
-2005-10-28  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* po/*.po: Updated po files, corrected/updated german translation.
-	* doc/plustek/Plustek-USB.changes: Update.
-	* backend/plustek.c backend/plustek.h: Added OPTION_SPEEDUP.
-	* backend/plustek-usbdevs.c: Changed high-speed setting for 
-	  UMAX 3400, due to bugreport #302317.
-	  Fixed CanoScan N650U settings (bugreport #302433).
-
-2005-10-25  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes: Update.
-	* backend/plustek.c: Bumped build number.
-	* backend/plustek-usbdevs.c: Tweaked LiDE25 settings.
-	* backend/plustek-usb.c: Let CIS devices use green-channel
-      for gray scans.
-	* backend/plustek-usbcal.c: Fixed segfault condition in fine
-      calibration for gray scanmodes.
-
-2005-10-24  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c backend/snapscan-scsi.c backend/snapscan.h
-	  backend/snapscan-options.c: Fix transparency range for Epson 
-	  2480/2580, fix preview for Epson 2580.
-
-2005-10-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/umax1220u.desc: Marked backend as
-	  unmaintained. Used non-broken link.
-
-2005-10-23  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c backend/snapscan-scsi.c: Fixes for buffer
-	  size in high-res modes by Simon Munton, small changes to delay 
-	  code.
-
-2005-10-23  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/hotplug/libsane.usermap: Added Epson Stylus DX3850 (from
-	  niels_kalle <niels_kalle@web.de>). 
-
-2005-10-22  Eddy De Greef <eddy_de_greef at tiscali dot be>
-
-	* backend/mustek_pp_cis.c: Decreased the maximum number of pixels 
-          on a line for CIS scanners a bit to avoid border artifacts.
-
-2005-10-22  Eddy De Greef <eddy_de_greef at tiscali dot be>
-
-	* backend/mustek_pp_cis.c backend/mustek_pp_cis.h
-          doc/sane-mustek_pp.man: Added an optional engine_delay parameter
-          to work around potential engine instability problems for CIS models.
-
-2005-10-21  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes: Update.
-	* backend/plustek.c: Bumped build number.
-	* backend/plustek-usbdevs.c: Fixed high-speed feature of
-	  Canoscan D660U.
-
-2005-10-20  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-scsi.c: Fixes for 16 bit 
-	  quality calibration by Simon Munton
-
-2005-10-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added HP ScanJet 7650 and
-	  UMAX Astra 2500.
-	* doc/descriptions-external/brother2.desc: MFC-210C is reported to
-	  work.
-	* NEWS: Created entry for sane-backends 1.0.17.
-
-2005-10-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* acinclude.m4 configure: Fixed check for libpthread functions.
-	* tools/hotplug/libsane.usermap: Added Brother MFC 210C (from
-	  Benjamin Mirza <bm1607@yahoo.de>). 
-	* doc/descriptions-external/epkowa.desc: Updated for iscan 1.17.0
-	  (patch from Olaf Meeuwissen <olaf@member.fsf.org>). Bug #302183.
-
-2005-10-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* AUTHORS: Marked Michael Herder as not active. No activity since
-	  some time, most email addresses bounce, no response to
-	  pings. Changed contact address to the only one that doesn't
-	  directly bounce.
-	* backend/artec_eplus48u.conf: Added support for UMAX AstraSlim
-	  1200 SE (from Harq al-Ada <nadaban.bogdan at gmail.com>).
-	* doc/descriptions/artec_eplus48u.desc: UMAX AstraSlim
-	  1200 SE is supported. Backend is unmaintained.
-	* doc/descriptions/unsupported.desc: Added HP ScanJet
-	  4850C. Removed UMAX AstraSlim 1200 SE.
-	* backend/gt68xx.c backend/gt68xx_generic.c
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES: Minor
-	  modifications to sheet-fed scanner support.
-	* backend/mustek_usb2.c backend/mustek_usb2.h
-	  backend/mustek_usb2_asic.c backend/mustek_usb2_asic.h
-	  backend/mustek_usb2_high.c backend/mustek_usb2_high.h
-	  backend/mustek_usb2_reflective.c backend/mustek_usb2_transparent.c
-	  doc/descriptions/mustek_usb2.desc
-	  doc/mustek_usb2/mustek_usb2.CHANGES:
-	  Removed typedefs for DWORD, WORD and so on. Used int, unsigned
-	  short, ... directly in the code. 
-	* AUTHORS configure configure.in backend/Makefile.in
-	  backend/dll.conf backend/lexmark-x1100.c backend/lexmark.c
-	  backend/lexmark.conf backend/lexmark.h doc/Makefile.in
-	  doc/sane-lexmark.man tools/hotplug/libsane.usermap: Added lexmark
-	  backend (from Fred Odendaal <freshshelf@rogers.com>).
-	* frontend/tstbackend.c: Added vendor "Lexmark".
-	* doc/sane.tex: Added vendor "Lexmark". Used current date.
-	* doc/descriptions-external/lexmark.desc
-	  doc/descriptions/lexmark.desc: Moved to doc/descriptions. Added
-	  "new" marker. Added manpage link. Updated version. Marked X1180
-	  as "basic" according to man page.
-	* doc/sane.man: Added lexmark backend.
-	* backend/Makefile.in doc/Makefile.in tools/Makefile.in: Make
-	  "make dist" work again.
-	* acinclude.m4 configure include/sane/config.h.in: Check for
-	  pthread_cancel() and pthread_testcancel(). 
-
-2005-10-15  Jochen Eisinger <jochen@penguin-breeder.org>
-
-	* doc/descriptions/mustek_pp.desc: add Medion MD9806 scanner as
-	  supported
-
-2005-10-14  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-options.c backend/snapscan-scsi.c
-	  backend/snapscan.c backend/snapscan-sources.c:
-	  Fixes for 16 bit scan mode from Simon Munton
-
-2005-10-11  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-options.c backend/snapscan-scsi.c
-	  backend/snapscan.c backend/snapscan-sources.c:
-	  Fixes for Epson 3490/3590 and 16 bit scan mode
-
-2005-10-11  Stephane Voltz <stefdev@modulonet.fr>
-
-	* backend/umax_pp.c: change sane_start semantic to allow for batch
-	  scanning
-
-2005-10-08  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/mustek_a3p1.desc: Downgraded status to
-	  minimal.
-	* doc/descriptions/mustek_usb2.desc: Added "new" marker.
-
-2005-10-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added HP ScanJet 3800c.
-	* frontend/scanimage.c: Use correct size for fgets. Patch from
-	  Antoine Jacoutot <ajacoutot@lphp.org>. 
-
-2005-10-05  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* backend/microtek2.c: Off-by-one error
-
-2005-10-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* AUTHORS acinclude.m4 configure configure.in backend/Makefile.in
-	  backend/dll.conf backend/mustek_usb2.c backend/mustek_usb2.h
-	  backend/mustek_usb2_asic.c backend/mustek_usb2_asic.h
-	  backend/mustek_usb2_high.c backend/mustek_usb2_high.h
-	  backend/mustek_usb2_reflective.c backend/mustek_usb2_transparent.c
-	  doc/Makefile.in doc/sane-mustek_usb2.man
-	  doc/mustek_usb2/mustek_usb2.CHANGES
-	  doc/mustek_usb2/mustek_usb2.TODO: 
-	  Added mustek_usb backend which supports the Mustek BearPaw 2448
-	  TA Pro. Changes of the code before inclusion to CVS can be found
-	  in doc/mustek_usb2/mustek_usb2.CHANGES.
-	* doc/sane.man: Added mustek_usb2. Added description for u12
-	  backend. Added missing links to other backends.
-	* doc/descriptions/mustek_usb2.desc: Moved from
-	  descriptions-external. Updated.
-	* PROJECTS: Removed link to BeOS (link goes to nowhere, SANE
-	  website has links to projects). Removed link to wi32 port
-  	  (included in SANE). Removed link to SaneTwain (listed on SANE
-	  website).
-	* doc/doxygen-sanei.conf.in: Updated to current doxygen
-	  version. Output more C-friendly format.
-	* include/sane/sanei.h include/sane/sanei_backend.h
-	  include/sane/sanei_debug.h include/sane/sanei_pp.h
-	  include/sane/sanei_usb.h: Fixed some bugs in doxygen
-	  documentation. Added some comments.
-
-2005-10-02  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes: Update.
-	* backend/plustek.c: Bumped build number.
-	* backend/plustek-usbdevs.c backend/plustek-usb.h: Updated motor
-	  settings for Canoscan LiDE25, thanks to Stephan February 
-	  <stephanf@singnet.com.sg> for providing these values.
-
-2005-10-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/as6e.desc: Added Trust Easy Scan 9600 Plus (bug
-	  #301000).
-	* backend/sharp.c: Fixed some compilation warnings (bug #300404).
-	* AUTHORS: Fixed Rene Rebe's email address.
-	* doc/descriptions/unsupported.desc: Removed Epson Perfection 4180
-	  (supported by epkowa backend).
-	
-2005-10-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/mustek_a3p1.desc
-	  doc/descriptions/unsupported.desc: Added external mustek_a3p1
-	  backend that supports Mustek P 3600 A3 Pro.
-	* tools/Makefile.in: Added udev to list of directories that are
-	  part of the distribution.
-	* doc/descriptions.txt: Yet another "itsself".
-	* backend/sp15c.c: Fixed some warnings (bug #302290).
-
-2005-10-01  Julien Blache <jb@jblache.org>
-	* doc/sane-find-scanner.man: Typo fix, s/itsself/itself/ from
-	Alfie Costa.
-
-2005-09-29  Eddy De Greef <eddy_de_greef at tiscali dot be>
-
-	* backend/mustek_pp_cis.c: Minor bug fix: wrong model name was 
-	  reported for 1200CP+ driver.
-
-2005-09-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
-	  backend/gt68xx_generic.c backend/gt68xx_generic.h
-	  backend/gt68xx_high.c backend/gt68xx_low.c backend/gt68xx_low.h
-	  doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES doc/gt68xx/gt68xx.TODO: 
-	  Added support for Plustek OpticSlim M12 (untested). Based on patch
-	  from Gerhard Jaeger <gerhard@gjaeger.de>. Fixed gt68xx homepage
-	  links in man page. Changed minimum version of libusb to 0.1.8.
-	* doc/descriptions/unsupported.desc: Removed Plustek OpticSlim M12.
-
-2005-09-28  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-options.c backend/snapscan-scsi.c
-	  backend/snapscan.c backend/snapscan.h:
-	  Added 16 bit option for Epson scanners, untested.
-	  Reenabled enhanced inquiry command for epson scanners.
-
-2005-09-28  Julien Blache <jb@jblache.org>
-	* tools/udev/convert-usermap.sh: Don't print 0x when matching VID
-	and PID.
-
-2005-09-28  Julien Blache <jb@jblache.org>
-	* tools/udev/convert-usermap.sh: Added script to convert
-	hotplug/libsane.usermap to a udev rules file. udev 070 + linux
-	2.6.14 will deprecate hotplug.
-	* tools/README: updated.
-
-2005-09-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/brother.desc: Removed duplicate entry.
-	* doc/descriptions/genesys.desc: Added link to genesys homepage.
-
-2005-09-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/sane-find-scanner.c: Print more clear output if no USB
-	  scanners are found. Point to manual page. Warn if libusb support
-	  hasn't been built.
-
-2005-09-25  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/lexmark.desc
-	  doc/descriptions/unsupported.desc: Added external lexmark
-	  backend. Moved Lexmark X11?? devices to lexmark.desc. Based on
-	  patch from  Fred Odendaal <freshshelf@rogers.com>.
-
-2005-09-25  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-scsi.c: Removed debugging code for 
-	  Epson scanners until a working solution has been found.               
-
-2005-09-23  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README: Mention in addition to the listed libraries, their
-	  header files are also neccessary. A missing usb.h is a common
-	  problem when building SANE (--> no USB support).
-	* configure configure.in: Added warning message that's printed
-	  when libusb or its header file is not available.
-	* frontend/scanimage.c doc/scanimage.man: Added progress indicator
-	  to scanimage (based on patch from Mario Goppold 
-	  <mgoppold@tbz-pariv.de>). Updated copyright information, added
-	  links to sane-devel mailing list.
-	* sanei/sanei_usb.c: Ignore EBUSY from usb_set_configuration. This
-	  function fails, if a different interface of the same device is
-	  claimed (e.g. by usblp).
-
-2005-09-22  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* backend/hp4200.c backend/umax.c backend/umax1220u.c
-	  include/sane/sanei_pv8630.h sanei/sanei_pv8630.c:
-	  Fix SANE_DEBUG_SANEI_PV8630
-
-2005-09-19  Frank Zago  <sane at zago.net>
-
-	* backend/dc210.c backend/leo.c backend/matsushita.c
-	  backend/sceptre.c backend/sp15c-scsi.h backend/sp15c.h
-	  backend/teco1.c backend/teco2.c backend/teco3.c
-	  include/sane/sanei_backend.h: Replaced __unused__ with 
-	  __sane_unused__ to avoid a namespace conflict.
-
-2005-09-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx_high.c
-	  doc/descriptions/gt68xx.descdoc/gt68xx/gt68xx.CHANGES
-	  doc/gt68xx/gt68xx.TODO: Fixed segfault that may happen with
-	  Mustek ScanExpress A3 USB. 
-	* doc/backend-writing.txt: Added some hints about number of
-	  files. 
-	* backend/mustek.conf doc/sane-mustek.man
-	  doc/descriptions/mustek.desc: Mustek Paragon 600 II EP
-	  works. Mentioned "parport0".
-	* doc/descriptions/unsupported.desc: Added Canon PIXMA MP750.
-
-2005-09-17  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* README.darwin: New date for good libusb from CVS
-
-2005-09-07  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* acinclude.m4, configure: fix disabling of locking when the
-	  locking user group does not exist
-
-2005-09-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Genius ColorPage Slim
-	  1200.
-
-2005-09-07  Oliver Schirrmeister <oschirr@abm.de>
-
-	* backend/fujitsu.c: enabled dropoutcolor for all fi-* scanners.
-	  Applied patch from Mario Goppold: Bugfixes for the M3092DCd     
-
-2005-09-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/sane-backends.ru.po: Updated Russian translation (from Vitaly
-	  Lipatov <LAV@vl3143.spb.edu>).
-
-2005-09-03  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.h backend/snapscan-scsi.c: (Hopefully) fixed
-	  some debugging code for Epson scanners that only works after 
-	  firmware upload.                  
-
-2005-09-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Epson Perfection 4490
-	  Photo. 
-	* tools/hotplug/libsane.usermap: Added HP PSC 750.
-
-2005-09-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx_devices.c
-	  backend/gt68xx_generic.c backend/gt68xx_high.c
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES: Genius
-	  ColorPage Vivid 1200 X is reported to work. Genius ColorPage Vivid
-	  4 XE seems to be the same as 4 X, it just doesn't have
-	  buttons. Cleanup of .desc file. Fixed gain setting. Mustek
-	  ScanExpress A3 USB 600 dpi color scanning works now. 
-	* tools/check-usb-chip.c: Added detection for SQ113 chip
-	  (e.g. Mustek BearPaw 2448 TA Pro).	
-
-2005-08-31  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Removed Mustek 1800 A3 Pro
-	  (this is actually a P3600 A3 Pro). 
-	* doc/descriptions-external/mustek_usb2.desc: Mustek BearPaw 2448
-	  TA Pro has status "good" now.
-	
-2005-08-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Removed Mustek BearPaw 2448
-	  TA Pro (now supported by external Mustek USB2 backend). Added
-	  comments about that backend to some other scanners that may be
-	  supported later.
-	* doc/descriptions-external/mustek_usb2.desc: New external Backend
-	  for Mustek BearPaw 2448 TA Pro.
-
-2005-08-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Canon LiDE 60 is GL841 based.
-
-2005-08-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/canon630u.desc: Changed status of Canon 636u
-	  too "good".
-
-2005-08-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/brother2.desc: Brother MFC-5440CN is
-	  reported to work (bug #302105).
-
-2005-08-24  St~hane Voltz <stefdev@modulonet.fr>
-
-	* backend/umax_pp.c backend/umax_pp_low.c tools/umax_pp.c: Added EPP
-	  support for 610P, revision number changes
-
-2005-08-23  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Canon LiDE 60. Reflecta
-	  Digitdia 3600 is not GL841-based.
-
-2005-08-22  St~hane Voltz <stefdev@modulonet.fr>
-
-	* tools/check-usb-chip.c: Added rts8858c detection (Lexmark
-	  X1100 series, Dell A920).
-
-2005-08-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/hotplug/libsane.usermap: Added some Genius scanners. Fixed
-	  Visioneer Onetouch 7300 USB. Added Plustek OpticSlim 2400.
-	* README.openbsd: Mention problems with library names.
-
-2005-08-22  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes: Update.
-	* backend/plustek.c: Bumped build number.
-	* backend/plustek-usb.c backend/plustek-usbscan.c: Fixed problem,
-	  when trying to scan at resolutions beyond the optical one
-	  (sensor stops too early).
-	* tools/hotplug/libsane.usermap: Added USB ID for LiDE25.
-
-2005-08-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/microtek2.desc
-	  doc/descriptions/unsupported.desc: Marked microtek2 backend as
-	  unsupported. Changed link to point to old website directly. Listed
-	  Microtek ScanMaker 9800XL as supported (bug #301515).
-	
-2005-08-21  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* ltmain.sh acinclude.am configure: Updated from libtool 1.5.18.
-
-2005-08-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
-	  backend/gt68xx_low.h doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES doc/gt68xx/gt68xx.TODO: 
-	  Increased number limit of scanners that can work with this
-	  backend to 50. Added support for Genius ColorPage Vivid 1200 X
-	  (untested).
-
-2005-08-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Fixed check for usbcalls.h on OS/2
-	  (patch from Paul Smedley <paul@smedley.info>).
-	* backend/gt68xx.c backend/gt68xx_devices.c doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES: Enabled GT68XX_FLAG_NO_STOP for
-	  Mustek BearPaw  2400 CU Plus. Some of these scanners don't seem
-	  to like that command.
-	* doc/descriptions/artec_eplus48u.desc: Disabled link to backend
-	  homepage which doesn't seem to contain anything sane-related.
-
-2005-08-19  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes: Update.
-	* backend/plustek-usb.h backend/plustek-usbdevs.c: Removed obsolete
-	  _WAF_BLACKFINE. LiDE20 does not seem to have a reliable black
-	  calibration area, so the devices now will switch off the lamp
-	  for dark calibration.
-	* backend/plustek-usbcal.c backend/plustek-usbscan.c: Cleanup.
-	* backend/plustek-usbshading.c: Fixed line statistics and added
-	  calibration data output.
-	* backend/plustek.c: Bumped build number.
-
-2005-08-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx_low.c backend/gt68xx_low.h
-	  doc/sane-gt68xx.man doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES doc/gt68xx/gt68xx.TODO:
-	  Fixed the problem concerning scanning on *BSD. Scanning only
-	  worked once (bug #300597). Fixed compilation warnings.
-
-2005-08-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README: Min. libusb version is 0.1.8.
-
-2005-08-17  Julien Blache <jb@jblache.org>
-
-	* tools/hotplug/libsane.usermap: Added USB IDs for the
-	  sm3600-supported scanners. If you know the exact model name
-	  corresponding to the above IDs, please mail sane-devel:
-	  0x05da/0x40b3, 0x05da/0x40b8,
-	  0x05da/0x40ca, 0x05da/0x40dd, 0x05da/0x40ff
-
-2005-08-16  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-scsi.c: Make compileable ;-)
-	* backend/snapscan-options.c: Removed //-style comment
-
-2005-08-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-	
-	* doc/descriptions/unsupported.desc: Added Canon PIXMA MP780 and
-	  Lexmark P6250.
-	* tools/sane-find-scanner.c: Don't print anything else but the
-	  found messages in "-q" mode.
-	* tools/check-usb-chip.c: Added check for combination of a
-	  PowerVision PV8630 (USB->parport bridge) and National
-	  Semiconductor LM9830 as used in the HP 4200. Fixed compilation
-	  warning. Added check for Toshiba M011 chips as used in Microtek
-	  ScanMaker 3600, 3700, and 3750.
-	* configure configure.in backend/Makefile.in backend/sm3600-scanusb.c
-	  backend/sm3600-scanutil.c backend/sm3600.c backend/sm3600.h
-	  doc/sane-sm3600.man doc/sane-usb.man:
-	  Removed direct dependence of sm3600 on libusb. Used sanei_usb
-	  instead. Based on patch from Fran~is Revol <revol@free.fr>.
-	  Updated documentation accordingly. Fixed compilation warnings.
-	
-2005-08-15  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c: Bumped version number
-	* backend/snapscan-scsi.c: Added temporary debug code for 2480/2580
-	  distinction
-
-2005-08-15  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c backend/snapscan-options.c backend/snapscan-scsi.c
-	  backend/snapscan.h doc/descriptions/snapscan.desc 
-	  backend/snapscan.conf: Added support for Epson Perfection 3490/3590 
-	  (thanks to Matt Judge).
-
-2005-08-15  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes: Update.
-	* doc/descriptions/plustek.desc: Updated version number.
-	* backend/plustek.h. backend/plustek-usb.h backend/plustek-usbcalfile.c
-	  backend/plustek-usbimg.c backend/plustek-usbmap.c
-	  backend/plustek-usbdevs.c backend/plustek-usbscan.c: Cleanup.
-	* backend/plustek.c: Bumped version and build number.
-	  Activated IPC between reader-process and parent.
-	* backend/plustek-usbio.c: usbio_DetectLM983x() now returns error if
-	  register could not be red, usbio_ResetLM983x() checks for reg7 
-	  value before writing.
-	* backend/plustek-usbhw.c: Added button support for Plustek/Genius 
-	  devices. Changed behaviour of usb_IsScannerReady().
-	  Added special misc I/O setup for CIS devices (usb_ResetRegisters).
-	* backend/plustek-usb.c: Minor fix for startup reset.
-	  Removed unnecessary calls to usbio_ResetLM983x().
-	* backend/plustek-usbshading.c: Readded kCIS670 to add 5% extra to 
-	  LiDE20 fine calibration.
-	* backend/plustek-usbcal.c: Tried to use the settings from SANE-1.0.13.
-	  Added _TWEAK_GAIN to allow increasing GAIN during lamp coarse 
-	  calibration. Added call to speedtest function.
-
-2005-08-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* Makefile.in: Added Changelog-1.0.16 to DISTFILES.
-	* backend/hp4200.c doc/sane-hp4200.man
-	  doc/descriptions/hp4200.desc: Enabled backtracking by
-	  default. This is slower but avois bumping the scan head at the end
-	  of the scan area and also missing parts of the scanned
-	  image. Increased safety margin for backtracking. This fixes the
-	  "garbled image" bug. Set default gamma value to 2. Manpage
-	  update. Status set to "basic".
-	* frontend/scanimage.c: Don't exit with error when trying to set
-	  inactive options. This especially happens in connection with
-	  geometry options and the v4l backend (bugs #300321, #301977).
-
-2005-08-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/niash.desc doc/descriptions/sm3840.desc:
-	  Removed ":new".
-	* AUTHORS configure configure.in backend/Makefile.in
-	  backend/dll.conf backend/hp4200.c backend/hp4200.conf
-	  backend/hp4200.h backend/hp4200_lm9830.c
-	  backend/hp4200_lm9830.h doc/Makefile.in
-	  doc/sane-hp4200.man doc/sane.man
-	  doc/descriptions/hp4200.desc: Added hp4200 backend. Code from
-	  Julien BLACHE's sane-backends-extras debian package, based on
-	  Frank Zago's patches based on Adrian Perez Jorge's code. Fixed
-	  compilation warnings. Fixed bug when no sane device was
-	  given. Code indented by indent -gnu. Added man page.
-	* doc/descriptions-external/hp4200.desc: Removed (backend is now
-	  included).
-	* configure configure.in: Moved CPPFLAGS definition down to avoid
-	  problems with libtool tests for -fPIC.
- 
-2005-08-10  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek_pp.c: Bumped build number.
-	* backend/plustek_pp-genericio.c: Fixed bug, that causes ASIC96003/1
-	  based devices to move their sensors too fast in lineart mode at
-	  200 and 300dpi.
-	* doc/plustek/Plustek-PARPORT.changes: Update.
-
-2005-08-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-	
-	* sanei/sanei_usb.c: Minor fixes for usbcalls interface (patch
-	  from Paul Smedley <paul@smedley.info>).
-	* doc/descriptions/unsupported.desc: Added Hewlett-Packard Scanjet
-	  4370. 
-	
-2005-08-08  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* acinclude.m4 configure: Locking feature will be disabled on OS/2
-	  per default (according to Paul Smedley <paul@smedley.info>).
-	* doc/plustek/Plustek-USB.changes: Update.
-	* backend/plustek.c: Bumped build number.
-	* doc/plustek/Plustek-USB.txt doc/descriptions/plustek.desc 
-	  doc/sane-plustek.man backend/plustek-usb.c backend/plustek-usbdevs.c:
-	  Added support for CanoScan LiDE25.
-
-2005-08-07  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c: Use first known device if no explicit device name
-	  is specified
-
-2005-08-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Updated version. Enabled compilation
-	  warnings.
-	* doc/releases.txt: Typo fix.
-	* config.guess config.sub: Updated from libtool 1.5.18.
-	* configure configure.in include/sane/config.h.in
-	  sanei/sanei_usb.c: Added support for usb functionality on OS/2
-	  using the usbcalls interface (patch from Paul Smedley
-	  <paul@smedley.info>).
-	* sanei/sanei_usb.c: Fixed some compilation warnings.
-
-Older entries can be found in ChangeLog-1.0.16.
diff --git a/ChangeLog-1.0.18 b/ChangeLog-1.0.18
deleted file mode 100644
index b224cf0..0000000
--- a/ChangeLog-1.0.18
+++ /dev/null
@@ -1,973 +0,0 @@
-******  Release of sane-backends 1.0.18. End of code freeze ******
-
-2006-07-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Increased version number.
-
-2006-07-02  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek.c: Fixed the fix (problem when trying to 
-	  select bit-depth).
-
-2006-07-01  Wittawat Yamwong <wittawat@web.de>
-
-	* doc/sane-pixma.man doc/descriptions/pixma.desc:
-	  Updated status of MP760 and MP780
-
-2006-06-30  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes: Update
-	* backend/plustek.c: Fixed problem when trying to select bit-depth.
-
-2006-06-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* NEWS: Added dell1600n_net backend.
-	* doc/releases.txt: Typo fix.
-	* aclocal.m4 configure configure.in include/sane/config.h.in: 
-	  Disabled compilation warnings for release.
-
----- CODE FREEZE FOR SANE-BACKENDS 1.0.18 ---
-
-2006-06-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* NEWS: Updated for 1.0.18.
-
-2006-06-24  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.c: update to v1.0.33, add 5900 usb id
-	* doc/descriptions/fujitsu.desc: usb id and version update
-
-2006-06-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/epson.desc: Fixed USB id of CX6600 (patch from
-	  Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>). 
-	* doc/descriptions-external/epkowa.desc: Updated (patch from 
-	  Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>). 
-	* doc/descriptions/unsupported.desc: Added Xerox WorkCentre
-	  PE120i. 
-
-2006-06-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane-usb.man: Fixed typo (bug #303571).
-
-2006-06-19  Giuseppe Sacco <eppesuig@debian.org>
-
-	* corrected sane-usb manual page.
-
-2006-06-15  Ulrich Deiters <ulrich.deiters@uni-koeln.de>
-
-	* backend/canon.c, canon.h, canon-scsi.c, canon-sane.c:
-	  got rid of some compiler warnings
-
-2006-06-14  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.c: update to v1.0.32, add 4220c2 usb id
-	* doc/descriptions/fujitsu.desc: usb id and version update
-
-2006-06-14  Jon Chambers <jon@jon.demon.co.uk>
-	* backend/dell1600n_net.c: working backend added
-	
-2006-06-13  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.[ch]: update to v1.0.31, add 5220c usb id,
-	  dont show ink level buttons if no imprinter, gather button
-	  presses more frequently
-	* doc/descriptions/fujitsu.desc: usb id and version update
-
-2006-06-12  Jochen Eisinger <jochen@penguin-breeder.org>
-	
-	* doc/descriptions/mustek_pp.desc: Added Micromaxx MM-0851
-
----- FEATURE FREEZE FOR SANE 1.0.18 ---
-
-2006-06-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/coolscan2.c doc/descriptions/coolscan2.desc: Added
-	  (minimal) support for Nikon LS 50 ED, Coolscan V ED and
-	  (probably) Super Coolscan LS-5000 ED (patch from Giuseppe Sacco
-	  <giuseppe@eppesuigoccas.homedns.org>). 
-	* backend/pixma.h: Fixed compilation problem on *BSD (ENODATA not
-	  defined). 
-	* doc/descriptions/unsupported.desc: Added Canon 9950. Removed
-	  Epson 4490 (supported by epkowa). Removed Nikon scanners
-	  (supported by coolscan2 backend). Updated PLANon DocuPen R700.
-
-2006-06-11 Eddy De Greef <eddy_de_greef at scarlet dot be>
-
-	* AUTHORS backend/mustek_pp_cis.c backend/mustek_pp_cis.h 
-	  doc/sane-mustek_pp.man: e-mail address update.
-
-2006-06-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-		(patch applied by Karl Heinz Kremer <khk@khk.net>
-
-	* doc/descriptions/epson.desc: Added CX-4800. Added Perfection
-	  4990 (bug #301795).
-	* backend/epson_usb.c: Added CX-4800 (bug #303341).
-	* backend/epson.c: Fixed segfault when a scanner isn't
-	  recognized. Added "Flatbed" as the only possible source option for
-	  MOD_SOURCE in this case (bug #303340).
-	  Epson CX4800 and CX6400 were detected as "unknown model". This
-	  changes request_identity2 to 0 in the EpsonCmdRec for the "D7"
-	  level, which skips the call to get_identity2_information(). The
-	  second bug was that the return status of
-	  get_identity2_information() was not checked in attach(). This
-	  actually allowed the scanner to be used but with inaccurate
-	  parameters (e.g. "Unknown model", default color depth, etc)
-	  because the scanner was already closed before probing for the rest
-	  of the parameters (bug #301478, #303342).
-	  The Epson Perfection 4990 photo/GT-X800 wrongly return 3200 dpi as
-	  their maximum resolution. This workaround enables teh full 4800
-	  dpi (bug #302090, patch from Claus Boje <claus@egehuset.dk>).
-	* backend/epson.conf.in: Detect some more epson SCSI scanners
-	  (GT-6000, GT-9000) which report "EPSON SC" instead of "EPSON" as
-	  SCSI manufacturer ID (bug #303269).
-	* sanei/sanei_pio.c: Don't do a busy loop when looking for
-	  scanners. This froze the backend when the scanner was switched
-	  off. Also CPU time is much reduced (bug #301926).
-
-2006-06-11 Gerard Klaver <gerard at gkall dot hobby dot nl>
-
-	* include/Makefile.in font_6x11.h added
-
-2006-06-10  Wittawat Yamwong <wittawat@web.de>
-
-	* backend/pixma_mp750.c doc/sane-pixma.man
-	  /doc/descriptions/pixma.desc:
-	  Removed experimental flag from MP750, MP760 and MP780.
-
-2006-06-09 Gerard Klaver <gerard at gkall dot hobby dot nl>
-
-	* doc/sane-stv680.man update text
-
-2006-06-09  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* frontend/scanimage.c: move sane_cancel() out of scan_it().
-	  more like scanadf. fixes issues with duplex adf scanning.
-
-2006-06-08  Wittawat Yamwong <wittawat@web.de>
-
-	* backend/pixma.h: Upgraded to version 0.11.3
-	* backend/pixma_common.c backend/pixma_common.h:
-	  Added a work-around for the buffer underrun problem.
-	* backend/pixma_io_sanei.c: Set minimum timeout to 10ms.
-	* backend/pixma_mp150.c: Added 2 commands for MP800.
-	* backend/pixma_mp730.c: Added debug info.
-	* backend/pixma_mp750.c: Added support for buttons and a work-around
-	  for the lockup problem.
-	* backend/pixma.c: Removed SANE_I18N from backend type string.
-	* doc/sane-pixma.man: Updated
-	* doc/descriptions/pixma.desc: Updated status of MP750.
-
-2006-06-08  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes: Update
-	* backend/plustek.c backend/plustek-usbcal.c
-	  backend/plustek-usbcalfile.c backend/plustek-usbhw.c:
-	  Fixed calibration cache issues (coarse calibration for all modes,
-	  correct fine calibration for sheetfed devices).
-
-2006-06-08  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* po/sane-backends.*.po: updated with new translation keys from
-	  genesys backend.
-
-2006-06-07  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-
-	* backend/genesys.c backend/genesys.h backend/genesys_low.h: added
-	  options for enabling/disabling horizontal interpolation at high
-	  resolutions and selection of color filter in grayscale and
-	  lineart modes.
-	* backend/genesys_gl841.c: implemented color filter selection.
-
-2006-06-07  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* configure, configure.in, backend/Makefile.in
-	  include/sane/sanei_access.h sanei/Makefile.in
-	  sanei/sanei_access.c: Added patch created by
-	  Vitaly Lipatov <LAV AT vl3143.spb.edu>:
-	  Add --with-lockdir to configure for set path to lock dir
-	  Set PATH_SANE_LOCK_DIR really to lock dir (instead localstatedir)
-	* po/sane-backends.de.po: Update.
-
-2006-06-06  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.[ch]: update to v1.0.30, init more models,
-	  M3091/2 duplex support, flatbed bug fixes, minor refactoring
-	* doc/descriptions/fujitsu.desc: status and version update
-	* doc/sane-fujitsu.man: remove note about broken M3091/2 duplex
-
-2006-06-06 Rene Rebe <rene@exactcode.de>
-
-	* backend/avision.c backend/avision.h backend/avision.conf.in
-	  doc/descriptions/avision.desc doc/sane-avision.man: updated the
-	  Avision backend (Build 182 -> 201), including a lot fixes,
-	  some new features and support for a bunch of new devices and updates
-	  to the status marks, including: control of the lamp power-save time,
-	  retrieval of NVRAM data such as the scan counts and serial number,
-	  correction of the quality vs. preview scan bit (was inverted),
-	  fixes for the logic deciding whether the cached window parameters
-	  are valid, yet another deinterlacing method (for new scanner
-	  models), rewritten main loop to be able to read with larger
-	  USB buffers for enhanced scan speed, fixes of BGR -> RGB mirroring
-	  (was off-by-one), attaching without a config by probing all
-	  known SCSI vendor/product IDs and some fixed typos on the way
-
-2006-06-06  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* po/Makefile.in, po/sane-backends.*.po: updated with translation
-	  keys from stv680 backend
-	* backend/Makefile.in: Fix stv680 dependencies
-
-2006-06-05 Gerard Klaver <gerard at gkall dot hobby dot nl>
-
-	* backend/stv680.c backend/stv680.h backend/stv680.conf.in added
-	* doc/sane-stv680.man doc/descriptions/stv680.desc added
-	* AUTHORS: added stv680 Gerard Klaver
-	* configure configure.in doc/Makefile.in doc/sane.man
-	  backend/Makefile.in backend/dll.conf.in: added stv680 backend
-	* doc/descriptions-external/stv680.desc: removed because the backend
-	  is now a part of sane-backends.
-
-2006-06-04  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.[ch]: update to v 1.0.29, option cleanups,
-	  M3091/2 color mode support, sloppy buffer supports saned/scanimage -T
-	* backend/fujitsu-scsi.c: proper casting in macro
-	* doc/descriptions/fujitsu.desc: status and version update
-	* doc/sane-fujitsu.man: remove note about broken M3091/2 color
-
-2006-06-03 Wittawat Yamwong <wittawat@web.de>
-	* backend/pixma_sane_options.c: Added SANE_I18N for "Flatbed" and "Color"
-	* backend/pixma_common.[ch]
-	  backend/pixma_mp150.c backend/pixma_mp730.c
-	  backend/pixma_mp750.c backend/pixma_rename.h
-	  backend/pixma.h: Added pixma_get_device_status()
-	* backend/pixma.c: Fixed a bug in sane_open(). State wasn't initiallized
-	  properly.
-	* doc/sane-pixma.man doc/descriptions/pixma.desc: Updated device status.
-
-2006-06-01  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.[ch]: update to v 1.0.28
-	* doc/descriptions/fujitsu.desc: status and version update
-
-2006-05-30  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.c: DBG speedup from abel deuring,
-	  duplex bugfix, split scsi/usb data into new DBG level,
-	  stop including or calling sanei_thread
-	* doc/descriptions/fujitsu.desc: minor update
-	* doc/sane-fujitsu.man: minor text changes, note DBG levels
-
-2006-05-28  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/sane-plustek_pp.man: Fixed typo.
-	* doc/sane-plustek.man: Update.
-	* doc/descriptions/plustek.desc: Update.
-	* backend/plustek.c backend/plustek.h backend/plustek-usb.c
-	  backend/plustek-usbcal.c backend/plustek-usbcalfile.c
-	  backend/plustek-usbdevs.c backend/plustek-usb.h
-	  backend/plustek-usbhw.c backend/plustek-usbimg.c
-	  backend/plustek-usbio.c backend/plustek-usbmap.c
-	  backend/plustek-usbscan.c backend/plustek-usbshading.c:
-	  Added support for CIS-based sheetfed scanners, namely TravelScan662.
-	  Added support for saving calibration data for CIS
-	  devices - should speedup CanoScan devices.
-
-2006-05-28  Wittawat Yamwong <wittawat@web.de>
-
-	* backend/pixma.h: Added #define ENODATA and EPROTO to let the
-	  backend compiles under OS/2 with gcc 3.3.5.
-
-2006-05-27  Giuseppe Sacco <eppesuig@debian.org>
-
-	* Updated italian translation
-
-2006-05-27  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* tools/sane-desc.c: Added plist output
-
-2006-05-26  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* po/Makefile.in, po/sane-backends.*.po: updated with translation
-	  keys from pixma backend
-
-2006-05-26  Wittawat Yamwong <wittawat@web.de>
-
-	* AUTHORS: added Wittawat Yamwong
-	* configure configure.in doc/Makefile.in doc/sane.man
-	  doc/descriptions/pixma.desc backend/Makefile.in 
-	  backend/dll.conf.in backend/pixma*.[ch]: added pixma backend
-        * doc/descriptions-external/pixma.desc: removed because the backend
-          is now a part of sane-backends.
-	* sanei/sanei_usb.c: Modified sanei_read_int(): call
-          usb_clear_halt() if and only if the endpoint is halted.
-
-2006-05-24  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* Updated Swedish translation
-
-2006-05-23  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.c: dont send scsi cmd F1 if unsupported.
-	* doc/descriptions/fujitsu.desc: update version number.
-
-2006-05-23  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Makefile.kernel26: Fixed extraction of version string.
-
-2006-05-21  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.c backend/fujitsu.conf.in 
-	  doc/descriptions/fujitsu.desc: added usb ids for fi-5110EOX
-
-2006-05-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README.linux: Updated concerning USB permissions (really, this
-	  time). 
-	* doc/descriptions/unsupported.desc: Removed models that are now
-	  in pixma.desc. Updated comment for Plustek OpticPro S24.
-	* doc/descriptions-external/hp_rts88xx.desc: Added reason for not
-	  including the backend.
-	* backend/gt68xx.c backend/gt68xx_devices.c doc/gt68xx/gt68xx.CHANGES
-	  doc/descriptions/gt68xx.desc: Added support for Plustek OpticPro
-	  S24 (some models). Added .conf entry for Plustek OpticPro S12.
-
-2006-05-19  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu*: use sanei_scsi_open_extended()
-	  change config file var to "buffer-size", increase default
-	* doc/sane-fujitsu.man: buffer-size mentioned
-
-2006-05-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/pixma.desc: Added some models (from
-	  Wittawat Yamwong <wy-sane-devel@arcor.de>). 
-
-2006-05-14  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.c: sane_read() - only send EOF with len=0
-	  do_cmd() - simplify timeout handling
-	* backend/fujitsu-scsi.h: increase default timeoutes
-
-2006-05-15  Stephane Voltz <stefdev@modulonet.fr> 
-
-	* backend/genesys_devices.c backend/genesys_gl646.c: tuned HP 2300
-	  geometry description and added a safeguard against failed origin
-	  detection
-
-2006-05-14  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu*: rewritten backend, supports many more scanners
-	  with much better usb support and less model-specific code.
-	* doc/sane-fujitsu.man: updated to match new backend.
-
-2006-05-12  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* doc/descriptions/fujitsu.desc: updated with all known scanners
-	  by fujitsu. Most now supported as 'basic'.
-
-2006-05-10  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/hotplug-ng/convert-usermap.sh
-	  tools/udev/convert-usermap.sh: Removed. No longer needed as
-	  hotplug-ng and udev files are generated by sane-desc now.
-	* tools/README tools/hotplug/README tools/hotplug-ng/README
-	  doc/sane-usb.man: Updated documentation concerning udev.
-	* doc/descriptions/unsupported.desc: Added Epson Stylus CX-5800
-	  and some PLANon scanners.
-
-2006-05-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/lexmark.desc: X1150 is reported to work.
-	* doc/descriptions-external/brother.desc: MFC-3820CN is reported
-	  to work. 
-
-2006-04-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/brother.desc
-	  doc/descriptions-external/brother2.desc: Network models are now
-	  supported (bug #303386).
-
-2006-04-23  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-
-	* backend/genesys_devices.c: Increase length of acceleration
-	  slopes for Canon LiDE 35/40/50/60
-
-2006-04-21  Stephane Voltz <stefdev@modulonet.fr> 
-
-	* backend/genesys.c: add workraound with issue related
-	  to asic reset and data scan amount
-
-2006-04-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/artec_eplus48u.conf.in: Made config file more
-	  readable. Instead of commenting every single line, the
-	  explanations are given once at the top. Don't repeat options
-	  that aren't changed anyway.
-	* doc/descriptions/unsupported.desc: Added Microtek Scanmaker
-	  3880. 
-
-2006-04-18  Giuseppe Sacco <eppesuig@debian.org>
-	* Updated italian translation
-
-2006-04-18  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-
-	* backend/genesys_gl841.c backend/genesys_gl646.c: Actually use
-	  the endian converted slope table.
-	* backend/genesys_conv_hlp.c: Fix interpolation code to emit all
-	  pixels of a line.
-	* doc/descriptions/unsupported.desc: Added missing scanners from
-	  libsane.usermap. 
-
-2006-04-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/epson.desc doc/descriptions/fujitsu.desc
-	  doc/descriptions/hp.desc doc/descriptions/u12.desc
-	  doc/descriptions/umax.desc: Added most USB vendor and product
-	  ids. Minor cleanup.
-	* doc/descriptions/avision.desc: Used avision-desc.sh to update
-	  the .desc file to current SANE CVS avision.c code. Added USB
-	  ids. 
-	* doc/descriptions/plustek.desc: Added USB ids. Splitted some
-	  entries which have two different USB ids. Clarified comment about
-	  UMAX 3400. 
-	* tools/hotplug/libsane.usermap: Removed. Will be created 
-	  automatically by sane-desc.
-	* tools/Makefile.in: Create libsane.usermap (for hotplug),
-	  libsane.db (for hotplug-ng) and libsane.rules (for udev)
-	  automatically with sane-desc based on the :usbid tokens in the
-	  description files.
-	* doc/Makefile.in: Don't print warnings when creating the HTML
-	  scanner tables. The warnings are already printed in the tools
-	  directory.
-	* doc/descriptions-external/brother.desc
-	  doc/descriptions-external/brother2.desc: Point to current lists
-	  on Brother website.
-	* tools/hotplug/.cvsignore tools/hotplug-ng/.cvsignore
-	  tools/udev/.cvsignore: Added.
-
-2006-04-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/umax1220u-common.c backend/umax1220u.c
-	  doc/descriptions/umax1220u.desc doc/sane-umax1220u.man: Make
-	  UMAX 2100U (and probably 1600U and 2000U) work. Code from Patrick
-	  Lessard <palessar@cgocable.ca>. Updated manual page and .desc
-	  file.
-	* AUTHORS: Added Patrick Lessard and Pierre Willenbrock.
-	* doc/descriptions/unsupported.desc
-	  doc/descriptions-external/pixma.desc: Moved scanners supported
-	  by the external pixma backend to pixma.desc. Added Canon PIXMA
-	  MP730.
-	* doc/sane-mustek_usb2.man: Removed description of non-existing
-	  configuration file.
-	
-2006-04-12  Julien Blache <jb@jblache.org>
-	* tools/sane-desc.c: Fix/optimize udev rules; tests on the same
-	  line are ANDed together, not ORed together, causing the rules to
-	  trigger more often than necessary.
-
-2006-04-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* frontend/saned.c: If saned does not find any config file, it
-	  calls fclose with a NULL FILE*. The code may also leak open file
-	  descriptors and FILE's if multiple config files are found. (bug
-	  #303339). Fixed possible segfault on close_handle() (bug
-	  #303338).
-	* doc/descriptions/umax1220u.desc: Added links to Patrick
-	  Lessard's patch.
-	* backend/qcam.c: Fixed undefined symbols in the qcam backend on
-          GNU/kFreeBSD (patch from Aurelien Jarno <aurelien@aurel32.net>).
-	* doc/descriptions/unsupported.desc: Added Lexmark X5150.
-
-2006-04-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/brother2.desc: Added several scanners
-	  from Brother website.
-	* doc/descriptions/unsupported.desc: Added C-Channel scanners.
-	* tools/hotplug/libsane.usermap: Added some scanners.
-
-2006-03-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/sp15c.c: Fixed ADF support. Patch from Andreas Degert
-	  <ad@papyrus-gmbh.de>. 
-	* doc/descriptions-external/cs3200f.desc: Listed new cs3200f
-	  backend for Canon 3200F.
-	* doc/descriptions/unsupported.desc: Added Canon PIXMA760, Tevion
-	  MD 90090, Microtek ScanMaker 4600, and Visioneer Onetouch
-	  9320. Removed Canon CanoScan 3200F (now in external backends).
-
-2006-03-27  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-
-	* backend/genesys.c backend/genesys.h backend/genesys_low.h 
-	  backend/genesys_conv.c backend/genesys_gl841.c: Added extended
-	  option "Threshold" for lineart mode(Thanks to Laurent Charpentier).
-
-2006-03-24  Julien Blache <jb@jblache.org>
-	* doc/*: Another batch of spelling fixes from A. Costa.
-
-2006-03-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Iris Iriscan and Xerox
-	  Documate 510.  
-
-2006-03-21  Julien Blache <jb@jblache.org>
-	
-	* doc/*.man: More spelling fixes from A. Costa (through Debian).
-
-2006-02-02  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-scsi.c: Limit inquiry length to 120 bytes if
-	  firmware is not yet loaded
-
-2006-03-18  Julien Blache <jb@jblache.org>
-	
-	* doc/sane-apple.man: Applied patch from A Costa (through Debian);
-	english/spelling fixes for sane-apple(5).
-
-2006-03-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Microtek ScanMaker 4850
-	  II and Plustek OpticPro ST 64+.
-
-2006-03-12  Stephane Voltz <stefdev@modulonet.fr> 
-
-	* backend/genesys_gl646.c: removed now unneeded #ifdef in
-	  gl646_send_gamma_table.
-
-2006-03-12  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-
-	* backend/genesys_gl646.c: fixed silly thinko in
-	  gl646_send_gamma_table.
-
-2006-03-12  Stephane Voltz <stefdev@modulonet.fr>
-
-	* backend/genesys_gl646.c: fixed gl646_send_gamma_table after
-	  endianess changes. Put again a little fix for power saving
-
-2006-03-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/sanei_usb.c tools/sane-find-scanner.c: Added USB support
-	  for DragonFlyBSD (bug #303183).
-
-2006-03-09  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-
-	* backend/genesys.c backend/genesys_low.h: Removed little endian 
-	  conversions in slope table creation functions
-	* backend/genesys_gl646.c backend/genesys_gl841.c: Added little
-	  endian conversions to gl*_send_slope_table functions
-
-2006-03-09  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-
-	* backend/genesys.c: Some annotations about endianess of scanned
-	  data
-	* backend/genesys_gl646.c: Convert gamma tables to little endian
-
-2006-03-06  Stephane Voltz <stefdev@modulonet.fr>
-
-	* backend/genesys_gl646.c: power saving fixes
-
-2006-03-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/samsung.desc: Added USB ids for
-	  SCX-4100 (bug #303166).
-	* doc/descriptions/unsupported.desc: Added Brother MFC 9600, Canon
-	  PIXMA MP450, and Plustek ScanCopy 115.
-	
-2006-02-16  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-PARPORT.changes: Update.
-	* backend/plustek_pp.c: Bumped build number.
-	* backend/plustek-pp_ptdrv.c backend/plustek-pp_detec.c:
-	  Fixed bug, that prevents backend from working, when the device
-	  is another parport than parport0 - spotted by Christoph Steinbruchel.
-
-2006-02-14  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/u12/U12.changes: Update.
-	* backend/u12.c: Bumped build number.
-	* backend/u12-hw.c: SoftwareReset is now disabled in
-	  cancelSequence when the device is a Genius scanner.
-
-2006-02-13  Stephane Voltz <stefdev@modulonet.fr>
-
-	* backend/genesys_gl646.c: disabled power saving for gl646.
-
-2006-02-12  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README.solaris: Added link to installation report.
-	* doc/descriptions/unsupported.desc: Removed HP ScanJet 8200
-	  (supported by Avision backend). Minor updates.
-
-2006-02-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Removed Trust Office Scan USB
-	  19200 (now in niash.desc), added Xerox 4800 One Touch.
-	* include/sane/sanei_usb.h sanei/sanei_usb.c: Workaround for
-	  compilation problem on Windows/cygwin.
-	* backend/dll.c: With cygwin, use ":" as DIR_SEP (patch from
-      Philip Aston <paston@bea.com>).
-
-2006-02-04  Ullrich Sigwanz <usigwanz@freesurf.ch>
-
-	* backend/niash_xfer.c: Added Trust OfficeScan 19200
-	* doc/descriptions/niash.desc: Added Trust OfficeScan 19200
-	* backend/niash.c: Removed Reload on X,Y settings
-
-2006-02-02  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.h: Corrected USB ID for Benq 310
-
-2006-01-31  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes: Update.
-	* backend/plustek.c: Bumped build number.
-	* backend/plustek-usbdevs.c: Fixed CanoScan N1220U settings.
-
-2006-01-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/brother2.desc: Changed status of
-	  Brother MFC-410CN to "basic" (bug #302961).
-	* doc/descriptions/unsupported.desc: Added Benq 7400UT and Genius
-	  Colorpage CS.
-
-2006-01-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/snapscan-usb.c: Added #defines for SHM_R/W for cygwin
-	  (patch from Philip Aston <philipa@mail.com>).
-	* AUTHORS: Troy Rollo is now active.
-
-2006-01-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/epkowa.desc: Updated to match
-	  iscan-1.18.0. Added usb ids (patch from Olaf Meeuwissen
-	  <olaf@member.fsf.org>).
-	* doc/descriptions/unsupported.desc: Added Scanshell 800N and
-	  Canon Smartbase MP360.
-	* sanei/sanei_usb.c tools/sane-find-scanner.c: Added checks for
-	  altsetting =! 0.
-
-2006-01-22  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* backend/dll.c, backend/plustek-usbhw.c, backend/plustek-usbscan.c,
-	  sanei/sanei_pio.c: Fixed warnings about C++ style comments.
-	* backend/hp5400_xfer.h: Fixed compilation warnings.
-
-2006-01-21  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* backend/canon-sane.c: Fixed variable redeclaration.
-
-2006-01-05  Stephane Voltz <stefdev@modulonet.fr>
-
-	* tools/hotplug/libsane.usermap: Added Dell A920 (rebranded X1100)
-
-2006-01-19  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes: Update.
-	* backend/plustek.c: Bumped build number. Fixed constraint_type for
-	  OPT_BUTTON.
-	* backend/plustek-usbdevs.c: Added high-speed setting for HP2200.
-	  Cleanup.
-
-2006-01-18  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes: Update.
-	* backend/plustek.c: Bumped build number.
-	* backend/plustek-usbdevs.c: Fixed CanoScan N670U settings,
-	  see (bugreport #302738).
-
-2006-01-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/canon630u.desc doc/descriptions/coolscan2.desc
-	  doc/descriptions/hp5400.desc doc/descriptions/niash.desc
-	  doc/descriptions/unsupported.desc: Added USB vendor and product
-	  ids. Minor cleanup.
-	* backend/artec_eplus48u.conf.in doc/sane-artec_eplus48u.man
-	  doc/descriptions/artec_eplus48u.desc: Added Yakumo Scan50. Minor
-	  cleanup.
-	* doc/descriptions/gt68xx.desc: Added Mustek BearPaw 1248 CU.
-	* doc/descriptions/lexmark.desc: Added USB vendor and product
-	  ids. Changed status of X1150 and X1170 according to reports on
-	  sane-devel.
-
-2006-01-15  Ulrich Deiters <ulrich.deiters@uni-koeln.de>
-
-	* backend/canon-sane.c: fixed byte-swapping problem for little-endian
-	  platforms (affects raw-mode scanning with FS2710 slide scanner)
-
-2006-01-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/check-usb-chip.c: Improved rts8822l-01h chipset
-	  detection by adding check for descriptor.bcdUSB == 0x110 reported
-	  by some scanners and accepting any value diferent to 0, read
-	  from 0xfe11 register. Patch from Jonathan Bravo Lopez
-	  <JKD@JKDSoft.cjb.net>.
-	* tools/sane-desc.c: Added "ignore" parameter to :usbid
-	  token. Print warning if a backend defines USB models without
-	  defining usbid. Print warning if a model doesn't have an
-	  interface.
-	* doc/descriptions.txt: Added "ignore" parameter to :usbid
-	  token.
-	* doc/descriptions-external/hpaio.desc doc/descriptions-external/hpoj.desc
-	  doc/descriptions-external/samsung.desc: Updated comments. Added
-	  usb ids or "ignore".
-
-2006-01-10  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* doc/descriptions/snapscan.desc: Changed entries for duplicate USB IDs,
-	  added Epson Stylus CX-1500
-	* backend/snapscan.c backend/snapscan-scsi.c: Added support for 12 bit
-	  gamma tables for Epson CX-1500
-	* backend/snapscan.conf.in: Added Epson Stylus CX-1500
-
-2006-01-10  Gerard Klaver <gerard at gkall dot hobby dot nl>
-
-	* doc/descriptions-external/stv680.desc: Added USB id.
-	  added Creative webcam to list
-
-2006-01-10  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/epkowa.desc: Film area guide mode of
-	 4990 not supported (bug #302728).
-	* doc/descriptions-external/brother-mfc4600.desc
-	  doc/descriptions-external/brother.desc
-	  doc/descriptions-external/brother2.desc
-	  doc/descriptions-external/hp3770.desc
-	  doc/descriptions-external/hp3900.desc
-	  doc/descriptions-external/hp8200.desc
-	  doc/descriptions-external/hp_rts88xx.desc
-	  doc/descriptions-external/mustek_a3p1.desc
-	  doc/descriptions-external/primascan.desc
-	  doc/descriptions-external/template.desc.
-	  doc/descriptions-external/viceo.desc:
-	  Added several USB ids. Added some more scanners. General cleanup.
-
-2006-01-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/gt68xx.desc: Added USB id.
-	* doc/descriptions/unsupported.desc: Added interfaces to Panasonic
-	  scanners.
-
-2006-01-08  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* doc/descriptions/snapscan.desc: Added USB IDs
-
-2006-01-08  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Xerox 4800.
-	* doc/descriptions.txt tools/sane-desc.c: Added support for
-	  keyword :usbid. All output modes now print the usb vendor and
-	  product modes. Added usermap, db, and udev output modes for
-	  generating USB vendor/product lists for hotplug (ng) and Linux
-	  udev. Added version information to html modes.
-	* doc/descriptions/gt68xx.desc: Added vendor and product ids for
-	  all scanners.
-	* doc/descriptions/artec_eplus48u.desc
-	  doc/descriptions/genesys.desc doc/descriptions/hp3500.desc
-	  doc/descriptions/hp4200.desc doc/descriptions/ma1509.desc
-	  doc/descriptions/microtek2.desc doc/descriptions/mustek_usb.desc
-	  doc/descriptions/mustek_usb2.desc doc/descriptions/sm3600.desc
-	  doc/descriptions/sm3840.desc doc/descriptions/template.desc.
-	  doc/descriptions/umax1220u.desc doc/descriptions/unsupported.desc
-	  doc/descriptions-external/template.desc.:
-	  Added USB vendor and product ids. Minor cleanups.
-
-2006-01-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Medion MD 85264 finger
-	  print sensor and Trust Office Scan USB 19200.
-	* doc/descriptions-external/brother2.desc
-	  tools/hotplug/libsane.usermap: Brother DCP-7010 is reported to
-	  work (bug #302862).
-	* tools/check-usb-chip.c: Print version information when detecting
-	  chip sets.
-	* sanei/sanei_usb.c: Added warning if libusb support is not built
-	  in and some more debug messages.
-	* doc/descriptions-external/hp3900.desc: Status of HP ScanJet 4070
-	  Photosmart is now minimal.
-	* tools/sane-desc.c: Added new output mode: statistics. This mode
-	  prints overal statistics about known devices. Added support for
-	  more than one search directory. Removed support for deprecated
-	  backend status ("alpha", "beta" ...). Ran indent -gnu. HTML
-	  output (backends and mfgs) prints statitics now. Unify status
-	  and device type strings. Simplified status and device type
-	  string printing. Removed any remaining links of backend status.
-
-2006-01-06  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-scsi.c backend/snapscan-options.c backend/snapscan.c:
-	 Some fixes for the Epson Stylus CX1500
-
-2006-01-05  Stephane Voltz <stefdev@modulonet.fr>
-
-	* backend/umax_pp_low.c: removed unused local variable
-
-2006-01-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/Makefile.in backend/abaton.conf backend/abaton.conf.in
-	  backend/agfafocus.conf backend/agfafocus.conf.in
-	  backend/apple.conf backend/apple.conf.in backend/artec.conf
-	  backend/artec.conf.in backend/artec_eplus48u.conf
-	  backend/artec_eplus48u.conf.in backend/avision.conf
-	  backend/avision.conf.in backend/bh.conf backend/bh.conf.in
-	  backend/canon.conf backend/canon.conf.in backend/canon630u.conf
-	  backend/canon630u.conf.in backend/canon_pp.conf
-	  backend/canon_pp.conf.in backend/coolscan.conf
-	  backend/coolscan.conf.in backend/coolscan2.conf
-	  backend/coolscan2.conf.in backend/dc210.conf
-	  backend/dc210.conf.in backend/dc240.conf backend/dc240.conf.in
-	  backend/dc25.conf backend/dc25.conf.in backend/dll.conf
-	  backend/dll.conf.in backend/dmc.conf backend/dmc.conf.in
-	  backend/epson.conf backend/epson.conf.in backend/fujitsu.conf
-	  backend/fujitsu.conf.in backend/genesys.conf
-	  backend/genesys.conf.in backend/gphoto2.conf
-	  backend/gphoto2.conf.in backend/gt68xx.conf
-	  backend/gt68xx.conf.in backend/hp.conf backend/hp.conf.in
-	  backend/hp4200.conf backend/hp4200.conf.in backend/hp5400.conf
-	  backend/hp5400.conf.in backend/hpsj5s.conf
-	  backend/hpsj5s.conf.in backend/ibm.conf backend/ibm.conf.in
-	  backend/leo.conf backend/leo.conf.in backend/lexmark.conf
-	  backend/lexmark.conf.in backend/ma1509.conf
-	  backend/ma1509.conf.in backend/matsushita.conf
-	  backend/matsushita.conf.in backend/microtek.conf
-	  backend/microtek.conf.in backend/microtek2.conf
-	  backend/microtek2.conf.in backend/mustek.conf
-	  backend/mustek.conf.in backend/mustek_pp.conf
-	  backend/mustek_pp.conf.in backend/mustek_usb.conf
-	  backend/mustek_usb.conf.in backend/nec.conf backend/nec.conf.in
-	  backend/net.conf backend/net.conf.in backend/pie.conf
-	  backend/pie.conf.in backend/plustek.conf backend/plustek.conf.in
-	  backend/plustek_pp.conf backend/plustek_pp.conf.in
-	  backend/qcam.conf backend/qcam.conf.in backend/ricoh.conf
-	  backend/ricoh.conf.in backend/s9036.conf backend/s9036.conf.in
-	  backend/saned.conf backend/saned.conf.in backend/sceptre.conf
-	  backend/sceptre.conf.in backend/sharp.conf backend/sharp.conf.in
-	  backend/sm3840.conf backend/sm3840.conf.in backend/snapscan.conf
-	  backend/snapscan.conf.in backend/sp15c.conf
-	  backend/sp15c.conf.in backend/st400.conf backend/st400.conf.in
-	  backend/tamarack.conf backend/tamarack.conf.in
-	  backend/teco1.conf backend/teco1.conf.in backend/teco2.conf
-	  backend/teco2.conf.in backend/teco3.conf backend/teco3.conf.in
-	  backend/test.conf backend/test.conf.in backend/u12.conf
-	  backend/u12.conf.in backend/umax.conf backend/umax.conf.in
-	  backend/umax1220u.conf backend/umax1220u.conf.in
-	  backend/umax_pp.conf backend/umax_pp.conf.in backend/v4l.conf
-	  backend/v4l.conf.in:
-	  Renamed backend configuration files from *.conf to
-	  *.conf.in. The configuration files are preprocessed by
-	  backend/Makefile now and variables like @DATADIR@ are substituted
-	  by the appropriate directories. This is especially useful for
-	  firmware locations. For the firmware paths for the artec_eplus48u,
-	  gt68xx, and snapscan backends variables were used. Bug #302590.
-	  Regenerate .conf files only if .conf.in were changed.
-	* backend/.cvsignore: Added *.conf.
-	* README.linux: Mentioned udev.
-	* doc/backend-writing.txt: New chapters about the build system and
-	  the files and directories of sane-backends. Fixed building
-	  instructions for tstbackend. Mentioned that sane_* symbols
-	  should be only used for API symbols.
-	* testsuite/Makefile.in testsuite/README testsuite/testfile.pnm:
-	  Changed testsuite to use the test backend instead of the pnm
-	  backend. This actually works with current sane-backends.
-	* PROBLEMS: Removed pnm problem description. It's not relevant for
-	  normal users and explained in the sane-pnm man page anyway.
-	* backend/genesys.c: Fixed some compilation warnings.
-	* tools/hotplug/libsane.usermap: Added Hewlett-Packard PSC 1210.
-
-2006-01-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane.tex: Corrected formula for calculation of
-	  bytes_per_line in chapter 4.3.8 sane_get_parameters.
-	  New version: 1.04.
-
-2006-01-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/microtek2.c backend/microtek2.h: Fixed problem with
-	  option "resolution" which exists twice at the same time. Bug
-	  #302466.
-	* tools/hotplug/libsane.usermap: Added Canon LiDE 60 (bug
-	  #302830).
-	* backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c
-	  backend/gt68xx_high.c doc/descriptions/gt68xx.desc
-	  doc/gt68xx/gt68xx.CHANGES doc/gt68xx/gt68xx.TODO: Added Plustek
-	  OpticPro S(T)12 (product id 0x040b). Mostly untested. Print
-	  warmup message 5 seconds after starting the warm-up.
-	* doc/descriptions/unsupported.desc: Added Visioneer 9450
-	  USB. Updated comments for Plustek S(T)12.
-	* backend/test.c backend/test.conf backend/test.h
-	  doc/sane-test.man doc/descriptions/test.desc:
-	  Added option "source" which can be used to simulate an Automatic
-	  Document Feeder (ADF). Added copyright header to test.h.
-	* frontend/scanimage.c: Don't create and delete a file in batch
-	  mode if the document feeder is empty or if CTRL-D is pressed in
-	  prompt mode. This change avoids deleting existing files. For an
-	  explanation, see bug #302797.
-
-2006-01-01  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-data.c backend/snapscan-options.c backend/snapscan.c
-	  doc/descriptions/snascan.desc:
-	  Added (static) calibration data for Benq 5150 / 5250
-	* backend/snapscan.h backend/snapscan.conf:
-	  Added preliminary support for Epson Stylus CX 1500
-	* backend/Makefile.in: Added snapscan-data.c
-
-2005-12-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/scanwit.desc: Added "(Acer)" to
-	  manufacturer name (bug #302801).
-	* doc/descriptions/unsupported.desc: Added/updated several old
-	  Acer (Benq) and Agfa parport scanners.
-
-2005-12-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/hotplug/libsane.usermap: Added Brother MFC 8440.
-	* Makefile.in: make libcheck now also checks for non standard sane
-	  symbols (sane_*).
-	* doc/descriptions/unsupported.desc: HP Scanjet 3690 uses GL646_HP
-	  chipset.
-
-2005-12-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README.linux: Mention ld.so.conf issue.
-	* doc/descriptions/unsupported.desc
-	  doc/descriptions-external/hp3900.desc: Added external hp3900
-	  backend. Moved (possibly) supported scanners from
-	  unsupported.desc.
-	* doc/backend-writing.txt: Added some hints about what to do to add
-	  a new backend to the existing sane-backends code.
-
-2005-12-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Lexmark X2330.
-
-2005-12-23  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added Canon Pixma MP500.
-	* README.openbsd: Added hint about CPPFLAGS.
-	* doc/descriptions/artec.desc: Changed status of Artec AT6 to
-	  "good" as reported in bug #302749.
-	* tools/hotplug/libsane.usermap: Added Brother MFC-7420.
-
-2005-12-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/dll.c doc/descriptions/dll.desc: Fixed dynamic loading
-	  on current HP/UX systems (bug #302732).
-	* AUTHORS ChangeLog configure configure.in backend/Makefile.in
-	  backend/dll.conf backend/hp3500.c doc/Makefile.in
-	  doc/sane-hp3500.man doc/sane.man doc/descriptions/hp3500.desc:
-	  Added hp3500 backend which supports the  HP ScanJet 3500 series,
-	  including the 3500C, 3530C and 3570C (patch from Troy Rollo
-	  <sane@troy.rollo.name>) (bug #302687).
-	* doc/descriptions-external/hp3500.desc: Deleted.
-	* doc/descriptions/hp4200.desc doc/descriptions/lexmark.desc
-	  doc/descriptions/mustek_usb2.desc: Removed "NEW!" markers.
-
-2005-12-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* Makefile.in: List ChangeLog-1.0.17 in DISTFILES.
-	* configure configure.in: Changed version to 1.0.17-cvs. Enabled
-	  compilation warnings.
-	* doc/descriptions-external/brother2.desc: Added Brother MFC-215C.
-
-Older entries can be found in ChangeLog-1.0.17.
diff --git a/ChangeLog-1.0.19 b/ChangeLog-1.0.19
deleted file mode 100644
index 2c4b8b2..0000000
--- a/ChangeLog-1.0.19
+++ /dev/null
@@ -1,1161 +0,0 @@
-******  Release of sane-backends 1.0.19. End of code freeze ******
-
-2008-02-10  m. allan noah <kitno455 a t gmail d o t com>
-	* Makefile.in: correct DISTFILES
-	* configure.in, configure: alpha sort backend names
-	* backend/Makefile.in: correct/sort DISTFILES and .la: targets
-	* include/Makefile.in: correct/sort SANE_INCLUDES
-	* doc/releases.txt: minor updates
-
-2008-02-10  m. allan noah <kitno455 a t gmail d o t com>
-	* config.guess, config.sub: updated to latest versions
-	* configure.in, configure: updated sane version number
-	* doc/releases.txt: minor updates
-	* sane-backends.lsm: updated maintainer and keyword info
-	* NEWS: added last 18+ months of updates to 1.0.19 section
-
-2008-02-09  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/hpljm1005.c, doc/descriptions/hpljm1005.desc:
-	  add usb ID for LaserJet M1120
-
-2008-02-09  Rene Rebe <rene@exactcode.de>
-
-	* backend/avision.ch: fixed device list matching for entries
-	  with partial matches on USB ID, but vendor / product string
-	  matches as mostly only the HP5300 vs. HP5370, fixed non-color
-	  calibration for devices not filling all RGB fields of calibration
-	  format information, do not send 3x3 color matrix to older devices
-	  (ASIC versions) as some HP53xx does not correctly handle it,
-	  improved calibration accuracy and fixed transparency adapter
-	  detection to not use non-zero as present, but just 1 (some
-	  devices now set 0xff as (-1) - not present ...
-
-2008-02-07  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/hpljm1005.c, doc/descriptions/hpljm1005.desc:
-	  add usb ID for LaserJet M1120n
-	* doc/descriptions-external/brother2.desc: add usb ID for DCP-120C
-
-2008-02-03  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/hpljm1005.c: better sane_cancel handling
-	* backend/agfafocus.c backend/coolscan.c, backend/coolscan2.c,
-	  backend/hpljm1005.c, backend/ibm.c, backend/lexmark_low.c,
-	  backend/microtek.c, backend/microtek2.c, backend/nec.c, backend/pie.c,
-	  backend/ricoh.c, backend/s9036.c, backend/st400.c, backend/umax.c:
-	  reduce gcc pedantic/ansi warnings from 690 to 280 lines, mostly
-	  via casts in str*() calls.
-
-2008-02-03  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* Makefile.in, */Makefile.in, tools/sane-config.in:
-	  Fix warnings about ignored --datarootdir
-	* backend/hp5590_low.c: Fix incompatible pointer type warning
-	* backend/genesys_gl646.c: Fix incompatible pointer type warning
-	* backend/dc25.c, backend/coolscan2.c, backend/epson2.c,
-	  backend/epson2-commands.c, backend/epson2-io.c, backend/epson2_net.c,
-	  backend/genesys.c, backend/genesys_gl841.c, backend/hp3900_usb.c,
-	  backend/lexmark_low.c, backend/plustek-usbhw.c, backend/sm3840.c:
-	  Fix format warnings
-	* backend/pixma.c: Add missing #include
-
-2008-02-02  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* configure, configure.in, include/sane/config.h.in,
-	  backend/hp3900_debug.c: make tiffio.h optional
-	* backend/Makefile.in: remove sanei_config2 from epjitsu deps
-	* backend/epson2.c, backend/hpljm1005.c: add missing #includes
-
-2008-02-01  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* po/sane-backends.no.po: renamed to sane-backends.nb.po
-	* po/Makefile.in: norwegian bokmål locale is nb and not no
-
-2008-01-30  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* backend/pixma.c: Fix initialization of the reader taskid
-
-2008-01-30  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/hpljm1005.c: call sane_get_devices if required
-
-2008-01-29  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/snapscan.c: fix bug #310538
-	* doc/descriptions/unsupported.desc: add Canon LiDE 600F
-
-2008-01-23  Alessandro Zummo <a.zummo@towertech.it>
-	* doc/descriptions/epson2.desc: cloned from epson.desc with
-	minor modifications.
-
-2008-01-22  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/hpljm1005.c, doc/descriptions-external/hpljm1005.desc:
-	  Update backend with DBG macro calls, remove external .desc file,
-	  from author- couriousous at mandriva dot org
-	* backend/fujitsu.c: disable compression option arg until sane 1.1.0
-	* doc/descriptions/dell1600n_net|hp3500|pixma.desc: remove 'new' flag
-
-2008-01-17  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/hpljm1005.c, doc/descriptions/hpljm1005.desc,
-	  doc/sane-hpljm1005.man, AUTHORS, configure, configure.in,
-	  backend/Makefile.in, backend/dll.conf.in, doc/Makefile.in,
-	  doc/sane.man: add hpljm1005 backend, couriousous at mandriva dot org
-
-	* tools/check-po.awk, po/sane-backends.fr.po: updates from
-	  Yann E. MORIN
-
-2008-01-16  m. allan noah <kitno455 a t gmail d o t com>
-	* po/sane-backends.fr.po: updated translation from Yann E. MORIN
-	* backend/fujitsu.c, backend/fujitsu.conf.in, 
-	  doc/descriptions/fujitsu.desc: add usb id for S500M
-
-2008-01-16  Jonathan Bravo Lopez <jkdsoft@gmail.com>
-	* backend/hp3900_usb.c: fixed compilation warning related
-	  to an argument type in Read_Bulk function.
-
-2008-01-14  m. allan noah <kitno455 a t gmail d o t com>
-	* tools/check-po.awk: support different use of 'fuzzy'
-	* po/sane-backends.fr.po: updated translation
-	  both updates from Yann E. MORIN
-
-2008-01-09  Gerard Klaver <gerard at gkall dot hobby dot nl>
-	* backend/teco2.c changed routine teco_request_sens
-	  add init value to size (bugreport
-	  https://bugzilla.novell.com/show_bug.cgi?id=205451)
-
-2008-01-09  Alessandro Zummo <a.zummo@towertech.it>
-	* changed functions prefix (esci_ for device commands,
-	e2_ for driver's functions), better handling of tpu area,
-	fixed tpu detection, changed freeing of line buffers,
-	fixed some XXXs.
-
-2008-01-09  Alessandro Zummo <a.zummo@towertech.it>
-	* sanei_tcp.c, fix compilation with cygwin.
-
-2008-01-02  m. allan noah <kitno455 a t gmail d o t com>
-	* AUTHORS, configure, configure.in, backend/Makefile.in,
-	  backend/dll.conf.in, backend/hs2p-saneopts.h,
-	  backend/hs2p-scsi.c, backend/hs2p-scsi.h, backend/hs2p.c
-	  backend/hs2p.conf.in, backend/hs2p.h doc/Makefile.in,
-	  doc/sane-hs2p.man, doc/sane.man, doc/descriptions/hs2p.desc:
-	  add hs2p backend for jazz_johnson a t verizon d o t net
-
-2007-12-29  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/epjitsu.c: let io_error fall thru usb command function
-	* backend/epjitsu.conf.in: use @DATADIR@ for holding firmware
-	* backend/Makefile.in: add epjitsu to FIRMWARE_DIRS
-
-2007-12-29  m. allan noah <kitno455 a t gmail d o t com>
-	* include/sane/sane.h, frontend/scanimage.c, backend/fujitsu.[ch]:
-	  commented/removed/deactivated all new SANE_FRAME code
-
-2007-12-26  Alessandro Zummo <a.zummo@towertech.it>
-	* backend/epson2.c: added network scanner autodiscovery
-
-2007-12-26  Alessandro Zummo <a.zummo@towertech.it>
-	* sanei/sanei_udp.c: added udp support functions
-
-2007-12-24  Julien Blache <jb@jblache.org>
-	* configure.in, configure: Do not build plustek_pp on Hurd. Patch
-	from Samuel Thibault <samuel.thibault@ens-lyon.org>. Add missing
-	closing paren to error message.
-
-2007-12-21  Jonathan Bravo Lopez <jkdsoft@gmail.com>
-
-	* backend/hp3900.c, backend/hp3900_rts8822.c: Fixed bug which made
-	  slide/negative scans unusable.
-	* backend/hp3900_config.c: Changed area constrains of slide/negative scans.
-
-2007-12-19  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/epjitsu.c: backend v1.0.10, fix missing function
-
-2007-12-19  Jonathan Bravo Lopez <jkdsoft@gmail.com>
-
-	* po/sane-backends.es.po: Updated translation.
-	* tools/check-usb-chip.c: fixed compilation warning and "RTS8822L-01H"
-	  strings renamed to "RTS8822"
-
-2007-12-19  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* po/Makefile.in, po/sane-backends.*.po: New translation keys for
-	  hp3900 backend. Updated Swedish translation.
-
-2007-12-17  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/epjitsu*, backend/Makefile.in, backend/dll.conf.in,
-	  doc/sane-epjitsu.man, doc/Makefile.in, doc/sane.man,
-	  doc/descriptions/epjitsu.desc, configure, configure.in, AUTHORS:
-	  add backend for Epson-based Fujitsu scanners (fi-60F and S300)
-
-2007-12-17  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek-usb.[ch] backend/plustek-usbcal.c backend/plustek-usbimg.c
-	  backend/plustek-usbio.c backend/plustek-usbshading.c: Fixed ARM/Xscale
-	  issues.
-	* backend/plustek.c: Bumped build number
-	* doc/plustek/Plustek-USB-TODO.txt doc/plustek/Plustek-USB.changes: Update
-
-2007-12-15  Alessandro Zummo <a.zummo@towertech.it>
-	* backend/epson2.c: fixed model detection,
-	  depth detection and removed some unused
-	  variables.
-
-2007-12-13  Jonathan Bravo Lopez <jkdsoft@gmail.com>
-	* Added files for 'hp3900' backend which supports
-	  HP Scanjet 3800/3970/4070/4370/G3010
-	* doc/descriptions-external/hp3900.desc: moved to doc/descriptions
-
-2007-12-10  Alessandro Zummo <a.zummo@towertech.it>
-	* backend/epson2.c: use epson2_model where possible,
-	  fixed segmentation fault.
-
-2007-12-08  Giuseppe Sacco <eppesuig@debian.org>
-
-	* Added esperanto translation, per Antonio Codazzi.
-
-2007-11-23  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* po/sane-backends.*.po: Update
-	* backend/plustek-usb.[ch] backend/plustek-usbcal.c
-	  backend/plustek-usbdevs.c backend/plustek.[ch]:
-	  Tweaked TravelScan464 settings. Improved AFE gain calculation
-	  for CIS devices. This should avoid stripes in the scanned images.
-	* doc/sane-plustek.man doc/plustek/Plustek-USB.changes: Update
-
-2007-11-22  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys.c, backend/genesys_devices.c,
-	  backend/genesys_low.h, backend/genesys_gl646.c,
-	  backend/genesys_gl841.c: add infrastructure for multiple motor
-	  power modes
-
-2007-11-21  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys_gl841.c: add internal flag for disabling lamp
-	  during scan(useful for black level calibration)
-
-2007-11-18  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* backend/mustek.c: Add protection for a double free (#306775)
-	* backend/agfafocus.c, backend/artec_eplus48u.c, backend/avision.c,
-	  backend/coolscan.c, backend/hp3500.c, backend/microtek2.c,
-	  backend/mustek.c, backend/pie.c, backend/pixma.c, backend/plustek.c,
-	  backend/plustek_pp.c, backend/snapscan.c, backend/sp15c.c,
-	  backend/tamarack.c, backend/test.c, backend/u12.c, backend/umax.c:
-	  Fix handling of valid "negative" PIDs.
-
-2007-11-18  Alessandro Zummo <a.zummo@towertech.it>
-
-	* backend/epson2.c: removed quick-format option. it's
-	the job of a frontend to provide such a commodity.
-	removed confusing parameters (preview-speed, speed).
-	when a preview is requested, the scanner will be
-	set to high speed (if possible).
-	removed references to the never implemented zoom function.
-	the function that shortened the list was actually
-	missing the first entry.
-	more resolutions addedd for networked scanners.
-	added support for Perfection 4990 (Claus Boje).
-
-2007-11-17  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.c, backend/fujitsu.conf.in, 
-	  doc/descriptions/fujitsu.desc: add usb id for S510
-
-2007-11-17  Rene Rebe <rene@exactcode.de>
-
-	* backend/avision.[ch]:
-	  Implemented support for latest Avision ASICs and features,
-	  including overscan, background raster, software scaling for
-	  cheaper ASICs used in HP scanners. Changed types used to
-	  more portable uint* ones, without underscore (_), removed
-	  in-file ChangeLog history, as the files became big enough.
-	  Implemented early calibration for easier handling of
-	  Avision-based film scanners and implemented support for
-	  2-pass duplex scanners.
-
-2007-11-16  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* include/sane/sanei_thread.h, include/sane/sanei_usb.h:
-	  Fixing doxygen warnings.
-
-2007-11-16  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek-usb.[ch] backend/plustek-usbcal.c
-	  backend/plustek-usbdevs.c backend/plustek-usbshading.c
-	  backend/plustek.[ch] backend/plustek.conf.in:
-	  Tweaked TravelScan464 settings. Added possibility to disable 
-	  dark-calibration with lamp on (touches devices like CanoScan1220 etc.)
-	  Use attribute packed for data access structs
-
-	* doc/sane-plustek.man doc/plustek/Plustek-USB.changes: Update
-
-	* include/sane/sanei_usb.h sanei/sanei_usb.c: Added function
-	  sanei_usb_get_descriptor() to retrieve some infos about a connected
-	  device
-
-2007-11-16  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* backend/artec_eplus48u.c, backend/coolscan.c, backend/mustek.c,
-	  backend/pie.c, backend/plustek.c, backend/plustek_pp.c,
-	  backend/snapscan.c, backend/test.c, backend/u12.c, backend/umax.c:
-	  Correct the test of the return value from sanei_thread_begin.
-
-2007-11-12  Julien Blache <jb@jblache.org>
-	* doc/descriptions-external/epkowa.desc: Update epkowa.desc for
-	iScan! 2.10.0. Patch provided by Olaf Meeuwissen.
-
-2007-11-11  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys_gl841.c: add check for low brightness
-
-2007-11-11  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys.c, backend/genesys_gl646.c,
-	  backend/genesys_gl841.c, backend/genesys_low.h: change 
-	  bulk_write_register to take number of registers instead of
-	  byte size of register set
-
-2007-05-08  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* acinclude.m4: NSLinkModule is deprecated in favour of dlopen -
-	  only look for NSLinkModule if dlopen is not available
-	* acinclude.m4, m4/libtool.m4: include libtool.m4 using m4_include
-	* ltmain.sh, m4/libtool.m4: newer versions.
-	* configure.in: move the byteorder test to after AC_GNU_SOURCE et al.
-	  to avoid warnings when running autoconf,
-	  add AC_SUBST(CROSS_COMPILING),
-	  add a check for IOKit/scsi/SCSICommandOperationCodes.h,
-	  add a check for SCSITaskSGElement (for darwin 64 bit support)
-	* doc/Makefile.in, tools/Makefile.in: disable things that need the
-	  built binaries to run when doing cross-compilations
-	* sanei/sanei_scsi.c: IOKit/scsi-commands has moved to IOKit/scsi -
-	  support both locations of headers, use SCSITaskSGElement if available
-	* aclocal.m4, config.guess, config.sub, configure,
-	  include/sane/config.h.in: update autogenerated files
-	* backends/Makefile.in: remove sanei_config2 from cardscan deps
-	* backends/dll.c: add MacOS X naming convention for dlopen
-	* tools/sane-find-scanner.c: IOKit/scsi-commands has moved to
-	  IOKit/scsi - support both locations of headers, fix some warnings
-
-2007-11-08  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes doc/sane-plustek.man: Update
-	* backend/plustek.c: Bumped build number
-	* doc/descriptions/unsupported.desc: Updated some entries
-	* backend/plustek-usb.c backend/plustek-usbimg.c backend/plustek-usbmap.c
-	  backend/plustek-usbscan.c backend/plustek-usbshading.c: Fixed copyright
-	* backend/plustek-usb.h backend/plustek-usbdevs.c 
-	  doc/descriptions/plustek.desc: Added support for TravelScan464
-
-2007-10-28  Julien Blache <jb@jblache.org>
-	* doc/descriptions/epson.desc: Added the Epson DX-6000 (04b8:082e)
-	based on user report.
-
-2007-10-27  Julien Blache <jb@jblache.org>
-	* backend/net.c: Fix IPv4 legacy code after last changes to the
-	net backend on 2007-10-24.
-
-2007-10-26  Julien Blache <jb@jblache.org>
-	* backend/abaton.c, backend/agfafocus.c, backend/apple.c,
-	backend/artec.c, backend/canon.c, backend/cardscan.c,
-	backend/coolscan.c, backend/epson.c, backend/epson2.c,
-	backend/fujitsu.c, backend/hp3500.c, backend/ibm.c,
-	backend/pint.c, backend/ricoh.c, backend/s9036.c,
-	backend/sm3600.c, backend/sp15c.c, backend/tamarack.c:
-	OPT_NUM_OPTS must be of type SANE_TYPE_INT.
-
-2007-10-25  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys.c: Removed some more hardcoded
-	  sizeof(Genesys_Register_Set)
-
-2007-10-25  Julien Blache <jb@jblache.org>
-	* sanei/sanei_ab306.c: Fix boundary checking after the for() loop
-	in sanei_ab306_open(). From Johannes Meixner at SuSE.
-	* backend/as6e.c: Fix strncpy()/strncat() usage in
-	check_for_driver(). From Johannes Meixner at SuSE.
-
-2007-10-25  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys_gl841.c: Hopefully removed the remaining hardcoded
-	  sizeof(Genesys_Register_Set)
-
-2007-10-25  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys_gl841.c: One more instance of 
-	  sizeof(Genesys_Register_Set) vs 2
-	* backend/genesys.c: Add check for small register set in 
-	  sanei_genesys_get_address
-
-2007-10-24  Julien Blache <jb@jblache.org>
-	* backends/net.c: Add an optional connection timeout for the
-	initial connection to saned. Based on a patch from Ryan Duryea
-	<rduryea@avanta.com>. Bump net backend version to 1.0.14.
-	* backends/net.conf.in: Add the new connect_timeout option and
-	adjust comments accordingly.
-	* doc/sane-net.man: Document the connect_timeout option and the
-	SANE_NET_TIMEOUT environment variable.
-
-2007-10-19  Stephane Voltz <stef.dev@free.fr>
-
-	* tools/check-usb-chip.c: added detection of rts8801 and
-	  rts8891 ASICs
-
-2007-10-13  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-
-	* backend/genesys_gl841.c backend/genesys_gl646.c: use
-	  sizeof(Genesys_Register_Set) instead of 2
-
-2007-10-07 Bertrik Sikken <bertrik@sikken.nl>
-	* doc/descriptions/unsupported.desc: updated with info from
-	  'FormularDaten' e-mails up to 2007/9/29
-
-2007-10-02  Julien Blache <jb@jblache.org>
-	* doc/descriptions-external/brother2.desc: add DCP-117C USB IDs
-	and mark support as good, based on user report.
-
-2007-10-01  Stephane Voltz <stef.dev@free.fr>
-
-	* backend/lexmark.c backend/lexmark_low.c:
-	  fixed compilation warnings
-
-2007-10-01  Stephane Voltz <stef.dev@free.fr>
-
-	* doc/sane-lexmark.man doc/descriptions/lexmark.desc
-	  backend/Makefile.in backend/lexmark.c backend/lexmark_low.c
-	  backend/lexmark_sensors.c backend/lexmark_models.c
-	  backend/lexmark.conf.in:
-	  moved experimental version to current tree
-
-2007-10-01  Stephane Voltz <stef.dev@free.fr>
-
-	* doc/sane-umax_pp.man doc/descriptions/umax_pp.desc:
-	  added Genius ColorPage-Life Pro as supported scanner
-	  by the umax_pp backend
-
-2007-09-28  Bertrik Sikken <bertrik@sikken.nl>
-	* doc/descriptions/unsupported.desc: updated with info from
-	  'FormularDaten' e-mails from 2007/7/3 to 2007/7/30
-
-2007-09-27  Julien Blache <jb@jblache.org>
-	* doc/backend-writing.txt: fix typos, patch from
-	<jazz_johnson@verizon.net>.
-
-2007-09-26  Julien Blache <jb@jblache.org>
-	* doc/descriptions/unsupported.desc: Added pointer to
-	http://code.google.com/p/kvss905c/ for the Panasonic KV-SS905C and
-	Panasonic KV-S3105C scanners (note that the non-SANE driver at
-	that URL supports other scanners of the KV-SS905C family).
-
-2007-09-25  Bertrik Sikken <bertrik@sikken.nl>
-	* doc/descriptions/unsupported.desc: updated with info from
-	  'FormularDaten' e-mails from 2007/5/1 to 2007/6/24
-
-2007-09-23  Bertrik Sikken <bertrik@sikken.nl>
-
-	* doc/descriptions/unsupported.desc: updated with info from
-	  'FormularDaten' e-mails from 2007/2/11 to 2007/4/30
-
-2007-09-17  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/descriptions/unsupported.desc: #305009 removed UMAX3400, as it is
-	  supported by the Plustek backend
-
-2007-08-28  Giuseppe Sacco <eppesuig@debian.org>
-
-        * Italian translation update
-	* Corrected a typo in backend/canon.c
-
-2007-08-27  Stephane Voltz <stef.dev@free.fr>
-
-	* backend/genesys.h backend/genesys_gl841.c backend/genesys_low.h
-	  backend/umax_pp.c backend/umax_pp.h backend/umax_pp_mid.c
-	  backend/umax_pp.h AUTHORS doc/sane-umax_pp.man doc/sane-genesys.man:
-	  mail address update, minor man update
-
-2007-08-26  Stephane Voltz <stef.dev@free.fr>
-
-	* backend/genesys.c backend/genesys_gl646.c backend/genesys_devices.c:
-	  HP2400 warmup fix by Luke
-
-2007-08-19  Henning Geinitz <sane@geinitz.org>
-
-	* backend/gt68xx.c backend/gt68xx.conf.in backend/gt68xx_devices.c
-	  backend/gt68xx_generic.c backend/gt68xx_gt6801.c
-	  backend/gt68xx_gt6816.c backend/gt68xx_high.c
-	  backend/gt68xx_high.h backend/gt68xx_low.c backend/gt68xx_low.h
-	  backend/gt68xx_mid.c doc/sane-gt68xx.man
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES: Added
-	  Artec Ultima 2000 e+, Nortek Myscan 1200, NeatReceipts Scanalizer
-	  Professional, Genius Colorpage Slim-1200. Name and email
-	  address changes.
-	* AUTHORS: Name and email address change.
-
-2007-08-18 Julien Blache <jb@jblache.org>
-	* doc/descriptions/epson.desc: Added Stylus CX-5000 (04b8:082b).
-	* backend/epson_usb.c: Added various USB IDs for CX-6000, DX-5050,
-	DX-5000, CX-5000, DX-4050.
-
-2007-08-12  Henning Geinitz <sane@geinitz.org>
-	* doc/descriptions-external/hpljm1005.desc: Added.
-
-2007-08-08  m. allan noah <kitno455 a t gmail d o t com>
-	* frontend/scanimage.c: bugfix: dont round up negative user values
-	* doc/descriptions/fujitsu.desc: add/consolidate new models
-
-2007-08-03 Julien Blache <jb@jblache.org>
-	* doc/descriptions/epson.desc: add the Epson Stylus Photo RX-700
-	(04b8:0810), based on user report. Add the Epson Stylus CX-6600
-	(04b8:0813), based on user report.
-
-2007-07-26  m. allan noah <kitno455 a t gmail d o t com>
-	* frontend/scanimage.c: add default: blocks to FRAME switch code
-	* backend/fujitsu.[ch]: update to version 1.0.52:
-	- remove unused jpeg function
-	- reactivate look-up-table based brightness and contrast options
-	- change range of hardware brightness/contrast to match LUT versions
-	- call send_lut() from sane_control_option instead of sane_start
-
-2007-07-31 Julien Blache <jb@jblache.org>
-	* doc/descriptions/epson.desc: add the Epson Stylys DX-5050
-	(04b8:082b).
-
-2007-07-30 Julien Blache <jb@jblache.org>
-	* doc/descriptions/epson.desc: add the Epson Stylus DX-4050
-	(04b8:082f), based on several reports. Add the Epson Stylus
-	DX-5000 (04b8:082b) on the same grounds.
-	* backend/canon.c: apply patch from Nils Philippsen, turning
-	3 logical AND into bitwise AND (SANE bug #304363).
-
-2007-07-29 Julien Blache <jb@jblache.org>
-	* tools/sane-desc.c: Add a RUN rule to the udev rules to
-	automatically disable USB suspend for all known scanners.
-	Works only with kernels >= 2.6.22 where
-	/sys/bus/usb/devices/*/power/level exists.
-
-2007-07-26  m. allan noah <kitno455 a t gmail d o t com>
-
-	* backend/fujitsu.c: update to version 1.0.51, fix bug in jpeg code
-
-2007-07-26 Julien Blache <jb@jblache.org>
-	* tools/sane-desc.c: revert my last commit and rework the one
-	before to produce a backward compatible udev rules file. Yay.
-
-2007-07-26  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes: Update
-	* backend/plustek.c: Bumped build number
-	* backend/plustek-usbhw.c: Force output bit set on misc I/O,
-	  when lamp is switched
-	* doc/descriptions/unsupported.desc: Updated some Plustek entries
-
-2007-07-25 Julien Blache <jb@jblache.org>
-	* tools/sane-desc.c: Update udev rules for use with Linux >=
-	2.6.22 and CONFIG_USB_DEVICE_CLASS=n.
-
-2007-07-20  Wittawat Yamwong <wittawat@web.de>
-
-	* backend/pixma.c backend/pixma.h backend/pixma_mp150.c
-	  doc/sane-pixma.man doc/descriptions/pixma.desc:
-	  upgraded to version 0.13.1
-	  added PIXMA MP960
-
-2007-07-15  m. allan noah <kitno455 a t gmail d o t com>
-
-	* doc/descriptions/fujitsu.desc, doc/sane-fujitsu.man: 
-	  update website and fi-60F status
-	* Authors, backend/dll.conf.in: added cardscan backend
-
-2007-07-14  m. allan noah <kitno455 a t gmail d o t com>
-
-	* doc/sane-cardscan.man,doc/Makefile.in,doc/descriptions/cardscan.desc,
-	  backend/cardscan.*,backend/Makefile.in,configure.in:
-	    add new v1.0.0 backend for Corex CardScan 800c
-
-2007-07-14  m. allan noah <kitno455 a t gmail d o t com>
-
-	* doc/sane-fujitsu.man: add more known models, fix bug #304450
-	* backend/Makefile.in: libsane-fujitsu.la does not use sanei_thread.lo
-
-2007-07-11  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* tools/check-usb-chip.c: Try to distinguish the various
-	  GenesysLogic GeneScan ASICS - GL841, GL842 and GL843
-
-2007-07-10  m. allan noah <kitno455 a t gmail d o t com>
-
-	* backend/fujitsu.[ch], backend/fujitsu-scsi.h: update to v1.0.50,
-	  add JPEG support, usb command sending and scan params cleanups
-	* include/sane/sane.h: add SANE_FRAME_JPEG
-	* frontend/scanimage.c: dont crash on unknown frame types
-
-2007-07-10  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/descriptions/plustek.desc: Fixed web entries
-	* backend/plustek-usb.h backend/plustek-usbdevs.c backend/plustek.c:
-	  Added flag to allow only 1- and 8-bit scanmodes. The Q-Scan does
-	  not seem to support 14-bit modes.
-
-2007-06-29  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek-usb*.[ch] backend/plustek.[ch]:
-	  Added sheetfed device Q-Scan USB001 from Portable Peripherals
-	  Fixed Mustek Bearpaw and made some speedup (bugreports #304343 and
-	  #301763)
-	  Fixed calibration for senororders other that RGB
-	* doc/descriptions/plustek.desc: Bumped version and added Q-Scan
-	* doc/descriptions/unsupported.desc: Removed Q-Scan
-	* doc/sane-plustek.man doc/plustek/Plustek-USB.changes: Update
-
-2007-06-28  m. allan noah <kitno455 a t gmail d o t com>
-
-	* backend/fujitsu.c: update to v1.0.49, fi-5750C usb ID and color mode
-	* backend/fujitsu.conf.in: add fi-5750C
-	* doc/descriptions/fujitsu.desc: bump version, add fi-5750C and S510
-
-2007-06-21 Julien Blache <jb@jblache.org>
-	* sanei/sanei_scsi.c: Switch sanei_scsi to the SG_IO ioctl
-	interface, instead of the asynchronous SG3 read/write interface.
-
-	Makes it possible to use SCSI scanners in 32/64bit mixed
-	environments, thanks to the ioctl 32bit compatibility layer, which
-	is NOT possible using the SG3 interface.
-
-2007-06-18  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-PARPORT.changes: Update.
-	* backend/plustek_pp.c: Bumped build number.
-	* backend/plustek-pp_drv.c backend/plustek_pp_sysdep.h:
-	  Make the Kernelmodule work with Kernels > 2.6.15 w/o DEVFS
-
-2007-06-12 Ilia Sotnikov <hostcc@gmail.com>
-
-	* Use libtool instead of ar/ranlib, which correctly handles dependencies
-	  (eg. for parallel makes)
-
-2007-05-08  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* po/Makefile.in, po/sane-backends.*.po: New translation keys for
-	  hp3500 and hp5590 backends. Updated Swedish translation.
-	* backend/hp5590.c: Do not localize option names
-
-2007-04-29 Ilia Sotnikov <hostcc@gmail.com>
-	
-	* backend/hp5590_low.c: don't use libusb structs directly, define
-	  necessary of them by ourselves ('struct usb_ctrl_setup' -> 'struct
-	  usb_in_usb_ctrl_setup')
-	* backend/hp5590_low.c: renamed 'struct usb_bulk_setup' to 'struct
-	  usb_in_usb_bulk_setup' to show its internal usage
-
-2007-04-24  Ilia Sotnikov <hostcc@gmail.com>
-
-	+ configure: added check for <netinet/in.h> header
-	+ Added files for 'hp5590' backend which supports
-	  HP ScanJet 5550/5590/7650 scanners
-	+ tools/check-usb-chip.c: added HP ScanJet 5550/5590/7650 detection
-	  routine
-
-2007-04-21  Troy Rollo <sane@troy.rollo.name>
-
-	* backend/hp3500.c: Improve speed and reduce noise of most
-	  resolutions; deal with an escape code discovered in the scanner's
-	  protocol; use hardware detailed calibrations for resolutions up to
-	  300; use improved software detailed calibration for other
-	  resolutions; ddd more debug information; drop the 25dpi
-	  resolution; make 200dpi the default (the same as the Windows
-	  frontend; Add code (not used yet) to deal partially with grayscale
-	  and lineart scanning; use I18N strings where appropriate.
-
-2007-04-21  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* doc/descriptions-external/hp5590.desc,
-	  doc/descriptions/unsupported.desc:
-	  Added description for new external backend hp5590
-	  See: http://lists.alioth.debian.org/pipermail/sane-devel/
-	  2007-April/018977.html
-
-2007-04-21  Julien Blache <jb@jblache.org>
-	* backend/epson.c: remove bogus check in
-	  get_identity2_information(), causing the identification of various
-	  Stylus CX5xxx models (among others) to fail. Olaf Meeuwissen from
-	  Epson confirmed the check was bogus.
-
-2007-04-17  Julien Blache <jb@jblache.org>
-
-	* backend/microtek.c: add missing braces.
-	* tools/sane-desc.c: use mode 0664 for usbfs device nodes; allows
-	  lsusb to still work for everybody on the system.
-
-2007-04-13  m. allan noah <kitno455 a t gmail d o t com>
-
-	* backend/fujitsu.c: update to v1.0.48, re-enable
-	  brightness/contrast for models with built-in support
-
-2007-04-15  Wittawat Yamwong <wittawat@web.de>
-
-	* doc/descriptions/unsupported.desc: Remove Canon PIXMA MP160 and
-	  Canon PIXMA MP600 (now supported by pixma backend)
-
-2007-04-13  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* doc/descriptions-external/hp3900.desc,
-	  doc/descriptions/unsupported.desc:
-	  Moved 3 scanners from unsupported to hp3900
-	  See: http://lists.alioth.debian.org/pipermail/sane-devel/
-	  2007-April/018980.html
-
-2007-04-13  m. allan noah <kitno455 a t gmail d o t com>
-
-	* backend/fujitsu.[ch]|fujitsu.conf.in: update to v1.0.47,
-	  change gamma determination, add support/usbid for fi-5650C
-	* doc/descriptions/fujitsu.desc: version number update
-	* tools/hal/.cvsignore: ignore .fdi file
-
-2007-04-09  Wittawat Yamwong <wittawat@web.de>
-
-	* backend/pixma*.[ch] doc/sane-pixma.man doc/descriptions/pixma.desc:
-	  Updated to version 0.13.0
-	  Added MP160, MP180, MP460, MP510 and MP600
-	  Fixed a buffer-overflow bug in sane_read()
-
-2007-04-5  Jochen Eisinger <jochen@penguin-breeder.org>
-
-	* README.openbsd, tools/README, tools/openbsd/attach,
-	  tools/openbsd/detach: add notes about device permissions on
-	  OpenBSD and provide some example scripts for hotplugd(8).
-
-2007-03-02  m. allan noah <kitno455 a t gmail d o t com>
-
-	* doc/sane.tex: update to 1.05, fix description of SANE_Parameters,
-	  from <dtlinker a t comcast d o t net>
-
-2007-03-21 Julien Blache <jb@jblache.org>
-	* tools/Makefile.in: Remove leftovers from a previous experiment.
-
-2007-03-18 Julien Blache <jb@jblache.org>
-	* tools/hal: New directory.
-	* tools/Makefile.in: Add rules to build hal/10-libsane.fdi.
-	* tools/sane-desc.c: Add output mode 'hal', from David Zeuthen <davidz@redhat.com>.
-
-2007-03-17 Oliver Rauch <oliver.rauch@xsane.org>
-	* Bug #303752: Maybe faulty icc-profile-file length detection:
-	  corrected icc profile length calculation
-
-2007-03-08  Earle F. Philhower, III <earlephilhower@yahoo.com>
-
-	* backend/sm3840*.[ch]: Add 1-bpp modes (lineart, halftone)
-	* doc/sane-sm3840.man: Add 1-bpp mode options
-
-2007-03-05  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes: Update.
-	* backend/plustek.c: Bumped build number.
-	* backend/plustek-usb.c: Fixed typo.
-	* backend/plustek-usbdevs.c: Added CanoScan to all Canon
-	  device strings, identified one more Plustek device as U24.
-	* backend/plustek-usbhw.c: Fixed button handling for Plustek/
-	  KYE devices and added some more debug messages.
-
-2007-02-24  Giuseppe Sacco <eppesuig@debian.org>
-
-	* Italian translation update
-	* Second Italian translation update
-
-2007-02-11  Jochen Eisinger <jochen@penguin-breeder.org>
-
-	* doc/sane-mustek_pp.man: clean up markup, bug #304392
-
-2007-02-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/sane-backends.pl.po: Polish translation fix (from Jakub
-	  Bogusz <qboosh at  pld-linux.org>, bug #304410). 
-
-2007-02-07  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* sanei/sanei_scsi.c: Fixed retrieval of HZ.
-
-2007-01-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/gt68xx.c backend/gt68xx_devices.c
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES: Added
-	  .conf entry for Pluste OpticPro S12 and S24. Updated .desc
-	  file. 
-	* doc/descriptions/unsupported.desc: Added UMAX Astra 2850. Added
-	  Canon Imagerunner series.
-
-2007-01-28  m. allan noah <kitno455 a t gmail d o t com>
-
-	* backend/fujitsu.[ch]: update to v1.0.45,
-	  update overscan code to extend max scan area
-	* doc/descriptions/fujitsu.desc: version number update
-
-2007-01-27 oliver rauch <oliver.rauch@rauch-domain.de>
-
-	* backend/umax.c
-	  removed bug in highlight blue using green value
-	* doc/umax/umax.CHANGES
-
-2007-01-26  m. allan noah <kitno455 a t gmail d o t com>
-
-	* AUTHORS, doc/sane-fujitsu.man, backend/fujitsu.conf.in,
-	  backend/fujitsu.c: updated email address
-	* backend/fujitsu-scsi.h, backend/fujitsu.[ch]: update to v1.0.44,
-	  set SANE_CAP_HARD_SELECT on all buttons/sensors.
-	  disable sending gamma LUT, quality errors reported. 
-	  support MS overscan.
-	  clamp the scan area to the pagesize on ADF.
-	* doc/descriptions/fujitsu.desc: version number update
-
-2006-01-21  Jochen Eisinger <jochen@penguin-breeder.org>
-
-	* doc/descriptions/mustek_pp.desc: Cybercom is a CIS scanner
-
-2007-01-20  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* backend/canon.c, backend/canon-sane.c:
-	  Fixed the "three-valued boolean" bug
-
-2007-01-20  Alessandro Zummo <a.zummo@towertech.it>
-
-	* sanei/sanei_tcp.c: added a missing include
-	* backend/epson2.c: fixed a bug while moving scanner data,
-	removed support for line mode (block or ext modes will be used).
-
-2007-01-20  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* acinclude.m4, aclocal.m4, configure, include/sane/config.h.in:
-	  Fix autogenerated files
-	* backend/canon.c, backend/epson.c, backend/epson2.c:
-	  String harmonization
-	* po/Makefile.in, po/sane-backends.*.po:
-	  New translation keys from canon and epson2 backends
-	  Updated Swedish translation
-	* backend/dll.c, backend/microtek.c, backend/umax1220.c,
-	  sanei/sanei_wire.c: Fixing compiler warnings
-
-2007-01-19  Mattias Ellert <mattias.ellert@tsl.uu.se>
-
-	* doc/descriptions/unsupported.desc: Added Visioneer Strobe Pro USB
-
-2007-01-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added and updated several
-	  scanners.
-
-2007-01-08  Julien Blache <jb@jblache.org>
-	* doc: fix man warnings.
-	* backend/microtek2.c: add missing return status check in
-	sane_start(), preventing an ugly segfault later on.
-
-2006-12-18  Alessandro Zummo <a.zummo@towertech.it>
-
-	* epson2: restructured code once more, splitted
-	  in multiple files, added networking
-	  support, added FS G extended handshaking mode,
-	  make proper use of extended commands when possible
-	* sanei/sanei_tcp.c: read now wait until all
-	  the requested data is available.
-
-2006-12-13  Alessandro Zummo <a.zummo@towertech.it>
-
-	* coolscan2: fixed coolscan2 infrared to work
-	  as advertised in the man page. RGBA format
-	  will come soon.
-
-2006-12-12  Alessandro Zummo <a.zummo@towertech.it>
-
-	* epson2: removed calls to alloca(), code reorganization
-	  fixed a bug with request_extended_status (reply
-	  length is 33 on older scanners).	
-	* include/.cvsignore: added two more entries
-
-2006-12-10  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-
-	* backend/genesys_devices.c: reduced height of calibration area
-	* backend/genesys_gl841.c: fixed bug in offset calibration(offset
-	values were not clamped to 0..255)
-
-2006-12-10  Ulrich Deiters <ulrich.deiters@uni-koeln.de>
-
-	* canon: disentangled some pointer arithmetics in canon-sane.c
-
-2006-12-07  Alessandro Zummo <a.zummo@towertech.it>
-
-	* epson2: reordered includes, replaced __FUNCTION__,
-	  use the new byteorder macros 
-	* moved acbyteorder.m4 to m4/byteorder.m4,
-	  added m4/stdint.m4
-
-2006-12-06  Alessandro Zummo <a.zummo@towertech.it>
-
-	* Added acbyteorder.m4 macro for endianness conversion
-
-2006-12-02  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-
-	* backend/genesys_devices.c: fixed gamma settings(1.0 now)
-	* backend/genesys.c backend/genesys_gl841.c: improved calibration
-	  for dark shades
-
-2006-12-02  Alessandro Zummo <a.zummo@towertech.it>
-
-	* Added missing bits for epson2 driver.
-
-2006-12-01  Alessandro Zummo <a.zummo@towertech.it>
-
-	* Added (experimental) epson2 driver.
-
-2006-12-01  Alessandro Zummo <a.zummo@towertech.it>
-
-	* Added sanei_tcp interface.
-
-2006-11-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/samsung.desc: SCX-4200 is reported to work.
-
-2006-11-22  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes: update.
-	* backend/plustek.c: bumped build number, fixed option 
-	  descriptors, see bug #303786.
-
-2006-11-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added several scanners, fixed
-	  the USB id for Microtek 4850 (bug #304151).
-	* doc/descriptions/umax1220u.desc: Updated status of UMAX 2000.
-	* doc/descriptions-external/brother2.desc: Updated status of
-	  Brother MFC-7420.
-
-2006-11-06  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* doc/descriptions-external/epkowa.desc: backend v2.3.0
-
-2006-10-31  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc: Added HP Photosmart C5100 and
-	  ScanJet 8390.
-	* doc/descriptions-external/hpoj.desc: Project is unmaintained.
-
-2006-10-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/sane-backends.pl.po: Major bugfix and few small changes
-	  (noticed by Jaroslaw Gorny) (bug #303962).
-	* po/sane-backends.es.po: Updated (from Jonathan Bravo Lopez
-	  <jkdsoft at gmail.com>).
-	* doc/descriptions-external/hp3900.desc 
-	  doc/descriptions-external/samsung.desc: Updated based on
-	  sane-devel information.
-	* doc/descriptions/unsupported.desc: Added Canon Canoscan 4400F,
-	  LiDE 70, Corex Cardscan 700 C, Umax Astra 4900, Visioneer
-	  Onetouch 7700. Updated other scanners.
-
-2006-10-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/hp3900.desc: Changed status of HP
-	  Scanjet 4370 to "minimal" (bug #303839).
-	* doc/scanimage.man frontend/scanimage.c: Added examples on how to
-	  set the scan area in the manual page (bug #303802). Mention how
-	  to separate parameters from options in --help and manpage (bug 
-	  #303819).
-	* doc/descriptions/unsupported.desc: Added EDT BizCardReader
-	  900C. Moved Genius ColorPage-SF600 to gt68xx.desc. Minor
-	  updates.
-	* backend/gt68xx.c backend/gt68xx_devices.c
-	  doc/descriptions/gt68xx.desc doc/gt68xx/gt68xx.CHANGES: Added
-	  Support for Genius Colorpage SF600. 
-
-2006-09-24  Giuseppe Sacco <eppesuig@debian.org>
-
-	* Updated italian translation
-
-2006-09-18  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.[ch], backend/fujitsu-scsi.h: update to v1.0.43,
-	  add model-specific code to init_vpd for M3099, clean some noise
-	* doc/descriptions/fujitsu.desc: version number update
-
-2006-09-18  Stephane Voltz <stef.dev@free.fr>
-
-	* backend/umax_pp.c backend/umax_pp_mid.c backend/umax_pp.c_low:
-	  color calibration fix. Mail address update.
-
-2006-09-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/unsupported.desc
-	  doc/descriptions-external/samsung.desc
-	  doc/descriptions-external/hpaio.desc: Added several scanners.
-	* po/sane-backends.pl.po: Updated Polish translation (from Jakub
-	  Bogusz, bug #303769).
-
-2006-08-31  Oliver Schwartz <oliverschwartz@users.sf.net>
-
-	* backend/snapscan-scsi.c: Bugfix for firmware download
-	  from Paul Smedley
-
-2006-08-31  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.c: update to v1.0.42,
-	  fix bug in get_hardware_status (#303798)
-	* doc/descriptions/fujitsu.desc: version number update
-
-2006-08-29  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-PARPORT.changes: update.
-	* backend/plustek-pp.h backend/plustek-pp_ptdrv.c backend/plustek_pp.c:
-	  fixed "not homing" problem, the sensor did not return when 
-	  the driver gets the _IOCTL_STOP command
-	  fixed compilation issue for kernels > 2.6.15
-	  fixed compiler warning conditions
-
-2006-08-28  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.c backend/fujitsu-scsi.h: update to v1.0.41,
-	  do_usb_cmd() returns io error on cmd/out/status/rs EOF,
-	  fix bug in MS buffer/prepick scsi data block
-	* doc/descriptions/fujitsu.desc: version number update
-
-2006-08-28  Stephane Voltz <stefdev@modulonet.fr>
-
-	* backend/genesys_gl646.c: changes in gl646_init_regs_for_warmup
-	  to add support for HP2400 model.
-
-2006-08-27  Wittawat Yamwong <wittawat@web.de>
-
-	* backend/pixma*.[ch]: update to 0.12.2,
-	  use own error codes e.g. PIXMA_EPROTO instead of EPROTO,
-	  add MP530, MP800R and MP360,
-	  add grayscale mode for MP700 and MP730,
-	  add work-around for lock-up ("hang") problem of MP760 and MP780,
-	  fix line correction (color alignment) for MP760
-	* doc/sane-pixma.man: update
-	* doc/descriptions/pixma.desc: add MP360,MP530 and MP800R product ID
-	* doc/descriptions/unsupported.desc: remove Smartbase MP360 (supported 
-	  by pixma backend)
-
-2006-08-26  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.[ch] backend/fujitsu-scsi.h: update to v1.0.40,
-	  add 5530C usb id, rewrite brightness/contrast/gamma functions,
-	  do_*_cmd functions handle short reads, updated init functions,
-	  add MS buffer and prepick support for newer scanners
-	* doc/descriptions/fujitsu.desc backend/fujitsu.conf.in:
-	  add 5530C usb id, version number update
-	* doc/descriptions/sane-fujitsu.man:
-	  note support for newer scanner models
-
-2006-08-22  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson_usb.c: Add product ID for CX3800/3810, V700/V750
-
-2006-06-11 Eddy De Greef <eddy_de_greef at scarlet dot be>
-
-	* doc/sane-mustek_pp.man: URL update.
-
-2006-08-21  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Fix buffer overflow error (submitted by Johannes Meixner)
-
-2006-08-21  Jon Chambers <jon@jon.demon.co.uk>
-	* TIFF tweaks for pickier libtiff under cygwin
-	* backend/Makefile.in: remove explicit $(srcdir) path from .conf
-	  source paths to allow support for kdevelop-style build dirs.
-	* backend/dell1600n_net.c: fix compile warnings
-
-2006-08-12  Jon Chambers <jon@jon.demon.co.uk>
-
-	* backend/dell1600n_net.c: update for dell1600n_net.conf + reduce memory footprint
-	* backend/dell1600n_net.conf.in: added
-	* backend/dell1600n_net.c: update for dell1600n_net.conf.in 
-
-2006-08-11  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-USB.changes: update.
-	* backend/plustek.c: bumped build number.
-	* backend/plustek-usbdevs.c: lowered speed for LiDE20/30 when
-	  using low resolutions.
-	* backend/plustek-usb.c: fixed warning condition.
-
-2006-08-09  Stephane Voltz <stefdev@modulonet.fr>
-
-	* backend/genesys_gl646.c backend/genesys.c backend/genesys_devices.c:
-	  improved sanei_genesys_search_reference_point to get more reliable
-	  detection for HP2300 and MD6345. Slight tune up for HP2400 model.
-
-2006-08-09  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/plustek/Plustek-PARPORT.changes doc/plustek/Plustek-USB.changes
-	  doc/u12/U12.changes: update.
-	* backend/artec_eplus48u.c backend/plustek.c backend/plustek_pp.c
-	  backend/u12.c: changed sane.type to "flatbed scanner" only.
-	* backend/plustek-usbdevs.c: fixed LiDE20/30 motor settings
-
-2006-08-06  Stephane Voltz <stefdev@modulonet.fr>
-
-	* backend/genesys_gl646.c backend/genesys.c: fix y scan area offset
-	  detection for HP2300, one more fixe related to bug #303681. 
-
-2006-08-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/epkowa.desc: Updated info about
-	  plugins and other comments (patch from Olaf Meeuwissen
-	  <olaf.meeuwissen@avasys.jp>).
-
-2006-07-30  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-
-	* backend/genesys_gl841.c: use an intermediate u_int8_t buffer
-	  for register write (bug #303681).
-
-2006-07-30  Stephane Voltz <stefdev@modulonet.fr>
-
-	* backend/genesys_gl646.c: use an intermediate char buffer
-	  for register bulk write (bug #303681).
-
-2006-07-25  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/libtool-get-dll-ext: Fixed compilation problem with newer
-	  tail programs which don't understand "-1" (bug #303630).
-
-2006-07-17  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.c: backend v1.0.39, rewrite contrast slope
-	  code for readability, portability to other table widths
-	* doc/descriptions/fujitsu.desc: version number update
-
-2006-07-16  Julien Blache <jb@jblache.org>
-	* tools/sane-desc.c: split very long comment lines in the
-	generated udev rules file. Some comment lines very overly long,
-	and udev produced warning messages while loading the rules file.
-
-2006-07-15  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.c: backend v1.0.38, add 'useless noise'
-	  debug level (35), for mode sense errors
-	* doc/sane-fujitsu.man: minor text changes, add new debug level
-	* doc/descriptions/fujitsu.desc: version number update
-
-2006-07-14  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.[ch] backend/fujitsu-scsi.h: backend v1.0.37,
-	  add support for mode sense command, use it to detect various
-	  page codes instead of hardcoding. add support for send cmd,
-	  use it to enable 8 or 10 bit LUT for brightness/contrast.
-	  minor global variable and option description cleanups.
-	* doc/descriptions/fujitsu.desc: version number/status update
-
-2006-07-06  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.[ch]: backend v1.0.36, less verbose debugging,
-	  fi-5900 needs even number of bytes per scanline
-	* doc/descriptions/fujitsu.desc: version number update
-
-2006-07-05  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.[ch] backend/fujitsu-scsi.h: backend v1.0.35,
-	  allow double feed detection, minor cleanups
-	* doc/descriptions/fujitsu.desc: version number update
-
-2006-07-04  m. allan noah <anoah AT pfeiffer DOT edu>
-
-	* backend/fujitsu.[ch] backend/fujitsu-scsi.h: 
-	  update to v1.0.34, add S500 usb id, get more inq and vpd data,
-	  allow background color setting for some scanners
-	* doc/descriptions/fujitsu.desc: version number update
-
-2006-07-03  Julien Blache <jb@jblache.org>
-	* tools/sane-desc.c: Fix a typo in the udev header.
-
-2006-07-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Changed version to 1.0.18-cvs. Enabled
-	  compilation warnings.
-	* Makefile.in: Added ChangeLog-1.0.18 to DISTFILES.
-
-Older entries can be found in ChangeLog-1.0.18.
diff --git a/ChangeLog-1.0.2 b/ChangeLog-1.0.2
deleted file mode 100644
index beb0d28..0000000
--- a/ChangeLog-1.0.2
+++ /dev/null
@@ -1,563 +0,0 @@
-2000-03-06  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* configure.in configure: New version is 1.0.2.
-
-2000-03-01  Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* doc/sane-scsi.man: fixed an ambiguity and a typo.
-
-2000-02-27  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* backend/v4l*.desc: Changed description from v4l to Video For
-	Linux.
-
-	* backend/lhii.desc: Updated with URL to LHII drivers home page.
-
-	* README.unixware7: Added compile information for SCO UnixWare 7
-	from Jens Scheithauer.
-
-2000-02-26  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/sane-epson.man: Updated documentation for EPSON
-	backend.
-
-2000-02-26  Chris Pinkham <cpinkham@infi.net>
-
-	* backend/artec.desc: updated statuses, added link to a webpage for
-	AS6E parallel models, added manpage info.
-
-2000-02-26  Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* Sharp man page updated; man page added to doc/Makefile.in
-
-2000-02-26  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* configure.in: Don't use -ansi and -pedantic unless
-	--enable-warnings is used.  Warnings are now disabled by default
-	to prepare for the next release.
-	
-2000-02-24  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* tools/sane-desc.el: In backend web page, packends not included
-	in the distribution have the version number in parentheses.
-
-2000-02-20  Karl Heinz Kremer <khk@khk.net
-
-	* backend/epson.c: Added some OS/2 compatibility fixes.
-
-2000-02-20  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* sanei/sanei_scsi.c: Make sure the file is valid ANSI C.
-
-	* configure: Regenerated based on current configure.in.
-
-	* include/sane/sanei_backend.h: Typedef u_int{8,16,32}_t.
-	Defining them gave bogus code in <sys/types.h> on Irix 6.5.
-
-	* backend/lhii.desc backend/musteka4s2.desc backend/nec.desc
-	backend/plustek.desc backend/sagitta.desc backend/st400.desc
-	backend/v4l.desc backend/v4l2.desc: Added info on existing
-	backends.  Placed version number in () to indicate that these
-	backend are distributed separately.
-
-	* backend/sharp.desc backend/pint.desc backend/canon.desc
-	backend/s9036.desc: Fixed typo and updated with more information.
-
-	* AUTHORS: Marked active maintainers with '(*)'.
-
-	* sanei/sanei_pio.c: Removed some warnings.
-
-	* configure.in: New flag --enable-warnings to turn on or off more
-	GCC warnings.  Default should be 'on' for development snapshots,
-	and 'off' for releases.
-
-2000-02-19  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.*: Updated desc file with new version number and 
-	  some more supported scanners.
-	  Removed OPT_PREVIEW_RESOLUTION so that the frontend can handle
-	  the preview resolution.
-	  Changed the OPT_RESOLUTION data from a range to a word list, so
-	  that the frontends can display the correct list of available
-	  resolutions.
-
-2000-02-19  Chris Pinkham <cpinkham@infi.net>
-
-	* backend/artec.c: Updated backend version to v0.5.13.  Corrected
-	matrix of which features/enhancements should be active for each
-	scan mode.  Fixed bug which causing Contrast to be INactive at
-	startup instead of Threshold.
-	* backend/artec.desc: updated backend version information.
-
-2000-02-19  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* sanei/sanei_thread.c include/sane/sanei_thread.h: These files
-	declares a _proposed_ internal SANE interface.  It was proposed by
-	Yuri Dario to wrap UNIX functions fork(), kill(), waitpid() and
-	wait(), which are missing or not working on OS/2.
-
-	* frontend/saned.c: OS/2 send socket on param list. Patch from
-	Yuri Dario.
-
-	* sanei/os2_srb.h sanei/sanei_scsi.c: Include OS/2 SCSI header file.
-
-	* include/sane/sanei_config.h sanei/sanei_config.c: New function
-	sanei_config_read().  Use this instead of fgets() when reading
-	config files to remove line ending chars on all known platforms.
-	Patch from Yuri Dario.
-
-	* configure.os2: Updated configure param list from Yuri Dario.
-
-2000-02-19  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-	* updated umax backend to version 1.0 build 18
-	  for details read backend/umax.CHANGES
-
-2000-02-19  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-	* corrected spelling error in umax,c (devive -> device)
-
-2000-02-18  Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* sharp.c / sharp.h: Options for resolution now conform to
-	the Sane API; fixed and initialisation bug. Updated backend 
-	version number in sharp.desc.	
-
-2000-02-18  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-	* updated umax backend to 1.0 build 17
-	  (added support for sanei_scsi_open_extended)
-	  for details take a look at backend/umax.CHANGES
-
-2000-02-15  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* backend/tamarack.desc: Updated info on request from Rogier
-	Wolff.
-
-2000-02-14  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* backend/m3096g-scsi.h backend/sp15c-scsi.h: Make lint_catcher
-	static to avoid link problems with duplicate symbols.
-	
-2000-02-13  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* README.unixware2: Information from Wolfgang Rapp on how to build
-	SANE on UnixWare 2.
-
-	* ltconfig ltmain.sh: Upgraded to libtool 1.3.4 and added Oliver
-	Rauch's soname patch.
-	
-	* backend/hp-accessor.c backend/hp-device.c backend/hp-handle.c
-	backend/hp-hpmem.c backend/hp-option.c backend/hp-option.h
-	backend/hp-scl.c backend/hp-scsi.h backend/hp.c backend/hp.desc
-	backend/hp.h doc/sane-hp.man: Updated HP backend to v0.86 from
-	Peter Kirchgessner.  Enable scan depths > 8 and add option
-	enable-image-buffering to config file.
-
-	* AUTHORS: Added author for backend s9036.
-	* backend/qcam.desc: Updated with more information.
-
-2000-02-11  Chris Pinkham <cpinkham@infi.net>
-
-	* backend/artec.c backend/artec.h: Updated backend to version 0.5.11.
-	  Removed mono_adjust function which handled bit offset in 1bpp modes,
-	  this is now handled by forcing all scans to be wide enough to fill a
-	  full byte.  Reinserted code to set brightness on A6000C model as this
-	  appears to be the only model that accepts that setting.  Bug-fixes
-	  for ADF & Transparency option settings.
-	* backend/artec.desc: updated backend version information.
-
-2000-02-11  Karl Heinz Kremer <khk@khk.net>
-	* backend/epson.c - Fixed default scan source when option equipment 
-	  is installed.  The default is now always "Flatbed". 
-
-2000-02-08  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* Added (again) missing file: doc/sane-logo2.jpg
-
-2000-02-08  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* Added missing umax doc files:
-	  - doc/sane-umax-old-scanners-doc.html
-	  - doc/sane-umax-not-listed-doc.html
-	  - doc/sane-umax-speed-doc.html
-        * Updated:
-	  - doc/sane-umax-doc.html
-	  - doc/sane-umax-scanners-doc.html
-
-2000-02-08  Matto Marjanovic  <maddog@mir.com>
-
-	* backend/microtek.c backend/microtek.h backend/microtek.conf
-	backend/microtek.desc doc/sane-microtek.man:  Updated microtek
-	backend to v0.12.0.  Changes:
-	- LUT entry size should match bit depth of scan.
-	- Free LUT's in sane_close().
-	- Fixed really dumb type typos in microtek.h.
-        - Added all "mystery" model codes (and an auto-warning).
-        - Added all additional document size codes.
-        - Made function (description) of "scan speed" more obvious.
-        - Added entries for Color PageWiz.
-        - Added entries for Agfa DuoScan.
-        - A few miscellaneous cleanups to quiet gcc warnings.
-
-2000-02-07  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* frontend/saned.c sanei/sanei_pio.c sanei/sanei_scsi.c: Some OS/2
-	patches from Yuri Dario.
-
-	* frontend/scanimage.c: Avoid sprintf("%s", NULL). Bugreport and
-	fix from Yuri Dario.
-
-2000-02-06  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* configure: Regenerated based on current configure.in.
-
-	doc/Makefile.in doc/sane-logo.gif doc/sane-logo.png doc/sane.gif
-	doc/sane.png: Convert .gif to .png.
-
-	* backend/canon.c backend/snapscan-sources.c: Port to HP/UX.  Stop
-	using GCC specific features.
-
-2000-02-05  Rene Rebe <rene.rebe@myokay.net>
-	* backedn/avision.? only minor updates and the new home-page
-	  url ...
-	
-2000-02-05  Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* fixed wrong buffer size handling for old Linux SG drivers
-	  in sanei_scsi.c
-	* updated sane-scsi.man: How to change the buffer size,
-	  if the new Linux SG driver is being used.
-	* fixed a type on sharp.c
-
-2000-02-03  Karl Heinz Kremer <khk@khk.net>
-	* backend/epson.[ch] Reworked the gamma correction stuff
-
-2000-02-02  Karl Heinz Kremer <khk@khk.net>
-	* backend/epson.[ch] Finally put the USB fix into the CVS
-	  version. Removed version number from epson.h so that this
-	  file does not need to be updated everytime epson.c changes.
-
-2000-02-01  Karl Heinz Kremer <khk@khk.net>
-	* backend/epson.[ch] More changes in the attach function to
-	  recognize USB scanners again.
-	* doc/sane-epson.man More updates to the man page. 
-
-2000-01-29  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* updated umax backend to version 1.0-build-16
-	  for details take a look at backend/umax.CHANGES
-
-2000-01-31  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* backend/hp-accessor.c backend/hp-accessor.h backend/hp-device.c
-	backend/hp-device.h backend/hp-handle.c backend/hp-hpmem.c
-	backend/hp-option.c backend/hp-option.h backend/hp-scl.c
-	backend/hp-scl.h backend/hp-scsi.h backend/hp.TODO backend/hp.c
-	backend/hp.desc doc/sane-hp.man: Updated to v0.85 from Peter
-	Kirchgessner.
-
-2000-01-30  Chris Pinkham <cpinkham@infi.net>
-
-	* backend/artec.c backend/artec.h: (v0.5.9) changes to get lineart
-	  and halftone modes working on AT12 and AM12S models.  bugfixes to
-	  eliminate hanging on some AT12 models.
-	* backend/artec.desc: version and model status updates
-
-2000-01-30  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-	* corrected missing "/" in include/sane/config.h.in line 251
-
-2000-01-30  Rene Rebe <rene.rebe@myokay.net>
-
-	* backend/avision.c fixed to compile on HP/UX
-	* backend/avision.desc fixed typo
-	* AUTHORS changed my eMail address
-	
-2000-01-30  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* backend/dll.c backend/dll.aliases doc/sane-dll.man: Aliased and
-	hidden backend patch from Ingo Wilken.
-
-	* config.sub configure.in include/sane/config.h.in sanei/sanei_scsi.c:
-	UnixWare 2.x and UnixWare 7 port by Wolfgang Rapp.
-
-2000-01-29 Karl Heinz Kremer <khk@Kk.net>
-
-	* backend/epson.[ch] Moved gamma "stuff" from advanced to standard
-	  options section to fix core dump in xscanimage
-	  Removed pragma pack() to make it easier to compile on non-gcc
-	  systems
-
-2000-01-29  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* preview (xscanimage): added GDK_INPUT_EXCEPTION to gdk_input_add
-	* updated umax-backend to build 15 (for more see umax.CHANGES
-	* xscanimage: added GDK_INPUT_EXCEPTION to gdk_input_add
-
-2000-01-26  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.[ch] Bugfix for resolution selection via menu
-	  Fixed coredump when no scanner found
-	  merged Christian Bucher's newest version
-
-	* AUTHORS ChangeLog
-
-2000-01-26  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* backend/m3096g-scsi.h backend/m3096g.c backend/m3096g.desc
-	backend/m3096g.h backend/sp15c-scsi.h backend/sp15c.c
-	backend/sp15c.desc backend/sp15c.h: Updated backends sp15c
-	(v1.12) and m3096g (v1.11) from Randolph Bentson.
-
-2000-01-25  Chris Pinkham <cpinkham@infi.net>
-
-	* backend/artec.h backend/artec.c backend/artec.desc
-	  installed new version (0.5.6) of artec backend with support
-	  for Artec AM12S and Plustek 19200S models and numerous bugfixes.
-	* doc/sane-artec.man
-	  updated manpage to reflect new list of supported models and
-	  backend status.
-
-
-2000-01-25  Abel Deuring <a.deuring@satzbau-gmbh.de>
-
-	* frontend/scanimage.c: minor modifications to the new batch mode
-	  If an error occurs in batch mode, the corresponding output file
-	  is now deleted. (Should make post-processing easier, because
-	  otherwise we would have an empty output file every time the
-	  ADF is empty or paper is jammed.)
-
-2000-01-25  Kazuya Fukuda <fukuda@avm.nhe.nec.co.jp> and
-            Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* backend/sharp.c: Fix of possible segfault in sane_init
-	* backend/sharp.conf: contains now a complete sample configuration
-
-2000-01-25  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* frontend/scanimage.c: Return SANE_STATUS_NO_MEM if advance()
-	failes.  Add return value to test_it().
-
-	* include/sane/sanei_debug.h: Add fflush() after fprintf() in
-	DBG macro.
-	
-	* AUTHORS backend/Makefile.in backend/m3096g.h backend/m3096g.c
-	backend/m3096g-scsi.h backend/m3096g.desc backend/m3096g.conf
-	backend/sp15c.h backend/sp15c.c backend/sp15c-scsi.h
-	backend/sp15c.conf backend/sp15c.desc backend/dll.conf
-	doc/Makefile.in doc/sane-fujitsu.man: Added backends sp15c (v1.11)
-	and m3096g (v1.10).
-
-	All patches from Randolph Bentson.
-
-2000-01-24  Abel Deuring <a.deuring@satzbau-gmbh.de>
-
-	* backend/sharp.c, backend/sharp.h: update to version 0.30 
-	(sorry, forgot to make this note some days earlier)
-
-2000-01-24  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* Added test for libcam to configure.in
-	  it is needed by FreeBSD 3+
-
-2000-01-21  Rene Rebe: <rene.rebe@okay.net>
-
-	* ChangeLog: updated (oversaw last time, sorry)
-	* backend/avision.c: fixed some compiling warnings
-	
-2000-01-21  Petter Reinholdtsen <pere@td.org.uit.no>
-
-        * sanei/sanei_scsi.c: Bugfix: Added return type for dummy
-	sanei_scsi_open_extended() call.  Bugreport for Solaris from
-	Martin Spott.
-
-2000-01-20  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* sanei/sanei_ab306.c: Removed compiler warnings.
-
-	* frontend/scanimage.c: Adds a "batch mode" to the software, that
-	can be used in conjunction with an ADF device, so that one can
-	e.g. scan a complete document consting of multiple pages with just
-	one call to scanimage.  This modification was created by Christian
-	Bucher so that his Epson scanner could use the ADF.  Patch from
-	Karl Heinz Kremer.
-
-2000-01-19  Rene Rebe <rene.rebe@okay.net>
-
-	* backend/avision.*: added - the (very) basic avision backend
-	* backend/Makefile.in: updated for the avision backend
-	* AUTHORS: updated
-
-2000-01-18  Karl Heinz Kremer <khk@khk.net>
-	* fixed typo in epson.desc and fixed the dates for
-	  two of my earlier submissions in ChangeLog file
-
-2000-01-16  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.desc updated with URL
-        * backend/epson.c added support for Expression family
-	  of scanners
-	* doc/sane-epson.man updated
-
-2000-01-10  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.desc fixed/updated. Now shows a link to
-	  the alternative FilmScan 200 backend.
-
-2000-01-09  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.* updated. This is a new backend still based 
-	  on the origial Sane 1.0.1 version, but with lots of work 
-	  done: Support for ADF/TPU, more function levels (up to B9 
-	  and initial work for F5), parallel scanner support and initial 
-	  support for USB scanners (don't use this yet, it still needs
-	  a lot of work to be functional and usable).
-
-2000-01-05  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* backend/umax* updated to backend version 1.0 build 14
-          for detailled info take a look at umax.CHANGES
-
-2000-01-05  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* sanei/sanei_scsi.c include/sane/sanei_scsi.h configure.in
-	linux_sg3_err.h: Updated Linux SCSI Generic (SG) driver as
-	follows:
-	     - new handling of sanei_scsi_max_request_size, if an SG
-	       driver >= 2 is installed;
-	     - SCSI command queueing on SG level for SG drivers >= 2.1.35;
-	     - usage of the new interface in SG version 3, if available
-	     - new configure option --enable-scsibuffersize=N
-	Patch from Abel Deuring <a.deuring@satzbau-gmbh.de>.
-
-2000-01-02  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* configure.in tools/Makefile.in tools/sane-config.in: New script
-	sane-config to help frontend developers find the sane libraries.
-
-1999-12-29  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* configure.in: Add gcc options '-W -Wall -Wpointer-arith
-	-Wcast-qual' to at least get warnings on illegal C code which
-	would fail to compile on HP/UX native compiler.
-
-1999-12-20  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* include/sane/config.h.in backend/dc25.desc backend/dc25.c:
-	Updated DC-25 backend to v1.2 from Peter Fales
-	<psfales@lucent.com>.
-	- Updated dc25.desc
-	- Retry capability for missing data or bad checksums in the data
-	  from the camera. This has resulted in a dramatic reduction in
-	  download failures.
-	- Include HAVE_CFMAKERAW in config.h.in and dc25.c.
-
-	* backend/dc210.c: Corrected HAVE_cfmakeraw to HAVE_CFMAKERAW.
-
-	* frontend/xscanimage.c: Change GIMP_EXTENSION to
-	SANE_GIMP_EXTENSION to avoid name conflict with gimp.  Patch from
-	Stanislav Brabec <utx@k332.feld.cvut.cz>.
-
-1999-12-12  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* backend/ricoh.h backend/ricoh.c: Add support for Ricoh IS50
-	scanner.  Limit IS50 resolution to 400 dpi.  Reverse IS50 contrast
-	direction.  Patch from Dick Streefland
-	<Dick.Streefland@inter.NL.net>.
-
-	* backend/microtek.c backend/microtek.h backend/microtek.conf
-	backend/microtek.desc doc/sane-microtek.man: Updated Microtek
-	backend to v0.11.0 from Matthew Marjanovic <maddog@mir.com>.
-
-	* backend/microtek2.c backend/microtek2.h: Updated Microtek2
-	backend to v0.8 from Bernd Schroeder <bernd@aquila.muc.de>.
-
-1999-11-20  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* ltmain.sh:
-        changed variable soname from "libsane-backendname.*"
-        to "libsane.*" by sed command.
-        * ltmain.sh:
-        changed again the sed command, forgot to remove "0-9"
-
-1999-11-14  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* backend/artec.c backend/artec.h backend/artec.desc
-	doc/sane-artec.5 doc/Makefile.in: Updated Artec backend to v0.5
-	from Chris Pinkham <cpinkham@infi.net>.
-
-1999-11-11  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* backend/microtek2.c backend/microtek2.h backend/microtek2.desc:
-	Updated Microtek2 backend to vpre0.8.161099 from Bernd Schroeder
-	<bernd@aquila.muc.de>
-
-	* backend/canon-* NEWS doc/canon.*: Updated Canon backend to
-	v991108 from Manuel Panea <mpd@rzg.mpg.de>.
-
-1999-09-14  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* removed sane-umax-*.gif and umaxlogo.gif,
-	  the files were replaced by jpg format.
-
-1999-09-13  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* backend/umax* and doc/sane-umax* updated to version 1.0-build-12
-          for detailled info take a look at umax.CHANGES
-
-1999-09-12  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* include/sane/config.h.in: Add missing HAVE_SYS_SOCKET_H.
-
-	* backend/hp-handle.c backend/hp-option.c backend/hp-option.h
- 	backend/hp-scl.c backend/hp-scl.h backend/hp-scsi.h backend/hp.c
- 	backend/hp.desc backend/hp.h doc/sane-hp.man: Updated backend to
- 	v0.83 from Peter Kirchgessner <peter@kirchgessner.net>.  News:
-	 - Reset scanner before downloading parameters (fixes problem with
- 	   sleep mode of scanner)
-         - Fix problem with coredump if non-scanner HP SCSI devices are
- 	   connected (CDR)
-         - Option scan-from-adf replaced by scantype
- 	   normal/adf/xpa. Transparency adapter scans (XPA) allow scanning
- 	   with internal light source switched off.
-         - PhotoScanner: Allow scanning of slides/negatives only at
- 	   multiple of 300 dpi. This fixes problem with preview which
- 	   scanned at arbitrary resolutions.
-	 - (by Marian Szebenyi): close pipe (coredump on Digital UNIX) 
-	
- 	* backend/Makefile.in: Correct install target to also work on
- 	platforms where dll endings isn't .so (like HP/UX).  Extract
- 	endings from libsane-dll.la.
-
-1999-09-07  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* tools/find-scanner.c: Checks (Linux only so far) for SCSI
- 	Generic support in the OS kernel. If NOT present it tells the user
- 	they may need SG drivers.  Patch from Nick Lamb
- 	<njl98r@ecs.soton.ac.uk>.
-	
-	* sanei/sanei_scsi.c [sanei_scsi_cmd sanei_scsi_open]: Digital
- 	UNIX 4.0D patches from Marian Szebenyi <dms35@cornell.edu>.
-
-1999-08-16  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* configure.in: Turn on more gcc warnings.
-
-	* acinclude.m4 configure.in: Separate GTK_LIBS into LIBS and
- 	LDFLAGS to get the X programs to link on HP/UX.
-	
-1999-08-12  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* aclocal.m4 configure.in configure: Generate configure and
- 	aclocal.m4 with autoconf 2.13.  Adding AC_PROG_LD, trying to get
- 	this compiling on CygWin32.  Add AM_PROG_CC_STDC to get it to
- 	compile out of the box on HP/UX.
-
-	* lib/dll.c: Use calloc() instead of malloc() and memset().  Use
-	dlerror() instead of strerror() when dlopen fails
- 	(bugfix from Ingo Wilkens).
-
-1999-08-11  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* config.guess config.sub: Updated to latest versions from FSF.
-  	Better support for BeOS, WinNT and others.
-	
-1999-08-09  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* Started CVS branch DEVEL_1_9.
-
-	* install-sh ltconfig ltmain.sh mkinstalldirs: Updated from
-	automake 1.4 and libtool 1.3.3.
-
diff --git a/ChangeLog-1.0.20 b/ChangeLog-1.0.20
deleted file mode 100644
index fbaacaa..0000000
--- a/ChangeLog-1.0.20
+++ /dev/null
@@ -1,2087 +0,0 @@
-2009-05-03 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* Makefile.in, aclocal.m4, configure, */Makefile.in: Regenerated 
-	with newer automake.
-	* backend/Makefile.am, tools/sane-config.in: Add missing 
-	$GPHOTO2_LDFLAGS so library can be found.
-	* tools/Makefile.am: Add mising $SCSI_LIBS to sane-find-scanner.
-
-******  Release of sane-backends 1.0.20. End of code freeze ******
-
-2009-05-03  m. allan noah <kitno455 a t gmail d o t com>
-	* config.guess, config.sub: updated to latest versions
-	* NEWS, configure.in, configure: updated for 1.0.20
-	* sane-backends.lsm, doc/releases.txt: minor tweaks
-	* doc/descriptions/coolscan3.desc, doc/descriptions/rts8891.desc:
-	  add :new marker, correct manpage link
-
-2009-05-01  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.c: copy_buffer() needs to count lines, or M309[12]
-	  cannot scan in duplex
-
-2009-04-30  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.c: ignore errors in scanner_control(),
-	  M3091 has not worked since sane 1.0.19, due to this.
-
-2009-04-30  m. allan noah <kitno455 a t gmail d o t com>
-	* acinclude.m4, backend/gphoto2.c, configure, include/sane/config.h.in:
-	  deal with upcoming gphoto2 interface change (patch by Chris Bagwell)
-	* po/sane-backends.nl.po: updates from Martin Kho
-
-2009-04-29  m. allan noah <kitno455 a t gmail d o t com>
-	* po/sane-backends.nl.po: updates from Martin Kho
-	* po/sane-backends.de.po: updates from Burkhard Luck
-	* po/Makefile.am, po/Makefile.in, po/sane-backends.en_GB.po: new
-	  translation from Andrew Coles
-	* po/*.po: rebuilt with new strings
-
-2009-04-29  Stéphane Voltz <stef.dev@free.fr>
-	* doc/sane-genesys.man doc/sane-rts8891.man: documentation updates and
-	  cleanups
-
-2009-04-28 Julien Blache <jb@jblache.org>
-	* sanei/sanei_scsi.c: /proc/scsi is being deprecated in the Linux
-	kernel; use sysfs for SCSI device enumeration in
-	sanei_scsi_find_devices() by default, keep
-	sanei_proc_scsi_find_devices() as a fallback option.
-
-2009-04-27  Gerhard Jaeger <gerhard@gjaeger.de>
-	* backend/plustek-usbdevs.c:
-	  Tweaked highspeed settings for Epson 1260
-
-2009-04-27  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c backend/rts8891.h backend/rts8891_devices.c
-	  backend/rts8891_low.c backend/rts8891_low.h backend/rts88xx_lib.c
-	  backend/rts88xx_lib.h: turn off scanner sharing option to off by default
-	  to keep on the safe side, copyright and internal version updates.
-
-2009-04-27  Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_gl646.c backend/genesys_devices.c:
-	shading calibration fixes for HP2300	
-
-2009-04-25  Alessandro Zummo <a.zummo@towertech.it>
-	* backend/epson2.c: fixed TPU warmup retry
-
-2009-04-23  Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_gl646.c backend/genesys_devices.c:
-	y scan position and shading calibration fixes for MD5345/MD6471
-
-2009-04-23  m. allan noah <kitno455 a t gmail d o t com>
-	* doc/descriptions/fujitsu.desc: update S1500 status to complete
-
-2009-04-22  m. allan noah <kitno455 a t gmail d o t com>
-	* include/sane/sane.h: convert new frame and status to #define
-
-2009-04-21  Nicolas Martin <nicols-guest at users.alioth.debian.org> 
-	* doc/sane-pixma.man, doc/descriptions/pixma.desc,
-	  backand/pixma_mp150.c:
-	  Updated documentation for Pixma MP240, reported to work fine by Nik.
-	  
-2009-04-21  Alex Belkin <abc@telekom.ru>
-	* backend/xerox_mfp.c: update version number.
-
-2009-04-20  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.c, backend/fujitsu.conf.in,
-	  doc/descriptions/fujitsu.desc: add S1500 usb ids and status
-	* backend/canon_dr.c: update credits
-	* doc/sane-fujitsu.man, doc/sane-canon_dr.man: update version numbers,
-	  dates, credits and known issues
-	* doc/saned.man: remove section about uncontrolled data port range
-
-2009-04-20  Alessandro Zummo <a.zummo@towertech.it>
-	* backend/coolscan3.c: temporarily disable infrared.
-
-2009-04-17  Nicolas Martin <nicols-guest at users.alioth.debian.org> 
-	* doc/sane-pixma.man, doc/descriptions/pixma.desc:
-	  Updated documentation for Pixma MP540, reported to work fine by Rogge.
-	  
-2009-04-17  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys.c, backend/genesys_gl646.c,
-	  backend/genesys_gl841.c, backend/genesys_low.h: Always do shading
-	  calibration in color mode on gl841.
-	* backend/genesys.c, backend/genesys_gl841.c: Fix bugs introduced above.
-
-2009-04-16  Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.h backend/genesys.c backend/genesys_gl646.c
-	  backend/genesys_devices.c: y scan position fixes
-	 - added a 'clear calibration cache button'
-
-2009-04-15  Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_gl646.c: calibration cache
-	 activation for gl646 based scanners
-
-2009-04-15  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.c, doc/descriptions/fujitsu.desc: backend v93
-	- return cmd status for reads of sensor options
-	* backend/canon_dr.c, doc/descriptions/canon_dr.desc: backend v26
-	- return cmd status for reads of sensor options
-	- allow rs to adjust read length for all bad status responses
-
-2009-04-14  Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl646.c:
-	  shading calibration rework for GL646 based scanners
-
-2009-04-13  m. allan noah <kitno455 a t gmail d o t com>
-	* tools/sane-desc.c: fix double summing of untested column
-
-2009-04-13  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c: minor version change to test commit scripts
-
-2009-04-13  Stéphane Voltz <stef.dev@free.fr>
-	* backend/pnm.c: conditional handling of STATUS_HW_LOCKED
-	  and STATUS_WARMING_UP
-
-2009-04-12  m. allan noah <kitno455 a t gmail d o t com>
-	* doc/doxygen-sanei.conf.in: update to recent version of doxygen
-
-2009-04-12  m. allan noah <kitno455 a t gmail d o t com>
-	* configure.in: change version to 1.0.20cvs
-	* configure: rebuild from configure.in
-	* include/sane/sane.h: hide API changes (minor, frame and status)
-	* backend/canon_dr.c, backend/fujitsu.c: SANE_FRAME_JPEG
-	* backend/coolscan3.c: SANE_FRAME_RGBI
-	* backend/genesys_gl646.c, backend/genesys_gl841.c: STATUS_HW_LOCKED
-	* backend/rts8891.c, frontend/scanimage.c: STATUS_WARMING_UP
-	* backend/pixma_io_sanei.c, backend/xerox_mfp.c,
-	  backend/sane_strstatus.c: STATUS_HW_LOCKED & STATUS_WARMING_UP
-	* doc/releases.txt: minor updates for new build system
-
-2009-04-07  Nicolas Martin <nicols-guest at users.alioth.debian.org> 
-	* doc/sane-pixma.man, doc/descriptions/pixma.desc:
-	  Updated documentation for i-SENSYS MF4018 support.
-	  
-2009-04-07 Julien Blache <jb@jblache.org>
-	* doc/descriptions-external/epkowa.desc: update for iScan 2.19.0,
-	from Olaf Meeuwissen.
-
-2009-04-05  Nicolas Martin <nicols-guest at users.alioth.debian.org> 
-	* backend/pixma_io.h, backend/pixma_io_sanei.c, doc/sane-pixma.man:
-	  Increased timeouts for read bulk and write bulk operations to 10s
-	  Changed minimum timeout for interrupt read to 100ms
-	  For MAC OS X : added a wrapper to sanei_usb_read_int as darwin libusb
-	  does not handle timeouts in interrupt reads. This disables button scan
-	  for MAC OS X, updated man page with this info.
-	* backend/pixma_mp150.c: 
-	  Added 2 new Canon Pixma models but usb pid/vid yet unknown.
-
-2009-04-05  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/canon_dr.[ch], backend/canon_dr.conf.in: backend v24
-	- fix DR-2510C duplex deinterlacing code
-	- rewrite sane_read helpers to read until EOF
-	- update sane_start for scanners that dont use object_position
-	- dont call sanei_usb_clear_halt() if device is not open
-	- increase default buffer size to 4 megs
-	- set buffermode on by default
-	- hide modes and resolutions that DR-2510C lies about
-	- read_panel() logs front-end access to sensors instead of timing
-	- rewrite do_usb_cmd() to use remainder from RS info
-	* doc/desciptions/canon_dr.desc: backend v24, update DR-2510C comment
-
-2009-03-31 Louis Lagendijk  <llagendijk-guest at users.alioth.debian.org>
-	* backend/pixma_bjnp.c:
-	- silenced some debug statements during scanner detections
-	- increased timeouts to 20 seconds as 10 seconds is apparently
-	- not enough for the combination of a Mac and an MX850.
-	
-2009-03-21 Alex Belkin <abc@telekom.ru>
-	* backend/xerox_mfp.conf.in: add Xerox Phaser 6110MFP
-	* backend/xerox_mfp.c: compatibility with scanners w/o feeder.
-
-2009-03-28 Julien Blache <jb@jblache.org>
-	* backend/avision.c: fix typos in error messages in
-	sense_handler().
-
-2009-03-27  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/canon_dr.[ch], backend/canon_dr-cmd.h: backend v23
-	- rewrite all image data processing code
-	- handle more image interlacing formats
-	- re-enable binary mode on some scanners
-	- limit some machines to full-width scanning
-	* doc/desciptions/canon_dr.desc: v23, improved comments
-
-2009-03-25  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/canon_dr.[ch]: backend v22
-	- add deinterlacing code for DR-2510C in duplex and color 
-
-2009-03-25  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys.c, backend/genesys_gl646.c,
-	backend/genesys_gl841.c, backend/genesys_low.h: Add calibration cache
-
-2009-03-24  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/canon_dr.[ch], backend/canon_dr-cmd.h: backend v21
-	- correct rgb padding macro
-	- skip send_panel and ssm_df commands for DR-20xx scanners
-	* doc/desciptions/microtek2.desc: add ScanMaker 6400XL
-
-2009-03-24 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* doc/Makefile.am: Don't include any template.desc. into
-	generated HTML files.
-
-2009-03-23  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/canon_dr.[ch], backend/canon_dr-cmd.h: backend v20
-	- improved macros for inquiry and set window
-	- shorten inquiry vpd length to match windows driver
-	- remove status-length config option
-	- add padded-read config option
-	- rewrite do_usb_cmd to pad reads and calloc/copy buffers
-	* backend/canon_dr.conf.in: s/status-length/padded-read/g
-
-2009-03-22  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/canon_dr.[ch]: backend v19
-	- pad gray deinterlacing area for DR-2510C
-	- override tl_x and br_x for fixed width scanners
-	* doc/descriptions/canon_dr.desc: backend v19, update comments
-
-2009-03-21  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/canon_dr.[ch], backend/canon_dr-cmd.h: backend v15 thru v18
-	- add byte-oriented duplex interlace code
-	- add RRGGBB color interlace code
-	- add basic support for DR-2580C, DR-2050C, DR-2080C, DR-2510C
-	- add more unknown setwindow bits
-	- add support for 16 byte status packets
-	- clean do_usb_cmd error handling (call reset more often)
-	- set status packet size from config file
-	- rewrite config file parsing to reset options after each scanner
-	- add config options for vendor, model, version
-	- dont call inquiry if those 3 options are set
-	- remove default config file from code
-	- add initial gray deinterlacing code for DR-2510C
-	- rename do_usb_reset to do_usb_clear
-	* doc/descriptions/canon_dr.desc: backend v18, update model status
-	* backend/canon_dr.conf.in: added better comments and new options
-
-2009-03-21  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys_devices.c: Enable Motor again for combined
-	dark/bright calibration, fix calculation of pixel number used in
-	calibration
-	* backend/genesys_devices.c, backend/genesys_gl646.c,
-	backend/genesys_gl841.c, backend/genesys_low.h: Remove park_head
-	* backend/genesys_devices.c, backend/genesys_gl841.c: Calculate
-	shading coefficients using maximum input resolution available
-
-2009-03-21  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch]: backend v91
-	- remove unused temp file code
-
-2009-03-20  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/hpljm1005.c: use private function instead of round() 
-
-2009-03-19  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys_devices.c, backend/genesys.conf.in:
-	Add basic support for Visioneer XP100 rev 3 and USB IDs for
-	Syscan DocketPort 465
-
-2009-03-06 Louis Lagendijk  <llagendijk-guest at users.alioth.debian.org>
-	* backend/pixma_bjnp.c backend/pixma_bjnp.h
-	backend/pixma_bjnp_private.h backend/pixma_io_sanei.c:
-	Make bjnp protocol more resilient against packet loss and corruption
-	Changed timeout for all responses to be at least 10 seconds
-	Send all broadcasts for scanner detection 5 times
-	Made sure scanners are added to device list only once
-	Changed device-id for bjnp so it uses scanner hostname/ip-address
-	instead of mac address as this is more human friendly.
-	To make room, use scanner model instead of USB-id (which is bogus
-	for network scanners
-
-2009-03-17  m. allan noah <kitno455 a t gmail d o t com>
-	* doc/desc/gt68xx.desc, backend/gt68xx.conf.in: add NeatReceipts
-	Mobile Scanner (from Kelly Price)
-
-2009-03-13  m. allan noah <kitno455 a t gmail d o t com>
-	* frontend/scanimage.c, doc/scanimage.man: make -B (buffer-size) 
-	selectable, and make long name consistent. (#309672 by Johannes Berg)
-
-2009-03-13  m. allan noah <kitno455 a t gmail d o t com>
-	* tools/sane-desc.c: remove 8859-1 chars from string cleaner,
-	enforce only printable ASCII on output
-
-2009-03-13  Ilia Sotnikov <hostcc@gmail.com>
-	* frontend/saned.c:
-	- Remove unnecessary 'res' variable assignment in check_host()
-	  (AF-indep version)
-
-2009-03-13 Julien Blache <jb@jblache.org>
-	* doc/descriptions-external/epkowa.desc: update for iScan 2.18.0,
-	from Olaf Meeuwissen.
-	* frontend/saned.c: rework Ilia's changes in
-	check_host(). Explicitly bind IPv6 addresses first, introduce
-	do_bindings_family() split off of do_bindings().
-
-2009-03-12  Ilia Sotnikov <hostcc@gmail.com>
-	* frontend/saned.c:
-	- Allow host checking to proceed if no local name was found
-
-2009-03-12  Ilia Sotnikov <hostcc@gmail.com>
-	* frontend/saned.c:
-	- Use hstrerror (h_errno) instead of strerror(errno) on gethostbyname()
-	  errors
-
-2009-03-12  Nicolas Martin <nicols-guest at users.alioth.debian.org> 
-	* doc/sane-pixma.man, doc/descriptions/pixma.desc:
-	  Added ImageClass MF4010 support in pixma backend docs.
-	* backend/pixma_imageclass.c:
-	  Removed ADF capability to ImageClass models without ADF
-	* backend/pixma.h, backend/pixma_common.c, backend/pixma_io_sanei.c:
-	  Added a PIXMA_EOF error return code
-
-2009-03-09 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys.h backend/genesys_devices.c
-	  backend/genesys_gl646.c doc/descriptions/lexmark.desc: cleanups
-	  for genesys backend. Change in document detection for gl646
-	  sheetfed scanners.
-	  - lexmark backend description update
-
-2009-03-09 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl646.c:
-	1200 dpi scan fix and head positionning fixes
-
-
-2009-03-07  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/canon_dr.c, backend/canon_dr.conf.in: backend version 14
-	- remove HARD_SELECT from counter (Legitimate, but API violation)
-	- attach to CR-series scanners as well
-
-2009-03-06 Louis Lagendijk  <llagendijk-guest at users.alioth.debian.org>
-	* backend/pixma_bjnp_private.h: disabled experimental/incomplete
-	button handling for bjnp protocol as it seems to cause problems
-	with xsane preview
-
-2009-03-06  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/canon_dr.c, backend/canon_dr.conf.in, 
-	  doc/descriptions/canon_dr.desc: backend version 13
-	- new vendor ID for recent machines
-	- add usb ids for several new machines
-	- DR-4010C reported good
-
-2009-03-05  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/umax1220u.c: set initial scan area dimensions to maximum
-
-2009-03-05 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* configure.in: Allow user to disable latex support; original
-	patch from Johnson Earls.
-
-2009-03-05  m. allan noah <kitno455 a t gmail d o t com>
-	* doc/descriptions-external/epkowa.desc: update all broken urls
-
-2009-03-04  m. allan noah <kitno455 a t gmail d o t com>
-	* doc/descriptions/coolscan3.desc, doc/sane-coolscan3.man,
-	  doc/Makefile.in|am: add missing coolscan3 docs
-	* backend/dll.conf.in: # out epson and coolscan2, remove hpoj text
-	* doc/descriptions/epson2.desc: add Epson RX-620
-
-2009-03-03  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys_gl841.c: Fix the generated generic gamma table.
-
-2009-02-28 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* tools/sane-config.in: Add space mistakenly removed during
-	last update.
-
-2009-03-03 Julien Blache <jb@jblache.org>
-	* doc/descriptions/epson.desc: add Epson RX-620 (0x04b8 0x0811),
-	reported by Heikki Kantola.
-
-2009-02-28 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* acinclude.m4, tools/sane-config.in: Add in missing libraries
-	to sane-config missed during fix to stop using LIBS to link everything.
-	Add back in code to move LDFLAGS out of $GPHOTO2_LIBS and into
-	GPHOTO2_LDFLAGS.
-
-2009-03-02 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_devices.c, backend/genesys_gl646.c: fix 400, 1200
-	and 2400 dpi scan modes for MD5345/MD6471
-
-2009-03-02 Julien Blache <jb@jblache.org>
-	* frontend/saned.c: work around backends that can't keep their
-	dirty fingers off stdin/stdout/stderr when run through inetd,
-	breaking the network dialog and crashing the remote net backend.
-
-2009-02-28 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* m4/byteorder.m4: Delete temporary file in all cases.
-	* backend/Makefile.am, japi/Makefile.am: Use BUILT_SOURCES
-	instead of dependency so that files are not compiled
-	during "dist" target.
-
-2009-02-28  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys.conf.in, backend/genesys_devices.c,
-	backend/genesys_gl841.c, backend/genesys_low.h: Add support for 
-	Ambir/Syscan DocketPORT 665
-	* backend/genesys.conf.in, backend/genesys_devices.c,
-	backend/genesys_low.h: Add support for Visioneer Roadwarrior
-	* backend/genesys_gl841.c: Adjust gl841 part to recent changes
-
-2009-02-27  Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys.conf.in backend/genesys.h
-	backend/genesys_devices.c backend/genesys_gl646.c backend/genesys_gl841.c
-	backend/genesys_low.h: rewrite of gl646 internals to enable easy
-	scanner addition and better calibration process. Untested support for
-	hp3670. Use of id in genesys_devices structures to have more robust
-	descriptions.
-
-2009-02-25 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* acinclude.m4, backend/*.[ch], tools/*.[ch], frontend/*.[ch]:
-	Global replace of u_int??_t with C9x standard based uintxx_t
-	in order to remove some tricky and overlapping portability logic
-	from acinclude.m4 and leave it in only m4/stdint.m4.
-
-2009-02-24 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* configure.in, m4/stdint.m4: Update to latest version to
-	get latest fixes and use logic to not recreate _stdint.h if
-	no changes (to prevent unneeded recompiles).
-	* m4/byteorder.m4: Added support to reuse existing byteorder.h if
-	no changes to prevent timestamp causing a recompile.
-
-2009-02-24  m. allan noah <kitno455 a t gmail d o t com>
-	* frontend/scanimage.c: improved comments, simplified x/y option code,
-	removed buggy -1/+1 x/y code (#311172), expose non-settable options,
-	check for invalid caps on options, handle option descs with \n
-	* doc/releases.txt: add note about cvs checkout on alioth.
-
-2009-02-24  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/*.[ch]: more consistent #include "../include/sane/config.h"
-
-2009-02-24  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/Makefile.am/in, backend/xerox_mfp.conf.in: should use conf.in
-
-2009-02-23 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* backend/Makefile.am: Add back in deletion of $(sanelibdir)/libsane.*
-	for buggy libtools.  Add some minor documentation.
-	* doc/backend-writing.txt: Add minor document updates to reflect
-	conversions to automake.
-
-2009-02-23  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.c, backend/fujitsu.conf.in,
-	doc/descriptions/fujitsu.desc, doc/sane-fujitsu.man: backend v90,
-	add S510M usb ID's, add fi-6010N to .desc
-	* backend/epjitsu.conf.in, doc/descriptions/epjitsu.desc,
-	doc/sane-epjitsu.man: add S300M usb ID's
-
-2009-02-23  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys_devices.c, backend/genesys_gl841.c, 
-	backend/genesys_low.h: Add post_scan and eject_feed to struct 
-	Genesys_Model
-	* backend/genesys.c, backend/genesys_gl646.c,
-	backend/genesys_gl841.c: Move sanei_genesys_{start,stop}_motor into
-	chip specific sources
-	backend/genesys_gl841.c: Make start/stop_(motor, now)action
-	actually work, various warning cleanups
-
-2009-02-23 Jonathan Bravo Lopez <jkdsoft@gmail.com>
-	backend/hp3900_config.c: Fix area of negative/slide scans for
-	HP ScanJet G3110.
-
-2009-02-22 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* japi/Makefile.am: Add back -version-number to java library but
-	also add V_REV.
-	* backend/Makefile.am: Use variables to add libraries to backends
-	instead of direct substitution. Easier to touch up variables on
-	problem platforms then substitution.  Also, add back in creating
-	dll.d directory; missed during conversion.
-	* backend/genesys_gl841.c: Portablity fixes for strict
-	C compilers.
-
-2009-02-21 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* po/Makefile.am, configure.in: convert remaining directory,
-	po, to use automake.
-	* doc/Makefile.am: Get rid of unneeded gnu extensions to quieten
-	down autotools warnings.
-	* lib/getopt.c, lib/getopt1.c: Fix disabling getopt compile again.
-
-2009-02-20  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/avision.c: backend v290, fix reader_pid and NVRAM option
-	  issues, by Mattias Ellert.
-	* backend/fujitsu.c: backend v89, fi-4750 has no serial number support
-	* doc/descriptions/fujitsu.desc: backend v89, remove 'MAC/TWAIN' text
-	* doc/sane-fujitsu.man: backend v89
-	* backend/.cvsignore: ignore *.loT
-
-2009-02-01  Mattias Ellert <mattias.ellert@fysast.uu.se>
-	* tools/Makefile.am: Add missing liblib dependencies
-	* frontend/scanimage.c: Restore alloca include order
-
-2009-02-19 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* configure.in, Makefile.am, backend/Makefile.am: Have
-	configure define configdir so all makefiles can use
-	it (fixes bug introduce with sanei converted to automake).
-	Enable running testsuite during distcheck.
-	* japa/Makefile.am: Convert japi to automake.
-
-2009-02-19 Julien Blache <jb@jblache.org>
-	* configure.in: add --enable-libusb_1_0 and check for libusb-1.0
-	using pkg-config.
-	* sanei/sanei_usb.c: add support for libusb-1.0.
-	* tools/sane-find-scanner.c: add support for libusb-1.0.
-	* tools/check-usb-chip.c: compile as an empty file if libusb-1.0
-	is used.
-
-2009-02-18 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* configure.in, tools/Makefile.am: convert tools to automake.
-	Add tools/openbsd to distribution package.
-	* include/Makefile.am: include files should have been installed
-	under sane/ directory when converted to automake.
-	* doc/Makefile.am: Cleanup. Use automake's built in support to
-	install docs within subdirectories.
-	* Makefile.am, testsuite: Convert testsuite to automake.  Waiting 
-	for test backend bugfix before enabling this to run during "distcheck".
-
-2009-02-18 Julien Blache <jb@jblache.org>
-	* configure.in, configure: raise avahi-client dependency to
-	0.6.24, following a needed bugfix in this release.
-	* backend/net.c: do not lock the Avahi thread before stopping
-	it. It looks like it's no longer necessary to do so.
-	* frontend/saned.c: fix handling of Avahi server restart so it
-	actually works.
-
-2009-02-14 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* configure.in, doc/Makefile.am, frontend/Makefile.am, 
-	include/Makefile.am, sanei/Makefile.am, tools/Makefile.am:
-	convert frontend, include, and sanei directories to use
-	automake.  Only reference libsanei.la now. Use am_conditional
-	to compile sanei_jpeg.lo.  distcheck now runs sanei/wire_test.
-
-2009-02-13 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* Makefile.am, configure.in, doc/Makefile.am: Convert
-	doc/Makefile to use automake. Main difference is that
-	no longer installs man pages for backends that are not
-	compiled.  Moved install ownership of $top_srcdir docs
-	to $top_srcdir's Makefile.
-
-2009-02-06 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* configure.in, backend/Makefile.am: Add back change to
-	use -version-number even though its known not to work on
-	some platforms (OS/2). -version-info results in a variety of
-	version numbers in soname based on platform and would not
-	be easily mappable back to values currently return by
-	each backend's sane_init().  ltmain.sh will need to be
-	hand patched for any known issues.
-
-2009-02-08  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys_gl841.c: Remove "init device" usb request.
-	* backend/genesys_gl841.c, backend/genesys_devices.c,
-	backend/genesys_low.h: Add support for uncalibrated scans in all
-	modes for Visioneer Strobe XP300. Front- and backside are
-	side-by-side, backside mirrored horizontally.
-	* doc/descriptions/genesys.desc: Added XP300 to the genesys
-	desc file.
-
-2009-02-06 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* configure.in, backend/Makefile.am: Add back in support for
-	optionally linking in sanei_jpeg.lo under backend directory; 
-	but using configure and not with GNU make extensions.
-	Move back to libtool's -version-info instead of -version-number
-	because the later has known bugs on platforms such as OS/2.
-
-2009-02-04 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* configure.in, acinclude.ac: Cleanup autoconf 2.63 warnings.  
-	add cv_ prefix to cached variable.  Remove AC_ARG_PROGRAM as
-	automake already invokes this. When prefered AC_USE_SYSTEM_EXTENSIONS
-	exists, use that instead of AC_GNU_SOURCE/AC_AIX/AC_MINUX.
-	Cleanup socket detection more by creating only a single
-	SOCKET_LIBS that contains list of all optional libraries
-	for any socket related funciton.  Make sure that checks
-	for socket related functions use SOCKET_LIBS when searching.
-	Check for getopt_long() and getopt.h.  Make OS/2 use
-	-no-undefined (same as windows).
-	* ltmain.sh, m4/libtool.m4: Upgrade to libtool 1.5.26.
-	* Makefile.am: Cleanups to match configure updates.
-	* frontend/scanimage.c, include/Makefile.in, lib/getopt.c
-	lib/getopt1.c, toosl/sane-desc.c, include/lgetopt.h:
-	Rename internal getopt.h to lgetopt.h to allow using
-	external getopt.h when it exists.  This allows to go
-	back to optionally compiling getopt()/getopt_long() and its 
-	prototypes and not have conflicts with external headers/symbols.
-
-2009-02-04  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/sane-pixma.man doc/descriptions/pixma.desc: 
-	Added ImageClass MF4120 support in pixma backend docs.
-
-2009-02-03 Julien Blache <jb@jblache.org>
-	* tools/sane-desc.c: filter out unsupported/unknown models from
-	output (udev/hal).
-
-2009-02-02  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_common.c backend/pixma_common.h /backend/pixma_imageclass.c
-	backend/pixma_mp150.c backend/pixma_mp730.c backend/pixma_mp750.c:
-	Change ALIGN macro name to ALIGN_SUP for PPC compatibility.
-	Some cosmetic changes to source code alignment.
-
-2009-02-01 Alex Belkin <abc@telekom.ru>
-	* backend/xerox_mfp.c backend/xerox_mfp.h:
-	Proper handling of parameters (to fix xsane crash).
-	* backend/xerox_mfp.conf doc/descriptions/xerox_mfp.desc:
-	Added Dell MFP 1815dn.
-
-2009-02-01 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* aclocalm4: fix prototype of internal strcasestr and usleep.
-	* configure.in: Group all USB logic together and all SCSI
-	logic together to aid understanding of whats no longer
-	valid.  Allow sharing enable/disable options between all 
-	USB drivers on multiple platforms.  Combined CAM_LIBS and 
-	SCSI_LIBS since they are mutually exclusive.  
-	Skip some USB/SCSI checks when previous tests show it will always fail.
-	* backend/Makefile.am, tools/Makefile.in: Combine CAM_LIBS and 
-	SCSI_LIBS. Add missing SOCKET_LIBS to epson2.  Add USB_LIB.
-	* saned.c: Add limits.h for PATH_MAX.
-
-2009-02-01  Mattias Ellert <mattias.ellert@fysast.uu.se>
-	* acinclude.m4, backend/Makefile.am: Restore the removed
-	DYNAMIC_FLAG configuration.
-	* acinclude.m4, sanei/sanei_jpeg.c: Don't compile sanei_jpeg
-	if libjpeg is unavailable.
-	* backend/canon_dr.c, backend/hs2p-scsi.c, backend/xerox_mfp.c:
-	format fixes.
-	* backend/hs2p.c: fix missing return.
-	* backend/canon630u-common.c: avoid redefinition warning.
-
-2009-01-31 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* backend/Makefil.am: Add missing math library to coolscan2
-	and coolscan3.
-	* acinclude.m4, configure.in: Define JPEG objects based on
-	existence of JPEG library and not on the dc* backends alone
-	since more backends then that use JPEG support.
-
-2009-01-30 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* frontend/saned.c: Replace usage of getgrouplist() with
-	getgrent() and friends.  getgrouplist is not posix and not
-	on several platforms including cygwin.
-	* acinclude.m4, configure.in:  Put all libraries into their
-	own *_LIB variables instead of $LIB so that we do not have to 
-	link in the world to all executables. Modified SANE_CHECK_U_TYPES
-	to be a little more portable to platforms that use #define
-	for u_* types. Create SANE_CHECK_BACKENDS macro so that
-	PRELOADABLE_BACKENDS can also be valided.  Auto-populated
-	PRELAODABLE_BACKENDS when detect dlopen() won't work.
-	Various protability cleanups.
-	* backend/dll.c: Make dll-preload.c a .h since its an include and
-	not compilable byitself.
-	* frontend/Makefile.in, frontend/scanimage.c, include/laaloca.h,
-	lib/Makefile.am, lib/alloca.c, strcasestr.c, tools/Makefile.in,
-	tools/sane-desc.c: Convert lib/ to automake.  Create a liblib.la
-	for everyone to use and a libfelib.la for only frontend programs.
-	Make all internal programs be prefixed with sanei_ as not to conflict
-	with other programs libsane is linked in with that will also most
-	likely create similar internal utils on problem platforms.
-	* include/getopt.h, lib/getopt.c, lib/getopt1.c: Always compile
-	and link in getopt_long() but prefix it with sanei_.  Its
-	easier to always use internal version then try to figure out what
-	platforms support getopt_long() and what header files to use.
-	* backend/Makefile.am: Convert backend makefile to automake.
-	Initial version that is feature parity with original but uses
-	specific rules instead of wildcards and only links in libraries/objs
-	really required. Room for more cleanup of whats linked in once
-	all makefiles have been converted to automake.
-
-2009-01-29 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* backend/epson2.c backend/pixma_bjnp.c, include/sane/sanei_backend.h,
-	sanei/sanei_tcp.c, sanie/sanei_udp.c: Improve portablity by
-	removing usage of MSG_WAITALL since not all platforms support
-	that (cygwin).  Default is to be blocking anyways.  Changed
-	usage of MSG_NOTWAIT to use fcntl() function as needed as well.
-	* configure.in, lib/Makefile.in, lib/strcasestr.c: Add internal
-	strcasestr() for platforms missing it (cygwin).
-	* pixma_common.c: Make source match header prototype for picky
-	compilers (cygwin).
-	* backend/umax_pp_mid.c: Allow BACKEND_NAME to be filename
-	yet debug to be SANE_DEBUG_UMAX_PP to match man page. 
-
-2009-01-28 Julien Blache <jb@jblache.org>
-	* doc/descriptions/epson.desc: added :scsi data for the GT-7000
-	and Perfection1200S. Patch from Dieter Jurzitza.
-
-2009-01-27 Louis Lagendijk  <llagendijk-guest at users.alioth.debian.org>
-	* backend/pixma_bjnp.c: fixed bug that caused scanner discovery to
-	fail when it encountered a point to point link (check data returned
-	by getifaddrs()
-
-2009-01-26 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* configure.in: Add AM_MAINTAINER_MODE to disable regenerating
-	configure files.  This was behavior of Makefiles before automake
-	and works around various timestamp issues.
-
-2009-01-25  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys_gl841.c: Change status code for locked head to 
-	SANE_STATUS_HW_LOCKED
-	
-2009-01-21  m. allan noah <kitno455 a t gmail d o t com>
-	* doc/descriptions/canon_dr.desc: correct version, status = new
-	* doc/descriptions/epjitsu.desc, doc/descriptions/fujitsu.desc: version
-	* doc/descriptions/umax1220u.desc: correct status of 1600U
-	* doc/descriptions/xerox_mfp.desc: status = new
-
-2009-01-23 Julien Blache <jb@jblache.org>
-	* doc/descriptions-external/epkowa.desc: Update for iScan 2.16.0,
-	from Olaf Meeuwissen.
-
-2009-01-22 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* Makefile.in: Submit Makefile.in from Makefile.am submitted
-	previously.
-	* backend/epson.c, backend/epson_scsi.c, backend/epson2_net.c,
-	backend/epson2_scsi.c, backend/genesys_gl646.c,
-	backend/genesys_gl841.c, backend/lexmark_low.c, backend/rts88xx_lib.c,
-	backend/umax_pp.c, backend/umax_pp_low.c, backend/umax_pp_mid.c,
-	doc/Makefile.in, doc/sane-epson.man, doc/sane-epson2.man:
-	Updated backends with EXTRA_* files to allow Makefile's
-	to always pass in BACKEND_NAME to be fixed to backend name
-	instead of filename; while still making sure that
-	SANE_DEBUG_${BACKEND}* exist as documented in man pages. 
-	Add references to epson and epson2 man pages about
-	SANE_DEBUG_EPSONx_SCSI and _NET options.
-	Created an epson2 man page; based mostly on epson page.
-	* backend/stubs.c: Currently, compiling stubs.c requires its
-	own compile rule simply to pass in -DSTUBS.  Since its always
-	required, just define it in stubs.c
-
-2009-01-22  Stéphane Voltz <stef.dev@free.fr>
-	* doc/Makefile.in doc/descriptions/genesys.desc : added the rts8891
-	man page to the generation and install . added XP200 to the genesys
-	desc file.
-
-2009-01-21 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* Makefile.am, lib/Makefile.in: Run all libcheck tests before
-	failure and look for both static and shared libraries.
-	Fixed $srcdir typo in lib/Makefile.in.
-
-2009-01-21  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/canon_dr.[ch], backend/epjitsu.[ch], backend/fujitsu.[ch]:
-	- dont export private symbols
-
-2009-01-19  m. allan noah <kitno455 a t gmail d o t com>
-	* doc/descriptions-external/brother2.desc: add MFC-7840W
-
-2009-01-19  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* pixma_imageclass.c:
-	Fixed select_source message length, and typo bug in last update.
-	Set MP4600 series for inverted checksumming. 
-
-2009-01-19  Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys.conf.in backend/genesys.h
-	backend/genesys_devices.c backend/genesys_gl646.c 
-	backend/genesys_gl841.c backend/genesys_low.h: add support for
-	uncalibrated scans in all modes for Visioneer Strobe XP200. Add
-	support for buttons for MD5345/HP2300 and XP200
-
-2009-01-18  m. allan noah <kitno455 a t gmail d o t com>
-	* doc/descriptions/unsupported.desc: everything reported from 
-	2008-07 to 2009-01
-
-2009-01-18  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys_low.h: Fix prototype of update_hardware_sensors.
-	Make half-ccd mode optional.
-	* backend/genesys_gl841.c: Make dpihw depend on sensor pixel count 
-	instead of sensor resolution. Make some Canon LiDE 35 specific
-	gpio handling conditional, add missing SCANMOD shift. Make
-	half-ccd mode optional. Reenable clock register setup from sensor
-	struct, set SCANMOD.
-	* backend/genesys_devices.c: Make half-ccd mode optional.
-	Reenable clock register setup from sensor struct, set SCANMOD.
-
-2009-01-17  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* pixma_mp150.c:
-	Fixed "Busy mode" exit processing. 
-
-2009-01-17 Julien Blache <jb@jblache.org>
-	* doc/descriptions/hp.desc: add SCSI identifiers for the ScanJet
-	IIc, from Daniel Golle (sane-devel, 20061105).
-	* frontend/scanimage.c: make batch mode create output files
-	atomically. Patch by Simon Matter <simon.matter@invoca.ch>.
-
-2009-01-16 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* .cvsignore, Makefile.in, aclocal.m4, config.sub, configure,
-	configure.in, backend/cvsignore, include/Makefile.in,
-	include/sane/config.h.in, INSTALL, Makefile.am, missing:
-	Convert top-level Makefile to be generated by automake.
-	"dist" target now includes m4 directory. Updated "libcheck"
-	target to look at dynamic libraries instead of static.
-
-2009-01-16 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* doc/Makefile.in, frontend/Makefile.in, include/Makefile.in,
-	japi/Makefile.in, lib/Makefile.in, po/Makefile.in, 
-	sanei/Makefile.in, testsuite/Makefile.in, tools/Makefile.in,
-	backend/Makefile.in:
-	Updates to Makefiles to prepare for transition to automake.
-	Fix a few bugs with "all" and "uninstall" targets to work when
-	$(builddir) != $(srcdir).  Added $(DESTDIR) to uninstall target.
-	Made $(distdir) related to current directory to match automake.
-
-2009-01-16  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys.c, backend/genesys.h, backend/genesys_devices.c,
-	backend/genesys_gl646.c, backend/genesys_gl841.c, 
-	backend/genesys_low.h: Add support for buttons on 
-	Canon LiDE 35/40/50.
-
-2009-01-15  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/sane-pixma.man, doc/descriptions/pixma.desc, 
-	pixma_mp150.c, AUTHORS:
-	Updated docs and comments in pixma backend. 
-	Added Dennis Lou to pixma backend authors
-
-2009-01-13 Louis Lagendijk  <llagendijk-guest at users.alioth.debian.org>
-        * AUTHORS: added myself as co-responsible for pixma backend
-
-2009-01-15  Alessandro Zummo <a.zummo@towertech.it>
-	* backend/epson2.c: do not use request_identity2 with
-	networked scanners, fixed generation of resolution
-	list.
-
-2009-01-13 Louis Lagendijk  <llagendijk-guest at users.alioth.debian.org>
-        * backend/pixma_bjnp.c: send broadcasts from bjnp port to make
-        firewalling easier
-
-2009-01-13 Julien Blache <jb@jblache.org>
-	* tools/sane-desc.c: replace opencoded device permissions and
-	ownership by proper definitions. Group USB devices by vendor in
-	the HAL FDI output. Replace obsolete SYSFS{} key by the newer
-	ATTR{} key in the udev output. Add a new :scsi keyword for SCSI
-	devices, add support for SCSI devices in the udev and HAL FDI
-	outputs.
-	* doc/descriptions/hp.desc, doc/descriptions/epson.desc: add :scsi
-	keyword to a handful of SCSI scanners known to advertise
-	themselves as type "Processor".
-
-	All of the above based on a patch contributed by Dieter Jurzitza.
-
-2009-01-10  m. allan noah <kitno455 a t gmail d o t com>
-	* sanei/sanei_usb.c: rescan usb every time sanei_usb_init() is called
-	- remove missing devices, add new devices to global lists
-	- based on code from stef.dev@free.fr
-
-2009-01-10  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/canon_dr.[ch], backend/canon_dr-cmd.h: backend v11
-	- send_panel() can disable too
-	- add cancel() to send d8 command
-	- call cancel() only after final read from scanner
-	- stop button reqests cancel
-
-2009-01-10 Jeremy Johnson <jeremy a t acjlaw dot net>
-	* backend/hs2p.c: replaced ulong with u_long, 
-	added static keyword for SANE_Status update_hs2p_data()
-
-2009-01-06 Jonathan Bravo Lopez <jkdsoft@gmail.com>
-	* backend/hp3900_sane.c, backend/hp3900_config.c,
-	  backend/hp3900_types.c, backend/hp3900.conf.in, doc/sane-hp3900.man,
-	  doc/descriptions/hp3900.desc:
-	  Added support for HP Scanjet G3110 scanner.
-
-2009-01-05 Jeremy Johnson <jeremy a t acjlaw dot net>
-	Added code to read_data() to pad image data to
-	requested length and to zero out any garbage using
-	information from sense data command. Added new
-	MAINTENANCE_DATA struct and options to display
-	scanner's maintenance/callibration statistics.
-	*backend/hs2p.h
-	- added enum CONNECTION_TYPES
-	- added HS2P_DATA struct
-	- added SENSE_DATA struct to struct HS2P_Device
-	- added SANE_String_Const orientation_list[]
-	- added macros isset_ILI() and isset_EOM()
-	*backend/hs2p-scsi.h
-	- replaced request_sense struct with SENSE_DATA struct
-	- added #define DATA_TYPE_EOL (va_list sentinel)
-	- added MAINTENANCE_DATA struct
-	*backend/hs2p-saneopts.h
-	- added OPT_ORIENTATION
-	- added MAINTENANCE_DATA options
-	*backend/hs2p.c
-	- added MAINTENANCE_DATA options
-	- added unused connType to attach()
-	- added update_hs2p_data() to fill in options
-	- added hs2p_open() and hs2p_close()
-	- added get_hs2p_data() to read scanner data
-	- added print_maintenance_data()
-	- modified sane_control_options() to
-	  accomodate new maintenance options and to
-	  handle Portrait/Landscape option
-	  replaced adf_status macro with s->data.adf_status
-	- modified sane_read() to correctly zero out the
-	  missing bytes on an incomplete read and to pad
-	  to the requested length
-	*backend/hs2p-scsi.c
-	- replaced request_sense() with get_sense_data()
-	- added print_sense_data()
-	- added SENSE_DATA *sdp to sense_handler()
-	- modified read_data() to handler other data type codes/qualifiers
-	- read_adf_status() now is replaced with call to 
-	  read_data(fd,*buf,*bufsize,dtc,dtq)
-
-2009-01-04  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/sane-pixma.man, doc/descriptions/pixma.desc:
-	Updated doc for pixma backend (ImageClass)
-
-2008-12-31  Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c: restored warming up broken by a previuos commit
-
-2008-12-28  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_imageclass.c:
-	Change to include different checksumming for MF41xx and MF42xx series
-
-2008-12-26  Alessandro Zummo <a.zummo@towertech.it>
-	* backend/epson2.c: changed version code,
-	added protection from wrong settings.
-
-2008-12-21  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch]: backend v87
-	- accept null pointer as empty device name
-	- track frontend reading sensor/button values to reload
-	- deactivate double feed options if df-action == default
-
-2008-12-21  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man, 
-	backend/pixma_mp150.c:
-	MP800/MP800R: Fixed bug and color planes shift issues, added TPU support
-	for 48 bits images depth up to 1200 dpi.
-	MP980: following a user feedback, declared as working.
-	Doc and man pages updated.
-
-2008-12-18  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch]: backend v86
-	- get_pixelsize() sets back window ID for back side scans
-	* doc/sane-fujitsu.man, doc/descriptions/fujitsu.desc: backend v86
-
-2008-12-17  Julien Blache <jb@jblache.org>
-	* backend/v4l.c: unmap mapped buffer in sane_cancel(). Use libv4l1
-	for v4l device access, buys us some support for v4l2 devices for
-	free thanks to libv4l1, libv4l2 and libv4lconvert.
-	* configure.in, configure: check for libv4l1 availability.
-
-2008-12-15  Alex Belkin <abc@telekom.ru>
-	* AUTHORS, configure, configure.in, backend/Makefile.in,
-	backend/xerox_mfp.c, backend/xerox_mfp.h, doc/Makefile.in,
-	doc/descriptions/xerox_mfp.desc, doc/sane-xerox_mfp.man:
-	Initial commit ot xerox_mfp backed.
-
-2008-12-12  Julien Blache <jb@jblache.org>
-	* frontend/saned.c: add a data_portrange config file option to
-	saned to specify a port range for the data connection. Based on a
-	patch contributed by Oren Held.
-	* backend/saned.conf.in: add the data_portrange option to the
-	config file and rework the comments.
-	* doc/saned.man: document the data_portrange option.
-
-2008-12-11  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c doc/sane-rts8891.man doc/descriptions/rts8891.desc:
-	  scan register setting fix, documentation update
-
-2008-12-10  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch]: backend v85
-	- round pixels_per_line down to arbitrary limits for fi-4990 & fi-4860
-	- fi-4860 returns random garbage to serial number queries
-	- initialize *info to 0 in sane_control_option()
-	* doc/descriptions/fujitsu.desc: backend v85, improve status/comments
-	* frontend/scanimage.c: initialize *info, fix buffer overwalk
-
-2008-12-10  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/canon_dr.c: backend v10
-	- add all documented request sense codes to sense_handler()
-	- fix color jpeg (remove unneeded BGR to RGB swapping code)
-	- add macros for LUT data
-	* backend/canon_dr.conf.in: add DR-2080C usb ID
-	* doc/descriptions/canon_dr.desc: backend v10, add DR 3020
-
-2008-12-08  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/canon_dr.[ch], backend/canon_dr-cmd.h: backend v9
-	- add rollerdeskew and stapledetect options
-	- add rollerdeskew and stapledetect bits to ssm_df()
-	* doc/descriptions/canon_dr.desc: backend v9
-
-2008-12-08  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/avision.c: backend v289
-	- fix sending SIGTERM when reader_pid == 0
-
-2008-12-07  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/canon_dr.[ch], backend/canon_dr-cmd.h: backend v8
-	- rename read/send_counter to read/send_panel
-	- enable control panel during init
-	- add options for all buttons
-	- call TUR twice in wait_scanner(), even if first succeeds
-	- disable rif
-	- enable brightness/contrast/threshold options
-	* doc/descriptions/canon_dr.desc, doc/sane-canon_dr.man: backend v8
-
-2008-12-06 Louis Lagendijk <llagendijk-guest at users.alioth.debian.org>
-	* backend/pixma_bjnp.c pixma_bjnp_private.h: 
-	  replaced getlogin/getenv by getpwuid(geteuid)
-
-2008-12-06 Louis Lagendijk <llagendijk-guest at users.alioth.debian.org>
-	* backend/pixma_bjnp.c pixma_bjnp_private.h: 
-	  On Ubuntu getlogin() returns NULL. So we now first try getlogin()
-	  and if that fails, we try getenv("USER") and if that fails we use
-	  a default user string
-
-2008-12-03  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c backend/rts8891_low.c: possible fix for
-	  failed scan at 300 and 1200 dpi for HP4400, sensor type 2.
-
-2008-12-01  Julien Blache <jb@jblache.org>
-	* sanei/sanei_usb.c: fix assignment in if clause, reported on
-	sane-devel.
-
-2008-11-30  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	MP620 supported by pixma backend confirmed, doc and man pages updated.
-
-2008-11-29  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/canon_dr.[ch]: backend v7
-	- jpeg support (size rounding and header overwrite)
-	- call object_position(load) between pages even if buffering is on
-	- use request sense info bytes on short scsi reads
-	- byte swap color BGR to RGB
-	- round image width down, not up
-	- round image height down to even # of lines
-	- always transfer even # of lines per block
-	- scsi and jpeg don't require reading extra lines to reach EOF
-	- rename buffer option to buffermode to avoid conflict with scanimage
-	- send ssm_do and ssm_df during sane_start
-	- improve sense_handler output
-	* doc/descriptions/canon_dr.desc: backend v7
-
-2008-11-29  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/canon_dr.[ch], backend/canon_dr-cmd.c: backend v6
-	- fix adf simplex
-	- rename ssm_duplex to ssm_buffer
-	- add --buffer option
-	- reduce inter-page commands when buffering is enabled
-	- improve sense_handler output
-	- enable counter option
-	- drop unused code
-	* doc/descriptions/canon_dr.desc: backend v6
-
-2008-11-26  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/*.[ch]: nearly every backend used V_MAJOR
-	instead of SANE_CURRENT_MAJOR in sane_init()
-	* backend/snapscan.c: remove EXPECTED_VERSION check
-	since new SANE standard is forward compatible
-
-2008-11-25  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/canon_dr.[ch], backend/canon_dr-cmd.c,
-	doc/descriptions/canon_dr.desc: backend v5
-	- remove EOF ejection code
-	- add SSM and GSM commands
-	- add dropout, doublefeed, and jpeg compression options
-	- disable adf backside
-	- fix adf duplex
-	- read two extra lines (ignore errors) at end of image
-	- only send scan command at beginning of batch
-	- fix bug in hexdump with 0 length string
-	- DR-7580 support
-
-2008-11-25  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma.c:
-	Fixed regression bug at end of scan for all PIXMA, noticeable 
-	in multipage ADF scan.
-
-2008-11-23  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, sane-backends/po/sane-backends.fr.po, 
-	doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	Support for MP630 in pixma backend.
-	Updated docs for MP630, and network interface to various PIXMA models
-	in pixma.desc.
-	Fixed some typos in French translations.
-
-2008-11-20  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c: fixes 'commit scan value' for HP4400.
-
-2008-11-20  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c: calibration fixes for HP4400 sensor type 3.
-
-2008-11-18  Alessandro Zummo <a.zummo@towertech.it>
-	* backend/epson2.c: fixed bug when an extended command
-	was used with D8 level scanners. bug reported
-	by Kare Sars <kare.sars@kolumbus.fi>
-
-2008-11-17  Gerhard Jaeger <gerhard@gjaeger.de>
-	* doc/descriptions-external/epkowa.desc:
-	  iscan 2.14.0 updates on behalf of olaf.meeuwissen@avasys.jp
-
-2008-11-12  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c: sensor detection fix. Lamp setting
-	  change for HP4400 sensor type 3.
-
-2008-11-11  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/canon_dr.c: backend v4
-	- eject document when sane_read() returns EOF
-
-2008-11-09  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/canon_dr.[ch], backend/canon_dr-cmd.h, doc/sane-canon_dr.man,
-	  backend/canon_dr.conf.in, doc/descriptions/canon_dr.desc:
-	- New Canon DR-series backend v3
-	- support all modes and resolutions of DR-9080C
-	- advanced options (MF detection, compression) not yet supported
-	- other larger models believed similar, smaller ones unknown
-	* doc/descriptions/unsupported.desc: remove Canon DR-series machines
-
-2008-11-07  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.c: backend v84
-	- round lines down to even number to get even # of total bytes
-	- round binary bpl and Bpl down to byte boundary
-
-2008-11-06  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.c: backend v83
-	- round binary bpl and Bpl up to byte boundary
-	- use s->params instead of user data in set_window()
-	- read_from_scanner() only grabs an even number of lines
-
-2008-10-31  Louis Lagendijk <llagendijk-guest at users.alioth.debian.org>
-	* Pixma backend (pixma.c/pixma_common.c/pixma_io_sanei.c/pixma_bjnp.c):
-	  bjnp tcp connection is now de-activated after initialization and
-	  re-activated at start of scanning. If we do not do this, the scanner
-	  closes its side of the connection after 30 secods of inactivity.
-	  Added a maximum to the retry of slect calls when signals are
-	  received
-	  Added blocksize detection for tcp read_bulk call
-
-2008-11-04  m. allan noah <kitno455 a t gmail d o t com>
-	* sanei/sanei_usb.c, include/sane/sanei_usb.h:
-	- shorten debug lines to fit in 80 chars
-	- add sanei_usb_clear_halt() required by upcoming canon_dr backend
-
-2008-10-31  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch], backend/fujitsu-scsi.h,
-	  backend/fujitsu.conf.in, doc/descriptions/fujitsu.desc: backend v82
-	- improved front-side endorser vpd detection
-	- send scanner_control_ric during sane_read of each side
-	- add fi-6770A and fi-6670A USB ID's
-
-2008-10-31  Louis Lagendijk <llagendijk-guest at users.alioth.debian.org>
-	* backend/pixma_bjnp.c: corrected small typo
-
-2008-10-31  Louis Lagendijk <llagendijk-guest at users.alioth.debian.org>
-	* backend/pixma_bjnp.c:
-	   Added retry to select() calls when they get interrupted by a
-	   signal. This solves problems in xsane after a first scan completed.
-	   There is still an issue that scanner closes tcp connection after
-	   30 seconds of inactivity
-	   backend/pixma_bjnp.c backend/bjnp_private.h
-	   Marked local functions as static and removed them from ..private.h
-
-2008-10-31  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c backend/rts8891_low.c backend/rts8891_low.h:
-	  added 600 and 1200 dpi scan for HP4400 and HP4470 with 'xpa' 
-	  sensor.
-
-2008-10-25  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, doc/sane-pixma.man doc/descriptions/pixma.desc:
-	Tweaks for TPU scan at 4800 dpi, and MP810 at 2400 dpi (now works).
-	Updated docs around that.
-
-2008-10-25  Louis Lagendijk  <llagendijk-guest at users.alioth.debian.org>
-	* Added configuration file support for pixma backend
-	Currently used only for configuration of network scanners.
-
-2008-10-22  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma.c, backend/pixma_io_sanei.c, backend/pixma_mp150.c:
-	TPU scanning in 48 bits mode now works fine on MP970, with Xsane or
-	scanimage.
-	Changed also minimum to 300 dpi for TPU scan, so that preview now works
-	in Xsane.
-	Added Legal paper dimensions (14") to ADF scan for MX850 and MX7600.
-	The rest is cosmetic only.
-
-2008-10-21  Louis Lagendijk <llagendijk-guest at users.alioth.debian.org>
-	* Added #ifdef around defintions of MIN and MAX in pixma_common.h 
-	- Re-enable includes in pixma_bjnp.c as they are needed on Freebsd
-	- Replaced getaddrinfo by gethostbyname in pixma_bjnp.c as this is 
-	  supported on OS/2 as well
-
-2008-10-21  m. allan noah <kitno455 a t gmail d o t com>
-	* doc/descriptions/fujitsu.desc: backend v81, fix fi-6240 usb id
-
-2008-10-20  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch], backend/fujitsu-scsi.h: backend v81
-	- increase USB timeouts
-	- enable get_pixelsize() to update scan params after set_window()
-	- remove even_scan_line hack
-
-2008-10-19  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* configure.in, configure, backend/pixma_bjnp.c,
-	backend/pixma_bjnp.h, backend/pixma_bjnp_private.h,
-	pixma.h, doc/descriptions/pixma.desc:
-	From Louis Lagendijk for bjnp protocol on pixma backend, add a header
-	check for ifaddrs.h  (necessary on different platforms BeOS, OS/2, ...)
-	Increment pixma backend version number.
-
-2008-10-15  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c: added 300 dpi scan for HP4400
-
-2008-10-15  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c: fixed HP4400 sensor detection, added 150
-	  dpi scan mode for HP4400
-
-2008-10-14  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma*.c, backend/pixma*.h (all pixma backend files),  
-	doc/sane-pixma.man, doc/description/pixma.desc, 
-	backend/Makefile.in
-	Added 3 new files backend/pixma_bjnp.c, backend/pixma_bjnp.h, 
-	backend/pixma_bjnp_private.h:
-	- Thanks to Louis Lagendijk, added an implementation of Canon's BJNP
-	network protocol to the pixma backend, for scanning with PIXMA devices
-	over a LAN network.
-	- Fix for ADF scan reset session when ADF is loaded with more pages 
-	to scan than the frontend requests.
-	- Updated pixma backend documentation and file headers.
-
-2008-10-09  m. allan noah <kitno455 a t gmail d o t com>
-	* doc/descriptions/fujitsu.desc, doc/sane-fujitsu.man: backend v80
-
-2008-10-08  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.c: backend v80
-	- front-side endorser uses data ID 0x80
-
-2008-10-06  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c backend/rts8891.h: fixed configuration option
-	  bug
-
-2008-10-04  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma.c, backend/pixma.h, backend/pixma_common.c, 
-	backend/pixma_io_sanei.c, backend/pixma_mp150.c, 
-	doc/sane-pixma.man, doc/description/pixma.desc:
-	MP970 scanning improvements, up to 4800 dpi. On the way soon, 
-	network BJNP protocol designed by Louis Lagendijk to be added to CVS.
-	MX7600 reported to work fine with the backend.
-	ADF scanning: 
-	- improved for latest PIXMAs like MX850, MX310.
-	- bug fix in Sane_start, when scanning several pages with ADF.
-	ADF DUPLEX scanning:
-	- new code for ADF Duplex, (to be tested) based on a MX850 Snoop. Changes
-	might fit also MP830 (To be confirmed).
-	TPU scanning:
-	- MP970 TPU scanning: Protocol works, get scanned TPU images with 48 bits
-	to 24 bits conversion, full 48 bit version yet to be debugged.
-
-2008-10-03  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/epjitsu.[ch]: backend v17:
-	- increase scan height ~1/2 inch due to head offset
-	- change page length autodetection condition
-
-2008-10-03  Stéphane Voltz <stef.dev@free.fr>
-	* include/sane/sane.h: added a SANE_CURRENT_MINOR define 
-
-2008-10-02  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c backend/rts8891.h backend/rts8891_low.h: 
-	add a 'sensornumber' option to override detected sensor model
-
-2008-10-02  m. allan noah <kitno455 a t gmail d o t com>
-	* doc/descriptions-external/epkowa.desc:
-	- iscan 2.12.0 updates from olaf.meeuwissen@avasys.jp
-
-2008-10-01  m. allan noah <kitno455 a t gmail d o t com>
-	* doc/descriptions/fujitsu.desc, backend/fujitsu.conf.in,
-	  backend/fujitsu.[ch], backend/fujitsu-scsi.h: backend v79
-	- add usb ids for several models
-	- print additional hardware capability bits
-	- detect front-side endorser
-	- disable endorser-side controls if only one side installed
-	- add quirks for fi-6x70
-
-2008-10-01  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/epjitsu.[ch]: backend v16:
-	- split fill_frontback_buffers_S300 into 3 functions
-	- enable threshold-curve option
-	- add 1-D dynamic binary thresholding code
-	- remove y-resolution option
-	- pad 225x200 data to 225x225
-
-2008-10-01  Gerhard Jaeger <gerhard@gjaeger.de>
-	* doc/descriptions/plustek.desc: Added entry for UT12 devid 0x0013
-	* doc/descriptions/unsupported.desc: Removed entry for UT12 devid 0x0013
-	* doc/descriptions/gt68xx.desc: Added entry for OpticSlim 2400plus
-	* backends/gt68xx.conf.in: Added entry for OpticSlim 2400plus
-
-2008-09-26  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891_low.c: fix HP4400 head parking
-
-2008-09-25  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/epjitsu.[ch], backend/epjitsu-cmd.h: backend v 13, 14 and 15:
-	- add working page-height control
-	- add working brightness, contrast and threshold controls
-	- add disabled threshold curve and geometry controls
-	- move initialization code to sane_get_devices, for hotplugging
-	- support S300 on USB power
-	- support S300 225x200 and 600x600 scans
-	- support for automatic paper length detection (parm.lines = -1)
-	- expose hardware buttons/sensors as options for S300
-	* doc/descriptions/epjitsu.desc: change S300 status to good
-
-2008-09-25  m. allan noah <kitno455 a t gmail d o t com>
-	* include/sane/saneopts.h: underscore not allowed in option names
-	* frontend/scanimage.c: fix broken unknown length (-1) binary scans,
-	  fix invalid tiff height with unknown length scans, fix compiler warn 
-
-2008-09-20  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c: fix typo in HP4400 variant detection
-
-2008-09-20  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c backend/rts8891_low.c backend/rts8891_low.h: more
-	fix for HP4400 head parking, 75 dpi support for another HP4400 sensor
-	variant, better variant detector and initial setting
-
-2008-09-13  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, doc/sane-pixma.man, doc/description/pixma.desc:
-	Changes in pixma backend for PIXMA MP970 at 4800 dpi (to be continued).
-	Declare MX7600 but yet untested.
-
-2008-09-11  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c backend/rts8891_low.c backend/rts8891_low.h: fix
-	parking for HP4400, tune dark calibration for HP4400
-
-2008-09-07  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c backend/pixma_imageclass.c backend/pixma_common.h
-	doc/sane-pixma.man doc/descriptions/pixma.desc:
-	- Updated doc for MF4140, MF4150 and MP810
-	- Remove white lines previously padded to image bottom for CCD sensors
-	- Modified scan area adjustments to enhance frontend area selection fit
-	but to be confirmed that it does not bring backward compatibility issues.
-
-2008-09-03  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c backend/rts8891_low.c backend/rts8891_low.h
-	  backend/rts88xx_lib.c: minor changes for hp4400 support
-
-2008-09-02  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c:
-	Some tweaks to have PIXMA MP810 supported by the pixma backend.
-
-2008-08-29  Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_gl646.c backend/genesys_devices.c:
-	- move to configuration framework
-	- fix GL646 GPO value usage
-	- HP2400/G2410 tidbits
-	- don't reset ASIC anymore
-
-2008-08-27  m. allan noah <kitno455 a t gmail d o t com>
-	* doc/descriptions/fujitsu.desc: mark fi-6230 and fi-6240 complete
-
-2008-08-26  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.c, doc/descriptions/fujitsu.desc: backend v78
-	- recent model names (fi-6xxx) dont end in 'C'
-	- simplify flatbed area overrides
-	- call scanner_control to change source during sane_start
-
-2008-08-26  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.c, backend/fujitsu-scsi.h: backend v77
-	- override flatbed maximum area for fi-6230C and fi-6240C
-	- set PF bit in all mode_select(6) CDB's
-	- set SANE_CAP_INACTIVE on all disabled options
-	- fix bug in mode_select page for sleep timer
-
-2008-08-25  Gerhard Jaeger <gerhard@gjaeger.de>
-	* backend/plustek-usb.c backend/plustek-usbdevs.c:
-	  Added preliminary support for Visioneer XP100
-	  Tweaked entry for LM9831 version of Plustek UT12
-	* backend/plustek.c: Bumped build number
-	* doc/sane-plustek.man doc/plustek/Plustek-USB.changes: Update
-	* doc/descriptions/plustek.desc: Added entry for Strobe XP100
-	* doc/descriptions/unsupported.desc: Removed entry for Strobe XP100
-
-2008-08-21  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c: calibration updating and 75 dpi scan for hp400
-
-2008-08-23  m. allan noah <kitno455 a t gmail d o t com>
-	* doc/descriptions/fujitsu.desc: set lots of scanners to complete :)
-
-2008-08-21  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c backend/rts8891_devices.c backend/rts8891_low.c
-	  backend/rts88xx_lib.c: add sensor type field and use it in geometry
-	  detection.
-
-2008-08-14  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c backend/rts88xx_lib.c: fix for hp4400 init
-
-2008-08-13  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch]: backend v76
-	- add independent maximum area values for flatbed
-	- override said values for fi-4220C, fi-4220C2 and fi-5220C
-	* doc/descriptions/fujitsu.desc: bump version, add 2 untested scanners
-
-2008-08-07 Rene Rebe <rene@exactcode.de>
-	* backend/fujitsu.c, backend/fujitsu.conf.in,
-	  doc/descriptions/fujitsu.desc: backend v75
-	- added fi-6230 ID, updated fi-6130, fi-6230 status
-
-2008-08-05 Julien Blache <jb@jblache.org>
-	* frontend/saned.c: initialize runas_{u,g}id to 0 instead of -1;
-	initialize ngroups to 0.
-
-2008-08-04 Julien Blache <jb@jblache.org>
-	* frontend/scanimage.c: fetch_options(), actually get option
-	descriptor 0 before attempting to get the value of option 0.
-
-2008-08-04  Stéphane Voltz <stef.dev@free.fr>
-	* backend/umax_pp.c backend/umaxp_pp.h backend/umax_pp.conf.in: 
-	  use configuration framework
-
-2008-08-02  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.c, backend/fujitsu-scsi.h: backend v74
-	 - replace global scsi blocks with local ones in each function
-
-2008-07-31 Julien Blache <jb@jblache.org>
-	* frontend/saned.c: set supplemental group list in addition to
-	setting euid and egid. Reported by Cameron Hutchison.
-
-2008-07-28 Julien Blache <jb@jblache.org>
-	* frontend/saned.c: call setegid() before seteuid(), aka while
-	we're still root. Patch from Nick Andrew <nick@nick-andrew.net>.
-
-2008-07-27  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.c, backend/fujitsu.conf.in,
-	  doc/descriptions/fujitsu.desc: backend v73
-	- add fi-6130 usb ID
-	- correct overscan dimension calculation
-	- provide correct overscan size overrides for fi-5110C and fi-4x20C2
-	- fi-5750C can't handle 10 bit LUT via USB
-
-2008-07-25  m. allan noah <kitno455 a t gmail d o t com>
-	* AUTHORS: Earle has commit perms
-	* doc/descriptions/unsupported.desc: add Lexmark X7170
-	* include/sane/sanei_config.h: remove typedef so doxygen will shutup
-
-2008-07-25  m. allan noah <kitno455 a t gmail d o t com>
-	* include/sane/saneopts.h: separate x-resolution from resolution
-	* backend/abaton.c, backend/artec.c, backend/canon-sane.c,
-	  backend/epjitsu.c, backend/fujitsu.c, backend/microtek2.c,
-	  backend/sp15c.c, backend/umax.c: use SANE_NAME_SCAN_RESOLUTION
-	  instead of SANE_NAME_SCAN_X_RESOLUTION, to avoid ui change
-
-2008-07-20 Julien Blache <jb@jblache.org>
-	* backend/net.c: sane_control_option: when the frontend doesn't
-	care (info == NULL) and the remote backend asks for a reload,
-	perform the reload. Hopefully this brings the behaviour back in
-	line with standard backends.
-
-2008-07-15  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c:
-	Changed page scan end condition to handle correctly PIXMA ADF.
-
-2008-07-14 Julien Blache <jb@jblache.org>
-	* doc/*.man: Fix hyphen vs. minus sign issues in the manpages,
-	breaking copy/paste of command-lines and options in UTF-8
-	environments.
-
-2008-07-13  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch]: backend v72,
-	- use mode_sense to determine background color support
-	- remove fi-5900 background color override
-
-2008-07-13  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch]: backend v71,
-	- disable overscan option if vpd does not tell overscan size
-	- fi-5110EOX crops scan area based on absolute maximum, not paper
-	- fi-5330C and fi-5650C can't handle 10 bit LUT via USB
-	- fi-5900 has background color, though it reports otherwise
-
-2008-07-10  Stéphane Voltz <stef.dev@free.fr>
-	* sanei/sanei_config.c: handle cases where config or callback
-	  function is NULL 
-	* backend/rts8891.c: use new configuration parsing framework
-
-2008-07-10  Stéphane Voltz <stef.dev@free.fr>
-	* include/sane/sanei_config.h: doxygen fix for new function
-
-2008-07-10  Stéphane Voltz <stef.dev@free.fr>
-	* backend/sanei_constrain_value.c: add support for SANE_Bool
-	  in sanei_check_value
-	* backend/Makefile.in: add sanei_constrain_value.lo to libsane
-2008-07-10  Stéphane Voltz <stef.dev@free.fr>
-	* backend/sanei_constrain_value.c: add support for SANE_Bool
-	  in sanei_check_value
-	* backend/Makefile.in: add sanei_constrain_value.lo to libsane
-	dependencies
-	* sanei/Makefile.in: add makedepend for .lo files
-	* include/sane/sanei_config.h sanei/sanei_config.c: add configuration
-	parsing framework
-
-2008-07-05  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch]: backend v70,
-	- fix bug in sane_get_parameters (failed to copy values)
-	- autodetect jpeg duplex interlacing mode by inspecting scan width
-
-2008-07-05  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma.c:
-	Fix in sane_control_option () for PIXMA ADF scan.
-	Change malformed test conditions for ADF/Duplex scan source.
-	Updated PIXMA MX850 description.
-
-2008-07-03  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch]: backend v69, support hot-unplugging scanners
-
-2008-07-02  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch], backend/fujitsu-scsi.h: backend v68, 
-	- add halftone type and pattern options
-	- support M3097G with IPC and CMP options via modified VPD response
-	* doc/descriptions/fujitsu.desc, doc/sane-fujitsu.man: backend v68,
-	- manpage cleanup
-
-2008-07-01  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch], backend/fujitsu-scsi.h: backend v67, 
-	- add IPC/DTC/SDTC options
-	- call check_for_cancel() in sane_cancel, unless reading flag is set
-
-2008-06-28  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c:
-	Removed "experimental" flag for PIXMA MX850.
-
-2008-06-26  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch], backend/fujitsu-scsi.h: backend v66,
-	- restructure double feed detection options for finer-grained control
-	- add endorser side option
-	- prevent init_interlace() from overriding init_model()
-	- simplify sane_start() and fix interlaced duplex jpeg support
-	- simplify sane_read() and add non-interlaced duplex jpeg support
-	- removed unused code
-
-2008-06-26  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/test.[ch]: check for options being controlled before loading
-
-2008-06-25  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_imageclass.c:
-	Patch from Sam Varshavchik to deal with libusb 64 read issue, 
-	for ImageClass MFPs.
-
-2008-06-24  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch], backend/fujitsu-scsi.h,
-	  doc/descriptions/fujitsu.desc, doc/sane-fujitsu.man:
-	  backend version 65, add endorser support, add quirks for fi-4990
-
-2008-06-24 Julien Blache <jb@jblache.org>
-	* backend/net.c: do not reload options behind the frontend's back
-	in sane_control_option; rather return SANE_STATUS_INVAL and warn
-	that the frontend is buggy. Fetch option descriptors in
-	sane_open() so a GET_VALUE on option 0 can still work without
-	having to get option descriptor 0 beforehand.
-	* frontend/saned.c: rework error/exit path in process_request()
-	to properly terminate the Avahi thread when in debug mode.
-
-2008-06-22 Julien Blache <jb@jblache.org>
-	* frontend/saned.c: terminate child processes before exiting in
-	debug mode.
-
-2008-06-19 Ilia Sotnikov <hostcc@gmail.com>
-	* backend/hp5590.c:
-	Fixed segmentation fault on invalid option passed to
-	sane_get_option_descriptor(), sane_control_option()
-	(thanks to Albert Cervera i Areny)
-
-2008-06-19 Ilia Sotnikov <hostcc@gmail.com>
-	* backend/hp5590.c, backend/hp5590_cmds.c, backend/hp5590_cmds.h
-	* backend/hp5590_low.c, backend/hp5590_low.h
-	* doc/descriptions/hp5590.desc, doc/sane-hp5590.man:
-	Added support for HP ScanJet 4570c (thanks to Markham Thomas)
-
-2008-06-15  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/sane-pixma.man,
-	* backend/pixma.c, backend/pixma_mp150.c, backend/pixma_sane_options.c
-	* sane-backends/po/sane-backends.??.po:
-	Remove "experimental" in pixma buttons options and text.
-	Fix some French translation typos, and update man page.
-
-2008-06-10  Stéphane Voltz <stef.dev@free.fr>
-	* backend/sanei_constrain_value.c: add support for arrays of SANE_Word
-	  in sanei_constrain_value
-	* backend/umax_pp.c: remove now unneede 'hand made' constrain on
-	  gamma tables
-
-2008-06-09  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c: fix for model with 'XPA' sensor
-
-2008-06-06  Julien Blache <jb@jblache.org>
-	* backend/net.c: lock the Avahi thread before stopping it and
-	tearing down the Avahi objects.
-
-2008-06-03  Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_gl646.c: fixed wrong offset for start
-	  of scanarea for MD6471 scanner.
-
-2008-05-30  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch], backend/fujitsu-scsi.h,
-	  doc/descriptions/fujitsu.desc: backend version 64,
-	  use model and serial to build sane.name (idea from Ryan Duryea),
-	  allow both serial_name and device_name to sane_open scanner,
-	  simulate missing VPD data for M3097G, probe scanner for color
-	  interlacing mode instead of hardcoding, other minor cleanups
-
-2008-05-29  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/sane-pixma.man: man update.
-	* backend/pixma_io_sanei.c: update status types, and take into 
-	account new ones.
-
-2008-05-15  Mattias Ellert <mattias.ellert@fysast.uu.se>
-	* backend/hp3900_sane.c: Correct typos.
-	* po/Makefile.in: add backend/rts8891.c to localization.
-	* po/sane-backends.sv.po: update Swedish localization.
-	
-2008-05-27  m. allan noah <kitno455 a t gmail d o t com>
-	* frontend/scanimage.c: add %n for newline to -f option
-
-2008-05-26 Jonathan Bravo Lopez <jkdsoft@gmail.com>
-	* po/sane-backends.es.po: added spanish translation about status strings
-	* po/Makefile.in: added backend/sane_strstatus.c to SRC_FILES section.
-
-2008-05-26  Rene Rebe <rene@exactcode.de>
-	* backend/avision.{c,h}: merged latest upstream SVN changes, bug fixes
-	  and device ID updates, including fixing uninitialized variables due
-	  former defect merge and exposure control for film / dia scanners
-
-2008-05-26  Stéphane Voltz <stef.dev@free.fr>
-	* backend/sane_strstatus.c: added new status and internationalization
-	  support
-	* frontend/scanimage.c, frontend/tstbackend.c: added handling of status
-	  SANE_STATUS_WARMING_UP
-	* backend/pnm.c: added 2 more virtual devices, one that is hardware
-	locked, and another that always do warming before scan.
-
-2008-05-26  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.[ch], backend/rts8891_low.[ch],
-	  backend/rts88xx_lib.[ch]: renamed per frontend struct, made use of
-	  new well-known option groups. Added warming-up handling in
-	  sane_start().
-
-2008-05-22  Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c:
-	changed top of scan area detection for MD6228/MD6471 models
-
-2008-05-23  Jonathan Bravo Lopez <jkdsoft@gmail.com>
-	* backend/hp3900_sane.c: setting appropiate capabilities to some options.
-
-2008-05-22  Jonathan Bravo Lopez <jkdsoft@gmail.com>
-	* backend/hp3900_sane.c: use 1.1.0 well-known option group strings.
-	* backend/hp3900_config.c, backend/hp3900_debug.c, 
-	  backend/hp3900_rts8822.c, backend/hp3900_types.c,
-	  backend/hp3900_usb.c: Fixed reference position detection for
-	  HP3800/HPG2710 scanners. Code clean up.
-
-2008-05-22  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c:
-	minor tweak for scanjet 4470cx
-
-2008-05-21  m. allan noah <kitno455 a t gmail d o t com>
-	* include/sane/saneopts.h: add sane 1.1.0 well-known button options
-	* backend/fujitsu.c: v1.0.63, use sane 1.1.0 well-known option
-	  names for some buttons, remove 'button-' from others
-
-2008-05-20  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch], backend/fujitsu-scsi.h: v1.0.62,
-	  check for all supported scsi commands, use well-known option
-	  group strings from saneopts.h, rename pagewidth to page-width
-	  to meet sane 1.1.0 spec, same for height, add unused get_window()
-	* doc/descriptions/fujitsu.desc: increase version to 1.0.62.
-
-2008-05-20  m. allan noah <kitno455 a t gmail d o t com>
-	* include/sane/sane.h: add SANE_STATUS_WARMING_UP and
-	  SANE_STATUS_HW_LOCKED, remove SANE_CAP_ALWAYS_SETTABLE,
-	  add SANE_FRAME_XML, improve comments on other new frame types.
-	* include/sane/saneopts.h: add common option groups, add new
-	  page-width and page-height well-known options
-
-2008-05-20  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/qcam.c, backend/v4l.c, frontend/tstbackend.c:
-	  remove undocumented and otherwise unused SANE_CAP_ALWAYS_SETTABLE
-
-2008-05-19  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c:
-	150/300 dpi shading calibration fixes for 'XPA' sensor HP4470 models
-
-2008-05-16  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.c: inspect correct bool to enable prepick mode
-
-2008-05-15  m. allan noah <kitno455 a t gmail d o t com>
-	* doc/descriptions/cardscan.desc, doc/descriptions/epjitsu.desc,
-	  doc/descriptions/hp3900.desc, doc/descriptions/hp5590.desc,
-	  doc/descriptions/hpljm1005.desc, doc/descriptions/hs2p.desc:
-	  remove 'new' tag from sane 1.0.19 backends
-	* doc/descriptions/fujitsu.desc, backend/fujitsu.conf.in:
-	  add fi-5530C2 usb ID
-	* backend/cardscan.c: correct version number
-	* backend/epjitsu.conf.in: improved firmware directions
-	* backend/fujitsu.[ch]: update to backend v 1.0.61
-
-2008-05-15  Mattias Ellert <mattias.ellert@fysast.uu.se>
-	* doc/sane-genesys.man, doc/sane-lexmark.man, doc/sane-microtek2.man,
-	  doc/sane-mustek_pp.man, doc/sane-pixma.man, doc/sane-rts8891.man,
-	  doc/sane-umax_pp.man:	Man page fixes
-	* doc/descriptions-external/hp_rts88xx.desc: removed since its
-	  successor rts8891 is now included in the SANE distribution
-
-2008-05-15  Mattias Ellert <mattias.ellert@fysast.uu.se>
-	* backend/agfafocus.h, backend/artec_eplus48u.c,
-	  backend/artec_eplus48u.h, backend/avision.h, backend/coolscan.h,
-	  backend/hp-handle.c, backend/hp3500.c, backend/microtek2.h,
-	  backend/mustek.c, backend/mustek.h, backend/pie.c, backend/pixma.c,
-	  backend/plustek-pp.h, backend/plustek.c, backend/plustek.h,
-	  backend/plustek_pp.c, backend/snapscan.c, backend/snapscan.h,
-	  backend/sp15c.h, backend/tamarack.h, backend/test.c, backend/test.h,
-	  backend/u12.c, backend/u12.h, backend/umax.c, backend/umax.h,
-	  include/sane/sanei_thread.h, sanei/sanei_thread.c:
-	Fix for bug #306751: sanei-thread with pthreads on 64 bit
-
-2008-05-12  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c 
-	150/300 dpi mode fixes for 'XPA' sensor HP4470 models
-
-2008-05-08  Alessandro Zummo <a.zummo@towertech.it>
-	* AUTHORS: added myself :)
-
-2008-05-07  Julien Blache <jb@jblache.org>
-	* doc/sane-config.man: Fix man warning.
-	* backend/dll.c: look for dll.conf snippets in
-	$configdir/dll.d; this is a facility for external backends
-	to automatically add their backends to the dll backend
-	configuration without mucking with dll.conf.
-	* backend/Makefile.in: create $configdir/dll.d.
-
-2008-05-07  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_imageclass.c, doc/descriptions/pixma.desc:
-	USB IDs updates in imageClass backend (pixma), by Dennis Lou.
-
-2008-05-07  Jochen Eisinger <jochen@penguin-breeder.org>
-	* doc/sane-mustek_pp.man: fix catman warning. Reported by
-	  Raymond Chen.
-
-2008-05-05  Earle Philhower <earlephilhower@yahoo.com>
-	* doc/sane-sm3840.man: Add lineart and halftone options to page
-	* backend/sm3840*: Remove 64-bit compile warnings
-
-2008-04-05  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c backend/rts8891_low.c
-	doc/descriptions/rts8891.desc:
-	150 dpi mode fix for 'XPA' sensor HP4470 models, description
-	update
-
-2008-05-05  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/sane-pixma.man, doc/descriptions/pixma.desc:
-	Description and man updates for PIXMA MX300.
-
-2008-05-04  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_imageclass.c, doc/descriptions/pixma.desc:
-	Code cleanup patch to imageClass backend (pixma) by Dennis Lou.
-
-2008-05-03  Julien Blache <jb@jblache.org>
-	* backend/epson2.c: initialize s->fd to -1 once the struct
-	Epson_Scanner is allocated and zeroed out in attach(). Otherwise
-	the backend sends inquiry data to fd 0, which it obviously
-	shouldn't do; this breaks scanning over saned.
-	* doc/net.tex: replace occurrences of SANE_STATUS_SUCCESS with
-	SANE_STATUS_GOOD, as SANE_STATUS_SUCCESS doesn't exist.
-
-2008-04-28  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/epjitsu.[ch]: backend v1.0.12, fix double free bug
-
-2008-04-27  m. allan noah <kitno455 a t gmail d o t com>
-	* sanei/sanei_usb.c: allow sanei_usb_init() to run once per second
-	* backend/fujitsu.c: backend v1.0.60, relocate call to sanei_usb_init(),
-	  free sane_devArray before calloc'ing a new one
-
-2008-04-22  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.c, backend/fujitsu.conf.in: backend v1.0.59,
-	add fi-6140 PID, and fi-6x40 color mode
-	* doc/descriptions/fujitsu.desc: add fi-6140 PID, mark as 'good'
-	* doc/descriptions/epjitsu.desc: add S300M, mark as 'untested'
-
-2008-04-22  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c:
-	Updated pixma backend to have MP970 (tested), and probably other 
-	CCD sensor MPs, working for Grayscale scan.
-
-2008-04-21  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma.c, backend/pixma_common.c, backend/pixma_rename.h
-	doc/sane-pixma.man, doc/descriptions/pixma.desc
-	(new) backend/pixma_imageclass.c, backend/Makefile.in:
-	Thanks to Dennis Lou, who adapted the pixma backend to add support
-	for Canon ImageCLASS series, fully tested for MF4270, and includes
-	PIDs declarations for other ImageCLASS devices, yet to be tested.
-	Fixes also a bug for ADF and ADF Duplex scan source selection.
-
-2008-04-20  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.h: remove #define SANE_FRAME_JPEG
-
-2008-04-19  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch], backend/fujitsu-scsi.h: backend v1.0.58,
-	  rename page code 32 to 'unknown', compile if NDEBUG is set,
-	  proper async sane_cancel support, re-enable JPEG support
-	  various functions rewritten (shorter, more clear)
-	* doc/descriptions/fujitsu.desc: add new fi-6xxx machines
-
-2008-04-18  Alessandro Zummo <a.zummo@towertech.it>
-	* backend/epson2.c: fixed attach() error path.
-
-2008-04-14  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, backend/pixma.h, backend/pixma_mp150.c
-	doc/sane-pixma.man, doc/descriptions/pixma.desc:
-	With feedback from MP970 owner, updated pixma backend for MP970
-	CCD sensor support (yet in color only), and more generally, 
-	support for other CCD sensor PIXMA: MP800, MP810, MP830, MP960,
-	but yet untested, which produce shifted color planes 
-	scanned images. Current trim based on sample images provided 
-	in bug reports and other web pages, but might require some 
-	few and simple final tweaks.
-	Also fixed a bug for MP220 at 1200 dpi, MP220 is now reported 
-	to work fine.
-
-2008-04-13  Julien Blache <jb@jblache.org>
-	* frontend/saned.c: fix typo.
-	* backend/net.c: plug an information leak in the net backend. When
-	sending out a SANE_NET_CONTROL_OPTION RPC for the
-	SANE_ACTION_GET_VALUE action (and SANE_ACTION_SET_AUTO for the
-	network protocol versions < 3), the backend was not clearing the
-	memory area for the value argument before sending it over the
-	network, resulting in an information leak for the
-	SANE_ACTION_GET_VALUE case.
-
-2008-04-12  Mattias Ellert <mattias.ellert@fysast.uu.se>
-	* backend/rts8891.c, backend/rts88xx_lib.c: fix format warning
-	* doc/sane-rts8891.man: man page fixes
-	* AUTHORS: e-mail update
-
-2008-04-11  Julien Blache <jb@jblache.org>
-	* frontend/saned.c: announce the _sane-port._tcp service via mDNS
-	(Avahi) when running in standalone or debug mode. A separate
-	process is responsible for the announcement through Avahi.
-	* backend/net.c: look for _sane-port._tcp service announcements
-	via mDNS (Avahi). A separate thread listens to announcements
-	through Avahi. Start the thread as early as possible in
-	sane_init() so as to get as much data as possible until
-	sane_get_devices() is called.
-	* aclocal.m4, configure, configure.in, include/sane/config.h.in:
-	add autofoo stuff for Avahi support, disabled by default.
-
-2008-04-10  Julien Blache <jb@jblache.org>
-	* frontend/saned.c: do not use daemon(), as it's a 4.4BSD/glibc
-	function; OS/2 for instance does not have it. Use an open-coded
-	equivalent. Add a PID file. saned -a username now drops privileges
-2008-04-22  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma.c, backend/pixma_common.c, backend/pixma_rename.h
-	doc/sane-pixma.man, doc/descriptions/pixma.desc
-	(new) backend/pixma_imageclass.c, backend/Makefile.in:
-	Thanks to Dennis Lou, who adapted the pixma backend to add support
-	for Canon ImageCLASS series, fully tested for MF4270, and includes
-	PIDs declarations for other ImageCLASS devices, yet to be tested.
-	Fixes also a bug for ADF and ADF Duplex scan source selection.
-
-2008-04-20  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.h: remove #define SANE_FRAME_JPEG
-
-2008-04-19  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch], backend/fujitsu-scsi.h: backend v1.0.58,
-	  rename page code 32 to 'unknown', compile if NDEBUG is set,
-	  proper async sane_cancel support, re-enable JPEG support
-	  various functions rewritten (shorter, more clear)
-	* doc/descriptions/fujitsu.desc: add new fi-6xxx machines
-
-2008-04-18  Alessandro Zummo <a.zummo@towertech.it>
-	* backend/epson2.c: fixed attach() error path.
-
-2008-04-14  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, backend/pixma.h, backend/pixma_mp150.c
-	doc/sane-pixma.man, doc/descriptions/pixma.desc:
-	With feedback from MP970 owner, updated pixma backend for MP970
-	CCD sensor support (yet in color only), and more generally, 
-	support for other CCD sensor PIXMA: MP800, MP810, MP830, MP960,
-	but yet untested, which produce shifted color planes 
-	scanned images. Current trim based on sample images provided 
-	in bug reports and other web pages, but might require some 
-	few and simple final tweaks.
-	Also fixed a bug for MP220 at 1200 dpi, MP220 is now reported 
-	to work fine.
-
-2008-04-13  Julien Blache <jb@jblache.org>
-	* frontend/saned.c: fix typo.
-	* backend/net.c: plug an information leak in the net backend. When
-	sending out a SANE_NET_CONTROL_OPTION RPC for the
-	SANE_ACTION_GET_VALUE action (and SANE_ACTION_SET_AUTO for the
-	network protocol versions < 3), the backend was not clearing the
-	memory area for the value argument before sending it over the
-	network, resulting in an information leak for the
-	SANE_ACTION_GET_VALUE case.
-
-2008-04-12  Mattias Ellert <mattias.ellert@fysast.uu.se>
-	* backend/rts8891.c, backend/rts88xx_lib.c: fix format warning
-	* doc/sane-rts8891.man: man page fixes
-	* AUTHORS: e-mail update
-
-2008-04-11  Julien Blache <jb@jblache.org>
-	* frontend/saned.c: announce the _sane-port._tcp service via mDNS
-	(Avahi) when running in standalone or debug mode. A separate
-	process is responsible for the announcement through Avahi.
-	* backend/net.c: look for _sane-port._tcp service announcements
-	via mDNS (Avahi). A separate thread listens to announcements
-	through Avahi. Start the thread as early as possible in
-	sane_init() so as to get as much data as possible until
-	sane_get_devices() is called.
-	* aclocal.m4, configure, configure.in, include/sane/config.h.in:
-	add autofoo stuff for Avahi support, disabled by default.
-
-2008-04-10  Julien Blache <jb@jblache.org>
-	* frontend/saned.c: do not use daemon(), as it's a 4.4BSD/glibc
-	function; OS/2 for instance does not have it. Use an open-coded
-	equivalent. Add a PID file. saned -a username now drops privileges
-	and runs as the given user (and group).
-	* doc/saned.man: document -a username.
-
-2008-04-06  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c: 
-	  Modifications for PIXMA MP970, to manage the CCD sensor
-	  with PIXMA generation 3 protocol. To be tested.
-
-2008-04-06  Julien Blache <jb@jblache.org>
-	* frontend/saned.c: add standalone daemon mode, building upon the
-	AF-indep/IPv6 debug mode. Reorganize code by splitting the main()
-	function into a series of functions. Factorize common code between
-	the old network code and the AF-indep code. There's now only one
-	version of main().
-	* doc/saned.man: document new -a flag, reorganize manpage
-	sections (separate inetd configuration under the INETD
-	CONFIGURATION section).
-
-2008-04-05  Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys.h backend/genesys_devices.c
-	  backend/genesys_gl646.c backend/genesys_low.h:
-	  Fixed double free problems, made OPT_COLOR_FILTER work for
-	  GL646 scanners, added OPT_CUSTOM_GAMMA and OPT_GAMMA_VECTOR*
-	  options, split sane_control_options to make it more readable,
-	  fixed 'reset stream' problem for MD6471.
-
-2008-04-05  Stéphane Voltz <stef.dev@free.fr>
-	* backend/rts8891.c: 
-	  split sane_control_option() to make it more readable
-
-2008-04-02  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, backend/pixma.c, doc/sane-pixma.man, 
-	  doc/descriptions/pixma.desc: 
-	  Added a 10s tempo before "NO PAPER" fail message appears in  ADF scan, 
-	  declared PIXMA MX850, moved MP970 to Generation 3 protocol, but yet
-	  untested.
-
-2008-03-28  Julien Blache <jb@jblache.org>
-	* sanei/sanei_usb.c, include/sane/sanei_usb.h: add
-	sanei_usb_get_vendor_product_byname().
-	* backend/snapscan-mutex.c: do not use ftok() in
-	snapscani_mutex_open(); ftok() will fail with anything for which
-	the devicename is not a filename. Construct an IPC key based on
-	the product ID, bus number and device number for libusb devices,
-	otherwise fallback to ftok() and check its return value.
-	* tools/sane-desc.c: HAL 0.5.11-rc2 does not support the info.bus
-	property anymore; superseded by info.subsystem. Unfortunately,
-	this is not backward-compatible, so add a new "hal-new" mode to
-	sane-desc.
-
-2008-03-28  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/hp-scl.c: add usleep to improve usb performance, from
-	  jim a t meyering d o t net
-
-2008-03-28  m. allan noah <kitno455 a t gmail d o t com>
-	* sanei/sanei_usb.c: add usb class 6 (imaging) to detected devices
-	* sanei/sanei_scsi.c: fix bug in sanei_scsi_find_devices() which
-	  caused early return if attach callback returned error.
-
-2008-03-22  Stéphane Voltz <stef.dev@free.fr>
-	* AUTHORS configure configure.in backend/dll.conf.in
-	  backend/Makefile.in backend/rts8891.c backend/rts8891.conf.in
-	  backend/rts8891_devices.c backend/rts8891.h backend/rts8891_low.c
-	  backend/rts8891_low.h backend/rts88xx_lib.c backend/rts88xx_lib.h
-	  doc/descriptions/rts8891.desc doc/descriptions/unsupported.desc
-	  doc/sane-rts8891.man:
-	  rts8891 backend inclusion
-
-2008-03-20  Julien Blache <jb@jblache.org>
-	* include/Makefile.in: remove _stdint.h and byteorder.h in
-	distclean target, autogenerated cruft.
-	* frontend/saned.c: fix debug messages around the getservbyname()
-	call in the IPv4 code as it still referred to the "sane" port
-	instead of "sane-port".
-
-2008-03-16  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, backend/pixma.h, doc/sane-pixma.man, 
-	  doc/descriptions/pixma.desc: 
-	  Changes to have new Canon PIXMA MX700 working with pixma backend
-	  Flatbed and ADF scan are supported.
-
-2008-03-15  Julien Blache <jb@jblache.org>
-	* include/sane/sanei_usb.h: typo fix.
-
-2008-03-02  Stéphane Voltz <stef.dev@free.fr>
-	* doc/descriptions/lexmark.desc: added X1195
-	* doc/descriptions/unsupported.desc: removed X11xx, X12xx and
-	  Dell A920 which are to be handled by the lexmark backend
-	* backend/umax_pp.h backend/umax_pp.c backend/umax_pp_mid.h
-	  backend/umax_pp_mid.c backend/umax_pp_low.h backend/umax_pp_low.c:
-	  copyright notice update
-
-2008-03-01  Gerard klaver <gerard at gkall dot hobby dot nl>
-	* doc/descriptions/as6e.desc added Dexxa 4800
-
-2008-02-26  Jonathan Bravo Lopez <jkdsoft@gmail.com>
-	* backend/hp3900_sane.c: Fixed optional grayscale emulation
-	* backend/hp3900_debug.c: Silence gcc warnings when tiffio.h
-	  is not used
-
-2008-02-25  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/fujitsu.[ch], backend/fujitsu-scsi.h:
-	  add mode sense for page code 32 (color interlacing?)
-	  and more debug output in init_ms(), for fi-5900
-
-2008-02-24  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, doc/sane-pixma.man, 
-	  doc/descriptions/pixma.desc: 
-	  Changes to have Canon PIXMA MP140 now working with pixma backend
-	  
-2008-02-23  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys_gl841.c: Make LEDs go really dark when "lamp" is off
-
-2008-02-22  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, backend/pixma_mp730.c, 
-	  doc/sane-pixma.man, doc/descriptions/pixma.desc: 
-	  Changed MP140 to experimental cause not working yet
-	  Changed MP710 to non-ADF scanner
-
-2008-02-22  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys_gl841.c: Fix debugging output of 
-	  gl841_bulk_write_register
-
-2008-02-21  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys.c, backend/genesys_gl646.c,
-	  backend/genesys_gl841.c, backend/genesys_low.h: Add LED exposure
-	control to gl841_set_lamp_power
-
-2008-02-20  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys_gl841.c: Send 32 registers at once instead of 1
-
-2008-02-20  Mattias Ellert <mattias.ellert@tsl.uu.se>
-	* backend/Makefile.in, ltmain.sh: Library version definition fixes
-	* backend/coolscan3.c: Fix format warnings
-
-2008-02-18  Alessandro Zummo <a.zummo@towertech.it>
-	* backend/coolscan3.c: added new coolscan3 backend
-	with improved stability and infrared support.
-	* configure.in, include/sanei.h: bumped version
-	number to 1.1.0 and enabled 1.1 frame types.
-
-	  doc/sane-pixma.man, doc/descriptions/pixma.desc,
-	  doc/descriptions-external/canon_mfp.desc:
-	> New models changes: 
-	  - added: Pixma MP210, MP470, MP520, MP610, MP710
-	  - declared but untested: Pixma MP140, MP220, MP740
-	  - declared experimental and untested: MP970
-	>  Bugs and fixes
-	  - multipage documents scan no more fails in non-ADF scan
-	  - IO Fail bug when scanning large pages e.g. with Xsane
-	  - implement send_time message form MP710, MP730 family
-	  - run indent -gnu on all pixma_* source files.
-
-2008-02-14  m. allan noah <kitno455 a t gmail d o t com>
-	* backend/cardscan.c, backend/epjitsu.c, backend/fujitsu.c:
-	sanei_read_config has already cleaned string, fix bug #310597
-
-2008-02-13  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	Patch by Stefan Lucke <stefan@lucke.in-berlin.de>
-	* backend/genesys_gl841.c: Fixes 3 possibilities for infinite
-	loops and adjusts loop threshold to given comments
-
-2008-02-13  Jonathan Bravo Lopez <jkdsoft@gmail.com>
-	* backend/hp3900.c, backend/hp3900_debug.c, backend/hp3900_rts8822.c,
-	  backend/hp3900_usb.c, backend/hp3900_sane.c, backend/hp3900_types.c,
-	  backend/hp3900_config.c, backend/hp3900.conf.in, /doc/sane-hp3900.man,
-	  doc/descriptions/hp3900.desc: Minor changes and added support for
-	  HP ScanJet G2710 scanner.
-
-2008-02-10  m. allan noah <kitno455 a t gmail d o t com>
-
-	* configure, configure.in: Changed version to 1.0.19-cvs. Enabled
-	  compilation warnings.
-	* Makefile.in: Added ChangeLog-1.0.19 to DISTFILES.
-
-Older entries can be found in ChangeLog-1.0.19.
diff --git a/ChangeLog-1.0.21 b/ChangeLog-1.0.21
deleted file mode 100644
index 6c2ccd2..0000000
--- a/ChangeLog-1.0.21
+++ /dev/null
@@ -1,887 +0,0 @@
-******  Release of sane-backends 1.0.21. End of code freeze ******
-
-2010-04-25 Chris Bagwell <chris at cnpbagwell do com>
-	* tools/sane-config.in: Fix typo: REGMGR=RESMGR.
-
-2010-04-21 m. allan noah <kitno455 at gmail dot com>
-	* tools/.gitignore: add sane-backends.pc
-	* po/uk.po: updated translation from Yuri Chornoivan
-	* po/nl.po: updated translation from Martin Kho
-
-2010-04-20 Chris Bagwell <chris at cnpbagwell do com>
-	* doc/descriptions-external/epkowa.desc: Updated based
-	on values that will be in next release of iscan.
-	Updated 4 pre-existing SCSI models with commonly used
-	model names.  This allows wider range of Epson SCSI scanners
-	to be correctly detected using auto-generated hal and udev
-	files.  This benefits epkowa, epson2, and epson backends.
-
-2010-04-18 m. allan noah <kitno455 at gmail dot com>
-	* tools/sane-desc.c: Update the sane-devel contact suggestion
-
-2010-04-16 m. allan noah <kitno455 at gmail dot com>
-	* backend/kvs1025*, kvs1025.desc, sane-kvs1025.man: backend v3
-	- invert usb status, add 0x to usbids, add missing KV-S1045 usbid
-
-2010-04-12  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, backend/pixma_io_sanei.c, 
-	doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	pixma: added changes from Gernot Hassenpflug to fully support
-	Canoscan 8800F.
-	debug code clean-up in pixma_mp150.c
-
-2010-04-12 Chris Bagwell <chris at cnpbagwell dot com>
-	* backend/p5.c, backend/p5_device.c, backend/p5.h: 
-	Remove references to libc.h in p5.h.  On OSX, it was including
-	socket.h and causing compile fail with conflicting connect()
-	functions.  Since backend doesn't support network
-	connects, should be fine to use name connect.
-
-2010-04-07 Chris Bagwell <chris at cnpbagwell dot com>
-	* acinclude.m4: cygwin and mingw is now hiding M_PI_2
-	defines with -ansi flag.  Remove to fix cygwin compile.
-	Mingw doesn't support fork() so default to pthreads.
-	Add u_short to complete definition of u_* types which
-	helps out ming when we define _BSDTYPES_DEFINED.
-
-2010-03-25 Stéphane Voltz <stef.dev at free.fr>
-	* backend/p5.c backend/p5_device.[ch] backend/genesys_gl646.c: 
-	replace u_int8_t and u_int16_t by uint8_t and uint16_t
-
-2010-04-06 Chris Bagwell <chris at cnpbagwell dot com>
-	* configure.in, tools/sane-backends.pc.in: Add stub for future
-	pkg-config support to configure.  This allows distributes
-	that are patching in pkg-config support to not rerun
-	autoconf and wipe out our custom libtool.
-	* tools/sane-config.in: Fix LDFLAGS bug related to GPHOTO2
-	support.
-
-2010-04-02 Chris Bagwell <chris at cnpbagwell dot com>
-	* acinclude.m4: Add --enable-rpath option to configure.
-	Ported from Fedora patches.
-
-2010-04-02 Chris Bagwell <chris at cnpbagwell dot com>
-	* backend/kvs1024*: Remove includes of usb.h
-	directly into backend.  Complete prototype
-	for sane_exit().
-
-2010-04-02 Chris Bagwell <chris at cnpbagwell dot com>
-	* po/Makefile.am: Remove unneeded distclean-local target.
-
-2010-03-25 Stéphane Voltz <stef.dev at free.fr>
-	* backend/kvs1025.c: compile fix
-
-2010-03-25 m. allan noah <kitno455 at gmail dot com>
-	* backend/kvs1025*: convert backend from libusb to sanei_usb
-	* doc/descriptions/kvs1025.desc, doc/sane-kvs1025.man: update docs
-	* backend/dll.conf.in, configure, configure.in: enable kvs1025 backend
-
-2010-03-16 Stéphane Voltz <stef.dev at free.fr>
-	* backend/rts8891.c: change register 0x11 settings for sensor type 1
-
-2010-03-15  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc:
-	pixma: fix color shifts for MP990 up to 2400 dpi
-	       updated and reorderd descs for several models.
-
-2010-03-15 Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.[ch] backend/genesys_devices.c backend/genesys_low.h
-	backend/genesys_gl646.[ch] backend/genesys_gl841.c: full transparency 
-	adaptor support for gl646 based scanners
-
-2010-03-11 Stéphane Voltz <stef.dev at free.fr>
-	* backend/rts8891.c: further register tweaking for 600 dpi scans
-
-2010-03-11 Stéphane Voltz <stef.dev at free.fr>
-	* backend/lexmark.c: minor bugfix when assigning possible dpi list
-
-2010-03-07 Stéphane Voltz <stef.dev at free.fr>
-	* backend/rts8891.c: tweak register settings at 600 dpi for HP4470
-
-2010-03-05 Stéphane Voltz <stef.dev at free.fr>
-	* backend/rts8891.c: fix HP4470 sensor detection
-
-2010-03-04 Stéphane Voltz <stef.dev at free.fr>
-	* backend/rts8891.c backend/rts8891.h: add debug traces for sensor
-	type handling
-
-2010-03-04 Stéphane Voltz <stef.dev at free.fr>
-	* doc/desc/genesys.desc: fix HP2400/G2410 USB id, update HP3670
-	status
-
-2010-03-01 Stéphane Voltz <stef.dev at free.fr>
-	* doc/sane-p5.man doc/sane-umax_pp.man doc/sane-rts8891.man
-	doc/sane-lexmark.man: fix author name accentuation and capitalization
-
-2010-03-01 Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.c backend/genesys_gl646.c
-	backend/genesys_devices.h: enable warming up and calibration cache
-	for HP3670
-
-2010-02-28 Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys_devices.c backend/genesys_gl646.c
-	backend/genesys_gl646.h: tune HP2400/G2410 settings
-
-2010-02-27 Chris Bagwell <chris at cnpbagwell dot com>
-	* Rerun autoconf/automake to align files to single version
-	of tools.
-
-2010-02-27 m. allan noah <kitno455 at gmail dot com>
-	* */Makefile.in: update with (unfortunately) slightly older automake
-	* po/*: standard gettext layout by Adi Roiban <adi at roiban dot ro>
-	* doc/descriptions/fujitsu.desc, backend/fujitsu.conf.in:
-	  add S1500M entry by Harald Weis
-	* tools/sane-desc.c: Condense warnings about half-baked .desc files
-
-2010-02-27 Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl646.c
-	backend/genesys_gl646.h: final work for HP3670 full support
-
-2010-02-25 Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys_gl646.c: fix regression for gl646 CCD scanners due
-	to incorrect color filter setting.
-
-2010-02-23 Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl646.c
-	backend/genesys_gl646.h: XP200 calibration rework. Some HP3670
-	improvements.
-
-2010-02-22 m. allan noah <kitno455 at gmail dot com>
-	 * backend/fujitsu.c: force enable flatbed for M3092, by Jochen Hepp
-	 * doc/Makefile.*, doc/descriptions-external/kodak-twain: new backend
-
-2010-02-22 Julien Blache <jb@jblache.org>
-	* doc/descriptions-external/epkowa.desc: Updated for iscan 2.24.0.
-
-2010-02-16 Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl646.c
-	backend/genesys_gl646.h backend/genesys_low.h: buttons and basic XPA
-	support for HP3670.
-
-2010-02-15 Stéphane Voltz <stef.dev at free.fr>
-	 * backend/p5.c backend/p5.h backend/p5_device.c backend/p5_device.h
-	 backend/p5.conf.in doc/descriptions/p5.desc doc/sane-p5.man: add new p5 backend for 
-	 Primax PagePartner
-	 * backend/dll.conf.in backend/Makefile.* configure* doc/Makefile.*
-	 doc/sane.man: p5 backend integration changes
-
-2010-02-13 m. allan noah <kitno455 at gmail dot com>
-	 * backend/avision.[ch]: updated settings for Visioneer 9450,
-	   based on code from Andyz Smith
-	 * doc/descriptions/avision.desc: added AV220-G and 6080E
-
-2010-02-12 m. allan noah <kitno455 at gmail dot com>
-	 * backend/kvs1025*: add new backend from Panasonic Russia, Ltd.
-	 * backend/Makefile.*, configure*, doc/Makefile.*, doc/sane.man:
-	   backend integration changes
-	 * doc/desciptions/kvs1025.desc, doc/sane-kvs1025.man: 
-	   the parts Panasonic forgot
-
-2010-02-12 m. allan noah <kitno455 at gmail dot com>
-	 * backend/fujitsu.c: disable bg_color for S1500
-
-2010-02-12 Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys_gl646.c: fixed MD5345 calibration
-
-2010-02-12 Stéphane Voltz <stef.dev at free.fr>
-	* doc/descriptions/genesys.desc backend/genesys.c
-	backend/genesys_devices.c backend/genesys_gl646.c
-	backend/genesys_gl646.h: added support for hp3670, uncalibrated scans
-	only
-
-2010-02-10 m. allan noah <kitno455 at gmail dot com>
-	* include/sane/saneopts.h: add three new SANE_VALUE macros
-	* backend/*.[ch]: use mode name macros from saneopts.h by Robert Ancell
-
-2010-02-10 m. allan noah <kitno455 at gmail dot com>
-	* doc/descriptions/hpaio.desc: updated from hplip v3.9.12
-	* po/sane-backends.nl.po: updates from Armijn Hemel
-
-2010-02-10 m. allan noah <kitno455 at gmail dot com>
-	* backend/canon_dr.c, backend/cardscan.c, backend/epjitsu.c,
-	  backend/fujitsu.c, backend/kodak.c, po/Makefile.*:
-	- enable translations of all static strings via SANE_I18N macro
-	- don't fail if sanei_scsi_open gives smaller buffer than asked for
-	* doc/descriptions/kodak.desc, doc/sane-canon_dr.man,
-	  doc/sane-fujitsu.man, doc/sane-kodak.man:
-	- minor version number and text updates
-
-2010-02-10 m. allan noah <kitno455 at gmail dot com>
-	* acinclude.m4, configure: missing $ in variable expansion
-	* frontend/scanimage.c: exit with error if stdout isatty()
-	* doc/descriptions/unsupported.desc, doc/descriptions/lexmark.desc:
-	- add Dell A940 and correct manpage name
-	* backend/gt68xx_high.c: maximum exposure 245 not 248, see bug #312113
-	* po/Makefile.*, po/sane-backends.ja.po:
-	- New Japanese translation from Hiroshi Miura
-
-2010-02-10 m. allan noah <kitno455 at gmail dot com>
-	* backend/cardscan.[ch], backend/cardscan.conf.in,
-	  doc/descriptions/cardscan.desc, doc/sane-cardscan.man:
-	- add lines_per_block config option
-	- add has_cal_buffer config option
-	- basic support for 600C
-	- clean #include lines
-	* doc/sane.man: add missing backends
-
-2010-02-10  Stéphane Voltz <stef.dev ar free.fr>
-	* doc/descriptions/genesys.desc: added G2410
-
-2010-02-10 m. allan noah <kitno455 at gmail dot com>
-	* backend/gt68xx_devices.c: add GT68XX_FLAG_NO_STOP to SF600
-	* doc/.gitignore, doc/Makefile.am, doc/Makefile.in:
-	- added new targets for scanner search engine db
-	* doc/releases.txt: improved doc
-	* doc/saned.man: clean typos
-	* tools/sane-desc.c: removed NAME= from udev rules (deprecated)
-
-2010-02-09 m. allan noah <kitno455 at gmail dot com>
-	* backend/fujitsu.c, doc/descriptions/fujitsu.desc,
-	  backend/canon_dr.c, doc/descriptions/canon_dr.desc,
-	  backend/epjitsu.c, doc/descriptions/epjitsu.desc,
-	  doc/sane-fujitsu.man, doc/sane-canon_dr.man, doc/sane-epjitsu.man,
-	  backend/epjitsu.conf.in:
-	- cleanup #include lines, copyrights, manual, and supported scanners.
-
-2010-02-08  Stéphane Voltz <stef.dev ar free.fr>
-	* backend/genesys.c backend/genesys.h backend/genesys_conv.c
-	backend/genesys_devices.c backend/genesys_gl646.c
-	backend/genesys_gl646.h: working uncalibrated 150/300 dpi modes for
-	HP3670. Enable custom gamma for gl841 based scanners. Turned dynamic
-	line-art to be default.
-
-2010-02-03  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys_conv.c: add safeguards when doing gray normalization
-
-2010-02-02  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/sane-pixma.man, doc/descriptions/pixma.desc:
-	pixma: updated docs for supported model ImageCLASS MF4350d.
-
-2010-01-31  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys_conv.c: normalize gray data when doing dynamic
-	lineart.
-
-2010-01-30  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.conf.in backend/genesys_devices.c 
-	doc/descriptions/genesys.desc doc/sane-genesys.man: add Xerox Travel
-	Scanner 100, work by Andrey Loginov <avloginov@gmail.com>
-
-2010-01-29  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_io.h, backend/pixma_imageclass.c, 
-	doc/sane-pixma.man, doc/descriptions/pixma.desc:
-	pixma: changed usb timeouts to 20 sec to support ImageClass MF3240.
-	       updated source code comments and documentation.
-
-2010-01-28  Oliver Schwartz <oliverschwartz at users.sourceforge.net>
-	* backend/snapscan-usb.c: Use hash of device string instead of parsing
-	it to create a semaphore id. The new code is less platform dependent
-	and should also work on FreeBSD 8.0.
-
-2010-01-27  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.c backend/genesys.h backend/genesys_conv.c
-	backend/genesys_low.h backend/genesys_gl841.c: add dynamic lineart
-	scanning based on epjitsu code by m. allan noah.
-
-2010-01-19  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma.h, backend/pixma_mp150.c:
-	pixma: changes for cropped area enhancement, supplied by Christian Scholtz
-	       for generation 3+ devices.
-
-2010-01-19  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.c backend/genesys.conf.in backend/genesys.h 
-	backend/genesys_conv.c backend/genesys_devices.c 
-	backend/genesys_gl646.c backend/genesys_gl841.c backend/genesys_low.h
-	doc/descriptions/genesys.desc doc/sane-genesys.man: add Visioneer 
-	OneTouch 7100 (patch by Jack McGill). Add software lineart option.
-
-2010-01-17  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.c backend/genesys_gl646.c: gray shading calibration
-	fix for CCD GL646 based scanners.
-
-2010-01-17  Mattias Ellert <mattias.ellert@fysast.uu.se>
-	* po/sane-backends.sv.po: Updated Swedish translations.
-
-2010-01-16  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.c backend/genesys_gl646.c: re-enable threshold
-	option, fix wpl computing for HP2400
-
-2010-01-13  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.c backend/genesys_low.c backend/genesys_gl646.c
-	backend/genesys_gl841.c doc/sane-genesys.man : add true gray scanning
-	for CIS based scanners
-
-2010-01-08  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/sane-pixma.man, doc/descriptions/pixma.desc:
-	pixma: updated documentation for MP490 and MP550 (supported models).
-
-2009-12-30  Stéphane Voltz <stef.dev at free.fr>
-	* backend/lexmark_low.c: improve init time debug messages
-
-2009-12-26  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/sane-pixma.man, backend/pixma.c, backend/pixma_mp150.c:
-	pixma: some routine maintenance updates to backend and documentation.
-
-2009-12-24  Julien Blache <jb@jblache.org>
-	* frontend/saned.c: fix a bug in the standalone polling code.
-
-2009-12-05  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.c backend/genesys_gl841.c backend/genesys_low.h:
-	fixed amount of bytes left to read at document end for gl841 based
-	sheetfed scanners
-
-2009-12-09  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man, 
-	backend/pixma_imageclass.c, backend/pixma_mp150.c:
-	pixma: updated backend, docs and desc for support to MP560 and MF4330d/ADF
-
-2009-12-06  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man, 
-	backend/pixma.h, backend/pixma.c, backend/pixma_mp150.c:
-	pixma: bumped version, added compilation type debug message.
-	       updated doc and desc (support for MX330)
-
-2009-12-05  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.c backend/genesys_gl841.c backend/genesys_devices.c
-	backend/genesys_low.h backend/genesys.conf.in
-	document/descriptions/genesys.desc: add full support for
-	Ambir/Syscan DS685. Use maximum height to handle the case when document
-	height isn't known before scan for sheetfed scanners
-
-2009-12-04  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c:
-	pixma: fix pixma backend bug for compilation with USE_PTHREAD/-lpthread
-
-2009-12-01  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys_gl841.c: take amount of data in scanner's buffer
-	into account when detecting end of document
-
-2009-11-30  Stéphane Voltz <stef.dev at free.fr>
-	* backend/gt68xx.c backend/gt68xx_high.c backend/gt68xx_high.h
-	backend/gt68xx_low.h backend/gt68xx_gt6816.h backend/gt68xx_gt6816.c: 
-	implement request '0x59' which detects document presence for 6816. Add
-	a sensor option to reports document presence, and test for document
-	before scan for 6816 sheetfed scanners.
-
-2009-11-29  Stéphane Voltz <stef.dev at free.fr>
-	* backend/gt68xx.c backend/gt68xx_high.c backend/gt68xx_high.h:
-	added 'clear calibration' button option and 'need calibration' 
-	sensor option.
-
-2009-11-28  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma.c, backend/pixma_mp1580.c, 
-	doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	pixma: fix pixma backend (end of scan), when compiled with USE_PTHREAD/-lpthread
-	       set support to complete for MP990 in documentation, as reported by Jean-Michel Poure.
-
-2009-11-28  Stéphane Voltz <stef.dev at free.fr>
-	* backend/gt68xx_generic.h backend/gt68xx_generic.c
-	backend/gt68xx_low.h backend/gt68xx_high.c backend/gt68xx_high.h
-	backend/gt68xx_devices.c backend/gt68xx.c
-	doc/descriptions/gt68xx.desc: added sheetfed calibration
-
-2009-11-25  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys_gl841.c: use only signed vars in
-	gl841_detect_document_end with a few more debug traces
-
-2009-11-25  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.conf.in backend/genesys_gl841.c
-	backend/genesys_devices.c: added docketport 467 model and add
-	debug traces in gl841_detect_document_end
-
-2009-11-23  Stéphane Voltz <stef.dev at free.fr>
-	* backend/gt68xx_generic.h backend/gt68xx_generic.c
-	backend/gt68xx.conf.in backend/gt68xx_low.h backend/gt68xx_high.c
-	backend/gt68xx_devices.c backend/gt68xx.c: fixed gt6816 based sheetfed
-	scanners positionning by implementing and using a move paper request.
-	Added Iriscan Express 2 model based on reports seen in sane-devel
-	list.
-
-2009-11-19  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	pixma: updated Pixma MP250 status to supported. Changed desc status
-	from good to complete for well supported models.
-
-2009-11-16  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.conf.in backend/genesys_gl841.c 
-	doc/descriptions/genesys.desc : applied fixes and status update from
-	Jack McGill.
-
-2009-11-16  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl646.c
-	backend/genesys_gl841.c: add needed flags for DP485/487 and XP100
-	scanners. Use different thresholds in strip detection function. Do
-	led, coarse and gain calibration at sensor's max resolution when doing
-	sheetfed calibration.
-
-2009-11-14 Julien Blache <jb@jblache.org>
-	* doc/descriptions/epson.desc: add the Perfection636 SCSI scanner, from
-	Frédéric Brière <fbriere@fbriere.net>.
-
-2009-11-06  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.c backend/genesys.h backend/genesys_devices.c
-	backend/genesys_gl646.c backend/genesys_gl646.h backend/genesys_gl841.c
-	backend/genesys_low.h doc/descriptions/genesys.desc
-	doc/sane-genesys.man:
-	sheetfed calibration work merge. All genesys supported sheetfed
-	scanners can now be calibrated with a special sheet.
-
-2009-10-28  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	pixma: declared Pixma MP550 (yet untested), updated docs.
-
-2009-10-22  Louis Lagendijk <llagendijk at users.alioth.debian.org>
-	* doc/sane-pixma.man:
-	Added networking details to doc/sane-pixma.man
-
-2009-10-21  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_imageclass.c, doc/sane-pixma.man:
-	pixma: added I-SENSYS MF4320d and updated doc, for this model and MP390.
-
-2009-10-20  Louis Lagendijk <louis@lagendijk.xs4all.nl>
-	* backend/pixma_io_sanei.c:
-	Allow for ranges in model returned from device (allow -)
-
-2009-10-18  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	pixma: updated doc to include support for MP270 and ImageClass MF3110
-
-2009-10-18  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, backend/pixma_imageclass.c, backend/pixma.h, 
-	doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	pixma:
-	- bumped backend version to 0.16.1
-	- Some error condition fixes to Generation 4 (MP640, ...) XML code
-	- Added ImageClass MF4360dn-MF4390dn
-
-2009-10-18  Troy Rollo <trollo-guest at users.alioth.debian.org>
-	* backend/hp3500.c: Stop backed from calling exit(), which is not
-	helpful when using threads instead of processes.
-
-2009-10-16  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	pixma: Changes to include new XML dialog for new 2009 PIXMA models,
-	like MP270 or MP640.
-
-2009-10-03  Ilia Sotnikov <hostcc@gmail.com>
-	* backend/epjitsu.c: use own private function instead of roundf()
-
-2009-10-02  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys_gl646.c: honor GENESYS_NO_CALIBRATION device
-	flag when setting registers for final scan
-
-2009-10-01 Jonathan Bravo Lopez <jkdsoft at gmail dot com>
-	* backend/hp3900_sane.c:
-	fix bug 311991: "Bad option sizes let frontend (e.g. xsane) crash"
-
-2009-10-01  Stéphane Voltz <stef.dev at free.fr>
-	* backend/lexmark_low.c: fix a memleak in find_start_line(),
-	check success of memory allocation after calloc()
-
-2009-09-29 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* backend/Makefile.am, backend/Makefile.in:
-	Add missing sanei_pio to qcam backend.  Fixes compile
-	error on embedded Linux boxes.  Added new genesys_gl646.h
-	to backend's SOURCES so its included in tar file.
-	* doc/Makefile.am, doc/Makefile.in:
-	Remove manual deletion of $docdir.  Modern automake cleans
-	up fine after itself and this fix is required for distcheck
-	target to pass on automake-1.11.
-
-2009-09-27  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_bjnp.c, backend/pixma_mp730.c:
-	Print size_t values as %lu with cast to unsigned long 
-	as prescribed in the file doc/backend_writing.txt, to avoid
-	compile warnings.
-	Removed unused debug code.
-
-2009-09-26 Julien Blache <jb@jblache.org>
-	* backend/genesys.c: add missing check when logging raw data,
-	patch by Tollef Fog Heen <tfheen@err.no>.
-
-2009-09-16  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, 
-	doc/sane-pixma.man:
-	pixma backend: Updated documentation for:
-	- Pixma MP260 support
-	- descriptions for recently added new models
-
-2009-09-14 m. allan noah <kitno455 at gmail dot com>
-	* sanei/sanei_usb.c: reset the libusb device handle after bus scan.
-	patch from Hans Petter Selasky
-	* backend/fujitsu.*, backend/Makefile.*: backend v97,
-	use sanei_magic to provide software deskew, autocrop and despeckle
-	* sanei/sanei_magic.c, include/sane/sanei_magic.h, Makefile.*:
-	new image processing lib for deskew, despeckle, autocrop.
-
-2009-09-13  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, backend/pixma_mp730.c:
-	pixma backend: Declared new Pixma models MP250, MP490, MP560, MP640, 
-	and MP990, all yet untested, and modified some debug code.
-
-2009-09-11  Mattias Ellert <mattias.ellert@fysast.uu.se>
-	* tools/sane-find-scanner.c: Fix false warning about USB not
-	  supported when linking with libusb-1.0.
-	* po/sane-backends.sv.po: Updated Swedish translations.
-
-2009-09-07  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp730.c:
-	pixma backend: added debug info for MF3110 and changed default params.
-
-2009-09-06  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp730.c, backend/pixma_imageclass.c, backend/pixma_mp150.c,
-	doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	pixma backend:
-	- Fix usb interrupt messages handling for MF3110
-	- New support for ImageClass MF4660
-	- Documentation updates
-
-2009-09-03  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp730.c:
-	pixma backend: change for MF3110 image encoding.
-
-2009-08-29  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_imageclass.c, backend/pixma_mp730.c:
-	pixma backend: moved MF3110 declaration to mp730 part of backend.
-
-2009-08-27  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/descriptions/pixma.desc, backend/pixma_mp150.c:
-	- pixma backend: Updated description for MP830 reported to be fully supported.
-
-2009-08-13 m. allan noah <kitno455 at gmail dot com>
-	* tools/sane-desc.c: add closedir call to fix bug #311880, patch
-	  from Johannes Meixner
-
-2009-08-08 Julien Blache <jb@jblache.org>
-	* frontend/saned.c: run_standalone(), explicitely check for errors
-	on fds.
-
-2009-08-07 m. allan noah <kitno455 at gmail dot com>
-	* backend/fujitsu.[ch], backend/fujitsu-scsi.h: Backend v96
-	- split sane_get_parameters into two functions
-	- remove unused code from get_pixelsize
-	- support hardware based auto length detection
-	* doc/descriptions/fujitsu.desc: various status and comment updates
-
-2009-08-07  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys_gl646.c backend/genesys_devices.c: 
-	- small fixes for hp3670 support
-
-2009-08-05  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.c: 
-	- fixed shading calibration for hp2300 when dpi <= 300
-
-2009-08-04  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.c backend/genesys_gl646.c backend/genesys_devices.c: 
-	- fixed document end detection for gl646 cis scanners
-	- disable color filter fro gray mode for gl646 cis scanners
-
-2009-08-03  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	- pixma backend: few cosmetic documentation updates.
-
-2009-08-02  Stéphane Voltz <stef.dev at free.fr>
-	* frontend/tstbackend.c: remove WARMING_UP_STATUS usage
-
-2009-07-30 Jonathan Bravo Lopez <jkdsoft at gmail dot com>
-	* backend/hp3900_config.c: 
-	- Fixed bug [#311856] possible for loop overflow
-
-2009-07-29 m. allan noah <kitno455 at gmail dot com>
-	* backend/canon_dr.[ch]: Backend v34
-	- add simplified Hough transform based deskewing code
-	- add extremity detecting cropping code
-	- use per-model background color to fill corners after deskew
-	- request and chop extra scanlines instead of rounding down
-	- remove padding dumb scanners add to top of front side
-	- sane_get_params uses intermediate struct instead of user struct
-	- if scanner stops, clone the last line until the end of buffer
-	- reset some intermediate params between duplex sides
-
-2009-07-28  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/descriptions/pixma.desc:
-	- Updated pixma backend desc for Pixma MX860
-
-2009-07-25  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	- Fix in declarations for Pixma MX320, MX330 and MX860, 
-	- Updated docs for MX860, confirmed to be supported.
-
-2009-06-23 m. allan noah <kitno455 at gmail dot com>
-	* backend/canon_dr.[ch]: Backend v33
-	- add software brightness/contrast for dumb scanners
-	- add blocking mode to allow full-page manipulation options to run
-	- add swdespeck option and support code
-	- add swdeskew and swcrop options (disabled)
-
-2009-06-22 m. allan noah <kitno455 at gmail dot com>
-	* backend/canon_dr.[ch]: Backend v32
-	- crop/resample image data before buffering, not after
-	- shink image buffers to size of output image, not input
-	- correct some debug message
-	- better handling of EOF
-	- add intermediate param struct to existing user and scan versions
-
-2009-07-17 Alex Belkin <abc at telekom.ru>
-	* backend/xerox_mfp.c: more sanity checking for debug mode.
-
-2009-07-15  Stéphane Voltz <stef.dev at free.fr>
-	* backend/lexmark.h: disable deep debugging 
-
-2009-07-10  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys.c backend/genesys_gl646.c backend/genesys_low.h
-	  backend/genesys_gl646.h backend/genesys_gl841.c 
-	  backend/genesys_devices.c backend/genesys.h:
-	- add shading calibration for sheetfed scanners
-	- shading calibration fix for all gl646 based scanners
-
-2009-07-06  Stéphane Voltz <stef.dev at free.fr>
-	* backend/lexmark.c backend/lexmark.h backend/lexmark_low.h: 
-	  do not use resolution higher than sensor resolution when doing
-	  calibation.
-
-2009-07-02  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma.h, backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	- Declared new models (yet untested) Pixma MX330 and MX860, updated docs.
-	- Bump backend minor version number. 
-
-2009-07-01 Alex Belkin <abc at telekom.ru>
-	* backend/xerox_mfp.conf.in: usbid for Samsung SCX-4500W
-
-2009-06-29 m. allan noah <kitno455 at gmail dot com>
-	* po/Makefile.am, po/Makefile.in, po/sane-backends.uk.po:
-	- Ukrainian translation from yurchor@ukr.net
-	* backend/avision.c: set flag for Fujitsu SP620C
-	* doc/desciptions/unsupported.desc: minor updates to Canon scanners
-	* doc/descriptions/canon_dr.desc: set status complete on 5 machines
-	* backend/canon_dr.c: reduce default buffer size to 2 megs
-
-2009-06-26 Julien Blache <jb@jblache.org>
-	* po/Makefile.am, po/Makefile.in, po/sane-backends.gl.po: added
-	new gl (galician/galego) translation.
-	* po/sane-backends.es.po: update es translation.
-	Both translations courtesy of Miguel Bouzada <mbouzada(at)gmail(dot)com>
-	* po/README: update instructions for po file addition.
-
-2009-06-22 m. allan noah <kitno455 at gmail dot com>
-	* backend/kodak.*: new backend for big Kodak SCSI/Firewire scanners
-	* doc/desciptions/kodak.desc, doc/sane-kodak.man: docs for same
-
-2009-06-22  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_imageclass.c, backend/pixma_mp730.c, doc/descriptions/pixma.desc:
-	- Added duplex ADF scan for Canon ImageCLASS D480.
-	- Fixed ImageCLASS MF5770 grayscale scanning.
-	- Moved ImageCLASS MF5730 and MF5750 to pixma_mp730.c (similarity with MF5770).
-	- Updated documentation.
-
-2009-06-20  Mattias Ellert <mattias.ellert@fysast.uu.se>
-	* po/sane-backends.sv.po: Updated Swedish translations.
-	* backend/hp5400_internal.h, backend/hp5590_cmds.c,
-	  backend/hp5590_low.c, backend/net.c: Add missing includes.
-
-2009-06-20  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_imageclass.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	Added Canon imageCLASS D480 support to the pixma backend.
-
-2009-06-17  Stéphane Voltz <stef.dev at free.fr>
-	* backend/lexmark_low.c: f3/f4 registers assignement cleanup
-
-2009-06-18  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c:
-	Fixed typo in pixma backend for MX320 declaration.
-
-2009-06-17 m. allan noah <kitno455 at gmail dot com>
-	* backend/canon_dr.[ch], backend/canon_dr-cmd.h: backend v30
-	- add fine cal support for machines with internal buffer (2050/2080)
-	- support fixed-width machines that require even bytes per scanline
-	- pad end of scan with gray if scanner stops prematurely
-	- better handling of errors during calibration
-	- cleanup canceling debug messages
-	- remove old cancel() prototype
-	- small sleep before clearing usb halt condition
-
-2009-06-17  Stéphane Voltz <stef.dev at free.fr>
-	* backend/lexmark_low.c: cleanups, better logging in is_home_line()
-	  and possible fix for bug #311862 by using f4 & f5 registers instead of
-	  f3 & f4
-
-2009-06-16  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	Declared Pixma MX320 in the pixma backend. Yet untested.
-
-2009-06-16 Julien Blache <jb@jblache.org>
-	* frontend/saned.c: fix strict aliasing issues, now problematic
-	with gcc 4.4.
-
-2009-06-14  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	Thanks to Vladimir Andreev patch, fix network scan for MP800R.
-	Documentation updates for latest MF5770 changes.
-
-2009-06-13  Alex Belkin <abc at telekom.ru>
-	* backend/xerox_mfp.conf.in, doc/descriptions/xerox_mfp.desc: usbids
-	for some Samsung devices.
-	* backend/xerox_mfp.c: backend version increment.
-
-2009-06-09 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* sanei/sanie_tcp.c, backend/epson2_net.c: Update
-	sanei_tcp_read() to better simulate old behavior of
-	MSG_WAITALL.  recv() tends to return MTU sized chunks
-	of data without that option.  And at least cygwin doesn't
-	support MSG_WAITALL.  Re-enable epson2 using that function
-	for big recieves.
-	* libgetopt.c, libgetopt1.c: Revert some logic meant to be used
-	only when we were always compiling internal getopt() functions.
-	Fix header filename.
-
-2009-06-09  Stéphane Voltz <stef.dev at free.fr>
-	* backend/lexmark.h backend/lexmark.c backend/lexmark_low.c:
-	  cleanups, better 'fake usb' and possible fix for bug #311862
-
-2009-06-08 m. allan noah <kitno455 at gmail dot com>
-	* backend/canon_dr.c: backend v29
-	- split coarse and fine cal to run independently
-	- add side option
-	- reset scan params to user request if calibration fails
-	- better handling of sane_cancel
-	- better handling of errors during sane_start and sane_read
-
-2009-06-08  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp730.c, backend/pixma_imageclass.c:
-	Modifications to support Canon ImageClass MF5770
-
-2009-06-04  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys_gl841.c: Make calibration steps always send 
-	  registers before trying to acquire a line.
-
-2009-05-29  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* doc/descriptions/genesys.desc: 
-	  Added description for Visioneer XP100r3, Visioneer Roadwarrior, 
-	  demoted DocketPort 465 to "untested"
-
-2009-05-28 m. allan noah <kitno455 at gmail dot com>
-	* backend/pnm.c: hide 'warming up' and 'hw locked' 'devices'
-
-2009-05-26 m. allan noah <kitno455 at gmail dot com>
-	* backend/canon.c: clamp film type to allowed range (bug #311685)
-
-2009-05-25 m. allan noah <kitno455 at gmail dot com>
-	* backend/fujitsu.[ch]: backend v94
-	- add side option to show which duplex image is being transferred
-	- convert front and simplex buffers to use much less ram
-	- add lowmemory option which makes duplex back buffer small too
-	- refactor image handling code to track eof's instead of lengths
-	- do color deinterlacing after reading from scanner, before buffering
-
-2009-05-25  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* sanei/sanei_usb.c:
-	Adds debug verbosity to last sanei_usb.c patch.
-
-2009-05-23  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/sane-pixma.man, doc/descriptions/pixma.desc:
-	Updated documentation for Pixma MultiPass MP730.
-
-2009-05-22  Alex Belkin <abc at telekom.ru>
-	* backend/xerox_mfp.c:
-	- additional error check to (stop scanadf) + fix of it.
-
-2009-05-22  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_imageclass.c, backend/pixma_mp730.c, sanei/sanei_usb.c:
-	- pixma_imageclass.c: supported devices list cleanup.
-	- pixma_mp730.c: fixed scan area width adjust and end of scan protocol for MP730.
-	- sanei/sanei_usb.c: in sanei_usb_open(), changed "endpoints seek loop" to 
-	  take into account only interfaces detected by sanei_usb_init()
-	  Fixes Pixma MP730 usb wrong endpoints selection. 
-
-2009-05-19  Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* backend/genesys_devices.c, backend/genesys_low.h: 
-	  Add Pentax DSmobile 600, Syscan 485, DCT 487
-	
-2009-05-18  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys_gl646.h: fixed missing part of the include
-
-2009-05-13  Stéphane Voltz <stef.dev at free.fr>
-	* backend/genesys_gl646.c backend/genesys_gl646.h: created a
-	  genesys_gl646.h header file, moved all declarations from 
-	  genesys_gl646.c to this file.
-
-2009-05-13  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c:
-	Fixed Pixma MP600R for network scan. Changes apply to MP600R _and_ MP600,
-	to use now a strict clone of Canon's driver protocol.
-
-2009-05-09 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* */*.c: standardize including local sane include files.
-
-2009-05-09  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc:
-	Fixed Pixma MP600 and MP600R for 2400 dpi scan, updated their descriptions.
-
-2009-05-08 m. allan noah <kitno455 at gmail dot com>
-	* backend/canon_dr*: backend v27
-	- bug fix in read_panel()
-	- initialize vars in do_usb_cmd()
-	- set buffermode off by default
-	- clear page counter during init and sane_start()
-	- eject previous page during init and sane_start()
-	- improved SSM_BUFF macros
-	- moved set_window() to after ssm-*()
-	- add coarse calibration (AFE offset/gain & per-channel exposure)
-	- add fine calibration (per-cell offset/gain)
-	- free image and fine cal buffers in sane_close()
-	- compare page counter of small scanners only in non-buffered mode
-	- add back-side gray mirroring code for DR-2580C
-
-2009-05-06  Nicolas Martin <nicols-guest at users.alioth.debian.org> 
-	* doc/descriptions/pixma.desc:
-	Updated descriptions in pixma backend for ImageClass MF4010 and MF4018.
-
-2009-05-06 Ilia Sotnikov <hostcc@gmail.com>
-
-	* doc/descriptions/unsupported.desc:
-	HP ScanJet 4500C/4570C/5500C is supported by the 'hp5590' backend.
-	* doc/descriptions/hp5590.desc:
-	Updated backend version, added HP ScanJet 4500C as completely supported,
-	added HP ScanJet 5500C as untested, HP ScanJet 4570C/5550C/5590/7650
-	marked as completely supported
-	* tools/check-usb-chip.c:
-	Updated HP ScanJet model names displayed during the check_hp5590().
-	* backend/hp5590.c, backend/hp5590_cmds.c, backend/hp5590_cmds.h, 
-	  backend/hp5590_low.c, backend/hp5590_low.h, doc/sane-hp5590.man:
-	Updated the list of supported devices (added HP 5500C which is similar
-	to 4570C, 5500C which is similar to 4500C) - only strings/comments, no
-	code was changed. Updated backend version. Updated man page.
-
-2009-05-06 Julien Blache <jb@jblache.org>
-	* tools/sane-desc.c: unbreak udev rules, use ATTRS instead of ATTR
-	for USB devices.
-	* frontend/saned.c: pass the network fds to saned_avahi() so the
-	Avahi process can close them. Fixes a hang possible hang of the
-	net backend when saned is run in debug mode.
-
-2009-05-05 Julien Blache <jb@jblache.org>
-	* doc/backend-writing.txt, doc/releases.txt: update for the switch
-	to git.
-
-2009-05-04 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* acinclude.m4: Rename --enable-fork-process to --enable-pthreads
-	to match internal usage. Stop linking in pthread when disabled.
-	* backend/Makefile.am: Add $PTHREAD_LIBS to all backends that
-	include sanei_thread.
-	* Makefile.am: Add new ChangeLog-1.0.20 to distribution list.
-
-2009-05-03 m. allan noah <kitno455 at gmail dot com>
-	* ChangeLog-1.0.20, Makefile.in: ChangeLog from 1.0.20 release
-	* configure, configure.in: version 1.0.21cvs
-	* doc/releases.txt: minor updates for new build system
-	* doc/descriptions/canon_dr.desc, doc/descriptions/coolscan3.desc,
-	  doc/descriptions/rts8891.desc, doc/descriptions/xerox_mfp.desc:
-	  remove :new tag
-
-2009-05-03 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
-	* Makefile.in, aclocal.m4, configure, */Makefile.in: Regenerated 
-	with newer automake.
-	* backend/Makefile.am, tools/sane-config.in: Add missing 
-	$GPHOTO2_LDFLAGS so library can be found.
-	* tools/Makefile.am: Add mising $SCSI_LIBS to sane-find-scanner.
-
-Older entries can be found in ChangeLog-1.0.20.
diff --git a/ChangeLog-1.0.22 b/ChangeLog-1.0.22
deleted file mode 100644
index 0af106e..0000000
--- a/ChangeLog-1.0.22
+++ /dev/null
@@ -1,536 +0,0 @@
-******  Release of sane-backends 1.0.22. End of code freeze ******
-
-2011-02-10 m. allan noah <kitno455 at gmail dot com>
-	* po/nl.po: updates from Martin Kho
-	* po/uk.po: updates from Yuri Chornoivan
-
-2011-02-04 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c: disable image processing options at 16 bits since
-	they can't handle it.
-
-2011-02-02 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_low.c backend/genesys_gl843.c:
-	more asynchronous parking issues
-
-2011-01-31 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_low.[ch]: don't return EOF too
-	early when applying image processing functions, handle writing of
-	lineart data, improve asynchronous head parking
-
-2011-01-31 m. allan noah <kitno455 at gmail dot com>
-	* backend/epjitsu.c, doc/descriptions/epjitsu.desc:
-	- comment changes
-	- added new models
-	* backend/fujitsu.c, doc/descriptions/fujitsu.desc,
-	doc/sane-fujitsu.man: fujitsu backend v106,
-	- added new models
-	- dont call mode_select with a page code the scanner does not support
-
-2011-01-28 Mike Kelly <mike@piratehaven.org>
-	* backends/avision.[ch]:
-	- Bumped build number to 294.
-	- Various minor code cleanups.
-	- Fixed initialization and duplexing for AV220-G
-	- Added ADF support for HP8200 series scanner (flipping duplexers).
-	- Return copied values in sane_get_parameters()
-	- Added paper-length option to prevent double feeds
-	- Added a Misc option group to hold misc features
-
-2011-01-26 m. allan noah <kitno455 at gmail dot com>
-	* backend/canon_dr.[ch], doc/descriptions/canon_dr.desc,
-	backend/canon_dr.conf.in, doc/sane-canon_dr.man: 
-	canon_dr backend v37:
-	- don't center window when using flatbed
-	- improve request sense error messages
-	- enable flatbed for all known models
-	- ad usb ids for DR-6030C, CR-135i & CR-190i
-	* doc/descriptions/unsupported.desc: moved DR-2020U from canon_dr.desc
-
-2011-01-20 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_devices.c backend/genesys_gl646.h: tune resolution
-	list and add internal values matching them
-
-2011-01-18 m. allan noah <kitno455 at gmail dot com>
-	* backend/canon_dr.[ch], doc/desc/canon_dr.desc, doc/sane-canon_dr.man:
-	canon_dr backend v36:
-	- initial support for DR-3080 and DR-5060 
-	- add code to clamp scan width to an arbitrary byte width boundary 
-	- add code to prevent setting of brightness/threshold/contrast 
-	- don't send dropout color command on non-color scanners 
-	- initial support for DR-7090C 
-	- update credits 
-	* po/pl.po: updated translation from Jakub Bogusz
-	* po/de.po: updated translation from Matthias Mailander
-	* backend/canon.conf.in: improved detection of scsi scanners
-
-2011-01-17 Stéphane Voltz <stef.dev@free.fr>
-	* doc/descriptions/genesys.desc: add DSmobile variant
-
-2011-01-15 Reinhold Kainhofer <reinhold@kainhofer.com>
-	* sanei/sanei_usb.c: Add function sanei_usb_set_endpoint to change the
-	endpoints for usb communications.
-	* backend/magicolor.c: Add new "magicolor" backend for KONICA MINOLTA
-	magicolor 1690MF devices
-
-2011-01-13 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_devices.c backend/genesys_gl124.c backend/genesys_gl124.h
-	doc/descriptions/genesys.desc: add 2400 dpi mode for LiDE 110 and 210
-
-2011-01-12 Stéphane Voltz <stef.dev@free.fr>
-	*  backend/genesys.c backend/genesys_devices.c backend/genesys_gl124.c
-	backend/genesys_gl124.h backend/genesys_low.c backend/genesys_low.h  :
-	prepare 2400 dpi modes for LiDE 210/110, add a wait for head to park
-	function and use it in sane_start().
-
-2011-01-06 Stéphane Voltz <stef.dev@free.fr>
-	*  backend/genesys.c backend/genesys_devices.c
-	backend/genesys_gl847.c: fix lineart issue when yres is higher than
-	xres and dynamic lineart is enabled, make gl847 wait for head to 
-	park between scans, wait for head ot park in sane_close()
-
-2011-01-05  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp730.c:
-	pixma: Added patch proposed by Klaus Stengel for Canon imageRunner 1020/1024/1025 support.
-
-2011-01-04  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, backend/pixma.c, backend/pixma.h
-	backend/pixma_common.c, backend/pixma_common.h:
-	pixma: several updates for MP830, MP990, memmove bug fix, and 64 bits image size.
-
-2011-01-04 Stéphane Voltz <stef.dev@free.fr>
-	*  backend/genesys.c backend/genesys_devices.c
-	backend/genesys_gl124.c: fix 1200 dpi lineart issues for gl124,
-	reenable low resolutions for lineart for gl124, and geometry fine
-	tuning for LiDE 110/210
-
-2011-01-03 Stéphane Voltz <stef.dev@free.fr>
-	* backends/lexmark_low.c: fix compilation issue due to incorrect
-	place for a DBG statement.
-
-2011-01-03 Chris Bagwell <chris at cnpbagwell.com>
-	* backends/Makefile.am: Add SOCKET_LIBS to xerox_mfp
-	for platforms such as solaris since it uses sanei_tcp.k
-	* doc/sane.tex: removed reference to changelog package
-	since its not used and not installed by Macports (#312596)
-	* doc/Makefile.am: put quotes around TEXINPUTS in case
-	paths have spaces in name.  This is so latex can find
-	html.sty package that is referenced by sane.tex.
-
-2011-01-01 Chris Bagwell <chris at cnpbagwell.com>
-	* */Makefile.in, configure, aclocal.m4: Generate from latest
-	autoconf (2.63 to 2.66).
-	* m4/*: Added new libtool helper files.
-	* ltmain.sh: updated to latest libtool and added back special
-	sane soname work around.
-	* po/Makefile.am: Allow "make dist" to work when translations
-	disabled.
-	* sanei/Makefile.am: allow "make check" to work on cygwin.
-
-2010-12-28 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.conf.in backend/genesys_devices.c backend/genesys_gl646.c
-	backend/genesys_gl847.c backend/genesys_gl847.h:
-	fix HP2300 warming up problem, add LiDE 700F and 5600F to gl847
-	devices, smooth DSmobile 600 moves.
-
-2010-12-27 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys.conf.in backend/genesys_devices.c
-	backend/genesys_gl841.c backend/genesys_low.h
-	doc/descriptions/genesys.desc doc/descriptions/unsupported.desc
-	doc/sane-genesys.man: add Plustek OpticBook 3600 support 
-	by Chris Berry <s0457957@sms.ed.ac.uk> and Michael Rickmann <mrickma@gwdg.de>
-
-2010-12-27 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_devices.c backend/genesys_gl124.c backend/genesys.c
-	doc/descriptions/genesys.desc doc/sane-genesys.man: enable 16 bit gamma
-	for gl124 scanners, models and credits update.
-
-2010-12-24 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_devices.c backend/genesys_gl124.c backend/genesys.c
-	doc/descriptions/genesys.desc: GL847 shading area size fix, GL124
-	shading area tuning, descriptions update.
-
-2010-12-24 Stéphane Voltz <stef.dev@free.fr>
-	* backend/lexmark*.[ch]: applied X74 support patch by Torsten Houwaart
-	<ToHo@gmx.de>
-
-2010-12-23 Mike Kelly <mike@piratehaven.org>
-	* backends/avision.[ch]:
-	- Bumped build number to 293.
-	- Removed "regularly tested" from various scanners.
-	- Fixed USB id for Avision FB2080E.
-	- Added support for the Avision AV210D2+ scanner.
-	- Moved device init code to sane_get_devices().
-	- Rewrote indirect "adf_mode" code to be more direct.
-	- Fixed indentation.
-	- Changed AVISION_FILTER_* defines to use final values.
-	- Wrap duplicate USB id entries with ifdefs.
-	- Removed a duplicate entry for Avision AV210C2.
-	- Print out USB ids as four digit hex numbers.
-	- Enhanced sane_get_option_descriptor() debug message.
-	* doc/descriptions/avision.desc:
-	- (Re)generated from avision.c.
-
-2010-12-19 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_gl124.h: LiDE 210 GPIO fix
-
-2010-12-16 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys.conf.in backend/genesys_devices.c
-	backend/genesys_gl124.h:
-	LiDE 210 support (GL124 based)
-
-2010-12-14 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys*.[ch] backend/genesys.conf.in backend/Makefile.am
-	backend/Makefile.in tools/check-usb-chip.c doc/desc/genesys.desc:
-	LiDE 110 support (GL124 based)
-
-2010-12-08 Mike Kelly <mike@piratehaven.org>
-	* doc/descriptions/avision.desc:
-	- (Re)generated from avision.c.
-	* doc/sane-avision.man:
-	- Added myself as maintainer.
-	* backends/avision.desc:
-	- Removed this obsolete file (again).
-	* backends/avision.c:
-	- Bumped version to 292.
-	- Added myself as maintainer.
-	- Added support for DocuMate262i.
-	- Added support entries for HP 8300 series.
-	* backends/avision.conf.in:
-	- Added myself as maintainer.
-
-2010-12-06 Julien Blache <jb@jblache.org>
-	* doc/descriptions/espon.desc, doc/descriptions/epson2.desc: add SCSI IDs
-	  for the Perfection 3200 (GT-9800) connected through FireWire. Report
-	  from Colin Kincaid Williams <discord@uw.edu>. Update Perfection 2450
-	  interface list.
-
-2010-12-02 m. allan noah <kitno455 at gmail dot com>
-	* backend/fujitsu.[ch], backend/fujitsu-scsi.h: 
-	Fujitsu backend version 105
-	- backup and restore image params around image processing code
-	- cache software crop/deskew parameters for use on backside of duplex
-	- fi-6110 does not support bgcolor or prepick
-
-2010-11-29 Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>
-	* backend/epson2-ops.c: fix list of supported commands for levels D1
-	  and D2.
-
-2010-11-24 m. allan noah <kitno455 at gmail dot com>
-	* backend/fujitsu.c, backend/fujitsu.conf.in, 
-	  doc/descriptions/fujitsu.desc, doc/sane-fujitsu.man:
-	Fujitsu backend versions 103 and 104
-	- remove compiled-in default config file
-	- initial support for new fi-6xxx machines
-	- never request more than s->buffer_size from scanner
-	- silence noisy set_window() calls from init_interlace()
-
-2010-11-19 Julien Blache <jb@jblache.org>
-	* doc/descriptions-external/epkowa.desc: update for iScan 2.26.1,
-	from Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>.
-
-2010-11-17 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c: don't write scan data unless specified by debug 
-	level.
-
-2010-11-08 Marc Deslauriers <marc.deslauriers@ubuntu.com>
-	* backend/v4l.c: convert v4l1 BGR data to RGB; v4l1 always returns
-	  BGR for RGB due to a coding error way back.
-
-2010-11-07 Marc Deslauriers <marc.deslauriers@ubuntu.com>
-	* backend/v4l.c: loop through the read buffers in the v4l backend so
-	  we don't get stale frames.
-
-2010-11-06 Stéphane Voltz <stef.dev@free.fr>
-	* frontend/scanimage.c doc/scanimage.man: add -A/--all-options to list
-	all control options exposed by a backend.
-
-2010-11-01 Stéphane Voltz <stef.dev@free.fr>
-	* frontend/scanimage.c: don't print readonly device options since
-	they can't be set on command line
-	
-2010-11-01 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl843.c 
-	backend/genesys_gl843.h backend/genesys_gl847.c: up build number to 41,
-	rework head parking,
-	fixed clear-calibration option reading, 
-	make calibration cache expire for non sheetfed gl847 scanners,
-	tuned KV-SS080 timings to improve image quality,
-	raised LiDE 100/200 defaukt gamma to 1.7
-	
-2010-10-31 Julien Blache <jb@jblache.org>
-	* doc/descriptions/hp.desc: add SCSI IDs for ScanJet 4c.
-
-2010-10-30 Julien Blache <jb@jblache.org>
-	* backend/xerox_mfp.conf.in, doc/descriptions/xerox_mfp.desc: add
-	Samsung SCX 4824 & 4825FN (Debian #601748). Resync desc file with
-	  config file.
-
-2010-10-13 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_devices.c backend/genesys_gl843.c 
-	backend/genesys_gl843.h: added 100, 150, 400 and 600 dpi modes for
-	G4050 and G4010. Added 500 and 400 dpi modes for KV-SS080
-	
-2010-09-30 Alex Belkin <abc@telekom.ru>
-	* Makefile.in backend/Makefile.am backend/Makefile.in backend/xerox_mfp-tcp.c
-	backend/xerox_mfp-usb.c backend/xerox_mfp.c backend/xerox_mfp.conf.in backend/xerox_mfp.h
-	doc/Makefile.in doc/descriptions/xerox_mfp.desc doc/sane-xerox_mfp.man frontend/Makefile.in
-	include/Makefile.in japi/Makefile.in lib/Makefile.in po/Makefile.in sanei/Makefile.in
-	testsuite/Makefile.in tools/Makefile.in: Added Samsung SCX-4500W scan over network support
-	for xerox_mfp backend (by Alexander Kuznetsov). autoconf and automake reconfigure
-	to support new files.
-
-2010-09-28 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys.conf.in backend/genesys_devices.c
-	backend/genesys_gl843.c backend/genesys_gl843.h: add minimal support
-	(200 and 300 dpi) for HP G4050. Add a device entry for G4010.
-
-2010-09-18 Reinhold Kainhofer <reinhold@kainhofer.com>
-	* include/sane/sanei_config.h sanei/sanei_config.c: Add
-	function sanei_config_get_paths to obtain all configuration pathes
-	(from env var SANE_CONFIG_DIR and default paths); fix pointers to
-	invalid/freed strings when SANE_CONFIG_DIR is set.
-	* backend/dll.c: When searching for the dll.d/ directory,
-	also use the SANE_CONFIG_DIR env variable.
-
-2010-07-12 Julien Blache <jb@jblache.org>
-	* doc/descriptions-external/epkowa.desc: update for iScan 2.26.0,
-	from Alesh Slovak <alesh.slovak@avasys.jp>.
-
-2010-09-17 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_low.h sanei/sanei_magic.c
-	backend/genesys_devices.c backend/genesys_gl843.c: do asynchronous head
-	parking for flatbed scanners to save scan time. Fix a couple of
-	memory overwrites detected by valgrind. Optimize shading data
-	writing and fine tune scaneara for gl843.
-
-2010-09-16 Julien Blache <jb@jblache.org>
-	* frontend/saned.c: exit Avahi process on error and when the poll
-	loop terminates.
-
-2010-09-13 Stéphane Voltz <stef.dev@free.fr>
-	* doc/descriptions/unsupported.desc: update status of scanners
-	now supported by the genesys backend.
-
-2010-09-13 Stéphane Voltz <stef.dev@free.fr>
-	* doc/sane-genesys.man doc/descriptions/genesys.desc
-	backend/genesys.con.in: update HP3690 status to supported
-
-2010-09-12 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_conv.c backend/genesys.c doc/sane-genesys.man
-	sanei/sanei_magic.c backend/genesys.h backend/genesys_low.h
-	backend/Makefile.in backend/Makefile.am: add software deskep, crop
-	and despeckle for the genesys backend.
-
-2010-09-08  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, backend/pixma_mp730.c
-	doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	pixma: several updates for MP375R, MP390, MP460 and docs by Gernot Hassenpflug.
-
-2010-09-07  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp750.c:
-	pixma: fix for 2400 dpi striping on MP760/770/780/790 by Gernot Hassenpflug.
-
-2010-09-05  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/sane-pixma.man:
-	pixma: man page update for devices as reported by Gernot Hassenpflug.
-
-2010-09-05 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_gl841.c: end of document detection rework for
-	sheetfed scanners.
-
-2010-09-04 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_devices.c backend/genesys.c backend/genesys_gl843.c:
-	1200 dpi resolution support for KV-SS080.
-
-2010-09-01 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_devices.c backend/genesys.c backend/genesys_gl843.c:
-	support for scan button, faster move to scan area and calibration fine
-	tuning.
-
-2010-09-01  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma.c, backend/pixma_mp730.c, backend/pixma_mp150.c
-	doc/descriptions/pixma.desc:
-	pixma: changes supplied by Gernot Hassenpflug for Lineart support
-	       to some Pixma devices, and desc updates.
-
-2010-08-31 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_devices.c backend/genesys.conf.in backend/genesys.c
-	backend/genesys_gl843.[ch] backend/Makefile.am backend/Makefile.in: 
-	support for gl843 based scanners, starting with KV-SS080.
-	disable true gray for LIDE35/50 since it breaks scanning
-
-2010-08-02 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_devices.c backend/genesys.conf.in: add a device
-	entry for the Canoscan 5600f.
-
-2010-07-25  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma.c, backend/pixma.h, backend/pixma_common.c,
-	backend/pixma_imageclass.c:
-	pixma: changes for future Lineart scan mode support.
-	       some MF8030 settings, but device not yet supported.
-
-2010-07-22  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, backend/pixma_imageclass.c, 
-	doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	pixma:  add support for PIXMA MX870.
-		declared PIXMA MF8030, but not yet working.
-
-2010-07-14 Julien Blache <jb@jblache.org>
-	* doc/descriptions/epson.desc, doc/descriptions/epson2.desc: add :scsi
-	keyword for the Perfection 2450 connected through FireWire. Courtesy
-	of Brian Denheyer <briand@aracnet.com>.
-
-2010-07-12 Julien Blache <jb@jblache.org>
-	* doc/descriptions-external/epkowa.desc: update for iScan 2.25.0,
-	from Alesh Slovak <alesh.slovak@avasys.jp>.
-
-2010-07-09 Julien Blache <jb@jblache.org>
-	* backend/dll.c: allow symlinks under SANE_CONFIG_DIR/dll.d.
-
-2010-07-04  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	pixma: changes for PIXMA MX350 support, usb and ethernet.
-
-2010-07-03  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/descriptions/pixma.desc, backend/pixma.c:
-	pixma: fix ImageClass MF6550 description.
-	       fix end of line crop buffer size.
-
-2010-07-02  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	pixma: update doc to include ImageClass MF6550 support.
-
-2010-07-02 m. allan noah <kitno455 at gmail dot com>
-	* backend/avision.c: patch for AV122-C2 from Ori Koren
-
-2010-07-01  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	pixma: thanks to Dan McGee patch, add support for PIXMA MX340.
-
-2010-06-23 m. allan noah <kitno455 at gmail dot com>
-	* backend/fujitsu.c: Fix compilation bug when jpeg support is enabled.
-
-2010-06-23 Julien Blache <jb@jblache.org>
-	* various: corrected initialization, printing, etc. in many backends 
-
-2010-06-21 Julien Blache <jb@jblache.org>
-	* tools/sane-desc.c: udev rules: set libsane_matched=yes for SCSI
-	devices too. Used by udev-acl later on.
-
-2010-06-21 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c
-	backend/genesys_low.h: improve scan quality by using double x
-	resolution internally at low resolution. Scan area geometry fine
-	tuning.
-
-2010-06-18 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c:
-	add 400, 200 and 100 dpi resolution to LiDE 100 and LiDE 200 . Disable
-	true gray until it really works.
-
-2010-06-15 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c
-	backend/genesys_gl847.h:
-	Canon LiDE 200 support up to 1200 DPI
-
-2010-06-15 m. allan noah <kitno455 at gmail dot com>
-	* doc/descriptions/xerox_mfp.desc, backend/xerox_mfp.conf.in:
-	  Add Samsung SCX-4600 USB IDs
-	* backend/kvs20xx.h: use sys/param.h instead of endian.h
-
-2010-06-10 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c:
-	calibration file name double free fix
-
-2010-06-10 m. allan noah <kitno455 at gmail dot com>
-	* backend/niash.c: patch for HP3300 from Yves Jeanrenaud
-	* po/fr.po: updates from Yann E. MORIN
-
-2010-06-10 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_devices.c backend/genesys_gl847.c:
-	LiDE 100 motor settings rework
-
-2010-06-09 m. allan noah <kitno455 at gmail dot com>
-	* backend/kvs20xx*, Makefiles, confs and docs:
-	- Add new kvs20xx backend from Panasonic, for KV-S202xC and KV-S204xC
-
-2010-06-09 m. allan noah <kitno455 at gmail dot com>
-	* backend/fujitsu.[ch]: backend v100:
-	- store more Request Sense data in scanner struct
-	- clear Request Sense data at start of every do_cmd() call
-	- track per-side ILI and global EOM flags
-	- set per-side EOF flag if ILI and EOM are set
-
-2010-06-09 m. allan noah <kitno455 at gmail dot com>
-	* backend/Makefile.{am|in}: add genesys_gl847 files
-	* po/Makefile.{am|in}: add LINGUAS POTFILES to EXTRA_DIST
-	* Makefile.am: add Changelog-1.0.21 to EXTRA_DIST
-
-2010-06-08  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_imageclass.c:
-	pixma: set #1 of modifiations for ImageClass MF65xx series.
-
-2010-06-07 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c:
-	LiDE 100 motor fine tuning
-
-2010-06-03 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c
-	doc/descriptions/genesys.desc:
-	final bits for full LiDE 100 support
-
-2010-05-31 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c:
-	shading calibration is working and led calibration has been tuned
-
-2010-05-30 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c
-	backend/genesys_low.h: Canon LiDE 100 working without shading
-	calibration which is the final bit to fix
-
-2010-05-24 m. allan noah <kitno455 at gmail dot com>
-	* backend/avision.c, doc/descriptions/avision.desc: add Fujitsu fi-5015C
-
-2010-05-20 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c:
-	make led and shading calibration work for LiDE 100
-
-2010-05-16 Chris Bagwell <chris at cnpbagwell dot com>
-	* README.freebsd: Add suggested hint that configure needs
-	to be told location of external libraries installed through
-	Ports.
-
-2010-05-16 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.[ch] backend/genesys_devices.c
-	backend/genesys.conf.in backend/genesys_gl847.[ch]
-	backend/Makefile.in: start of LiDE 100 and LIDE 200 support
-
-2010-05-16 Stéphane Voltz <stef.dev@free.fr>
-	* sanei/sanei_usb.c include/sane/sanei_usb.h: add a sanei_usb_reset() 
-	function.
-
-2010-05-15 m. allan noah <kitno455 at gmail dot com>
-	* backend/fujitsu.c: backend v99
-	- sense_handler(): collect rs_info for any ILI, not just EOM
-	- do_usb_cmd(): use rs_info whenever set, not just EOF
-	- read_from_*(): better handling of EOF from lower level functions
-	- sane_read(): improve duplexing logic
-
-2010-05-03 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-	* Change status of CanoScan LiDE 40 from untested to good
-
-2010-04-27 m. allan noah <kitno455 at gmail dot com>
-	* po/Makefile.in: include POTFILES and LINGUAS in DIST
-	* doc/releases.txt: more git notes
-
-2010-04-25 Julien Blache <jb@jblache.org>
-	* tools/sane-backends.pc.in: syntax fixes.
-
-2010-04-25 m. allan noah <kitno455 at gmail dot com>
-	* ChangeLog-1.0.21, Makefile.in: ChangeLog for 1.0.21 release
-	* configure, configure.in: version 1.0.22git
-	* doc/descriptions/kodak.desc, doc/descriptions/kvs1025.desc,
-	  doc/descriptions/p5.desc: remove :new tag
-	* doc/releases.txt: minor updates due to new git hooks
-
-Older entries can be found in ChangeLog-1.0.21.
diff --git a/ChangeLog-1.0.23 b/ChangeLog-1.0.23
deleted file mode 100644
index 07d5e69..0000000
--- a/ChangeLog-1.0.23
+++ /dev/null
@@ -1,694 +0,0 @@
-******  Release of sane-backends 1.0.23. End of code freeze ******
-
-2012-08-18 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* po/nl.po: Updated Dutch translation from Martin Kho.
-
-2012-08-17 Chris Bagwell <chris at cnpbagwell dot com>
-	* backend/kvs40xx*: Fix scan() symbol name that
-	was still conflicting the epjistu and snapscan backends.
-
-2012-08-16 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma.[ch], backend/pixma_common.[ch], 
-	backend/pixma_imageclass.c, backend/pixma_mp*.c:
-	Copyright updated.
-
-2012-08-11 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma.c, backend/pixma_mp150.c, backend/pixma_mp810.c:
-	Lineart fix for generation 1+2 scanners.   
-
-2012-08-09 Paul Newall <quandry at ntlworld dot com>
-	* /backend/kodakaio.c: 
-	calling of poll tidied up, may fix problems with repeated scans.
-
-2012-07-30 Stéphane Voltz <stef.dev@free.fr>
-	* doc/sane-genesys.man backend/genesys_low.h backend/genesys*.c:
-	rewrite lineart emulation du to bugs exhibited by the use of the
-	genesys backend through saned. Fixed an option delcartion that led
-	to saned crash and fixed batch scanning with sheet-fed scanners.
-
-2012-08-07 Chris Bagwell <chris at cnpbagwell dot com>
-	* backend/kvs20xx*, backend/kvs40xx*: Fix duplicate symbols
-	caused by copy&pasting between related backends. This
-	allows prelinking of backends to work.
-	* backend/hp5590_low.c: Fix unresolved symbols error by
-	including byteorder.h header.
-	* backend/dll.c: Use correct function prototype for prelink
-	version of DLL backend.  Helps some 64-bit compilers.
-
-2012-07-31 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	doc updates for all PIXMA scanners
-	* backend/pixma.h, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	- Pixma backend version 0.17.0
-	- date updated in Pixma man page
-
-2012-07-30 m. allan noah <kitno455 at gmail dot com>
-	* backend/kvs1025.h: Increase max paper size (Matthew Wild)
-	* doc/*.man, doc/*.html: Typo fixes (Yuri Chornoivan)
-
-2012-07-30 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_gl843.c backend/genesys_gl646.c:
-	fix batch scanning for gl646 scanners
-
-2012-07-29 Paul Newall <quandry at ntlworld dot com>
-	* /doc/descriptions/kodakaio.desc: 
-	advent AW10 added.
-
-2012-07-28 Paul Newall <quandry at ntlworld dot com>
-	* /doc/descriptions/kodakaio.desc: 
-	usbids added and version.
-
-2012-07-28 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* doc/descriptions/pixma.desc: scanners resorted by name
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, 
-	doc/sane-pixma.man: new scanners reported by DMoeller
-	- Canon PIXMA MX410 as untested
-	- Canon PIXMA MX420 as complete
-	- Canon PIXMA E500, E600, MX370 Series, MX430 Series, MX710 Series
-	  as untested and experimental
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc: capabilities updated
-	  for Canon PIXMA MX510 and MX890 
-	* backend/pixma_mp150.c, doc/sane-pixma.man: all 2012 untested new devices
-	  marked as experimental 
-
-2012-07-26 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* README.linux: 
-	New detailled description for the installation of SANE backend.
-
-2012-07-24 m. allan noah <kitno455 at gmail dot com>
-	* backend/kvs40xx_opt.c: Oops- it is new
-	* doc/descriptions/kvs40xx.desc: Fix typo (Yuri Chornoivan)
-	* po/uk.po: Updated (Yuri Chornoivan)
-	* tools/Makefile.am, tools/Makefile.in, tools/sane-config.in: 
-	sane-config fixes (Ruediger Meier)
-
-2012-07-15 Ilia Sotnikov <hostcc@gmail.com>
-	* backend/hp5590.c, backend/hp5590_low.c:
-	Fix hp5590 backend on big-endian platforms provided by Nhan Ngo Dinh
-	<nngodinh@tiscali.it>
-
-2012-07-13 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl124.c
-	backend/genesys_gl646.c backend/p5.c backend/p5.h backend/p5_device.h
-	backend/rts8891.c backend/rts8891.h backend/rts8891_devices.c backend/rts8891_low.c
-	backend/rts8891_low.h backend/rts88xx_lib.c backend/rts88xx_lib.h
-	backend/umax_pp.c backend/umax_pp.h backend/umax_pp_low.c
-	backend/umax_pp_low.h backend/umax_pp_mid.c backend/umax_pp_mid.h
-	doc/sane-genesys.man sanei/sanei_magic.c :
-	misc cleanups and doc updates to prepare release
-
-2012-06-28 Paul Newall <quandry@ntlworld.com>
-	* backend/kodakaio.c backend/kodakaio.conf.in backend/kodakaio.h
-	doc/sane-kodakaio.man doc/descriptions/kodakaio.desc
-	configure.in makefile.am dllconf.in doc/makefile.am: Added new backend kodakaio for 
-	kodak ESP nnnn, Cnnn, hero AiOs, detection of cups added to configure
-	since cups is used for network auto detection.
-
-2012-06-27 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma.[ch], backend/pixma_sane_options.c,
-	doc/descriptions/pixma.desc:
-	- Pixma backend version 0.16.4
-	- new scan modes for 48 bit flatbed scanners:
-	  PIXMA_SCAN_MODE_COLOR_48, PIXMA_SCAN_MODE_GRAY_16,
-	  enabled by capability PIXMA_CAP_48BIT
-	* backend/pixma_mp150.c: unused capability PIXMA_CAP_48BIT removed
-	* backend/pixma_mp810.c:
-	- new capability for CS9000F: PIXMA_CAP_48BIT  
-	- functions for scan mode detection improved
-	- lowest resolution for 48 bit flatbed scan modes is 150 dpi 
-	* po/de.po: German translations for new scan modes
-
-2012-06-04 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys.h backend/genesys_low.h
-	backend/genesys_devices.c backend/genesys_gl124.[ch] : LiDE 110/210
-	led calibration improvements, add a 'lamp off during scan' option,
-	add 2400x4800 mode to LiDE 100, 110 and 210, improve remove/add
-	scanner detection.
-
-2012-06-01 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_gl841.c: apply led calibration fix
-
-2012-06-01 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c: fix get_device to handle scanner plugging and
-	unplugging
-
-2012-05-31 Stéphane Voltz <stef.dev@free.fr>
-	* doc/descriptions/genesys.desc doc/sane-genesys.man
-	doc/descriptions/unsupported.desc: updated Xerox onetouch 2400 status
-	to supported
-
-2012-05-30 Stéphane Voltz <stef.dev@free.fr>
-	*  backend/genesys.c backend/genesys_gl124.c backend/genesys_gl124.h:
-	align gl124 code on latest gl847 improvements
-
-2012-05-29 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl847.c
-	backend/genesys_gl847.h doc/descriptions/genesys.desc: add 4800 dpi
-	for LiDE 700F
-	- improve fedd/move to scan area for gl847 based scanners
-	- remove non working 400 dpi mode
-
-2012-05-28 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_devices.c backend/genesys_gl124.c
-	backend/genesys_gl847.c backend/genesys_gl847.h backend/genesys_low.h
-	doc/descriptions/genesys.desc doc/sane-genesys.man: 
-	add support for LiDE 700F up to 2400 dpi
-
-2012-05-10 m. allan noah <kitno455 at gmail dot com>
-	* backend/fujitsu.c: backend v111
-	- call send_* and mode_select_* from sane_start
-	- split read payloads into new debug level
-	- add paper-protect, staple-detect and df-recovery options
-
-2012-05-09 m. allan noah <kitno455 at gmail dot com>
-	* backend/fujitsu.[ch], backend/fujitsu-scsi.h: backend v110
-	- correct max_y_fb for fi-62x0 series
-	- add must_fully_buffer helper routine
-	- add hwdeskewcrop option, with fallback to software versions
-	- add 'actual' param to get_pixelsize for post-scan
-	- add recent model VPD params
-	- only set params->lines = -1 when using ald without buffering
-	- fix bugs in background color when using software deskew
-	* sanei/sanei_magic.c: Update deskew algo
-	- allow paper to be +/- 1 inch from top of image
-	- correct integer overflow
-	- improve (disabled) debug logs
-
-2012-05-03 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_io_sanei.c, backend/pixma_mp150.c, 
-	doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	Patch for Canon Pixma MP280 from Daniel Beer.
-	- PIXMA_EOF mapped to PIXMA_ETIMEDOUT.
-	- Maximum resolution reduced to 600dpi.
-	- Scanner added to doc files.
-
-2012-04-23 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* AUTHORS: Pixma backend and email addresses updates.
-
-2012-04-20 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* tools/sane-desc.c: tools/udev/libsane.rules supports scanner group
-	access to any scanner, with and without acl support. 
-
-2012-04-17 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma.c, backend/pixma_sane_options.c, po/de.po:
-	New description for device specific option "source".
-
-2012-04-17 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma.c: select first entries of dynamic dpi list 
-	and dynamic mode list as default values after changing the scan source 
-
-2012-04-04 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	New scanners Canon Pixma MX510 and Canon Pixma MX890. Both are untested.
-
-2012-04-04 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma.[ch], backend/pixma_mp810.c, po/de.po: color and grayscale
-	negatives scan in TPU mode, for CS8800F and CS9000F.
-
-2012-04-04 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_mp810.c: cropping y and h to scanable area in TPU mode,
-	for CS8800F and CS9000F.
-
-2012-03-29 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_gl124.c backend/genesys_devices.c: use feed earlier
-	at high resolution. Tune LiDE 110/210 geometry.
-
-2012-03-26 Stéphane Voltz <stef.dev@free.fr>
-	* doc/descriptions/unsupported.desc: removed G4010/G4050,
-	patch by Martin Michlmayr <tbm@cyrius.com>.
-
-2012-03-25 Mike Kelly <mike@piratehaven.org>
-	* backends/avision.[ch]:
-	- Added Xerox Documate 632.
-	- Added firmware checking for HP5370c scanners.
-	- Reverted AV610 USB IDs and removed AV_INT_STATUS.
-	- Fixed warning about printf and size_t.
-	- Fixed bug using wrong enum in x/y range check.
-
-2012-03-22 Rolf Bensch <rolf at bensch hyphen online dot de>
-    * po/de.po: New German translations for pixma backend.
-
-2012-03-21 Mike Kelly <mike@piratehaven.org>
-	* backends/avision.[ch]:
-	- Added Gray mode support for Kodak i30 and i40.
-	- Skip post-processing when caching flipping duplex.
-	- Moved a comment nearer its code.
-	- Added sane_reload_devices() to sane_init().
-	- Corrected the logic to set lines = -1 for ADF mode.
-	- Fix calculations when flipping back of duplex page.
-	- Track the number of lines to flip as a negative number.
-
-2012-03-20 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_*.[ch]: gl841 sheetfed scanners calibration
-	improvement, fix document end detection when doing dynamic lineart.
-	Copyrights updates.
-
-2012-03-19 Gerhard Jaeger <gerhard@gjaeger.de>
-	* backend/plustek.c: Fix batch scanning with Plustek backend
-	Patch submitted and tested by Elias Oltmanns <eo@nebensachen.de>
-
-2012-03-19 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_devices.c backend/genesys_gl843.c: update HP4850
-	geometry and fix initial state
-
-2012-03-06 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_bjnp.c: Replace index() with strchr(). Bug #313563.
-
-2012-02-29 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma.[ch], backend/pixma_common.c, 
-	backend/pixma_sane_options.[ch]: New device specific option 
-	'threshold-curve'. Can be used to optimize 1 bit B/W lineart scans.
-
-2012-02-27 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_imageclass.c, doc/descriptions/pixma.desc, 
-	doc/sane-pixma.man: New scanner Canon imageCLASS MF4410 from 
-	Vasiliy Olekhov.
-
-2012-02-16 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma.c, backend/pixma_sane_options.[ch]: 
-	New device specific option 'gamma'.
-
-2012-02-09 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma.[ch], backend/pixma_common.[ch], 
-	backend/pixma_sane_options.[ch], backend/pixma_mp{150,810}.c:
-	1 bit B/W lineart for pixma_mp150 and pixma_810 subdrivers.  
-
-2012-02-06 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_mp150, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	New scanner Canon PIXMA MX360.
-
-2012-02-03 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma.h: set PIXMA_VERSION_{MAJOR,MINOR,BUILD} to 0.16.3.
-
-2012-02-03 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/scripts/pixma_gen_options.py: script to generate 
-	backend/pixma_sane_options.c and backend/pixma_sane_options.h 
-	from pixma.c. Found in old pixma project archive file
-	http://home.arcor.de/wittawat/pixma/mp150-0.13.1.tar.bz2.
-
-2012-01-31 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma.[ch], backend/pixma_imageclass.c, backend/pixma_mp[17]50.c,
-	backend/pixma_mp730.c, backend/pixma_mp810.c: modify dpi_list dependent on
-	different scanner capabilities for normal (flatbed) and ADF/TPU modes.    
-
-2012-01-23 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_mp150, doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	New scanner PIXMA MX880 Series.
-
-2012-01-21 Ruediger Meier <sweet_f_a@gmx.de>
-	* backend/canon_dr.h, backend/cardscan.h, backend/dll.c,
-	backend/epjitsu.h, backend/fujitsu.h, backend/gt68xx.c,
-	backend/kodak.h, backend/microtek2.h, sanei/sanei_access.[hc]: fix and
-	cleanup portable PATH_SEP and DIR_PATH defines
-	* sanei/sanei_scsi.c, tools/sane-find-scanner.c, configure.in,
-	sane/config.h.in: use the right scsi header on win32.
-
-2012-01-17 Rolf Bensch <rolf at bensch hyphen online dot de>
-	* backend/pixma_mp810.c: Flatbed mode supports max. 4800 dpi.
-
-2012-01-14 m. allan noah <kitno455 at gmail dot com>
-	* backend/Makefile.{am,in}, backend/pixma.[ch],
-	backend/pixma_common.c, backend/pixma_mp[17]50.c,
-	backend/pixma_mp810.c, backend/pixma_rename.h,
-	doc/descriptions/pixma.desc, doc/sane-pixma.man:
-	Updated Pixma backend from Gernot Hassenpflug.
-
-2012-01-03 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_gl646.c backend/genesys_gl847.c
-	backend/genesys_gl43.[ch]: fixd scan line number for gl646 CCD
-	scanners, improved led calbration for gl847 CIS scanners and G4050 XPA
-	work progress.
-
-2011-12-30 Alex Belkin <abc at telekom.ru>
-	* backend/xerox_mfp.conf.in doc/descriptions/xerox_mfp.desc: usb id
-	for Samsung SCX-3205W, reported by sane tester.
-
-2011-12-27 Chris Bagwell <chris at cnpbagwell dot com>
-	* configure.in, configure, config.h.in, sanei_usb.c,
-	check-usb-chip.c, sane-find-scanner.c: Add check for
-	libusb-win32 which is API compatible with libusb-0.1
-	but has different header file name to prevent conflicts
-	with Windows own usb.h.  Since libusb-1.0 is scheduled to
-	support Windows (not a forked version), it will probably
-	work as-is if user has pkg-config installed under mingw.
-
-2011-12-20 m. allan noah <kitno455 at gmail dot com>
-	* backend/fujitsu*, doc/descriptions/fujitsu.desc: backend v109
-	- added some MS and INQ information
-	- increased default buffer size for later machines in config file
-	- renamed new fi-6xx0Z models
-
-2011-12-18 Chris Bagwell <chris at cnpbagwell dot com>
-	* doc/descriptions-external/epkowa.desc: update for new iScan
-	2.28.1 release from Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>.
-
-2011-11-29 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_low.h backend/genesys_devices.c
-	backend/genesys_gl847.c: genesys backend build 67, gl847 led and
-	shadingcalibration improvements.
-
-2011-11-21 m. allan noah <kitno455 at gmail dot com>
-	* backend/fujitsu.[ch]: backend v107 and v108
-	- M3091 does not support scanner_control(adf)
-	- Correct buffer overflow in read_from_3091duplex()
-	- sane_read() now always calls read_from_*()
-	- read_from_*() are callable when there is no data, and read to eof
-	- sane_read() will keep alternate duplex reads to similar length
-	- Added debugging statements
-	- Corrected comments
-	- Updated Copyright
-	- merged x/y resolution options
-	- moved page width/height to start of geometry group
-	- use mode to pick resolution list v/s range
-	- improved M3091 resolution choices
-
-2011-11-20 Chris Bagwell <chris at cnpbagwell dot com>
-	* epson2-commands.c: Include <sys/types.h> to resolve u_long.
-	* epson2.c, magicolor.c, xerox_mfp-tcp.c: Include <sys/types.h>
-	and to <sys/socket.h> for anyone using setsockopt().
-	* sanei_tcp.h: Include <sys/types.h> since ssize_t is referenced.
-	* sanei_usb.c: FreeBSD version checks.  All changes in this
-	batch come from FreeBSD ports patches. Bug #312503.
-
-2011-11-20 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_*.[ch] doc/descriptions/genesys.desc: build
-	66. Add hp N6310 and 4850C devices. Fix gl847 calibration. 
-	GL843 XPA support groundwork.
-
-2011-11-14 Chris Bagwell <chris at cnpbagwell dot com>
-        * doc/descriptions-external/epkowa.desc: update for new iScan
-	release from Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>.
-
-2011-11-10 Chris Bagwell <chris at cnpbagwell dot com>
-	* include/sane/sanei_thread.h, sanei/sanei_thread.c:
-	Make SANE_Pid map to pthread_t to be compilable
-	on platforms where pthread_t is not a integer;
-	namely mingw.
-	* configure, configure.in, include/sane/config.h.in,
-	lib/Makefile.am, lib/Makefile.in, lib/sleep.c: Add
-	a sleep() replacement function; mostly for mingw.
-	* backend/epson2-ops.c, backend/epson2.c, umax_pp_low.c:
-	Revert some broken sleep()->usleep() conversions.
-
-2011-11-09 Chris Bagwell <chris at cnpbagwell dot com>
-	* configure, configure.in, acinclude.m4:
-	Convert enable_dynamic to "auto" behavior. Previous
-	attempt was resulting in it always defaulting to
-	"yes" and user had to use --disable-dynamic on
-	platforms that couldn't support it.
-	* backend/epson2-ops.c, backend/epson2.c, backend/epson2.h:
-	minor portability changes to epson2.  #ifdef some optional
-	headers and use usleep() instead of sleep(). Switch to
-	sanei_udb_set_noblock().
-
-2011-11-08 Chris Bagwell <chris at cnpbagwell dot com>
-	* backend/Makefile.*: Finish preload linking fix.
-	dll.c was being linked in with convienence library.
-	If it needs to have two behaviors then we need to
-	create two libraries.  Now preloading is working in
-	libsane.so again and disabled in libsane-dll.so.
-	* configure.in, configure, README, */Makefile.*:
-	Update README to describe use of BACKENDS and
-	PRELOADABLE_BACKENDS to limit backend compiles.
-	Also, mark those in configure.in as variables so
-	they show up in "configure --help".
-	Add back the useful --disable-dynamic and
-	--disable-preload that appear to have been removed
-	at some point but are documented in README.
-	* README.windows: Update info to include mingw
-	references.
-
-2011-11-07 Chris Bagwell <chris at cnpbagwell dot com>
-	* ltmain.sh: Disable sane's soname libtool hack for
-	mingw platform so that DLL's will be created for
-	each backin built; just like on unix platforms.
-	* backend/Makefile.*: Add missing sanei_magic.lo to
-	libsane backend.
-	* sanei/sanei_tcp.c sanei/sanei_udp.c include/sane/sanei_udp.h:
-	Add WSAStartup()/WSACleanup() calls on mingw to get ws2_32
-	working. Make util function to set sockets to nonblocking
-	and make work in unix and mingw platforms.
-
-2011-11-06 Chris Bagwell <chris at cnpbagwell dot com>
-	* INSTALL, Makefile.am, */Makefile.in, compile, config.guess,
-	config.sub, configure, depcomp, include/sane/config.h.in,
-	install-sh, ltmain.sh, libtool.m4, ltversion.m4, missing,
-	mkinstalldirs: Update files using autoconf 2.68 and libtool 2.4.
-	* configure.in, frontend/scanimage.c, include/sane/sanei_tcp.h,
-	include/sane/sanei_udp.h, lib/inet_ntop.c, lib/inet_pton.c,
-	sanei/sanei_tcp.c, sanei/sanei_udp.c, tools/sane-find-scanner.c:
-	Add check for winsock2. Add ws2_32 library when found. Look
-	for getuid and getpass since not on mingw.
-	* lib/sigprocmask.c: Comment out logic on windows for now since
-	it doesn't work. At least it will compile.
-	* lib/syslog.c: Add a replacement syslog for at least mingw.
-	* testsuite/Makefile.*: Use $(EXEEXT) so that scanimage can
-	be ran on windows.
-	* backend/Makefile.*, backend/dll.c: Modify dll backend
-	so that libsane-dll does not reference preloaded backends
-	symbols since its not linking them in.  Only libsane
-	references preloaded backend symbols and also links them
-	in now.
-
-2011-11-05 Chris Bagwell <chris at cnpbagwell dot com>
-	* lib/vsyslog.c, frontend/scanimage.c, include/sane/sanei_tcp.h
-	include/sane/sanei_udp.h, lib/inet_ntop.c, lib/inet_pton.c,
-	sanei/sanie_init_debug.c, sanei/sanei_scsi.c, sanei/sanei_tcp.c,
-	sanei_udp.c, sanei_usb.c: mingw32 compile fixes. Mostly its
-	not including header files that windows doesn't have and
-	add winsock.h as needed.  Also, do not use signals windows
-	doesn't have as well.
-
-2011-11-02 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_*.[ch] backend/Makefile.am backend/Makefile.in:
-	genesys_gl841.h creation and genesys backend code cleanup
-
-2011-11-01 m. allan noah <kitno455 at gmail dot com>
-	* backend/canon_dr.[ch]: backend v39
-	- DR-2580C pads the backside of duplex scans
-
-2011-11-01 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_gl124.c backend/genesys_gl646.c
-	backend/genesys_gl841.c backend/genesys_gl843.c backend/genesys_gl847.c
-	backend/genesys_low.c backend/genesys_low.h: do <sys/types.h> include
-	in a clean way
-
-2011-10-30 Mattias Ellert <mattias.ellert@fysast.uu.se>
-	* backend/kvs40xx.h: Use portable endian macro from config.h
-	* backend/kodak.c: Use more precise path to internal headers
-	* backend/canon630u.c, backend/genesys_gl124.c,
-	  backend/genesys_gl646.c, backend/genesys_gl841.c,
-	  backend/genesys_gl843.c, backend/genesys_gl847.c,
-	  backend/genesys_low.c, backend/hp3900_rts8822.c,
-	  backend/rts88xx_lib.c, backend/xerox_mfp.c, sanei/sanei_pio.c:
-	  Include <sys/types.h> for definition of u_long on MacOS X
-	* po/sv.po: Update Swedish translation
-
-2011-10-21 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys.h backend/genesys_devices.c
-	backend/genesys_gl*.c backend/genesys_gl843.h
-	backend/genesys_low.[ch], doc/sane.man doc/sane-genesys.man
-	doc/descriptions/genesys.desc:
-	1200 and 2400 dpi support for G4010/G4050
-
-2011-10-19 Alex Belkin <abc at telekom.ru>
-	* backend/xerox_mfp.conf.in doc/descriptions/xerox_mfp.desc: usb id
-	for Samsung CLX 3185, reported by John Dignum.
-
-2011-10-01 Alex Belkin <abc at telekom.ru>
-	* backend/xerox_mfp.conf.in doc/descriptions/xerox_mfp.desc: usb id
-	for Samsung SCX-4828FN or SCX-4x28 Series, reported by Patrice
-	Levesque.
-
-2011-09-16 Nils Philippsen <nils@redhat.com>
-	* doc/sane-hpljm1005.man doc/sane-p5.man: use groff escape sequences in
-	man pages
-	* AUTHORS NEWS doc/descriptions.txt doc/*/*.CHANGES
-	doc/plustek/Plustek-*.txt doc/u12/U12.*
-	doc/umax/sane-umax-parport-doc.html: encode to UTF-8
-	* tools/sane-config.in: use pkg-config
-	* doc/descriptions/epson2.desc backend/epson_usb.c: add USB id for Epson
-	Stylus SX125
-
-2011-09-07 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_devices.c backend/genesys_low.h
-	backend/genesys_gl124.c: fix button mapping for LiDE 210
-
-2011-08-25 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_gl646.c backend/genesys_low.c backend/genesys_low.h
-	backend/genesys.c: add a no move during shading calibratiob flag, and
-	use it for MD5345
-
-2011-08-23 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_gl847.c backend/genesys_low.c backend/genesys_low.h
-	backend/genesys.c backend/genesys_gl124.c backend/genesys_gl843.c:
-	make sure to use the fatest speed when parking, use lowest sensor dpi
-	as default resolution
-
-2011-08-22 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys*.[ch]: enable calibration for G4050/G4010 and
-	minor code refactors
-
-2011-08-05 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_low.c backend/genesys_conv.c:
-	fixed generic calibration cache for CCD case and when yres is higher
-	than sensor's maximum one. Fixed lineart data enlarging when yres is
-	higher than xres.
-
-2011-07-31 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_gl646.c backend/genesys_gl841.c
-	backend/genesys_gl843.c backend/genesys_gl847.c backend/genesys_gl124.c
-	backend/genesys_low.[ch]: is_compatible cache refactor for gl843,
-	gl847 and gl124
-
-2011-07-31 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_gl124.[ch] backend/genesys_gl843.[ch]:
-	use sanei_genesys_compute_dpihw instead of specific function.
-
-2011-07-15 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_devices.c backend/genesys_gl646.c
-	backend/genesys_gl847.c: re-tune scan area of MD5345/MD6228.
-	parking function clean up.
-
-2011-07-15 Stéphane Voltz <stef.dev@free.fr>
-	* backend/lexmark.c backend/lexmark_low.c: increase tolerance when
-	detecting the 'home' dot.
-
-2011-07-07 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c: fixed incorrect image height for sheetfed
-	scanners
-
-2011-07-07 m. allan noah <kitno455 at gmail dot com>
-	* po/pt.po: updated translation from cncsolutions.com.br
-
-2011-07-06 m. allan noah <kitno455 at gmail dot com>
-	* backend/canon_dr.[ch]: backend version 38
-	- initial support for DR-5020
-	- use ppl_mod instead of Bpl_mod, apply to all modes
-	- invert logic of read_panel tracking
-	- add ability to disable read_panel()
-	- automatically disable read/send_panel if unsupported
-	* doc/descriptions/canon_dr.desc: status of DR-5020
-
-2011-07-06 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_low.h backend/genesys_gl847.c backend/genesys.c 
-	backend/genesys_gl124.c backend/genesys_gl843.c backend/genesys_gl646.c
-	backend/genesys_gl841.c: improve 4800 dpi quality for LiDE 200 by
-	increasing the number of lines scan for shading
-
-2011-07-05 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_low.h backend/genesys_gl847.c backend/genesys_devices.c
-	backend/genesys.c backend/genesys_gl124.c backend/genesys_gl843.c
-	backend/genesys_gl646.c backend/genesys_gl841.c: make 4800 pdi work
-	for Lide200. Calibration cache file leak fix.
-
-2011-06-30 Olaf Meeuwissen <olaf.meeuwissen@avasys.jp>
-	* frontend/scanimage.c: plug a memory leak in batch mode.
-
-2011-06-24 Julien Blache <jb@jblache.org>
-	* tools/sane-desc.c: add a wildcard rule for Epson SCSI scanners
-	with a model string beginning with "SCANNER". Idea from Olaf
-	Meeuwissen.
-
-2011-06-21 Julien Blache <jb@jblache.org>
-	* doc/descriptions/epson2.desc: added SCSI IDs for the GT-10000+,
-	reported by Simon Becherer.
-
-2011-06-16 Alex Belkin <abc at telekom.ru>
-	* backend/xerox_mfp.conf.in doc/descriptions/xerox_mfp.desc: usb id
-	for Samsung CLX-216x Series, tested with CLX-2160, reported by Malte
-	Starostik <malte@malte.homeip.net>
-
-2011-06-15 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys_gl847.c: lineart fix
-
-2011-06-13 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_devices.c backend/genesys_gl646.c 
-	backend/genesys_gl646.h doc/descriptions/genesys.desc
-	doc/sane-genesys.man: add full HP2400 support thanks a patch from
-	Alexey Osipov <simba@lerlan.ru>
-
-2011-06-13 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys*.[ch] : rework of gl847 to reach 2400 dpi for 
-	LiDE 100 and 4800 dpi for LiDE 200
-
-2011-06-10 Stéphane Voltz <stef.dev@free.fr>
-	* backend/lexmark_models.c: fix missing motor initialization
-
-2011-06-07 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys.c backend/genesys.h backend/genesys_conv.c:
-	add blank page skipping and rotation detection options
-
-2011-06-06 m. allan noah <kitno455 at gmail dot com>
-	* docs/*kvs40xx*, backend/kvs40xx*: New Panasonic KV-S40xx/70xx
-	backend, originally by Panasonic Russia.
-	* acinclude.m4, */Makefile.am, configure*: build new kvs40xx backend
-	* po/POTFILES: add kvs* backends
-	* po/.gitignore: ignore sane-backends.pot
-	* include/sane/sanei_magic.h, sanei/sanei_magic.c:
-	add new blank detection and rotation detection routines
-	* backend/kvs1025*, backend/Makefile*: add support for sanei_magic
-
-2011-06-02 Julien Blache <jb@jblache.org>
-	* tools/sane-desc.c: add udev+acl output mode, udev rules using ACLs
-	for the scanner group instead of making the device root:scanner 0664.
-	This is designed to help with MFPs and play nice with ConsoleKit.
-
-2011-04-20 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_low.c backend/genesys_devices.c
-	backend/genesys.conf.in: add Xerox 2400 onetouch model and improve
-	big endian handling
-
-2011-03-19 Julien Blache <jb@jblache.org>
-	* tools/sane-desc.c: move away from using power/level for disabling
-	USB autosuspend/power management and use power/control if available.
-
-2011-03-18 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_low.c backend/genesys.c : rewrite big endian fixes 
-	for gl847/gl124 based scanners. Improve calibration cache file handling.
-
-2011-03-17 Stéphane Voltz <stef.dev@free.fr>
-	* backend/genesys_low.c: big endian fixes for gl847/gl124 based 
-	scanners. Patch by Olaf Zimmermann <oez@pt.lu> .
-
-2011-03-15 Stéphane Voltz <stef.dev@free.fr>
-	* backend/Makefile.in backend/canon_dr.[ch]: fixes to allow full
-	static build under cygwin
-
-2011-03-12 Troy Rollo <sane@troy.rollo.name>
-	* backend/hp3500.c: Remove interdependency between contrast and
-	  brightness.
-
-2011-03-12 Julien Blache <jb@jblache.org>
-	* doc/scanimage.man: batch-start defaults to 1 if not specified,
-	  not 0. Reported by Jakub Wilk <jwilk@debian.org>.
-
-2011-03-12 Troy Rollo <sane@troy.rollo.name>
-	* backend/hp3500.c: Add grayscale and line art scanning. Add contrast
-	  and brightness controls which influence the calibration data provided
-	  to the scanner.
-
-2011-03-06 Ilia Sotnikov <hostcc@gmail.com>
-	* backend/hp5590.c, backend/hp5590_cmds.{c,h}: in ADF modes the device can
-	  scan up to 14", which is usually bigger than what scanner reports back
-	  during initialization
-	* backend/hp5590.c, backend/hp5590_cmds.{c,h}, backend/hp5590_low.{c,h}:
-	  fixed detection of HP4500 devices (tested) and HP5550 (untested) - these
-	  devices need no reading USB-in-USB acknowledgement after each command. To
-	  achieve that, proto_flags are passed down to low-level functions. These
-	  flags are taken from device descriptions
-	* backend/hp5590_low.{c,h}: fixed up get_status command - index should
-	  be 0x00, not 0x20
-	* backend/hp5590.c: bump up the backend version
-
-2011-03-04 Julien Blache <jb@jblache.org>
-	* frontend/saned.c: define PATH_MAX if needed, fixes build on
-	HURD. Patch from Pino Toscano <toscano.pino@tiscali.it>.
-
-2011-02-16 Julien Blache <jb@jblache.org>
-	* backend/v4l.c, backend/v4l.h: fix build with libv4l 0.8.3+.
-
-2011-02-13 m. allan noah <kitno455 at gmail dot com>
-	* doc/releases.txt: minor updates
-
-Older entries can be found in ChangeLog-1.0.22.
diff --git a/ChangeLog-1.0.3 b/ChangeLog-1.0.3
deleted file mode 100644
index dad5f74..0000000
--- a/ChangeLog-1.0.3
+++ /dev/null
@@ -1,791 +0,0 @@
-2000-08-12  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* configure.in aclocal.m4 configure NEWS: New version 1.0.3.
-	Updated release date and removed freeze markers.
-
-2000-08-12  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-	* changed tools/sane-desc.el sane.gif->sane.png
-
-2000-08-10  Henning Meier-Geinitz <hmg@gmx.de>
-        * backend/avision.c: Changed // comment to /* */. This broke 
-	  compilation on AIX cc, Irix cc and Sun cc.
-	
-2000-08-10  Rene Rebe <rene.rebe@myokay.net>
-	* backend/avision.h: some updates + cleanups
-	* backend/avision.c: use of DB () and sane_config_read ()
-	  general cleanups (sorry for the big commit - I used Emacs auto-ident
-	  for some regions ...)
-	
-2000-08-07  Henning Meier-Geinitz <hmg@gmx.de>
-        
-	* README.irix: Removed text about library version problems.
-	* README.linux: Added comment about idescsi problems.
-	* ltmain.sh: Changed Irix library version system (from Oliver Rauch).
-	  This should fix the library version problems under Irix.
-	* backend/Makefile.in: Added all files in lib/ to LIBLIB. This fixes
-	  a bug concerning linking with external frontends.
-	
-2000-08-06  Henning Meier-Geinitz <hmg@gmx.de>
-        
-	* backend/plustek.c: Removed "const" from function header. This fixes
-	  a compilation problem on aix/cc.
-	* configure configure.in: Additional warnings are now disabled by
- 	  default for the 1.0.3 realease.
-
-2000-08-06  Henning Meier-Geinitz <hmg@gmx.de>
-        
-	* backend/hp4200.desc: Added description file for HP 4200 USB
-	  scanner.
-
-2000-08-05  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* AUTHORS: Added link to PROJECTS.
-	* PROJECTS: Removed frontends that are included in the SANE 
-	  distribution. Added frontends: sanecgi, scanadf. Removed backends
- 	  Kodak DS-20 (old camera, no specs available, not interested anymore),
- 	  Logitech (old handscanner, author not interested anymore). Added
- 	  backends as6e (Artec AS6E), bh (Bell and Howell Copiscan), lhii
-	  (handheld scanner support), Mustek USB, nec (NEC  PC-IN500/4C),
-	  v4l2 (Video for Linux 2). Added/updated information about SANE
-	  ports: BeOS, OS/2, win32. Added Information about WinSANE and
-	  TWAIN interface for xsane-win32. Added link to AUTHORS and README.
- 	  Changed format. Added explanation for statuses.
-	* README: Added link to PROJECTS.
-	* README.irix: New file. Information about the library version and
-	  jpeg library problems.
-	* backend/as6e.desc: New description file for the Artec AS6E.
-	* backend/bh.desc: New description file for Bell and Howell Copiscan
-	  scanners.
-
-2000-08-03  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* PROJECTS: Removed backends that are included in SANE. Updated
-	  info for Primax. Added HP 4200.
-
-2000-08-02  Henning Meier-Geinitz <hmg@gmx.de>
-	* NEWS: Updated backend versions.
-	* backend/hp*.c: Changed include statements from #include <sane/...>
- 	  to #include "sane/...".
-
-2000-08-02  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* backend/v4l.c: Check return value of ioctl() calls.  Use DBG()
-	instead of syslog() report progress.  Removed redundant check for
-	trailing newline in config file as we are now using
-	sanei_config_read().  Remove ioctl(VIDIOCSYNC), as it hangs on my
-	v4l2 device.
-
-2000-07-31  Henning Meier-Geinitz <hmg@gmx.de>
-	* backend/mustek.*: Update to Mustek backend 1.0-96. Fixed Problem
-	  with detecting some three-pass scanners.
-	
-2000-07-31  Henning Meier-Geinitz <hmg@gmx.de>
-        * doc/sane.tex: Chapter 4 said, that this was standard version
-	  0 (draft). Changed to 1 and removed "(draft)".
-	
-2000-07-31  Henning Meier-Geinitz <hmg@gmx.de>
-        * sanei/sanei_DomainOS.c sanei/sanei_ab306.c sanei/sanei_codec_ascii.c
- 	  sanei/sanei_codec_bin.c sanei/sanei_config.c sanei/sanei_config2.c
-	  sanei/sanei_constrain_value.c sanei/sanei_init_debug.c 
-	  sanei/sanei_load_values.c sanei/sanei_net.c sanei/sanei_pa4s2.c
-	  sanei/sanei_pio.c sanei/sanei_save_values.c sanei/sanei_scsi.c
-	  sanei/sanei_thread.c sanei/sanei_wire.c sanei/test_wire.c: Changed 
-	  include statements from #include <sane/...> to #include "sane...".
-	* PROBLEMS: Updated Mustek entry.
-	* TODO: Updated some entries that are done.
-	* backend/avision.c backend/plustek.c: Changed include statements from
- 	  #include <sane/...> to #include "sane...".
-	
-2000-07-30  Peter Kirchgessner <peter@kirchgessner.net>
-
-        * backend/hp.desc: Change Parallel to Parport in description
-
-2000-07-30  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-	* changed all <config.h> to "config.h" in lib/*.c
-
-2000-07-30  Henning Meier-Geinitz <hmg@gmx.de>
-	
-	* backend/mustek.*: Update to Mustek backend 1.0-95. Changed from
-	  wait() to waitpid() and removed unused code.
-	* configure configure.in backend/m3096g.c backend/sp15c.c: Reverted
-	  the V_REV patch. V_REV should not be used in backends.
-
-2000-07-30  Henning Meier-Geinitz <hmg@gmx.de>
-        
-	* configure configure.in: Add V_REV to CPPFLAGS (only V_MAJOR and 
-	  V_MINOR were defined until now).
-	* doc/.cvsignore: Added sane-coolscan.5.
-
-2000-07-29  Henning Meier-Geinitz <hmg@gmx.de>
-	
-	* backend/sp15c.c backend/m3096g.c: Replace fgets with 
-	  sanei_config_read, return V_REV as part of version_code string 
-	  (patch from Randolph Bentson).
-
-2000-07-29  Chris Pinkham <cpinkham@infi.net>
-
-	* backend/artec.c: Changed include statements from #include <sane/...>
-	  to #include "sane...".
-
-2000-07-29  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* backend/GUIDE: Added some comments about portability and
-	  documentation.
-	* backend/abaton.c backend/agfafocus.c backend/apple.c 
-	  backend/canon.c backend/coolscan.c backend/dc210.c backend/dc25.c
-	  backend/dll.c backend/dmc.c backend/microtek.c backend/microtek2.c
- 	  backend/microtek2.c backend/mustek_pp.c backend/net.c backend/pint.c
-	  backend/pnm.c backend/qcam.c backend/ricoh.c backend/s9036.c
-	  backend/sane_strstatus.c backend/sharp.c backend/snapscan.c 
-	  backend/st400.c backend/stubs.c backend/tamarack.c backend/v4l.c:
-	  Changed include statements from #include <sane/...> to 
-	  #include "sane...".
-	* backend/avision.c backend/dc25.c: Use DBG(0, ...) instead of
- 	  fprintf (stderr, ...)
-	* backend/avision.c backend/canon-sane.c backend/coolscan.c
-	  backend/dc25.c backend/microtek.c backend/microtek2.c
- 	  backend/st400.c: Use sanei_config_read() instead of fgets().
-	* backend/coolscan.desc backend/microtek.desc backend/microtek2.desc
-	  backend/st400.desc: Added :interface and :manpage entries.
-	* backend/nec.desc: Status is beta now (was: new). Fixed typo.
-	* doc/canon.README: Removed, because the information is included in
- 	  the manpage now.
-	* doc/Makefile.in: Added sane-coolscan to list of mapages to install.
-	* README: Added Link to coolscan manpage.
-	* backend/mustek.*: Update to Mustek backend 1.0-94. Fixed the
-	  #include <sane/...> bug.
-	
-2000-07-29  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Changed the include statements for SANE includes
-	  from #include <...> to #include "..."
-
-2000-07-28  Chris Pinkham <cpinkham@infi.net>
-
-	* backend/aretc.c: Corrected sane_close() bug.  Converted to use
-	  sanei_config_read() instead of fgets().
-	* backend/artec.desc: Changed interface entry to "Parport" vs "Parallel"
-
-2000-07-28  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* ltmain.sh: Added underscore to sed expression for removing
- 	  backendname from soname (needed for libsane-mustek_pp).
-	* sane.lsm: Added keywords for new backends.
-	* lib/isfdtype.c: Added implementation for platforms that lack
-	  isfdtype() (mostly from Olly Betts).
-	* backend/v4l.desc: Activated man page entry.
-	* backend/mustek.* doc/sane-mustek.man: Update to Mustek backend
- 	  1.0-93. Fixed color scanning for Paragon 600 II N firmware 1.02.
-	  Fixed possible segfault in sane_control_option() when info is 0.
-	  Removed some compiler warnings.
-	* NEWS: Updated Mustek backend version, added Artec, fixed typo
- 	* doc/Makefile.in doc/sane-snapscan.man doc/sane-canon.man README
- 	  backend/snapscan.desc backend/canon.desc backend/.cvsignore:
- 	  Added manpage for canon and snapscan backends. Added :interface
- 	  entry for canon.
-	* backend/canon-sane.c: Fixed possible segfault in 
-	  sane_control_option() when info is 0.
-	
-2000-07-22  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* backend/v4l.c: Bugfix: Avoid crashing in
-	sane_control_option() when last param is NULL.
-
-2000-07-25  Chris Pinkham <cpinkham@infi.net>
-
-	* backend/artec.c: Updated to v0.5.14. Added "Negative" mode as option
-	  even when in color/greyscale modes.  Fix sane_close() bug.  Fixed bug
-	  in sane_get_option_descriptor that allowed invalid option number.
-	  Changed numerous int variables to size_t to eliminate warnings.
-	  Changed various elements in ARTEC_Scanner structure to SANE_Int
-	  instead of int.  Replaced all fprintf() statements with DBG().
-	* backend/artec.desc Added interface entries.
-
-2000-07-26  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Fixed problem with Perfection610 scanner.
-	  The variable s->color_shuffle_line was not correctly initialized.
-	* backend/epson.desc: Updated version number
-
-2000-07-26  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-	* added info about variable scsi buffer sizes defined by backends
-	  umax, mustek, sharp (via sanei_scsi_open_extended()) to
-	  man sane-scsi
-
-2000-07-25  Henning Meier-Geinitz <hmg@gmx.de>
-        
-	* backend/snapscan.c: Use DBG(0, ...) instead of fprintf (stderr, ...) 
-	* backend/abaton.c backend/agfafocus.c backend/apple.c backend/dc210.c
- 	  backend/dll.c backend/dmc.c backend/microtek2.c backend/pint.c
-	  backend/qcam.c backend/ricoh.c backend/s9036.c backend/snapscan.c
-	  backend/tamarack.c: Use sanei_config_read instead of fgets.
-	* backend/dc210.c backend/microtek.c backend/pnm.c: Added 
-	  #include <sane/config.h>.
-	* backend/dc25.c backend/m3096.c backend/m3096g.c backend/sp15.c
- 	  backend/st400.c: Moved #include <sane/config.h> to the beginning.
-	* AUTHORS: Changed agfa to agfafocus.
-	
-2000-07-25  Peter Kirchgessner <peter@kirchgessner.net>
-
-        * backend/hp.c hp-scl.c hp-option.c hp-handle.c hp-accessor.c
-          remove inline stuff
-
-2000-07-25  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* configure.in configure include/sane/config.h.in 
-	  include/sane/sanei_backend.h: Moved test for u_int* to configure.
-	* include/sane/sanei_debug.h: Remove #warning (Irix compiler doesn't
-	  like this)
-	* backend/mustek.* doc/sane-mustek.man: Update to Mustek backend
-	  1.0-92. Changed linedistance correction for MFS-8000SP. Fixed 
-	  margin positions and removed warning for MFS 6000CX. Warning is
- 	  printed in debug level 0 again. Removed test for gamma length. 
-	  Fixed (partly) ADF handling. Man page update. More details in
-	  mustek.CHANGES.
-	* NEWS: updated for new Mustek backend version.
-
-2000-07-20  Peter Kirchgessner <peter@kirchgessner.net>
-        * backend/hp.c: use sanei_config_read() instead of fgets
-        * backend/hp-scl.c: Dont write chars < 32 to DBG
-
-2000-07-20  Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* backend/sharp.c: removed fgets-call + minor bugfix
-	* backend/sharp.desc: added entry ":manpage"
-	* sanei/sanei_scsi.c: added missing dummy function 
-	  sanei_scsi_req_flush_all_extended
-
-2000-07-18  Henning Meier-Geinitz <hmg@gmx.de>
-        
-	* configure.in configure: Fixed --enable-warnings to work as 
-	  advertised.
-
-2000-07-18  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* configure.in configure include/sane/config.h.in lib/Makefile.in
-	lib/getenv.c lib/isfdtype.c lib/vsyslog.c
-	sanei/sanei_init_debug.c: OS/2's getenv() is useless, OS/2,
-	Solaris and AIX is missing isfdtype() and AIX is missing
-	vsyslog().  Implement replacement functions.
-
-2000-07-17  Henning Meier-Geinitz <hmg@gmx.de>
-        
-	* backend/snapscan.c backend/snapscan-scsi.c: Replace C++ comment 
-	  with C comment.
-
-2000-07-17  Henning Meier-Geinitz <hmg@gmx.de>
-        
-	* include/sane/sanei_backend.h: Replace C++ comment with C comment.
-	
-2000-07-17  Henning Meier-Geinitz <hmg@gmx.de>
-        
-	* backend/musteka4s2.desc: Removed. Now that the mustek_pp
-	  backend is part of SANE musteka4s2 is no longer neccessary.
-	  If somebody really wants to use the old musteka4s2 sources
-	  he will find a link on the mustek_pp WWW page.
-
-2000-07-16  Jochen Eisinger <jochen.eisinger@gmx.net>
-
-	* backend/mustek_pp.c: Replaced fgets() with sanei_config_read()
-
-2000-07-16  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* include/sane/sanei_debug.h:  Fix typo.
-
-2000-07-15  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Replaced fprintf() with DBG()
-
-	* backend/epson.desc: updated version number
-
-2000-07-15  Henning Meier-Geinitz <hmg@gmx.de>
-	
-        * backend/dc210.c: Replaced fprintf (stderr, ...)  by DBG ().
-
-2000-07-15  Henning Meier-Geinitz <hmg@gmx.de>
-	
-        * doc/Makefile.in doc/sane-dc210.man doc/sane-v4l.man 
-	  doc/.cvsignore: Added manpages for dc210 and v4l. These
-	  are just standard manpages. Please check and update them.
-
-	* README: Added dc210, v4l and mustek_pp entries.
-
-2000-07-15  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* backend/mustek.* doc/sane-mustek.man: Update to Mustek backend
- 	  1.0-90. Fixed linedistance-handling for Paragon 8000SP. Fixed
-	  mustek.conf port entry. Updated man page (parallel port 
-	  scanners and 600 II N).
-
-	* NEWS: Updated (mustek backend version 1.0-90)
-
-	* backend/dll.conf: Commented out mustek_pp on behalf of the
-	  maintainer
-
-	* doc/.cvsignore: added sane-mustek_pp.5, sane-plustek.5 and
-	  sane-st400.5
-	  
-2000-07-15  Andreas Rick <andreas.rick@free.fr>
-
-	* backend/coolscan.c: added missing initialization in 
-	coolscan_read_data_block()	
-
-2000-07-13  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* AUTHORS backend/dll.conf backend/Makefile.in backend/mustek_pp.c
-	backend/mustek_pp.desc backend/mustek_pp.h backend/mustek_pp.conf
-	doc/Makefile.in doc/sane-mustek_pp.man: New backend for
-	ScanExpress 6000 P, ScanMagic 4800 P, 600 III EP Plus, ScanExpress
-	600 SEP and MD9848 from Jochen Eisinger.
-
-	* backend/snapscan-310.c backend/snapscan-scsi.c
-	backend/snapscan-sources.c backend/snapscan-sources.h
-	backend/snapscan-utils.c backend/snapscan.c backend/snapscan.desc
-	backend/snapscan.h: New snapscan backend version dated 20000514
-	from Steve Underwood.
-
-	* backend/microtek2.h backend/microtek2.c backend/microtek2.desc:
-	Add support for ScanMaker X6USB.  Patch from Oliver Neukum.
-
-	* README.os2 configure.os2 include/sane/sanei_backend.h
-	sanei/os2_srb.h sanei/sanei_init_debug.c backend/dll.c
-	backend/net.c frontend/saned.c : Some of the OS/2 patches from
-	Yuri Dario.
-
-	* frontend/saned.c: Correct cancel handling in saned.  Patch from
-	Jochen Eisinger.
-
-2000-07-12  Ingo Wilken <Ingo.Wilken@informatik.uni-oldenburg.de>
-
-	* frontend/scanimage.c, doc/scanimage.man: Support for
-	  environment variable SANE_DEFAULT_DEVICE.
-	
-2000-07-11  Ingo Wilken <Ingo.Wilken@informatik.uni-oldenburg.de>
-
-	* backend/st400.c, backend/st400.conf, backend/st400.h,
-	doc/sane-st400.man: new files
-	* backend/st400.desc: updated information
-	* README, backend/Makefile.in, doc/Makefile.in: added st400 backend
-	* AUTHORS: added myself as maintainer of st400 backend
-	
-2000-07-09  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* doc/sane-hp.man: Updated manual page (scantype --> scan source)
-
-2000-07-09  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* backend/hp-handle.c, hp-scl.c, hp-scl.h, hp.c, hp.h, hp-option.c
-              hp-option.h: Add wait for front panel button
-
-	* backend/hp.desc: Changed version to 0.88
-
-2000-07-09  Andreas Rick <andreas.rick@free.fr>
-
-	* AUTHORS: added myself as maintainer of the coolscan backend
-
-	* README: added Coolscan page link
-
-	* doc/sane-coolscan.man: first version of Coolscan manpage
-
-2000-07-09  Gerhard Jaeger <g.jaeger@earthling.net>
-
-	* AUTHORS: added myself as maintainer of the Plustek backend
-
-	* README: added Plustek manpage entry
-
-	* backend/plustek.desc: updated description
-
-	* backend/plustek.c backend/plustek.h backend/plustek-share.h 
-	  backend/plustek.conf: added Plustek backend code 
-
-	* backend/Makefile.in doc/Makefile.in backend/dll.conf: 
-	  added plustek entries
-
-	* doc/sane-plustek.man: added manpage for Plustek backend
-
-2000-07-09  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* sanei/sanei_thread.c: Add required include files to get this to
-	compile almost without warnings on Unix.
-
-	* frontend/Makefile.in frontend/scanimage.c frontend/stiff.h
-	frontend/stiff.c doc/scanimage.man: Add 16 bit support and new
-	option --format to change file format.  Makes it possible to save
-	uncompressed TIFF images.  Patch from Peter Kirchgessner.
-
-	* backend/microtek2.c: Add ScanMaker X6USB identifier.  Patch from
-	Oliver Neukum.
-
-2000-07-07  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* acinclude.m4 configure.in aclocal.m4 configure: New autoconf
-	test SANE_V4L_VERSION.
-
-	* AUTHORS: Added myself as CVS repository maintainer.
-
-	* include/sane/sanei_debug.h sanei/sanei_init_debug.c: Send debug
-	messages to syslog if stderr is a socket.
-
-2000-07-06  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* configure configure.in: Change "you're" to "you are" to avoid
-	confusing emacs font-lock mode.  Regenerated configure.
-
-	* backend/v4l.c: Fix sane_close() bug.
-
-2000-07-02  Peter Kirchgessner <peter@kirchgessner.net>
-
-        * backend/hp.desc added interface entries
-
-        * backend/hp.c, backend/hp-handle.c
-          ADF-support for ScanJet IIp
-          Return error SANE_STATUS_NO_DOCS if no paper in ADF
-
-2000-06-30  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* backend/mustek.* Update to Mustek backend 1.0-89. Fixed "scan 
-	  slider doesn't return to start" bug. Details in
- 	  backend/mustek.CHANGES.
-
-	* backend/nec.desc backend/dc25.desc backend/m3096g.desc: Added
-	  :interface entries. Updated email adderess.
-
-2000-06-28  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c Fixed sane_close() - when the scanner still had
-	  data to deliver at the time the scanner was closed, it was impossible
-	  to restart any frontend software. This also caused scanimge -T to
-	  work just once.
-
-2000-06-28  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* backend/mustek.* Update to Mustek backend 1.0-88. Small bugfixes.
-	  Details in backend/mustek.CHANGES.
-
-	* backend/sp15.desc backend/dc25.desc backend/m3096g.desc: Added
-	  :interface entries.
-	
-2000-06-28  Oliver Rauch
-	* Updated umax backend to version 1.0.21
-          take a look at backend/umax.CHANGES for details
-          - updated umax.desc, umax manpage
-           
-2000-06-28  Abel Deuring
-	* backend/sharp.esc: added "interface" entries
-
-2000-06-28  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* backend/pint.c: fixed sane_close bug
-
-	* backend/microtek.c: fixed compilation problem with NDEBUG
- 	  defined
-
-2000-06-27  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* backend/lhii.desc: added :interface
-	* README.linux: added reference to Linux SCSI documentation (from
-	  Abel Deuring)
-
-2000-06-26  Henning Meier-Geinitz <hmg@gmx.de>
-	
-	* backend/musteka4s2.desc: Added all more scanners and
-	  :interface entries
-	* backend/sagitta.desc: Removed on behalf of the author. Nobody
-	  has showed interest in this very old (and rare) scanner over
- 	  the years. It's difficult to keep it up-to-date because a kernel
-	  module is neccessary. Nobody volunteered to take over 
-	  maintainership.
-	* backend/tamarack.c: Changed all fprintf to DBG calls.
-	  
-2000-06-26  Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* sanei/sanei_scsi.c and include/sanei/sanei_scsi.h: 
-	  new functions sanei_scsi_cmd2 and sanei_scsi_req_enter2 
-	  for proper handling of "unusual" SCSI commands lengths
-	* backend/canon-scsi.c: call sanei_scsi_cmd2, where necessary
-
-2000-06-25  René Rebe <rene.rebe@myokay.net>
-	* backend/avision.c: fixed sane_close () bug
-	* backend/avision.desc: added some more scanners
-	
-2000-06-25  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* backend/mustek.* doc/sane-mustek.man: Update to Mustek backend
-	  1.0-87. Fixed gamma correction for 1200 A3 Pro. Fixed dependancy
- 	  of mustek.h on sane-backends.h. Fixed debug output bug in 
-	  fix_linedistance_se. Updated documentation and mustek.conf.
-
-	* README: Added v4l and fixed typo.
-
-2000-06-25  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.desc - Changed Parallel to Parport
-
-2000-06-25  Henning Meier-Geinitz <hmg@gmx.de>
-
-        * doc/Makefile.in doc/sane-s9036.man doc/sane-tamarack.man 
-	  doc/sane-ricoh.man doc/sane-avision.man doc/xcam.man .cvsignore:
- 	  Added manpages for these backends and xcam.
-
-	* frontend/xcam.README: removed because manpage now exists.
-
-	* backend/plustek.desc backend/qcam.desc backend/ricoh.desc
-	  backend/s9036.desc backend/tamarack.desc backend/avision.desc
-	  backend/st400.desc: Updated :interface and :manpage information.
-
-	* README: Updated information regarding documentation.
-
-	* backend/tamarack.c: Changed printf(...) to fprintf(stderr,...)
-	  on behalf of the maintainer.
-
-2000-06-25  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* backend/Makefile.in backend/v4l.desc backend/v4l.c: V4L backend
-	corrections. Corrected dependencies.  Removed () in version
-	number, as this backend is now included in the distribution.  More
-	debug info and use sanei_config_read() instead of fgets() in
-	backend.
-
-2000-06-23  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.desc - added :interface information
-
-2000-06-23  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* AUTHORS: Added Juergen G. Schimmer as author of the v4l backend.
-
-	* configure.in backend/Makefile.in backend/dll.conf
-	backend/v4l-frequencies.h backend/v4l-grab.h backend/v4l.c
-	backend/v4l.conf backend/v4l.desc backend/v4l.h: Added Video4Linux
-	backend from Juergen G. Schimmer.
-
-2000-06-22  Henning Meier-Geinitz <hmg@gmx.de>
-
-        * include/sane/sanei_pa4s2.h sanei/sanei_pa4s2.c Makefile.in 
-	  backend/Makefile.in sanei/Makefile.in: Added interface for
-	  Mustek parallel port scanners (from Jochen Eisinger 
-	  <jochen.eisinger@gmx.net>). This will be used by the Mustek
-	  parallel port backend mustek_pp (coming soon).
-
-	* tools/sane-desc.el backend/template.desc.: Added support for
-	  "interface" column in sane-desc.el. The new keyword is 
-	  ":interface", examples in "template.desc.". All maintainers
-	  should update their *.desc files.
-
-	* backend/mustek.desc abaton.desc agfafocus.desc apple.desc 
-	  dc210.desc dmc.desc qcam.desc ricoh.desc s9036.desc snapscan.desc
-	  tamarack.desc: added interface entry for the Mustek and 
-	  unmaintained backends.
-
-	* backend/abaton.c apple.c qcam.c tamarack.c: fixed sane_close ()
- 	  bug for the unmaintained backends.
-	
-2000-06-18  Henning Meier-Geinitz <hmg@gmx.de>
-        
-	* backend/mustek.* doc/sane-mustek.man: Update to Mustek backend
-          1.0-86. Added support for Mustek Paragon 1200 A3 pro (1, 8, and 24
-          bit/pixel; calibration doesn't work yet). Removed some remainings
-          of color lineart and halftone support. More debugging
-          output. Fixed bug in sane_control_option (option was not checked
-          for negative values).  Fixed bug in sane_close. General code
-          cleanup. Details in backend/mustek.CHANGES.
-
-2000-06-13  Karl Heinz Kremer <khk@khk.net>
-	* backend/epson.*: Invert image when scanning negative off the TPU.
-	  Initialize optial_res to 0. Fix sane_close() bug. Make threshold
-	  only active when halftoning is off and scan depth is 1. Make
-	  film type only active when TPU is selected. Scanner based
-	  color correction. More constraints for GUI. Cleanup in option
-	  handling.
-
-2000-05-21  Henning Meier-Geinitz <hmg@gmx.de>
-        
-	* backend/mustek.*: Update to Mustek backend 1.0-85. Added double
- 	  buffering. This may improve scan performance a bit. Removed
-	  dead code (in dev_read_start). Changed linedistance correction 
-	  handling. Paragon 12000 SP color mode might work now with all 
-	  firmware versions. Details in backend/mustek.CHANGES.
-
-2000-05-27  Karl Heinz Kremer <khk@khk.net>
-	* backend/epson.[ch] Support for multiple EPSON scanners added
-	  Fixed Perfection 610 color problem
-
-2000-05-26  Abel Deuring <a.deuringæsatzbau-gmbh.de>
-	* sanei/sanei_scsi.c: Fixed a bug in the Linux queue handling,
-	  as suggested by Simon Munton
-
-2000-05-22  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-        * ltconfig: Added option "-X" to ldconfig for linux-gnu
-          this solves the problem with link /usr/local/libs/sane/libsane.so.1 => libsane-umax.so.1
-
-2000-05-21  Henning Meier-Geinitz <hmg@gmx.de>
-
-        * README: Added quick install. Removed list of supported platforms
-          because it is unknown how accurate it is at the moment. Added 
-          description for --enable-scsibuffersize (partly from Abel
-          Deuring). Removed operating system specific information. See
-          README.* files instead. Added comment to read the PROBLEMS file.
-          Added/changed list of available documentation. Added comment on 
-          possible causes for the frontends not detecting scanners. Added
-          comment on tools directory. Headings should be easier to find now.
-      
-        * README.aix: New file. Extracted from README.
-
-        * README.hp-ux: New file. Extracted from README.
-
-        * README.linux: New file. What is needed to get SCSI scanners to
-          work under Linux. Workaround for Adaptec 1542 users (from Abel
-          Deuring)
-	
-2000-05-18  Henning Meier-Geinitz <hmg@gmx.de>
-	
-	* backend/mustek.* doc/sane-mustek.man: Update to Mustek backend
-	  1.0-82. Added shrinked image fix to ScanExpress 12000SP models
-	  <= v2.0. Fixed remaining sane_cancel problems (in non_blocking
-	  mode). Fixed color stripes and segmentation fault for Paragon
-	  MFS-12000SP 1.00 (at least for me). Some minor debug output
-	  additions and changes. Look at backend/mustek.CHANGES for more
-	  details.
-
-	* doc/.cvsignore: Added missing sane-sharp.5
-	
-2000-05-07  Henning Meier-Geinitz <hmg@gmx.de>
-
-        * backend/mustek.* doc/sane-mustek.man: Update to Mustek backend
-	  1.0-81. Added transparency adapter (TA) support for all Mustek
- 	  scanners. Fixed shrinked image bug for the ScanExpress 6000SP.
- 	  Removed unused options (3-pass scanners and 600 II N). Scan
-	  source selection now shows only the options currently available.
-	  Fixed a bug concerning the ADF handling. sane_init () now uses
-	  sanei_config_read () and sanei_config_get_string () instead of
-	  its own functions. Man page and .desc update. Look at 
-	  backend/mustek.CHANGES for more details.
-
-2000-04-27  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.* Some code cleanup, added support for GRB
-	  images and did some Gamma correction fixes for the Perfection
-	  610.
-
-2000-04-27  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* include/sane/sanei_debug.h: Bugfix.  Make sure the source
-	compiles even if NDEBUG is defined.
-
-2000-04-23  Henning Meier-Geinitz <hmg@gmx.de>
-
-        * backend/mustek.* doc/sane-mustek.man: Update to Mustek backend
- 	  1.0-80. Adjusted scan areas for most scanners. Added transparency
- 	  adapter support for all Paragon legal size scanners. Fixed color
- 	  mode for the Paragon MFS-8000SP (gamma problems). New system to
- 	  set buffersize using sanei_scsi_open_extended. Removed (maybe
- 	  temporarily) support for SCSI queue. Fixed shrinked image bug with
- 	  the ScanExpress 12000SP. Fixed positional options detection
-	  (from mustek.conf). Added option "buffersize". Adjusted
- 	  mustek.conf template to more reasonable defaults. Lots of
-	  small fixes and more complete debugging output. Look at
-          backend/mustek.CHANGES for more details.
-	
-2000-04-15  Andreas Rick  <andreas.rick@free.fr>
-
-        * backend/coolscan.* Update coolscan backend to version 0.4.3.
-	  This version includes support for the newer Nikon Coolscan
-	  models LS-30 and LS-2000. Dustremoval is not yet included.
-	
-2000-04-09  Henning Meier-Geinitz <hmg@gmx.de>
-
-        * backend/mustek.* doc/sane-mustek.man: Update to Mustek backend 
-	  1.0-79. Changed version system. Linedistance correction for
-	  the 600 II N is fixed. Added output of scanning time. Rewrite
-	  of the resolution encoding for the 3-pass scanners. Look at
-	  backend/mustek.CHANGES for details.
-	
-2000-04-05  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-	* Updated umax backend to version 1.0.2-build-20
-          take a look at backend/umax.CHANGES for details
-
-2000-04-05  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* frontend/xscanimage.c, frontend/preview.c: Fixed a small bug 
-	concerning 3-pass scanners. gdk_input_add() was called three times
-	without a preceding gdk_input_remove().
-
-	* frontend/scanimage.c: Fixed a bug where the scan was cancelled
-	after a test for low mem even if enough memory is available. This
-	probably only affected 3-pass scanners.
-	
-2000-04-02 Henning Meier-Geinitz <hmg@gmx.de>
-
-        * backend/mustek.*: Update to Mustek backend 0.78. Fixed several
-	small bugs and spelling errors. Adjusted scanner names to Mustek
-        style. Inquiry is even more verbose now. Look at
-        backend/mustek.CHANGES for details.
-      
-2000-03-27  Karl Heinz Kremer <khk@khk.net>
-	* backend/epson.c  backend/epson.desc: Removed
-	  status request for push button. This caused an
-	  error on older scanners. Fixed a few typos in
-	  the .desc file and added GT-9000 scanner.
-
-2000-03-23  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-	* updated umax backend to version 1.0 build 19
-	  for details read backend/umax.CHANGES
-
-2000-03-22  Karl Heinz Kremer <khk@khk.net>
-      * backend/epson.*: Several fixes for minor problems.
-        Fixed function level A4 scanners (line mode instead
-        of byte mode). Removed unnecessary free() calls.
-        Use extended status for recognize warm up. This fixes
-        problems with TPU and occasional crashes during startup.
-        Added D1 level for Perfection 610.
-        Added first version of support for set threshold and set
-        zoom.                            
-
-2000-03-19  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* backend/mustek.c: Updated backend to new version 0.76. Fixes for
- 	600 II N (color stripes, cancel handling), ScanExpress ("XC06" is
- 	now recognized), MFS-1200SP (linedistance correction in high
- 	resolutions, patch from Andreas Beck), STORE makros (patch from
- 	Norbert Mueller), ADF (patch from Joerg Anders), firmware
- 	identification (patch from Marco G. Salvagno), sane_cancel (scan
- 	will now be cancelled immediately, no new sane_read necessary),
- 	sane_get_option_descriptor (test for option < 0). Added a more
- 	verbose inquiry output. Adjusted debug levels. Changed the model
- 	names (sane.model) to reflect the real scanner names. Removed some
- 	compiler warnings. Added new maintainer.
-
-	* backend/mustek.desc: Added link to backend homepage. Added all
- 	the different scanner names used for the same model. Added Trust
- 	scanners known to work. Removed firmware versions and scanner ids. 
-
-	* backend/mustek.CHANGES: New file. More detailed changes for the
- 	Mustek backend.
-	
-	* doc/sane-mustek.man: Documentation for the 600 II N linedistance
- 	options. Added warning from PROBLEMS. Added link to backend homepage.
-	Changed supported scanners list (see mustek.desc). Added more bug
-	entries.
-
-	* AUTHORS: Added new maintainer and email address
-	
-2000-03-18  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* backend/Makefile.in tools/libtool-get-dll-ext: New script to
-	detect shared library endings without using 'rev' which is missing
-	on some platforms.
-
-2000-03-14  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* sanei/sanei_scsi.c: Test for 'USE == LINUX_INTERFACE' instead of
-	defined(__linux__).
-
-2000-03-14  Abel Deuring <a.deuring@satzbau-gmbh.de>
-	
-	* new version of ths Sharp backend (0.31): added support for the
-	JX350 (Thanks to Shuhei Tomita for providing the patch)
-
-2000-03-07  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* Makefile.in (lsm) sane.lsm sane-1.0.1.lsm: New target to
-	generate Linux Software Map (LSM) entry from template.  Remove old
-	file.
-	
diff --git a/ChangeLog-1.0.4 b/ChangeLog-1.0.4
deleted file mode 100644
index 94a64aa..0000000
--- a/ChangeLog-1.0.4
+++ /dev/null
@@ -1,729 +0,0 @@
-************************  Release of sane-backends 1.0.4 **********************
-
-2000-12-22  Henning Meier-Geinitz <hmg@gmx.de>
-	
-        * configure configure.in: Changed version to 1.0.4 and package to 
-	  sane-backends (from Oliver Rauch <Oliver.Rauch@Wolfsburg.DE).
-        * sane.lsm Removed (renamed to sane-backends.lsm).
-	* sane-backends.lsm New file. Package name is sane-backends instead 
-	  of sane and added additional maintainer: Oliver Rauch (from
-	  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE).
-
-2000-12-17  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* TODO: Some points about OS/2 compilation problems.
-
-2000-12-17  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* TODO: More details for net/saned problems.
-
-2000-12-16  Jochen Eisinger <jochen.eisinger@gmx.net>
-
-	* TODO: removed entry about net.c seg-faulting when saned isn't
-	  loaded or timed-out
-
-2000-12-16  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* configure configure.in: Disable warnings by default for release.
-	* sanei/sanei_wire.c: Fixed typo.
-
-2000-12-16  Jochen Eisinger <jochen.eisinger@gmx.net>
-
-	* sanei/sanei_wire.c: added test for negative parameter to memcpy()
-
-2000-12-15 Gerhard Jaeger <g.jaeger@earthling.net>
-
-	* fixed wrong options in sane-plustek.man
-
-2000-12-12 Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* corrected backend version in umax.desc
-
-**************************  Code freeze for SANE 1.0.4 ** *********************
-
-2000-12-12  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* NEWS: Updated/corrected version numbers of backends.
-	
-2000-12-10  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* doc/sane-scsi.man: Small changes/updates concerning Linux
-	  2.2. Updated entries about Adaptec cards, NCR53c400/Domex 3181
-	  cards, NCR 810 cards. Removed direct links to some backends.
-	* doc/sane-snapscan.man: Added link to new snapscan website.
-
-2000-12-10  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* backend/mustek.c backend/mustek.desc backend/mustek.CHANGES:
-	  Fixed wrong comment in encode_resolution. Added missing test for
-	  return status in sane_start.  Fixed wrong calculation of tlx and
-	  tly for Pro series scanners. Increased version number.
-
-2000-12-09  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Fixed user defined gamma curve for
-	  inverted images. When scanning negatives the gamma curve
-	  was applied incorrectly. Fixed debug output for user defined
-	  gamma curves - no [epson] in between values anymore.
-
-2000-12-09  Peter Kirchgessner <peter@kirchgessner.net>
-
-        * doc/sane-hp.man, backend/hp.desc
-          Add HP ScanJet 6390C to list of supported scanners
-
-2000-12-07  Henning Meier-Geinitz <hmg@gmx.de>
-	
-	* TODO: Updated. Removed entries about plustek comment problembelm
-	  and libsane.la. Added entry about disabling local scanning.
-
-2000-12-07 Gerhard Jaeger <g.jaeger@earthling.net>
-	
-    * backend/plustek-share.h backend/plustek.h backend/plustek.c
-      removed warning conditions
-      fixed a bug that causes wrong frontend displays
-      fixed problem when driver returns error during read
-
-2000-12-05  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* NEWS: Updated backend versions. Added point about compilation fixes
-	  on Irix and FreeBSD.
-	* backend/mustek.c backend/mustek.desc backend/mustek.CHANGES:
-	  Fixed problem with lamp control of SE scanners and reduced
-	  length of scan area for Paragon 1200 SP PRO. Removed warning for
-	  this scanner. Increased version number.
-	
-2000-12-05  Henning Meier-Geinitz <hmg@gmx.de>
-    
-	* TODO: Updated. Added point about plustek-share.h using c++ comment
-	  and reminder to check config.in.h. Removed entriy about as6e.c stat
-	  result check.
-	* backend/as6e.c backend/as63.h: Comitted patch from Eugene Weiss
-	  <eweiss@sas.upenn.edu>. Fixes: Use only DBG (no printfs). Check result
-	  of stat. Add GPL header.
-
-2000-12-05 Gerhard Jaeger <g.jaeger@earthling.net>
-	
-	* backend/plustek-share.h
-	  cleanup
-
-2000-12-05  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* backend/hp-handle.c
-	  - Change SCL_UNLOAD to SCL_CHANGE_DOC (bug from copying code)
-
-2000-12-04  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* TODO: Updated. Added entries about as6e stat problems and addition to
-	  sanei_scsi.c from FreeBSD ports.
-	
-*************************  snapshot-2000-12-04  *******************************
-
-2000-12-04  Peter Kirchgessner <peter@kirchgessner.net>
-
-        * backend/hp.c, hp-handle.c, hp.desc
-          - fix problem with ADF support on 6350C (and maybe others)
-
-2000-12-04  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* removed usage of gettext, problem with -lintl should be solved:
-	  - removed usage of gettext from lib/getopt.c
-	  - removed test for libintl/gettext in configure[.in]
-	  - removed intllib from frontend/Makfile.in
-	* updated umax.desc
-
-2000-12-03  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.*: Version 0.1.38
-	  Removed changes regarding 12/14 bit support because of SANE
-	  feature freeze for 1.0.4. 
-	  The following fixes are in the software compared to the version
-	  prior to the feature freeze:
-	  - refresh UI after a change in the scan mode setting (was not updated
-	    when going from Binary to Gray or vice versa)
-	  - Read values for "line distance" from the scanner instead of using
-	    hardcoded values. This makes sure the backend always uses the correct
-	    values regardless of firmware version.
-	  - Fixed an "off-by-one" error in the color reordering routine that 
-	    caused weird artifacts in some instances.
-
-2000-12-03  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Fixed off-by-one in color reordering
-
-2000-12-02  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.*: Read information about optical resolution 
-	  and line distance from scanner instead of hardcoded values.
-          Add support for color depth > 8 bits per channel. 
-	  (can use 12, 14 and 16 bits per channel)
-	  EPSON backend is now version 0.36 
-
-2000-11-30  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* changed backend/Makefile.in:
-	  wrong old installation of libsane.la
-	  $(INSTALL_PROGRAM) libsane.la $(libdir)/libsane.la
-	  to this:
-	  $(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) libsane.la $(libdir)/libsane.la
-
-2000-11-30  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* README.irix: Removed. Problem with libjpeg is solved.
-	* TODO: Updated. Removed hpoj addition. Added snapscan link. Added 
-	  entry about net backend segfaulting if using net:localhost. Removed
-	  artec O_SYNC problem. Removed Irix jpeg problem. Removed PTAL 
-	  addition.
-	* doc/saned.man: Added paragraph about xinetd (from Matt Mozur 
-	  <matt.mozur@sourwood.net>). Removed links to backends, added
-	  sane-"backendname" instead.
-	* doc/sane-net.man: Added comment about segfaults if scanning
-	  on localhost.
-	* sanei/sanei_scsi.c: Added missing DBG_INIT (from FreeBSD ports).
-
-2000-11-30 Gerhard Jaeger <g.jaeger@earthling.net>
-	
-	* backend/plustek.c backend/plustek.desc backend/plustek-share.h
-	  backend/plustek.h doc/sane-plustek.man:
-	  changed to version 0.38 - document update, minor bugfixes
-
-2000-11-30  Chris Pinkham <cpinkham@infi.net>
-
-	* artec.c: removed O_SYNC for posix compatibility, converted variable
-	  to unsigned char to get rid of overflow error.  Changed version
-	  to 0.5.15.
-
-2000-11-30  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* changed sane-config.in again:
-	  sane-config --libs has to print all libs
-	  that the sane libs depend on.
-	  This is not needed for shared libs and that
-	  was the reason why I removed all libs but "-lsane".
-	  But when linking against static sane libs we need
-	  to know about all necessary libs.
-
-*************************  snapshot-2000-11-28  *******************************
-
-2000-11-28  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* added SANE_CHECK_JPEG to aclocal.m4 and configure.in
-	  (test routine by henning Meier Geinitz)
-
-*************************  Feature freeze for SANE 1.0.4  *********************
-
-2000-11-27  Peter Kirchgessner <peter@kirchgessner.net>
-
-        * NEWS: hp-backend version is 0.92
-
-2000-11-27  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* backend/umax.c: corrected wrong BUILD (25->24)
-
-2000-11-26  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* AUTHORS: Added Karsten Festag as maintainer of microtek2.
-	* backend/mustek.* doc/sane-mustek.man: Update to Mustek backend
-	  1.0-100. Added option fast-preview that tries to use the fastest
-	  mode available for preview. This is supported for the 3-pass
-	  scanners (was option "preview in gray") and some of the
-	  ScanExpress scanners (6000 SP, 12000 SP Plus). Use #include 
-	  "../include/sane/...". Put option force-wait into mustek.conf
-	  (disabled). Removed block mode for Paragon 6000 SP and 8000 SP. 
-	  Code cleanup. More debug output. Details in backend/mustek.CHANGES.
-	* doc/.cvsignore: Added sane-as6e.5 and sane-nec.5.
-	
-2000-11-26  Peter Kirchgessner <peter@kirchgessner.net>
-
-        * backend/hp.desc, doc/sane-hp.man
-          Add descriptions for PTAL support
-
-        * backend/hp.c
-          If PTAL-support requested, write warning about unsupported PTAL
-          with DBG(0,...  instead of DBG(1,...
-
-2000-11-25  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* configure configure.in acinclude.m4 aclocal.m4 
-	  include/sane/config.h.in: Added test for PTAL library and headers 
-	  (patch from David Paschal <paschal@rcsis.com>). Some reformating of 
-	  the output of configure --help.
-
-	* backend/GUIDE: Updated entry about #include.
-	
-2000-11-24  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* AUTHORS: Removed authors of xscanimage and xcam (now in 
-	  sane-frontends).
-	* README.unixware2, README.unixware7: X-frontends are no longer
-	  included. Removed comments and sourcecode of "rev" (not supported/used
-	  in backends/Makefile anymore).
-	* sane.lsm: X-frontends are no longer included. Used blanks instead of
-	  tabs.
-	* doc/scanimage.man: Removed links to backends, added generic link
-	  instead.
-	* doc/.cvsignore frontend/.cvsignore: X-frontends are no longer included.
-
-2000-11-24  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* changed configure.in, configure frontend/Makefile.in
-	  and backend/Makfile.in:
-	  The shared libraries required by the backends are linked to
-	  the backends (they have been linked to the frontends before).
-	  Only libintl is linked to the frontend.
-	* changed tool/sane-config.in, sane-config --libs => "-lsane",
-	  all other libraries are linked to the backend libs now
-
-2000-11-24  Jochen Eisinger <jochen.eisinger@gmx.net>
-
-	* doc/scanimage.man doc/saned.man: updated description of password
-	  file
-	* sanei/sanei_auth.c frontend/saned.c frontend/scanimage.c: replaced
-	  index() by strchr(). Changed style of password file
-	* backend/net.c: the net backend now prepends net:host: to the
-	  resource before calling the auth_callback function
-
-2000-11-23  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* removed doc/xcam.man, doc/xscanimage.man and
-	  updated doc/Makefile.in
-	* changed configure.in and frontend/Makefile.in,
-	  "-lintl" is not added to @LIBS@ any more, @INTLLIBS@
-	  is defined instead now, this is necessary because "-lintl"
-	  has to be added to the frontends and not to a backend and
-	  sane-config --libs must not list it.
-	* Added "Introduction" to README that tells about
-	  the new X-frontend package
-	* removed gimp and gtk parts from include/sane/config.h.in
-	* removed gtk test from aclocal.m4
-	* removed xcam.c xscanimage.c sane-style.rc progress.c progress.h
-                  preview.c preview.h preferences.c preferences.h gtkglue.c gtkglue.h 
-          from frontend/
-	* removed parts for xcam and xscanimage from frontend/Makefile.in,
-          configure.in and updated confiugre
-
-2000-11-23  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* NEWS: Updated for SANE 1.0.4. Please check.
-	* README.aix: Removed paragraph about shared libs not working.
-	* README.linux: Added paragraph about excessive warnings due to glibc
-	  bug (from Peter Kirchgessner).
-	* TODO: Removed entry about shared libs not working on AIX. Added entry
-	  about PTAL checks. Removed entry about DBG and microtek2. Added entry
-	  about dc210 and jpeg functions. Added entry about using strchr() 
-	  instead of index().
-	* sane.lsm: Added NEC.
-	* backend/microtek2.c: (from karsten.festag@t-online.de (Karsten
-	  Festag)) Use DBG instead of printf/fprintf. Use 
-	  #include "../sane/include/..." instead of #include "sane/...". Fixed
-	  warnings. 
-	
-2000-11-23  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c:  Display "Set Focus" control only for scanners that
-	  can actually handle the command.
-
-2000-11-22  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* changed configure and configure.in, removed test for sting.h/strings.h
-	  this is not needed because we use strchr instead (always in string.h)
-	  of index (sometimes in string.h, sometimes in strings.h)
-
-	* changed ltconfig for aix4*, repleace -o $objdir/$soname by -o $lib,
-	  the shared libraries are handled correct now
-
-2000-11-21 Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* backend/sharp.c, backend/sharp.desc, doc/sharp.man: Support
-	  for JX320 added	
-
-2000-11-21  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* AUTHORS: Added FUKUDA Kazuya for the nec Backend. Used spaces instead 
-	  of tabs.
-	* PROJECTS: Removed entry about NEC. Added/updated entries about Mustek
-	  USB scanners.
-	* README: Added link to sane-nec(5).
-	* TODO: Removed entries about sanei_authorize and plain text passwords.
-	* backend/Makefile.in backend/dll.conf backend/nec.conf backend/nec.c
-	  backend/nec.desc backend/nec.h doc/Makefile.in doc/sane-nec.man:
-	  Added nec backend for the NEC scanners PC-IN500/4C (from Kazuya Fukuda 
-	  <fukuda@pjs.nevt.nec.co.jp>)
-
-2000-11-20  Henning Meier-Geinitz <hmg@gmx.de>
-	
-	* AUTHORS: Added Eugene S. Weiss.
-	* PROJECTS: Removed Artec as6e backend.
-	* README: Added link to man sane-as6e.5.
-	* TODO: Removed as6e.
-	* doc/Makefile.in: Added generation of as6e manpage.
-        * backend/Makefile.in: Added entries for as6e.
-	* backend/dll.conf: Added as6e.
-	* backend/as6e.c backend/as6e.h backend/as6e.desc doc/sane-as6e.man:
-	  Added backend for Artec AS6E parallel port scanner (from Eugene S.
-	  Weiss <yossarian@users.sourceforge.net>).
-	
-2000-11-20  Jochen Eisinger <jochen.eisinger@gmx.net>
-
-	* configure configure.in: Added test for /dev/urandom and
-	  index() in string.h or strings.h
-	* backend/net.c: Fixed SANE_NET_AUTHORIZE call handling
-	* doc/net.tex: Clarified definition of SANE_NET_AUTHORIZE, added
-	  definition of MD5 authorization
-	* doc/sane.tex: Upgraded to version 1.0.2, changed definition of
-	  SANE_MAX_USERNAME_LEN & SANE_MAX_PASSWORD_LEN to 128 chars
-	* doc/saned.man: added description of SANE_CONFIG_DIR/saned.users
-	* doc/scanimage.man: added description of ~/.sane/pass and
-	  --accept-md5-only
-	* frontend/saned.c: implemented user authorization on a per backend
-	  basis
-	* frontend/scanimage.c: fixed bug (option -b wasn't present)
-	  implemented auth_callback
-	* lib/md5.c include/md5.h: added md5 functions from GNU textutils
-	* include/sane/sane.h: changed definition of SANE_MAX_USERNAME_LEN &
-	  SANE_MAX_PASSWORD_LEN to 128 chars
-	* include/sane/sanei_auth.h sanei/sanei_auth.c: implemented new
-	  SANE interface for user authorization using MD5 digest
-	* lib/Makefile.in sanei/Makefile.in: updated Makefiles
-
-2000-11-19  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Removed one debug output statement.
-
-2000-11-19  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.[ch]: Added support for "set focus position" command. This
-	  command is necessary to scan via the TPU with the Expression1600.
-2000-11-19  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* TODO: Removed entry about stiff.*. Updated entry about testing
-	  saned.
-
-2000-11-19  Jochen Eisinger <jochen.eisinger@gmx.net>
-
-	* backend/mustek_pp.[ch]: replaced #include "sane/.." by
-	  #include "../include/sane/.."
-
-2000-11-19  Peter Kirchgessner <peter@kirchgessner.net>
-
-        * frontend/stiff.c: Fix problem with writing Tag bits per sample
-          for color tiff files.
-
-2000-11-18  Jochen Eisinger <jochen.eisinger@gmx.net>
-
-	* doc/sane-mustek_pp.man backend/mustek_pp.*: updated mustek_pp
-	  backend to version 0.9-devel
-
-2000-11-15  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* PROJECTS: Added entry about Visioneer OneTouch 8600.
-	* TODO: Added entries about net backend crashing after timeout, stiff.c
-	  problems, and more details about Irix cc jpeg problems.
-
-2000-11-15  Rene Rebe <rene.rebe@gmx.net>
-	* backend/avision.[c,h]: some fixes for brightness and contrast via
-	  the gamma-table. New config-option to force the backend to use DIN A4
-	  ("option force-a4"). Clean up.
-	
-2000-11-14  Rene Rebe <rene.rebe@gmx.net>
-	* backend/avision.[h,c]: Added gamma table support in hardware.
-	  Brightness and contrast emulation via the hardware gamma table.
-	  Code cleanup.
-	* AUTHORS: Changed my e-mail address.
-	
-2000-11-13  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* Makefile.in: Install sane.h and saneopts.h only.
-	* PROJECTS: Removed sane-pie.
-	* TODO: Removed sane-pie. Added possible portability problem for
-	  artec. Removed entry about installed headers. Added entry about
-	  gettext and libdl.
-	* doc/.cvsignore: Added sane-pie.5.
-
-2000-11-13  Simon Munton <simon@munton.demon.co.uk>
-
-	* backend/pie.c backend/pie-scsidef.c backend/pie.conf backend/pie.desc
-	  doc/sane-pie.man: Added Pacific Image Electronics backend for ScanAce
-	  range of scanners (also supports DevCom BlackWidow scanners and ADLIB
-	  JetScan scanners).
-	* README backend/Makefile.in backend/dll.conf doc/Makefile.in: Added pie
-	  backend.
-	* sane.lsm: Added keywords for pie backend.
-	* AUTHORS: Added myself as maintainer of pie backend.
-
-2000-11-12  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* doc/sane.tex: Fixed a typo.
-	* doc/.cvsignore: Added the files produced by make ps.
-	* README: Removed X-frontends. Point to sane-frontends and website.
-	  Some reformatting.
-	* TODO: Updated concerning frontends split.
-	* PROJECTS: Removed entries about frontends (now in 
-	  sane-frontends/README)
-	* PROBLEMS: Removed entries about frontends (now in
-	  sane-frontends/PROBLEMS)
-	
-2000-11-10  Henning Meier-Geinitz <hmg@gmx.de>
-
-        * sanei/sanei_constrain_value.c: If constraint_type is
-	  SANE_CONSTRAINT_RANGE and quantization is used, the results may
-	  be outside the limits of the range because quantization uses the
-	  orginal value. Fixed by doing quantization with the already 
-	  checked value.
-
-2000-11-10 Gerhard Jaeger <g.jaeger@earthling.net>
-	
-	* backend/plustek.c backend/plustek.desc backend/plustek-share.h
-      backend/plustek.h doc/sane-plustek.man:
-	  updated to version 0.37 - support for xsane, new models
-      document update, minor bugfixes
-
-2000-11-08  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* TODO: Updated. Added entries for viceo backend and addition to hp
-	  backend. Updated entries about the include issue. Added point about
-	  additional options for pnm backend, install problem of libsane.la, 
-	  and some build problems and the --without-x problem. Some more 
-	  details for detecting older SANE versions. 
-
-	* LEVEL2: Added entry about sending messages from backend to frontend.
-	  Removed entry about image polarity.
-
-	* backend/mustek.c backend/mustek.h backend/mustek.CHANGES 
-      backend/mustek.desc: Update to Mustek backend 1.0-99. Better
-	  transparency adapter support for ScanExpress scanners. Changed
-	  color support for ScanExpress scanners (faster at some resolutions
-	  now). Paragon 1200 SP color mode should work now without garbage at
-	  the end of an image. Some bugfixes. Details in 
-	  backend/mustek.CHANGES.
-	
-2000-11-08  Jochen Eisinger <jochen.eisinger@gmx.net>
-
-	* include/sane/sanei_debug.h: fixed typo
-
-2000-10-30  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* TODO: Updated. Added points about --without-x and the 
-	  #include <sane...> stuff. Added xcam problem. Changed entry for
-	  Relisys scanner.
-
-2000-10-30  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* frontend/xscanimage.c: Define GIMP_ENABLE_COMPAT_CRUFT when
-	including gimp.h to use the old API.  Eventually we should convert
-	the frontends to use the new Gimp API.  Patch from Kevin Dalley.
-
-2000-10-29  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* TODO: Updated.
-	
-2000-10-23  Peter Kirchgessner <peter@kirchgessner.net>
-
-        *backend/hp-accessor.c hp-device.c hp-handle.c hp-hpmem.c hp.h hp.c
-                 hp-option.c  hp-scl.c: Change sanei_debug-interface
-            Allocate accessors once (for fixed size accessors)
-            Close connection in some error conditions
-
-2000-10-23  Jochen Eisinger <jochen.eisinger@gmx.net>
-
-	* backend/dll.c: added test for ``dll'' in dll.conf
-
-2000-10-23  Jochen Eisinger <jochen.eisinger@gmx.net>
-
-	* sanei/sanei_init_debug.c include/sane/sanei_debug.h
-	  frontend/saned.c: removed vararg macros
-
-2000-10-17  Henning Meier-Geinitz <hmg@gmx.de>
- 
-	* doc/sane.tex: Added paragraph about image polarity as discussed
-	  on sane-devel. This is the version from Nick Lamb.
-	
-2000-10-15  Jochen Eisinger <jochen.eisinger@gmx.net>
-
-	* include/sane/sanei_debug.h: sanei_debug_init was only declared
-	  if VARARG macros are supported. Fixed this.
-
-2000-10-08  Jochen Eisinger <jochen.eisinger@gmx.net>
-
-	* sanei/sanei_pa4s2.c: fixed all but one compiler warning
-
-2000-10-03  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* tools/find-scanner.c: Explicitly state that find-scanner won't
- 	  find non-SCSI scanners.
-	* doc/scanimage.man: Add examples for SANE device names.
-	* frontend/scanimage.c: Output message when no devices are found.
-	  Add example for devicename to --help message. Print warning
-	  when a Unix devicename is used instead of a SANE device. Removed
-	  compiler warning.
-	* TODO: Removed entries about the fgets and include issues in
- 	  umax. Removed entries about scanimage device name
- 	  documentation. Added a point about xscanimage problems with the
- 	  new GIMP API.
-	* backend/mustek.* doc/sane-mustek.man: Update to Mustek backend
- 	  1.0-98. Fixed segmentation fault in sane_init. Enabled double
- 	  buffering. Clear inquiry buffer before using. Paragon 1200 SP now
- 	  uses LD_BLOCK color correction. Removed LD MFS (wasn't used
- 	  anymore). Fix sane_cancel for Paragon series II scanners. Fix
- 	  halftone and grain for Paragon series II scanners. Backtracking is
- 	  used automaticly by all scanners now. Some safety checks, code
- 	  cleanup and more debug output. Details are in 
-	  backend/mustek.CHANGES.
-
-2000-10-02  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* Updated umax backend to sane-umax-1.0.3-build-24
-          take a look at backend/umax.CHANGES for details
-
-2000-10-02  Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-        * sanei/sanei_constrain_value.c:
-          if checked option is a range and the value is out of
-	  range the value is now corrected to the minimum or maximum
-	  allowed value and SANE_INFO_INEXACT is set.
-	  The old version returned with an error. This caused problems
-	  when the value was a little bit out of range because of rounding
-          errors.
-
-2000-09-30  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* backend/pnm.c: Fixed three segfaults due to buffer overruns:
- 	  maximum length of filename wasn't checked; maximum length in
- 	  sane_read wasn't always checked; ppm_type wasn't always set in
- 	  getparmfromfile. Added some checks for safety and removal of
- 	  warnings. Added DBG lines for every SANE API call.
-	* TODO: Added entries about the backend:devicename issue. Add a
-	  comment about fronends not to crash when length is -1. Added entry
- 	  about sane-pie. Added point about fronends not checking if too 
-	  much data is delivered with sane_read.
-	* PROJECTS: Added entry about sane-pie.
-
-2000-09-24  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* backend/mustek.*: Update to Mustek backend 1.0-97. This is a
-       	  development version and is only tested for three-pass scanners.
-  	  Added support for Paragon 1200 SP Pro and ScanExpress A3 SP.
-  	  Removed detection of " C04" and " C12" (don't seem to exist).
-  	  Changed SCSI request scheme. Sane_read can read more than 4096
- 	  bytes from pipe. Minimum dpi is 30 now. Fixed LD correction for
- 	  Paragon 1200SP 1.06 and 1.11.  Read SCSI buffer into big block and
- 	  do LD after that for Paragon one-pass scanners. New option
- 	  "blocksize" in mustek.conf. Better detection of the scanner type
- 	  (three-pass, Paragon I, ...). Fixed possible segmentation faults
- 	  in Paragon 600 II N LD code, scsi_sense_wait_ready and
- 	  sense_handler. Decreased maximum scan size of Paragon 800 II
- 	  SP. For three-pass scanners: fixed stop_scan and speed code, scan
- 	  area is in pixels now, added RGB brightness and contrast, use
- 	  +-100% for brightness and contrast. Return SANE_STATUS_CANCELLED
- 	  when scan was cancelled. Option "force backtracking" is enabled by
- 	  default, "scan speed" is set to "fastest". Added option
- 	  "force-warn" for mustek.conf.  Rewrote halftone mode. Better error
- 	  handling and more debug output.
-	* TODO: Clarified point about image data polarity. Moved point about
-	  xscanimage not updating the progress bar for 3pass scanners to
-	  frontend section. Removed umax entry in "frontends". Removed entry
-	  about alpha channel (was added to LEVEL2 file).
-	* LEVEL2: Add point about image data polarity.
-	* frontend/scanimage.c: Removed some warnings.
-	
-2000-09-19  Gerhard Jaeger <g.jaeger@earthling.net>
-
-	* backend/plustek.desc doc/sane-plustek.man:
-	  updated information about supported scanners	  
-
-2000-09-18  Henning Meier-Geinitz <hmg@gmx.de>
-
-        * README: Removed comment about xscanimage error message. Added
-          comment about find-scanner (may find scanners not supported by
-          SANE).
-	* tools/README: Added comment about find-scanner and some lines
- 	  about sane-desc.el and sane-config.
-	* tools/find-scanner.c: Added comment about scanners not supported
- 	  by SANE. Removed some warnings.
-	* TODO LEVEL2: Removed xscanimage error comment from TODO and moved
- 	  ideas for SANE 2.0 from TODO to LEVEL2.
-
-2000-09-18  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* backend/v4l.c: Remove X11 dependency.
-
-2000-09-17  Henning Meier-Geinitz <hmg@gmx.de>
-	
-	* frontend/xscanimage.c: Fixed gtk_main_quit bug (based on patch
- 	  from <moloch@nikocity.de>). An error message was printed when 
-	  no sane device was found.
-
-2000-09-17  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* config.guess config.sub : Upgraded to latest version from
-	<URL:ftp://ftp.gnu.org/pub/gnu/config/>.
-
-	* doc/Makefile.in: New target 'install-docs' to install
-	documentation in $(prefix)/doc/sane-<version>/.
-
-	* japi/Makefile.in: Move javac and javah to make variables.
-
-2000-09-16  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* TODO: Added xscanimage bug and information about versioning
- 	  problems. Some other minor changes.
-
-2000-09-15 Gerhard Jaeger <g.jaeger@earthling.net>
-	
-	* backend/plustek.c
-	  added some code to support timing measurement in debug sessions
-
-2000-09-10 Peter Kirchgessner <peter@kirchgessner.net>
-
-        * backend/hp-handle.c
-            Special handling of sane_cancel for OfficeJet K series
-
-2000-09-09 Peter Kirchgessner <peter@kirchgessner.net>
-
-        * backend/hp.h hp-scsi.h hp-scl.h hp-option.h hp-option.c
-                  hp-device.h hp-scl.c hp.c hp-device.c hp-handle.c
-
-          David Paschal (paschal@rcsis.com)
-            Added support for flatbed HP OfficeJets.
-          fix problem with cancel preview
-          fix timing problem between killing child and writing to pipe
-          change fprintf(stderr,...) to DBG
-          change include <sane..> to "sane.." in hp.h
-          change handling of options that have global effects.
-            i.e. if option scanmode is received (has global effect),
-            all options that "may change" are send to the scanner again.
-            This fixes a problem that --resolution specified infront of
-            --mode on command line of scanimage was ignored.
-            NOTE: This change does not allow to specify --depth 12 infront of
-            --mode color, because --depth is only enabled with --mode color.
-          add depth greater 8 bits for mode grayscale
-          add option for 8 bit output but 10/12 bit scanning
-
-2000-08-24 Gerhard Jaeger <g.jaeger@earthling.net>
-
-	* Updated plustek backend to support multiple devices and 12bit color-depth
-	  affected files: backend/plustek.c backend/plustek.h 
-	                  backend/plustek-share.h backend/plustek.conf
-	* backend/plustek.desc: updated information about supported scanner
-	* doc/sane-plustek.man: updated manpage according to the changes
-
-2000-08-23 Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* sanei/sanei_scsi.c: Second attempt to fix the errno bug
-	  in the Linux command queue handling. 
-
-2000-08-19  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* TODO: Included TODO file for 1.0.4.
-	* sanei/sanei_ab306.c: Removed some comiler warnings.
-	* doc/sane.tex: Set \date to the date of the last change (not
-	  the date of running latex (\today))
-	* frontend/xscanimage.c: Fixed image size overrun (>ca. 400 MB). 
-	  Removed some compiler warnings.
-	
-2000-08-15  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* configure configure.in: Default to --enable-warnings again.
-	
-2000-08-15  Jochen Eisinger <jochen.eisinger@gmx.net>
-
-	* backend/mustek_pp.c: fixed bug in config_ccd_1013 that prevents
-	ASIC 1013 scanners from working
-
diff --git a/ChangeLog-1.0.5 b/ChangeLog-1.0.5
deleted file mode 100644
index 9c0a992..0000000
--- a/ChangeLog-1.0.5
+++ /dev/null
@@ -1,1194 +0,0 @@
-2001-07-01 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-************************  end of code freeze ***********************************
-************************  Release of sane-backends 1.0.5 **********************
-
-
-2001-06-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Disabled warnings by default.
-	* NEWS: Updated version numbers, added dc25.
-
-2001-06-25  Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* configure.in/configure: changed version to 1.0.5
-
-2001-06-25 ********** CODE FREEZE FOR SANE-1.0.5
-	   snapshot sane-backends-pre1-1.0.5
-           planned release on 2001-07-01
-
-
-2001-06-24  Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* backend/umax*: bugfixes:
-          * bugfix for DOR:
-            - bottom-right edge keeps in position if possible when DOR is switched on
- 
-          * bugfix for Astra 610S color mode:
-            - scale_y is set to 0.5 if y_resolutions is smaller than optical_res/2
-              this does fix the color scan problems for Astra 610S.
-              Not tested for Astra 600S.
-
-2001-06-20  Peter Fales <peter@fales.com>
-
-	* backend/dc25.c - Backed out the previously added mkdtemp()
-	  patch, as mkdtemp is not available on all platforms.
-	* TODO: Removed entry about dc25 bug
-	
-2001-06-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Updated documentation entries. Added compilation bug in dc25.c.
-
-2001-06-20  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* doc/sane-umax_pp.man:  corrections according to the TODO list
-
---- cvs snapshot-2001-06-17 ---
-
-2001-06-17  Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* backend/umax*: bugfixes:
-         - removed "#include <assert.h>" from umax.c: assert() is never called
-         - bugfix for 3 pass scanning:
-           reposition_scanner is called in sane_start for 2nd and 3rd pass of 3 pass scan
-         - bugfix for UTA and DOR geometry offsets
-
-2001-06-14  Peter Fales <peter@fales.com>
-
-	* backend/dc25.c - Added a patch from Tim Waugh to use mkdtemp()
-	  instead of mktemp().  Also cleaned up some compiler warnings.
-
-2001-06-14  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/sane-epson.man: Removed reference to sane-devel list
-
-2001-06-14  Simon Munton <simon@munton.demon.co.uk>
-	* doc/sane-pie.man: Fixed formatting problems
-
-2001-06-14  Gerhard Jaeger <g.jaeger@earthling.net>
-
-	* doc/sane-plustek.man:
-	  Corrected URL to Plustek mailing list
-
-2001-06-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Added link to libieee1284.
-
-2001-06-13  Karl Heinz Kremer <khk@khk.net>
-	
-	* backend/epson.desc: Added GT-9500 (same scanner as Expression 636)
-	* backend/epson.c: Finally updated version #
-
-2001-06-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Updated the entries about documentation.
-
-2001-06-13  Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* sanei/sanei-scsi.c: Corrected bug in sanei_scsi_cmd2 for IRIX:
-	  - scsi_req.ds_senselen has been set to sizeof pointer, is set
-	    to 128 bytes now (1024 bytes does not work)
-	  - sensebuf is cleared before scsi command is executed
-	  - sensehandle always called when it exists and an error occurs
-
-2001-06-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/umax_pp.c: Also use sanei_umax_pp_SetLamp() (patch from 
-	  Tim Waugh <twaugh@redhat.com>).
-
-2001-06-11  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c backend/umax_pp_low.h backend/umax_pp_mid.c: 
-	  make use of PPGETMODES only when available in ppdev.h. Corrected OS/2
-	  typo in Outb() and rename sanei_umax_pp_Lamp() to 
-	  sanei_umax_pp_SetLamp().
-	
-
-2001-06-05  Peter Fales <peter@fales.com>
-
-	* backend/doc/sane-dc25.man, sane-dc210.man, sane-dc240.man -
-	  Added reference to web page for information about sane
-	  mailing list
-
-2001-06-10  Jochen Eisinger <jochen.eisinger@gmx.net>
-	* doc/sane-mustek_pp.man: added pointer and note to list
-	  subscription page
-
---- cvs snapshot-2001-06-10 ---
-
-2001-06-10  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane-artec.man doc/sane-coolscan.man doc/sane-umax.man:
-	  Fixed whatis/apropos output (don't put an empty line after
-	  the NAME section). Added SEE ALSO entry to sane(7).
-	* doc/sane-dll.man: Fixed output bug and added SEE ALSO entry.
-	* doc/sane-scsi.man: Rephrased the paragraphs about Linux sg
-	  buffer to make it clear, that kernel changes are really only
-	  necessary with older kernels. Fixed torque.net URL. Added comment,
-	  that usually every SCSI adapter should work. Added paragraph about
-	  problems with Acard adapters. Rephrased NCR810 entry.
-	* doc/sane-net.man: Updated BUGS section. Added SEE ALSO.
-	* doc/saned.man doc/sane-abaton.man doc/sane-agfafocus.man
-	  doc/sane-apple.man doc/sane-as6e.man doc/sane-avision.man
-	  doc/sane-bh.man doc/sane-dc210.man doc/sane-dc240.man
-	  doc/sane-dc25.man doc/sane-dmc.man doc/sane-epson.man
-	  doc/sane-fujitsu.man doc/sane-hp.man doc/sane-microtek.man
-	  doc/sane-mustek_pp.man doc/sane-nec.man doc/sane-pie.man
-	  doc/sane-pint.man doc/sane-plustek.man doc/sane-pnm.man
-	  doc/sane-qcam.man doc/sane-ricoh.man doc/sane-s9036.man
-	  doc/sane-sharp.man doc/sane-sm3600.man doc/sane-st400.man
-	  doc/sane-tamarack.man doc/sane-umax_pp.man doc/sane-v4l.man:
-	  Added SEE ALSO entry for sane(7).
-	* doc/sane-coolscan.man: Used @@ macros instead of fixed paths.
-	* doc/sane-dc210.man doc/sane-dc240.man doc/sane-dc25.man:
-	  Used @@ macros instead of fixed paths. Fixed library paths.
-	* doc/Makefile.in doc/sane-coolscan.man doc/sane-dc210.man
-	  doc/sane-dc240.man doc/sane-dc25.man: Set the correct library
-	  path for all backends by changing @LIBDIR@ to $(libdir)/sane.
-	* doc/sane-as6e.man doc/sane-canon.man doc/sane-microtek.man
-	  doc/sane-microtek2.man: Some minor formatting issues.
-	* doc/sane-mustek.man doc/sane-v4l.man: Added link to mostang mail
-	  page. Fixed some formatting issues.
-	* doc/backend-writing.txt: Added paragraph about @LIBDIR@ and friends
-	  in manual pages.
-	* TODO: Added several entries about manual pages. Removed entry about
-	  sane(7).
-
-2001-06-09  Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* sanei/sanei_scsi.c:
-	  applied patch by Douglas Gilbert <dgilbert@interlog.com>
-	  that solves compilation problem about:
-	  storage size of `ssid' isn't known
-
-2001-06-09  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Changed debug level for for an informational
-	  message in the sense_handler from 0 to 2.
-
-2001-06-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README.os2: Added link to Franz Bakan's web page.
-	* configure configure.in backend/Makefile.in include/sane/config.h.in:
-	  Check for sys/sem.h and disable snapscan if it isn't available.
-	  Removed "//" (C++-style comment) from config.h.in. Link to djpeg
-	  only once.
-	* TODO: Added comment on command line option for timeout in saned.
-
-2001-06-09  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* acinclude.m4 include/sane/config.h.in: Fix configure/compile
-	  problem on Alpha/Tru64 Unix.
-
-2001-06-07  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c: make use of PPGETMODES to get ppdev
-	capabilites.
-
-2001-06-05  Peter Fales <peter@fales.com>
-
-	* backend/dc240.c - Fixed bug where attempting to change the
-	  "image number" in an empty camera causes a core dump.
-
-2001-06-06  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c: OS/2 compile fixes (again). Backend 
-	successfully built on Warp with EMX 0.9d.
-
-2001-06-06  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c: OS/2 compile fixes
-
-2001-06-05  Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* changed my email address in sane-backends.lsm
-
-
---- feature freeze for sane-1.0.5 is active ---
---- cvs snapshot-2001-06-05 ---
-
-2001-06-04  Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* update of umax backend to version 1.0 buid 27
-
-2001-06-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Updated the entries concerning net+saned. Removed the
-	  exporting symbols entry. Added entry about lassert.h.
-	* include/lassert.h sanei/sanei_scsi.c: Use local assert.h file to
-	  fix problems with AIX and shared libraries.
-	* frontend/test.c: Changed order of headers to get test.c compiling
-	  on OS/2.
-	* frontend/.cvsignore: Added test.
-	* frontend/saned.c: Increase timeout to one hour.
-	* backend/coolscan.c: Declared all internal functions static.
-	* tools/Makefile.in: Fixed typo that prevented make from removing 
-	  mustek600iin-off.
-	* sanei/sanei_scsi.c: Fixed some small bugs concerning error reporting.
-	* frontend/scanimage.c: Fixed small bug in output for batch mode.
-
-2001-06-03  Peter Fales <peter@fales.com>
-
-	* backend/dc240.c - Batch scanning of multiple images with scanimage
-	  was failing if subsequent images have a different size than
-	  from the first image.
-
-2001-06-03  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/sane-epson.man: Updated documentation
-
-2001-06-03  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c: Fixed compile problem on archs that
-	  have inb/outb and not insb/outsb. Cleaned up and simplified probing
-	  code.
-
-2001-06-03  Peter Fales <peter@fales.com>
-
-	* backend/dc240.c - Add "auto increment" option to allow all
-	  images to be downloaded with the --batch option to scanimage.
-
-2001-06-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek.c: Added some debug messages.
-	* backend/net.c: Fixed yet another segfault. Added debug messages.
-	* frontend/scanimage.c doc/scanimage.man: Added more options for
-	  batch-scanning (patch from Caskey Dickson 
-	  <caskey-lists-sane-devel@technocage.com>).
-	
-2001-06-02  Chris Pinkham <cpinkham@infi.net>
-
-	* backend/artec.desc: updated version number to match artec.c.
-
-2001-06-02  Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* corrected umax version numver in umax.desc (1.0.24->1.0.26)
-
-2001-06-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* NEWS: Updated concerning backend versions.
-	* TODO: Removed nec entries. Added entry about ADF extension to
-	  scanimage.
-	* backend/qcam.c: Another occurence where struct flock must be defined
-	  for OS/2.
-	* AUTHORS: Fixed Kazuya Fukuda's name and email address.
-	* backend/nec.c backend/nec.h backend/nec.desc: Update to backend
-	  version 0.12 (from Kazuya Fukuda <kazuya@pjs.nevt.nec.co.jp>).
-	  Removed references to sharp backend (grep for "JX"). Check for
-	  HAVE_SYS_SHM_H before including sys/shm.h and disable shared
-	  memory support if necessary. Free devlist allocated in
-	  sane_get_devices() in sane_exit() resolution setting bug fixed 
-	  (PC-IN500/4C 10dpi step). Removed resolution list.
-
-2001-06-02  Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* changed minimum scsi buffer size from 64KB to 32KB
-
-
-2001-06-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/umax_pp_low.c: Fixed the FreeBSD problems by checking
-	  /dev/io before accessing io ports (patch from Stéphane Voltz
-	  <svoltz@wanadoo.fr>).
-	* backend/snapscan.c: Fixed two bugs: pss->devname must be checked
-	  for 0. Return total number of lines in sane_get_parameters (patch
-	  from Ben Stanley <bds02@uow.edu.au>).
-
-2001-05-31  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek.c: Updated some comments.
-	* TODO: Removed the entry about the config_line[len-1] bug.
-	* configure configure.in include/sane/config.h.in backend/qcam.c:
-	  Check for struct flock and define it if necessary. 
-	* tools/Makefile.in: Make sure that backend/umax_pp_low.o exists
-	  when umax_pp.o is linked.
-	* backend/bh.c backend/m3096g.c backend/sp15c.c: Fixed 
-	  config_line[len-1] bug which could generate an access violation 
-	  if len==0.
-	* lib/alloca.c lib/getnev.c lib/getopt.c lib/getopt1.c
-	  lib/isfdtype.c lib/md5.c lib sigprocmask.c lib/snprintf.c lib
-	  strdup.c lib/strndup.c lib/strsep.c lib/usleep.c lib/vsyslog.c:
-	  Used #include "../include/sane/config.h".
-	* sanei/sanei_scsi.c: Fixed compilation issue for OS/2 in
-	  sanei_scsi_find_devices.
-	
---- cvs snapshot-2001-05-30 ---
-
-2001-05-30 Marian Eichholz <marian@freenet-ag.de>
-
-	* backend sm3600 with better gain calibration incorporated.
-          fixed a superfluceous export.
-
-2001-05-30  Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* Problem with SOLARIS_INTERFACE (change from 2001-05-27)
-	  had an other reason than the scsi buffer size (MAX_DATA).
-	  Changed scsi buffer size for solaris sg driver
-	  (USE == SOLARIS_INTERFACE in sanei_scsi.c) again from 32 KB
-	  to 128KB.
-
-2001-05-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/Makefile.in: Fixed umax_pp compilation problem with Solaris
-	  and other operating systems.
-	
-2001-05-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/canon.conf doc/sane-canon.man: Added config file and some
-	  documentation for it.
-	* AUTHORS: Added Chris Bagwell and Oliver Schwartz for snapscan.
-	* TODO: Added entry about possible sanei_usb.*.
-
-2001-05-29  Peter Fales <peter@fales.com>
-
-	* backend/dc240.c - Fixed a fairly obscure problem that can result in 
-	  core dump. (Deleting pictures with gphoto, then launching 
-	  xscanimage without power cycling the camera left bad data in the
-	  camera status table.)
-
-2001-05-29  Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* added entry about sanei_parport in TODO
-
-2001-05-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/releases.txt: Removed comment about net.* and dll.* version
-	  updating. Added info about make install-mostang.
-	* TODO: Updated concerning backend bugs (export and config_line).
-	* backend/umax_pp_low.c: Fixed bus error with FreeBSD.
-
-2001-05-27  Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* changed scsi buffer size for solaris sg driver
-	  (USE == SOLARIS_INTERFACE in sanei_scsi.c) to 32 KB
-	  again because it does not work for at least one system
-	  with 64KB.
-
-2001-05-27  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* doc/releases.txt: Added points on tagging the source and
-	  generating a diff from the last release.
-
---- cvs snapshot-2001-05-27 ---
-
-2001-05-27  Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* sanei/sanei_scsi.c: changed scsi buffer size (MAX_DATA)
-          to 128KB for: SOLARIS_INTERFACE, SOLARIS_SG_INTERFACE,
-	  SOLARIS_USCSI_INTERFACE and IRIX_INTERFACE
-	  (some scanners have problems with the predefined 32KB
-	   buffer size, these systems should work with 128KB
-	   but we need to test if no problems do occur).
-
-2001-05-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane-microtek2.man: Include updates from backend version 0.9
-	  (from karsten.festag@t-online.de (Karsten Festag)).
-	* backend/sm3600.c: setResolutions has only 5 instead of 6 resolutions.
-
-2001-05-26  Jochen Eisinger <jochen.eisinger@gmx.net>
-
-	* backend/mustek_pp.c: declared function comp() static
-	* TODO: removed entry regarding this problem
-
-2001-05-26  Chris Pinkham <cpinkham@infi.net>
-
-	* backend/artec.c: Added code in sane_exit() to free memory
-	  malloced in sane_get_devices().  Declared several functions
-	  'static' so they are not exported.
-	* TODO: removed 'artec' backend from list mentioned in describing
-	  above problems.
-
-2001-05-26  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* TODO: Updated entry on library search path, sanei API
-	  documentation and sane_init() return value.
-	
-	* Makefile.in:New target 'libcheck' making sure libraries export
-	  only sane_* and sanei_* symbols.
-
-2001-05-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Removed snapscan and microtek2 updates. Removed status change of
-	  as6e. Removed True64 Unix and HP/UX compilation problems. Added entry
-	  about exporting symbols. Reformatted some entries. 
-	* backend/microtek2.c backend/microtek2.desc backend/microtek2.h:
-	  Updated to version 0.9 (from Karsten Festag 
-	  <karsten.festag@t-online.de>).
-	* doc/sane-snapscan.man: Added new scanners and authors.
-	* AUTHORS: Added Sebastien Sable and Henrik Johansson.
-	* backend/snapscan-scsi.c backend/snapscan-sources.c
-	  backend/snapscan-sources.h backend/snapscan-usb.c
-	  backend/snapscan-usb.h backend/snapscan.c backend/snapscan.conf
-	  backend/snapscan.desc backend/snapscan.h: Updated snapscan backend to
-	  version 1.2 (from Sebastien Sable <Sebastien.Sable@snv.jussieu.fr>).
-	* doc/backend-writing.txt: Added "make libcheck" info.
-	* backend/sm3600-color.c backend/sm3600-gray.c backend/sm3600-homerun.c
-	  backend/sm3600-scanmtek.c backend/sm3600-scanusb.c
-	  backend/sm3600-scanutil.c backend/sm3600.c backend/sm3600.h:
-	  Made all non-sane-api functions static. Fixed some warnings.
-	* backend/sm3600.desc: Changed status to new.
-	* backend/as6e.desc: Changed status to alpha because backend
-	  isn't new any more.
-	* acinclude.m4 aclocal.m4 configure configure.in 
-	  include/sane/config.h.in: Fixed u_int* bug for Tru64 by
-	  including sys/bitypes.h.
-	* PROJECTS: Added hpoj project.
-
-2001-05-25 Jochen Eisinger <jochen.eisinger@gmx.net>
-
-	* doc/sane-mustek_pp.man, backend/mustek_pp.desc: Changed URL
-	  of the homepage to home.nexgo.de/jochen.eisinger/sane/
-
-2001-05-25  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Allow more than 8 bit color depth even for 
-	  preview mode  since Xsane can handle this. Some code cleanup.
-          Removed ancient code that was used to determine the resolution
-          back when the backend still had a slider for the resolution
-          selection.
-	* backend/epson.desc: Updated version number, added new scanners.
-
-2001-05-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sane-mustek.man: Removed some bug descriptions and addded
-	  sane(7) to SEE ALSO.
-	* sane-find-scanner.man sane-scsi.man scanimage.man: Added
-	  sane(7) to SEE ALSO.
-	* PROJECTS: Removed entry about Polaroid SprintScan 35LE (now in
-	  microtek).
-	* TODO: Removed umax from lists of backends with sane_get_devices
-	  and config_line bug. Removed entry about make uninstall and
-	  sanei_wire.c bug. Removed entry about microtek update. Added point
-	  about adding sane(7) to any manual page.
-
-2001-05-23  Matto Marjanovic  <maddog@yoo-hoo.ai.mit.edu>
-
-	* backend/microtek.c backend/microtek.h:
-	   o Added support for Agfa StudioStar (weird pixel packing)
-           o A couple of small fixes (missing 'static' declarations)
-           o Upped version to 0.12.3
-	
-2001-05-23  Matto Marjanovic  <maddog@yoo-hoo.ai.mit.edu>
-
-	* backend/microtek.c backend/microtek.h:  Small fixes:
-           o Use 'expanded contrast/exposure settings' inquiry data to
-	     dynamically set ranges for those options.
-           o Patches for Polaroid SprintScan 35LE (from Dick Bruijn)
-              - added "Polaroid" vendor string
-              - screwed around with 'brightness' setting
-              - attached 'negative scan' button
-           o sane_exit() now frees the devlist allocated by sane_get_devices()
-           o upped version to 0.12.2
-
-2001-05-23  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp.c: changed option names to use lower case characters
-		and dashes instead of spaces.
-
-	* backend/umax_pp_low.c: commented out a useless command sequence.
-		Added 55 AA pattern escaping in data block sending.
-
-2001-05-22  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Added sense handler to support the GT-8000 scanner.
-	  Also added experimental (and #ifdef protected) USB scanner probing
-	  code - requires patch to USB scanner driver.
-
-2001-05-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README: Added "man sane" to quick install. Added paragraph about
-	  old versions. Added paragraph about "make clean" and "make
-	  distclean". Added section about removing SANE.
-	* Makefile.in backend/Makefile.in doc/Makefile.in lib/Makefile.in
-	  sanei/Makefile.in tools/Makefile.in: Added target "uninstall".
-
-2001-05-20  Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* removed a bug in saned (patch by Matthias Trute <mtrute@topmail.de>)
-          calculation of the reader buffer index was not correct:
-             if (reader >= sizeof (buf))
-          -    reader = 0;
-          +    reader -= sizeof(buf);
-
-2001-05-19  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: fixed dates in change log entries
-	  and finally fixed the TPU bug with older scanners
-
-2001-05-17  Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* removed bug in umax backend sane_exit
-
-2001-05-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* include/lalloca.h: Used a more suitable comment.
-	* doc/backend-writing.txt: Reformated. Added point about headers
-	  and libraries that are not available on every system and inclusion
-	  of backends into CVS. Some minor fixes and clarifications.
-	* NEWS: Updated concerning sane man page and new backends.
-	
-2001-05-17  Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* updated umax backend to version 1.0 build 26
-
-2001-05-15  Peter Fales <peter@fales.com>
-
-	* backend/dc25.c, backend/dc240.c - Added DBG(1,..) to print
-	  version string
-
-2001-05-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/.cvsignore: Added sane-sm3600.5.
-	
-	* PROJECTS: Removed sm3600.
-
-	* TODO: Updates concerning memory leaks and access violations.
-
-	* AUTHORS doc/Makefile.in: doc/sane-sm3600.man doc/sane.man: Updated
-	  documentation concerning sm3600 backend and added man page (from
-	  from Marian Eichholz <eichholz@computer.org>).
-	
-	* configure configure.in include/sane/config.h.in: Detect presence
-	  of libusb and enable sm3600 backend.
-	
-	* backend/Makefile.in backend/dll.c backend/sm3600-color.c
-	  backend/sm3600-homerun.c backend/sm3600-scantool.h
-	  backend/sm3600-scanutil.c backend/sm3600.desc
-	  backend/sm3600-gray.c backend/sm3600-scanmtek.c
-	  backend/sm3600-scanusb.c backend/sm3600.c backend/sm3600.h:
-	  Added sm3600 backend (from Marian Eichholz <eichholz@computer.org>).
-
-2001-05-16  Chris Pinkham <cpinkham@infi.net>
-
-	* backend/artec.c: changed #include to use "../include/sane/config.h"
-	  instead of "sane/config.h".
-
-2001-05-16  Stéphane Voltz <svoltz@wanadoo.fr>
-
-	* backend/umax_pp.c: fix memory leak in sane_exit
-
-	* backend/umax_pp_low.c backend/umax_pp_low.h : added /proc parsing
-	  when available to get I/O addr. Added pauses in 610P probe
-	  sequence.
-
-2001-05-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* frontend/scanimage.c: scanimage_exit: use the handle (not its
-	  address) for sane_close. Fixed yet another warning.
-
-2001-05-14  Gerhard Jaeger <g.jaeger@earthling.net>
-	* backend/plustek.c:
-	  Free memory malloced in sane_get_devices() in sane_exit()
-
-2001-05-14  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* backend/lhii.desc: Updated with current version and contact
-	  information.
-
-	* frontend/scanimage.c tools/sane-find-scanner.c: Remove some
-	  compiler warnings.
-
-2001-05-13  Peter Fales <peter@fales.com>
-	* backend/dc25.c: Remove DBG(0,...) line that was getting printed
-	  for non-dc25 users.
-
-2001-05-13  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Removed check for '\n' before end of line
-          Free memory malloced in sane_get_devices() in sane_exit() again
-          Check first if the scanner does support the set film type
-          and set focus position before the GUI elements are displayed.
-          This caused problems with older (B4 level) scanners when a TPU
-          was connected.
-
-2001-05-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane.man: Added path to sane.ps. Added comments about
-	  how somebody can help the SANE project. Added comments about
-	  possible problems with old installaitions of SANE and
-	  /etc/ld.so.conf. Added section "REPORTING BUGS".
-	* tools/Makefile.in tools/.cvsignore: Added mustek600iin-off.
-	* sanei/sanei_codec_ascii.c tools/mustek600iin-off.c
-	  tools/sane-find-scanner.c frontend/stiff.c: Used #include
-	  "../include/sane/...".
-	* backend/net.c backend/net.h backend/net.desc: Fixed some memory
-	  leaks. A bit of reformating. Added more debug output. Used
-	  #include "../include/sane/...".
-	* sanei_codec_bin.c sanei/sanei_net.c sanei/sanei_wire.c: Fixed
-	  some memory leaks. Used #include "../include/sane/...".
-	* frontend/scanimage.c: Added exit handler to call sane_close
-	  and sane_exit in any case and to free alloced memory. A bit of
-	  reformating. Used #include "../include/sane/...". Fixed some
-	  warnings.
-	* frontend/saned.c: Fixed some memory leaks. Fixed some warnings.
-	  Some reformating. Used #include "../include/sane/...".
-	* README.hp-ux: Use gmake if make doesn't work.
-	* LEVEL2: Added point about sane_init results != SANE_STATUS_GOOD.
-	* TODO: Added entries about memory leaks, sane_init return values, and
-	  HP-UX problems in isfdtype.c.
-
-2001-05-11  Jochen Eisinger <jochen.eisinger@gmx.de>
-
-	* TODO, backend/mustek_pp.c: fixed line-end handling, removed entry
-	  from TODO list
-
-2001-05-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Removed pie from lists of bugs. Removed sane manual page.
-	  Added some context to the Tru64 problems.
-	
-2001-05-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/.cvsignore: Added sane.7.
-	* README: Removed content that's now in the sane maual page.
-	  Added reference to man sane.
-	* doc/Makefile.in doc/sane.man: Added SANE manual page.
-	* doc/sane.tex: Clarified the paragraph concerning sane_read. If
-	  *len != 0 the status must be SANE_STATUS_GOOD.
-	
-2001-05-08  Simon Munton <simon@munton.demon.co.uk>
-	* backend/pie.c: Free devlist in sane_exit. Removed redundant check for
-	trailing newline in config file.
-
-2001-05-07  Peter Fales <peter@fales.com>
-	* backend/dc25.[ch]: Cleaned up compiler warnings and fixed (very
-	  minor) memory leak.
-
-2001-05-07  Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-	* applied a patch by Douglas Gilbert to sanei_scsi.c
-          it solves the Problem that the scanner is not
-          found on linux systems when the order of the
-          scsi devices is not coverd by the order of
-          devices listed by /proc/scsi/scsi, it prefers
-          new kernel 2.4 methods when available
-
-2001-05-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek.c doc/mustek/mustek.CHANGES: Free devlist
-	  in sane_exit.
-	* TODO: Updated concerning config_line[len - 1] stuff. Added
-	  some (most) backends to list of sane_get_devices leak.
-	* backend/dll.c backend/dll.desc: Removed access to uninitialized
-	  memory. Increased version number.
-	* backend/net.c backend/net.desc: Removed access to uninitialized
-	  memory. Changed htons to ntohs in DBG statement. Free devlist
-	  in sane_exit. Use "../include/sane/...". Increased version number.
-
-2001-05-04  Gerhard Jaeger <g.jaeger@earthling.net>
-	* backend/plustek.c: Applied Petters' patch to avoid an
-	  illegal memory access
-
-2001-05-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
-	
-	* NEWS: Updated.
-	* PROJECTS: Removed umax_pp. Added Canon FB620S and FS2710 backend.
-	* TODO: Removed entry about umax_pp and comment about testing
-	  for existing sane installations and plustek memory access violation.
-	  Added Canon FB620S and FS2710 backend and entries about Tru64
-	  compilation problems and installation procedure for translations.
-	* doc/backend-writing.txt: Added entries about SANE_I18N() and
-	  documentation directories.
-
-2001-05-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* AUTHORS README: Updated concerning umax_pp.
-	
-	* doc/Makefile.in doc/sane-umax_pp.man .cvsignore: Added manpage for
-	  umax_pp (patch from Stéphane Voltz <svoltz@wanadoo.fr>).
-	
-	* tools/README tools/Makefile.in tools/umax_pp.c tools/.cvsignore:
-	  Added umax_pp test program (patch from Stéphane Voltz 
-	  <svoltz@wanadoo.fr>).
-	
-	* configure configure.in include/sane/config.h.in: Test for
-	  linux/ppdev.h (for umax_pp backend).
-	
-	* backend/umax_pp.c backend/umax_pp.h backend/umax_pp_low.c
-	  backend/umax_pp_low.h backend/umax_pp_mid.c backend/umax_pp_mid.h
-	  backend/umax_pp.conf backend/umax_pp.desc backend/Makefile.in 
-	  dll.conf: Added umax_pp backend (patch from Stéphane Voltz 
-	  <svoltz@wanadoo.fr>).
-
-2001-05-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Don't use -ansi for Solaris. On some
-	  Solaris installations compilation breaks with -ansi.
-
-	* doc/Makefile.in tools/sane-desc.el doc/.cvsignore: Install
-	  sane.ps and sane.dvi if latex/makeindex/dvips is available.
-	  Generate sane-backends.html in doc/. New target: 
-	  install-mostang. Installs the sane standard 
-	  (.ps, .ps.gz and html), the html manpages, and sane-backends.html
-	  on www.mostang.com.
-
-2001-05-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in include/sane/config.h.in README.solaris
-	  sanei/sanei_scsi.c: Added support for Solaris sgen SCSI driver
-	  (patch from Juergen Keil <jk@tools.de>).
-	* acinclude.m4 aclocal.m4 configure: Added Irix to the list
-	  of operating systems that can use -Wl,-rpath.
-	* doc/Makefile.in: Install all the READMEs and other available
-	  documentation in $docdir. Print which manpage is generated.
-	  Don't remove files/dirs that doesn't exist. Remove the html
-	  manpages in distclean. Fixed spelling mistake in .PHONY.
-	* TODO: Added entries about possible segfaults and memory leaks.
-	  Added entry about AIX problems. Removed entry about installing
-	  documentation.
-	* PROJECTS: Added Canon FB330P, FP630P.
-
-2001-04-30  Jochen Eisinger <jochen.eisinger@informatik.uni-freiburg.de>
-
-	* doc/sane-mustek_pp.man: Added information about CIS patches
-	  by Eddy De Greef
-
-2001-04-29  Chris Pinkham <cpinkham@infi.net>
-
-	* backend/artec.c: Fixed bug causing possible dereference of a NULL
-	  pointer.
-	* backend/artec.desc: Modified Parport entry to say AS6E scanner
-	  supported by SANE AS6E backend.
-
-2001-04-29  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* sanei/sanei_config.c sanei/sanei_codec_bin.c: Avoid reading
-	  uninitialized memory.
-	* sanei/sanei_config.c: Fix memleak when using env
-	  SANE_CONFIG_DIR.
-	* backend/net.c sanei/sanei_wire.c include/sane/sanei_wire.h: Make
-	  sure net backend release all memory when finished.
-	* README: Added info about the CVS repository.
-
-2001-04-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/sanei_wire.c: Don't free memory that's not alocced.
-	* sanei/sanei_config.c: Avoid reading uninitialized memory when 
-	  checking SANE_CONFIG_DIR.
-	* backend/mustek.c: Fixed several memory leaks.
-	* frontend/scanimage.c: Fixed memory leak.
-	* sanei/sanei_config2.c: Fixed memory leak: vendor wasn't freed.
-	* PROJECTS: Added entry for the Fujitsu M3091DCd. Updated my email
-	  address.
-	* TODO: Added entry for the Fujitsu M3091DCd and a combined Fujitsu
-	  backend. Clarified that "printf" also shouldn't be used.
-	* backend/dll.desc: Added my email as contact address.
-	* backend/m3091.desc: New file for the Fujitsu M3091DCd.
-	* doc/sane-mustek.man: Updated URL.
-
-2001-04-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek.CHANGES backend/umax.CHANGES backend/umax.FAQ
-	  backend/umax.TODO: Moved to doc/mustek respectively doc/umax.
-	* doc/canon.CHANGES doc/canon.install2700F.txt doc/canon:
-	  Moved canon-specific documentation to doc/canon.
-	* doc/mustek: New subdirectory for mustek-specific documentation.
-	* doc/sane-umax*.html doc/sane-umax*.jpg doc/sane-umax-doc.tex
-	  doc/sane-umax-doc.dvi doc/umax: Moved all the umax-specific
-	  documentation to new subdirectory umax.
-
-2001-04-28  Peter Kirchgessner <peter@kirchgessner.net>
-
-        * backend/hp.desc, doc/sane-hp.man: Add support for new models
-          through PTAL-library
-
-2001-04-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/agfafogus.c: Moved PATH_MAX after sanei_backend.h include
-	  to avoid warning. Changed printf to DBG.
-	* backend/mustek.c backend/mustek.CHANGES backend/mustek.desc: Added
-	  support for translating options. Used only PACKAGE_VERSION for
-	  output. Updated email address. New version: 1.0-107.
-	* include/sane/sanei_backend.h include/sane/saneopts.h: Added macro
-	  SANE_I18N. It's used to mark strings that can be translated and
-	  used by a frontend. Usually these are option titles and descriptions
-	  as well as the contents of string lists. Used this macro to mark
-	  the translatable strings in saneopts.h. More translation support
-	  will follow.
-
-2001-04-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* PROBLEMS: Point to pnm/saned security risks.
-	* TODO: Removed the entries about epson usb mis-detection and check
-	  for installed sane versions.
-	* configure configure.in backend/Makefile.in: Added detection of older
-	  versions of SANE. The pnm backend is now disabled by default.
-	* backend/dll.c backend/dll.desc: Fixed file descriptor leak (found by
-	  Douglas Gilbert). New version: 1.0.2.
-	* backend/net.desc: Added Jochen Eisinger's email address as contact
-	  for the net backend.
-	* doc/sane-pnm.man: Point to pnm/saned security risks.
-	
-2001-04-21  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.conf: Commented out the usb config entry, this can
-	  block other USB scanners from being recognized.
-
-2001-04-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* AUTHORS: Added Michael Herder and me for pnm. Updated my email
-	  address.
-	* TODO: Removed pnm entry about adding more options. Added entry about
-	  epson backend freezing when trying to detect non-epson USB scanner.
-	  Added entry about adding contact adresses to .desc files. Added
-	  comment about me working on a sane man page. Removed entry about OS/2
-	  problems in sanei_scsi.c.
-	* configure configure.in: Removed a newline in --help message.
-	* backend/pnm.c: Added several options: gamma tables 
-	  (-> arrays), resolution option (word list), read only test option
-	  (SANE_CAP_SOFT_DETECT), several options for returning status codes
-	  in sane_read (all of this is from Michael Herder <crapsite@gmx.net>).
-	  Added build version info, print version information in sane_init.
-	  Use ../include/sane/ for includes. Version is 1.0.1.
-	* backend/pnm.desc: Updated contact info and version.
-	
-2001-04-19  Gerhard Jaeger <g.jaeger@earthling.net>
-	* backend/plustek.c: removed again that old fgets() call - sorry
-
-2001-04-19  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* tools/sane-config.in: Fix typo in previous commit.
-
-2001-04-17  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/sane-epson.man: Fixed types, some reformatting and got rid
-	  of a duplicate paragraph.
-
-2001-04-17  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* backend/dc210.desc backend/dc240.desc backend/microtek2.desc:
-	  Update contact information for backends. dc240 status is :NEW.
-	* TODO: added entries about as6e status shouldn't be :new, and
-	  installing all documentation files.
-	
-2001-04-16  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* Makefile.in: New target 'sort-cvsignore' to keep all .cvsignore
-	files sorted.
-
-	* acinclude.m4 configure.in tools/sane-config.in: Try to guess how
-	to set runtime link path, and make it easier to extend.
-
-	* acinclude.m4 configure.in: Clean up warning flag handling.
-
-2001-04-16  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* README: Updated xsane link.
-	* configure configure.in backend/dll.c backend/dll.desc 
-	  backend/net.c backend/net.desc include/sane/config.h.in
-	  Yet another change in the version system for dll and net.
-	  For sane_init return the version of the package but use
-	  own internal version number in the source (printed with
-	  debugging enabled) and in *.desc. The internal versions
-	  of both net and dll are set to 1.0.1. Please increase the
-	  build number with every change on the source files.
-	* doc/realeases.txt -> doc/releases.txt. Fixed spelling error.
-	  Added entries about sane-backends.html, sane.ps, man pages,
-	  platforms page.
-	
-2001-04-14  Gerhard Jaeger <g.jaeger@earthling.net>
-	* backend/plustek.c backend/plustek.desc backend/plustek.h
-	  backend/plustek-share.h
-	  minor fixes and additional scanner models
-	* doc/sane-plustek.man added info about slowIO switch
-
-2001-04-13  Oliver Rauch <Oliver.Rauch@Rauch-domain.de>
-	* changed my email address in AUTHORS
-
-2001-04-13  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* PROJECTS TODO: Added entry about E3 USB chipset.
-	* backend/dll.c backend/dll.desc: New version is 1.0.5. Version and
-	  PACKAGE_VERSION is printed with debug level set to 1 or higher.
-	  The version numbers of all backends that are loaded are printed
-	  at debug level 3 or higher. Print error if backend with wrong
-	  major version number is loaded. Some standardization changes
-	  concerning the DBG messages.
-	* backend/net.c backend/net.desc: New version is 1.0.5. Version and
-	  PACKAGE_VERSION is printed with debug level set to 1 or higher.
-	  Some standardization changes concerning the DBG messages.
-	* backend/pnm.c: Return SANE_INFO_RELOAD_PARAMS even if the pnm
-	  file doesn't exist or can't be loaded (from mh <crapsite@gmx.net>).
-	* doc/backend-writing.txt: Added AUTHORS to the list of things that
-	  should be updated when including a new backend. Added points about
-	  avoiding printf and exit in backends.
-	* doc/releases.txt: New file. This text summarizes some points to
-	  pay attention to when a new release of sane-backends is made.
-	  Additions and corrections are appreciated.
-	* doc/scanimage.man: Add some more information about the -V option.
-	* frontend/scanimage.c: The option -V now also prints the version of
-	  the backend (ususally dll).
-	
-2001-04-11  Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* sanei/sanei_scsi.c: fixed a bug in error handling for the
-	  Linux SG driver verison 3.x
-	* sanei/sanei_scsi.c, configure.in, configure: Usage of direct IO
-	  disabled by default.
-         * README.linux: Added a note, how to enable direct IO
-
-2001-04-08  Henning Meier-Geinitz <hmg@gmx.de>
-	
-	* backend/mustek.c backend/mustek.desc backend/mustek.CHANGES
-	  Added detection of the TA for the Paragon 1200 SP Pro. Added
-	  warning about not supported Trust scanners. Changed description
-	  of contrast and brightness settings. Backend status is "stable" 
-	  now. New version: 1.0-106.
-	* acinclude.m4 aclocal.m4: Fixed comment concerning dc240.
-	* configure configure.in include/sane/config.h.in: Added test for
-	  socklen_t in sys/socket.h. This fixes the compilation problem on
-	  Irix.
-	* doc/sane-avision.man doc/sane-ricoh.man doc/sane-s9036.man
-	  doc/sane-tamarack.man: find-scanner is now called
-	  sane-find-scanner and installed on the system so it's not 
-	  necessary to point to the tools directory.
-	* frontend/scanimage.c: Fixed too long line in output.
-	* sane-config.in: Name is sane-config again (was sane-backends-config
-	  due to the renaming of the package).
-	* TODO: Removed entry about net.c not compiling on Irix and
-	  references to find-scanner in the man pages. Updated numbers of
-	  the compilation warnings. Still too many, however.
-	  
-2001-04-07  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* backend/sc240.c backend/dc240.h backend/dc240.conf
-	  backend/dc240.desc backend/dll.conf doc/sane-dc240.man:
-	  Added dc240 backend for the Kodak DC240 Digital camera (from
-	  Peter Fales <peter@fales.com>).
-	* doc/Makefile.in: Added sane-dc240 in section 5.
-	* backend/Makefile.in: Added dc240.
-	* configure configure.in: If the jpeg libs are not available,
-	  dc240 is also disabled.
-	* AUTHORS: Added entry for dc240 and updated email address of
-	  Peter Fales.
-	* NEWS: First version of the news entry for 1.0.5.
-	* PROJECTS: Removed dc240. Added Microrec ScanMaker 3600.
-	* README: Added dc240.
-	* TODO: Removed dc240. Added entry about keep-alive mechanism in saned.
-	* sane-backends.lsm: Added dc240.
-	* testsuite/.cvsignore: New file. Added entry for Makefile.
-
-2001-03-31  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.*: Next attempt to get the reported number of 
-	  lines correct for the "color shuffling" part.
-          Added more comments.
-
-2001-03-31  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* backend/mustek.c backend/mustek.desc backend/mustek.h
-	  backend/mustek.CHANGES: Fixed grascale gamma for the 600 II N.
-	  Fixed ADF problems when selecting windows smaller than the
-	  whole scan area. Fixed linedistcnace corrections issues concerning
-	  ADF and concerning 1200SP V 1.00. New version: 1.0-105.
-
-2001-03-31  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* PROJECTS: Updated entry about Canon 1220U and Umax 1220P / HP3200C.
-	  Added entry about Kodak DC-240.
-	* TODO: Added Umax 1200P/2000P & HP 320C + Kodak DC-240 as backends
-	  to be included. Added net.c compilation problem.
-	
-2001-03-10  Jochen Eisinger <jochen.eisinger@gmx.net>
-
-	* frontend/saned.c: fixed bug that allowed access to a scanner
-	  without being prompted for a password
-
-2001-03-04 Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* umack backend updated to version 1.0-build-25
-
-2001-02-26 Abel Deuring <a.deuring@satzbau-gmbh.de>
-
-	* sanei/sanei_scsi.c: removed a possible null pointer 
-	  dereference in the Solaris/Schilling driver part. (Bug was 
-	  found and fixed by William L. Sebok)
-
-	* backend/tamarack.c: inconsistent call to sanei_scsi_cmd fixed
-
-2001-02-22  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* TODO: Add comment on how link problems should really be fixed.
-	* TODO: List memleak problem for sane_get_devices().
-
-	* configure.in include/sane/config.h.in: Really move definition of
-	SCSIBUFFERSIZE from CFLAGS to config.h.
-
-	* configure.in testsuite/*: Started on runtime test suite.
-	Currently only tests if PNM test scanning works.
-
-	* sanei/sanei_constrain_value.c sanei/sanei_load_values.c
-	sanei/sanei_save_values.c: Include "sane/sanei.h" to make sure the
-	prototype match the function.
-
-	* backend/pnm.c: Write more sensible error message when failing to
-	open PNM file.
-
-	* include/sane/sanei_backend.h: Include <fcntl.h> before testing
-	for O_NONBLOCK and <limits.h> before testing for PATH_MAX to
-	increase the chances of getting the real value.
-
-2001-02-12  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* backend/dll.c backend/v4l.c: Get rid of small memory leak when
-	using 'scanimage -L'.
-
-2001-02-10  Tom Martone <tom@martoneconsulting.com>
-
-        * backend/bh.c backend/bh.h doc/sane-bh.man
-	  added support for Copiscan 8000 series by Mark Temple
-	  added options deskew and rotation
-	  inquiry compares product to COPISCAN rather than COPISCAN II
-
-2001-02-04 Peter Kirchgessner <peter@kirchgessner.net>
-
-        * hp-backend V0.94, backend/hp.c hp-handle.c hp-scl.h:
-          Switch off lamp after scan
-
-2001-01-31 Abel Deuring <a.deuring@satzbau-gmbh.de>
-
-	* sanei/linux_sg3_err.h: New version provided by Douglas Gilbert.
-	  Does not longer #include <linux/../scsi/scsi.h> and
-	  #include <linux/../scsi/sg.h>
-	* sanei/sanei_scsi.c (Linux part): fixed some format errors in 
-	  debug output; added debug: system("cat /proc/scsi/sg/debug 1>&2"), 
-	  if debug level >= 255. (Suggestion by Douglas Gilbert)
-
-2001-01-23 Oliver Rauch <Oliver.Rauch@Wolfsburg.DE>
-
-	* TODO: sane-config changes
-
-2001-01-21  Tom Martone <tom@martoneconsulting.com>
-
-        * backend/dll.conf: Added bh
-
-2001-01-21  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* AUTHORS: Added Tom Martone.
-	* PROJECTS: Removed bh (now included in sane).
-	* README: Added entry for sane-bh(5).
-	* TODO: Removed bh. Updated BearPaw entry. Added entry about v4l
-	  problem.
-	* backend/v4l.c: Changed comment as v4l is part of the sane package.
-
-2001-01-20  Tom Martone <tom@martoneconsulting.com>
-
-        * doc/.cvsignore: Added sane-bh.5.
-
-2001-01-20  Tom Martone <tom@martoneconsulting.com>
-
-	* backend/bh.c backend/bh.conf backend/bh.h doc/sane-bh.man
-	  Added new backend Bell and Howell Copiscan scanners
-	* backend/bh.desc
-	  Updated version from (0.1) to 1.0-4
-	  Referenced manpage
-	* backend/Makefile.in
-	  Added bh to PRELOADABLE_BACKENDS
-	  Added libsane-bh.la dependencies
-	* doc/Makefile.in
-	  Added sane-bh.5 to SECT5
-
-2001-01-17  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* backend/mustek.c backend/mustek.desc backend/mustek.h
-	  backend/mustek.CHANGES doc/sane-mustek.man:
-	  Added 36 bit mode for Pro models. Removed support for "special"
-	  modes, used options instead. Code cleanup. Updated manpage
-	  concerning sane-find-scanner. New version: 1.0-104.
-	* configure: regenerated from configure.in.
-	
-2001-01-14  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* sanei/sanei_scsi.c: Make sure to initialize uninitialized
-	variable 'defined' to zero.
-
-	* include/sane/sanei_wire.h: Add missing prototype for
-	sanei_w_ptr() and sanei_w_bool().
-
-	* configure.in include/sane/config.h.in: Move definition of
-	HAVE_DEV_URANDOM and SCSIBUFFERSIZE from CFLAGS to config.h.
-
-2001-01-07  Abel Deuring <a.deuring@satzbau-gmbh.de>
-
-	* sanei/sanei_scsi-c: (Linux part) timeout for SCSI commands
-	  sent with the SG driver version increased; debug output of
-	  device status, host status, driver status and sense buffer 
-	  added.
-
-2001-01-09  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* PROJECTS TODO: Added/updated entries about backends for Mustek
-	  BearPaw and 1200 UB scanners.
-
-2001-01-07  Abel Deuring <a.deuring@satzbau-gmbh.de>
-
-	* sanei/sanei_scsi-c: (Linux part) improved detection of
-	  sanei_scsi_max_request_size. Setting SANE_SG_BUFFERSIZE for
-	  low drivers which don't support scatter-gather should
-	  no longer be necessary.
-	* sanei/sanei_scsi-c: (Linux part) Added support for the new
-	  devfs in sanei_scsi_find_devices-
-	* backend/sharp.c: Test for existence of shm.h added.
-	* TODO: Removed entry about missing detection of shm.h in sharp
-	  backend.
-
-2001-01-03  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* PROJECTS: Added Umax 1220P / HP3200C.
-
-2000-12-31  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* tools/find-scanner.c: Removed. Now called sane-find-scanner.
-	* tools/sane-find-scanner: New file (was find-scanner).
-	* tools/.cvsignore tools/Makefile.in tools/README: Updated because
-	  of name change. sane-find-scanner is installed now.
-	* README README.linux: Updated because of sane-find-scanner.
-	* frontend/scanimage.man: Updated because of sane-find-scanner.
-	* doc/sane-find-scanner.man: New file.
-	* doc/.cvsignore doc/Makefile.in: Added sane-find-scanner(1).
-	* TODO: Updated concerning sane-find-scanner. Added entry about
-	  qcam /tmp file handling. Some spelling corrections.
-
-2000-12-31  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* backend/mustek.CHANGES backend/mustek.c backend/mustek.desc 
-	  backend/mustek.h doc/sane-mustek.man:  Added calibration for Pro
-	  scanners and the SE 12000 SP Plus. Added option to use the full
-	  legal size of the Paragon 1200 LS scanner. Added fast preview for
-	  Pro scanners. Bug fixes. New version: 1.0-103.
-	
-2000-12-25  Karl Heinz Kremer <khk@khk.net
-
-	* backend/epson.*: Version 0.2.01
-	  Added bit-depth selection again. 
-   	  Fixed problem with bilevel scanning with Perfection610: The
-	  line count has to be an even number with this scanner.
-	  Several initialization fixes regarding bit depth selection.
-	  This version goes back into the CVS repository, the 1.0.4 
-	  release is out and therefore the code freeze is over.
-	  Some general cleanup, added more comments.
-
-2000-12-23  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* TODO: Removed entry about net/saned crashes.
-	* backend/net.c: Fixed segfault when using SANE_TYPE_STRING options
-	  (e.g. scanimage on localhost). Added checks to prevent other
-	  segfaults. Fixed some warnings.
-	* backend/snapscan.desc: Changed to use new homepage.
-
-2000-12-23  Henning Meier-Geinitz <hmg@gmx.de>
-
-	* NEWS: Added date of release.
-	* TODO: Removed entries about PATH_MAX, sanei_scsi_find_devices, and
-	  shm.h. Added entry about the necessity to check HAVE_SYS_SHM_H.
-	* configure configure.in include/sane/config.h.in: Default to
-	  --enable-warnings again. Don't set "-ansi" for OS/2. Test for 
-	  sys/shm.h. 
-	* backend/GUIDE: Moved to doc/backend-writing.txt.
-	* doc/backend-writing.txt: New file (moved from backend/GUIDE).
-	  Added comments about sanei-backend.h and PATH_MAX.
-	* include/sane/sanei_backend.h: Added define for PATH_MAX (if
-	  necessary).
-	* sanei/sanei_scsi.c: Implemented sanei_scsi_find_devices for FreeBSD
-	  (from ports@FreeBSD.org).
-	* tools/Makefile.in: Use INSTALL_SCRIPT instead of INSTALL_PROGRAM for
-	  sane-config (from ports@FreeBSD.org).
-
diff --git a/ChangeLog-1.0.6 b/ChangeLog-1.0.6
deleted file mode 100644
index d8c007f..0000000
--- a/ChangeLog-1.0.6
+++ /dev/null
@@ -1,667 +0,0 @@
-******  Release of sane-backends 1.0.6. End of code freeze ******
-
-2001-11-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sane-backends.lsm: Added keyword gphoto.
-	
-2001-10-31  Peter Fales <peter@fales.com>
-
-	* acinclude.m4, aclocal.m4, configure - Fix build failure due to 
-	  renaming of gphoto2 header files
-
-2001-10-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/apple.desc: Updated URL.
-	* backend/canon_pp.desc: Fixed two wrong scanner names (from
-	  "Matthew Duggan" <stauff@guarana.org>).
-	* backend/m3091.desc backend/m3096.desc backend/sp15c.desc:
-	  Updated URL.
-
-2001-10-29  Peter Fales <peter@fales.com>
-
-	* backend/dc25.desc - Update URLs
-
-2001-10-19 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* set correct backend version number in backend/umax.desc
-
-
-******    code freeze sane-1.0.6 / sane-pre1-1.0.6  *****
-
-
-2001-10-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/microtek2.desc: Added missing scanner descriptions (from
-	  karsten.festag@t-online.de (Karsten Festag)).
-	* NEWS: Updated version numbers. Added release date.
-	* configure configure.in: New version: 1.0.6. Disabled warnings by
-	  default.
-
-2001-10-28  Peter Fales <peter@fales.com>
-
-	* backend/gphoto2.c, backend/gphoto2.conf: the ghoto2 people
-	  made some pretty radical changes to the API and broke 
-	  the gphoto2 backend.  Made the changes to allow the
-	  gphoto2 backend to work with the latest changes from the
-	  gphoto2 library CVS.
-
-2001-10-28  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Fixed bug in recognition of faulty Perfection 1650
-
-2001-10-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Removed entry about @LIBDIR@ and @CONFIGDIR@ in man pages.
-	  Added Entry about sanei_scsi return values and timeout.
-	* backend/microtek2.desc backend/microtek2.h doc/sane-microtek2.man:
-	  Increased version number to 0.95. Updated man page. Patch from
-	  karsten.festag@t-online.de (Karsten Festag).
-
-2001-10-27 Peter Kirchgessner <peter@kirchgessner.net>
-
-  *backend/hp-accessor.c hp-device.c hp-handle.c hp-hpmem.c hp-option.c
-           hp-scl.c:
-    Use ../include/lassert.h
-
-2001-10-17 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-  * umax backend bugfixes (new version number: 1.0 build 31):
-    man page uses @LIBDIR@ and @CONFIGDIR@,
-    calibration fix for Supervista S-12 and compatible scanners
-    directory backend:
-      umax.c umax-scanner.c umax-scsidef.h
-    directory doc:
-      sane-umax.man /umax/sane-umax-advanced-options-doc.html
-      umax/sane-umax-standard-options-doc.html umax/umax.CHANGES    
-
-2001-10-27  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-  * backend/Makefile.in     backend/snapscan-usb.c
-    backend/snapscan-usb.h  backend/snapscan.c
-    backend/snapscan.h
-    Check USB vendor ID to avoid USB hangup
-    Fix dither matrix computation bug
-
-******    snapshot 2001-10-27                        *****
-
-2001-10-26  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-  * backend/snapscan.conf
-    Make /dev/sga the default device to avoid USB hangup
-
-2001-10-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Removed net/saned cancel problem. Added entry about
-	  clarifying sane_get_select_fd/sane_cancel in sane.tex.
-	  Added entry about sanei_usb and control messages.
-	* sanei/sanei_usb.c: Fixed vendor/device detection for Linux
-	  versions >= 2.4.13.
-
-2001-10-25  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-  * NEWS backend/snapscan.c backend/snapscan.desc
-    Change snapscan backend version number to 1.4.0
-
-2001-10-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/microtek2.c backend/microtek2.desc backend/microtek2.h
-	  doc/sane-microtek2.man: Updated microtek2 backend to build
-	  20011023 (from karsten.festag@t-online.de (Karsten Festag)).
-	  Bugfix for scsi_read_image_status - supports now the old and the
-	  new method. Improved backend-calibration supports brightness and
-	  contrast settings and color balancing. Enable 12 bit per color
-	  scanning with Scanmaker 9600XL (and other types that use the segreg
-	  pixel transfer format and support 12 bit, untested). 10 bit does not
-	  work yet. Make C6 USB work.
-
-2001-10-24  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-  * doc/sane-snapscan.man
-    Documentation update.
-
-2001-10-23  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-  * backend/snapscan-scsi.c
-    Limit number of scan lines for quality calibration to fit in
-    SCSI buffer.
-
-2001-10-21  Peter Kirchgessner <peter@kirchgessner.net>
-
-  * backend/hp.desc, doc/sane-hp.man
-    Add support for OfficeJet PSC 900 series
-
-2001-10-20  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.[ch]: Fix for older Perfection 1650 scanners -
-	  their firmware only reports half of the vertical scanning
-	  area and they need to swap two color channels.
-
-2001-10-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* PROJECTS: Added Coolscan2 backend.
-
-2001-10-15  Peter Fales <peter@fales.com>
-
-	* backend/gphoto2.c, backend/gphoto2.h: Cosmetic cleanup
-
-******    Feature freeze for sane-1.0.6 is active    *****
-******    snapshot 2001-10-15                        *****
-
-2001-10-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Removed some entries about net/saned.
-	* doc/saned.man: Clear up that a FQDN must be used in
-	  saned.conf and that localhost is allways granted acces.
-	* NEWS: Updated.
-
-2001-10-14 Jochen Eisinger <jochen.eisinger@gmx.de>
-
-	* backend/mustek_pp.conf: added comment about changes in
-	  the naming of ports in 2.4.x
-
-2001-10-13 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* backend/umax.c, bachend/umax-scanner.c, backend/umax.desc,
-	  doc/umax/sane-umax-config-doc.html, doc/umax/umax.CHANGES,
-	  doc/sane-umax.man:
-	  update to sane-umax-1.0 build 30:
-	  - added EDGE KTX-9600US as supported scanner
-	  - Changing scansource does not change lower left selection
-            edge if not necessary
-
-2001-10-12  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-scsi.c    backend/snapscan.h
-	  backend/snapscan.c
-	  Update to snapscan-20011012
-
-2001-10-12  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/sanei_wire.c: Added debug output (based on patch
-	  from Jochen Eisinger <jochen.eisinger@gmx.de>).
-	* backend/net.c backend/net.desc: Better and more debug output
-	  (based on patch from Jochen Eisinger <jochen.eisinger@gmx.de>).
-	  Fixed some debug output and formatting issues of the byte order
-	  patch. Increased version number to 1.0.5.
-	* frontend/saned.c: More debug output. Used DBG instead of
-	  fprintf/perror. Fixed some formatting issues.
-
-2001-10-10  Jochen Eisinger <jochen.eisinger@gmx.de>
-
-	* sanei/sanei_wire.c: replaced memcpy with memmove
-
-2001-10-10  Jochen Eisinger <jochen.eisinger@gmx.de>
-
-	* PROJECTS: added URL to HP ScanJet 2200c project
-
-2001-10-10  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/m3096g-scsi.h backend/m3096g.c backend/m3096g.h
-	  doc/sane-fujitsu.man: Update (from Oliver Schirrmeister
-	  <oschirr@abm.de>). Added: Support for ipc2/3 and cmp2 options;
- 	  support for duplex-scanners m3093DG, m4097DG; constraint checking
-	  for m3093; support EVPD (virtual product data); support ADF paper
-	  size spezification.
-	* AUTHORS: Added Oliver Schirrmeister for m3096g, removed the active
-	  sign (*) from Randolph Bentson.
-
-2001-10-09  Peter Fales <peter@fales.com>
-
-	* backend/dc210.c, backend/dc210.h: Fix compiler warnings
-
-2001-10-09  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-scsi.c    backend/snapscan-usb.c
-	  backend/snapscan.c
-	  Fix compiler warnings
-
-2001-10-09  Peter Fales <peter@fales.com>
-
-	* backend/gphoto2.desc: Yet another try at getting a format that
-	  generates the right web page.
-
-2001-10-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/ibm.desc: Removed old entry.
-	* backend/sm3600.desc: Changed status to :alpha.
-	* doc/sane-agfafocus.man: Fixed some small mistakes.
-	* doc/sane-apple.man: Fixed some small mistakes. Added link
-	  to mostang.com mailing list archive.
-	* doc/sane-artec.man: Fixed spelling mistake and formatting issues.
-	* doc/sane-nec.man: Fixed problem with table.
-	* doc/sane-sharp.man: Fixed problem with table.
-	* backend/sharp.desc: Added link to sane-sharp manual page.
-	* doc/sane_mustek_pp.man: Removed link to sane-musteka4s2 (doesn't
-	  exist).
-	* doc/sane-abaton.man doc/sane-agfafocus.man doc/sane-apple.man
-	  doc/sane-bh.man doc/sane-microtek.man doc/sane-pint.man
-	  doc/sane-st400.man: Added link to mostang.com mailing list page.
-	* backend/net.c backend/net.desc: Fixed byte order problems for 16
-	  bits per color image data (from mh <crapsite@gmx.net>).
-	* TODO: Removed entries about .desc files, man pages and net.c
-	  byte-order problem.
-
-2001-10-09  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-scsi.c    backend/snapscan-sources.c
-	  backend/snapscan-sources.h backend/snapscan-usb.c
-	  backend/snapscan-usb.h     backend/snapscan.c
-	  backend/snapscan.conf      backend/snapscan.desc
-	  backend/snapscan.h
-	  Update to snapscan-20011008
-
-2001-10-08  Peter Fales <peter@fales.com>
-
-	* backend/gphoto2.desc: Another try at getting a format that
-	  generates the right web page.
-
-2001-10-08  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/ibm.desc: New file. Backend for the IBM 2456 and the
-	  Ricoh IS-410.
-	* PROJECTS: Added IBM backend. Removed gphoto2 (now included in
-	  distribution).
-
-2001-10-07  Peter Fales <peter@fales.com>
-
-	* backend/gphoto2.desc: Cleaned up syntax errors
-	  doc/sane.man:  Added gphoto2 backend to digital camera section
-	  AUTHORS:  Added gphoto2 backend/author
-
-2001-10-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek_usb.c backend/mustek_usb.conf backend/mustek_usb.desc
-	  backend/mustek_usb_high.c backend/mustek_usb_high.h
-	  backend/mustek_usb_low.c backend/mustek_usb_low.h
-	  backend/mustek_usb_mid.c backend/mustek_usb_mid.h
-	  doc/mustek_usb/mustek_usb.CHANGES: Fixed problem with 1200UB
-	  sensor detection. Started work on 1200 USB. New version:
-	  1.0-7.
-
-2001-10-07 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-        * created directory "po"
-          added files po/epson.de.po and po/umax.de.po
-
-          we have to define how we will handle (include+install)
-          translations, in the moments the files are only added
-          to the directory structure without any function
-
-
-2001-10-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/canon_pp.desc: New file (from Matthew Duggan
-	  <stauff@guarana.org>.
-
-2001-10-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Removed entries about hp and plustek backends.
-	* backend/microtek2.c backend/microtek2.h doc/sane-microtek2.man:
-	  Updated Microtek2 backend to version 0.9 build 20010828 (from
-	  Karsten Festag <karsten.festag@t-online.de>).
-	* NEWS: Updated.
-
-2001-10-04  Peter Kirchgessner <peter@kirchgessner.net>
-
-        * backend/hp-accessor.c hp-device.c hp-handle.c hp-hpmem.c
-                  hp-option.c  hp-scl.c
-            Use include "../include/assert.h"
-          doc/sane-hp.man
-            Tell about subscribing to sane-devel
-
-2001-10-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README.hp-ux: Lots of new and updated information (from
-	  Michael Piotrowski <mxp@dynalabs.de>).
-
-2001-10-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/dll.c backend/dll.desc: HP/UX uses .sl for shared libs.
-	  Changed status to "stable". Increased version number.
-	* tools/sane-find-scanner.c: Check for __hpux instead of __hpux__.
-
-2001-10-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Added possible saned problem with (not) fully qualified
-	  domain names.
-
-2001-09-29  Peter Fales <peter@fales.com>
-
-	* backend/gphoto2.c, backend/gphoto2.h, backend/gphoto2.desc:
-	  Cosmetic cleanup and minor fixes.  Added list of gphoto2
-	  supported cameras to gphoto2.desc, even though most of them
-	  are not tested and probably not working yet.
-
-2001-09-24  Peter Fales <peter@fales.com>
-
-	* backend/gphoto2.c, backend/gphoto2.h, backend/gphoto2.conf:
-	  Cosmetic cleanup and changes to reflect changes to the gphoto2
-	  API.
-
-2001-09-23  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Added SCSI problem with Linux/Sparc.
-
-2001-09-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/sanei_scsi.c: Fixed detection of SCSI devices that return
-	  device strings (vendor, product) consisting of spaces.
-	  sanei_scsi_req_enter2 was changed to copy the CDB and data before
-	  sending it to the device. Both patches are from Abel Deuring.
-	* sanei/sanei_config2.c: Removed some remainings of the USB merge.
-
-2001-09-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/umax1220u.desc: New file (from Marcio Luis Teixeira
-	  <marciot@holly.colostate.edu>).
-	* PROJECTS: Updated Winsane address.
-	* TODO: Added net/saned and .desc file entries. Removed scanimage/adf
-	  extention entry.
-	* backend/pnm.c backend/pnm.desc: Make sure that *length=0 in 
-	  sane_read(). Added more debug output.
-	
-2001-09-18  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c backend/umax_pp.desc:
-	  corrected compile problem when no ppdev available,
-	  changed status from :new to :beta.
-
-2001-09-17  Peter Fales <peter@fales.com>
-
-	* backend/gphoto2.c:  Converted from test code using pipes to
-	  the command line program to using the camera API.  Currently
-	  only supportes cameras that natively generate jpeg files.
-
-2001-09-17  Tom Martone <tom@martoneconsulting.com>
-        * backend/bh.desc
-          changed status from :new to :beta
-
-2001-09-17  Simon Munton <simon@munton.demon.co.uk>
-	* backend/pie.c backend/pie.conf: Changed ADLIB to AdLib as this is
-	  what the scanner returns and the comparison is case sensitive
-	
-	* doc/sane-pie.man: Update the status of the AdLib JetScan 630
-
-2001-09-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* PROJECTS: Removed (very) old entries. Removed backends which
-	  are included in the distribution now. Updated bearpaw and OS/2
-	  entries.
-	* NEWS: Created preliminary entry for 1.0.6.
-	  
-2001-09-16  Peter Fales <peter@fales.com>
-
-	* backend/dc240.desc:  Change status from new to alpha
-
-	  acinclude.m4, aclocal.m4, configure:  Cosmetic changes to 
-	  help text and change function used in gphoto2 lib check due
-	  to API change
-
-2001-09-16  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c backend/umax_pp_mid.c
-	  tools/umax_pp.c:
-	  change ppdev support to compile and run on linux kernel 
-	  prior to 2.4.5
-
-2001-09-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek_usb.c backend/mustek_usb.desc
-	  backend/mustek_usb_high.c backend/mustek_usb_high.h
-	  backend/mustek_usb_mid.c backend/mustek_usb_mid.h
-	  doc/sane-mustek_usb.man doc/mustek_usb/mustek_usb.CHANGES
-	  doc/mustek_usb/mustek_usb.TODO: Update to mustek_usb backend
-	  1.0-6. Increased resolution to the maximum hardware supports.
-	  No fixed resolution any more. Gamma table support. Bugfixes.
-	
-2001-09-12  Peter Fales <peter@fales.com>
-
-	* acinclude.m4 aclocal.m4 configure configure.in: Changes to
-	  start using gphoto2 libraries in gphoto2 backend
-
-	  backend/gphoto2.c backend/gphoto2.h: Use gphoto2 headers and
-          library functions for list management
-
-2001-09-12  Peter Fales <peter@fales.com>
-
-	* backend/doc/.cvsignore:  Added gphoto2 man page to .cvsignore
-
-2001-09-11  Peter Fales <peter@fales.com>
-
-	* backend/doc/Makefile.in:  Added man page for gphoto2 backend
-
-2001-09-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/Makefile.in: Added mustek_usb again.
-
-2001-09-10  Peter Fales <peter@fales.com>
-
-	* backend/gphoto2.c, backend/Makefile.in, configure.in, configure,
-	  acinclude.m4, aclocal.m4: Add gphoto2 backend to Makefiles.
-	  It's disable if the gphoto2 program is not present.
-
-2001-09-10  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek.c backend/mustek.desc doc/mustek/mustek.CHANGES:
-	  Fixed problem with gamma correction. New version: 1.0-113.
-	* backend/mustek_usb.c backend/mustek_usb.desc 
-	  backend/mustek_usb_high.c backend/mustek_usb_low.c
-	  backend/mustek_usb_low.h backend/mustek_usb_mid.c
-	  backend/mustek_usb_mid.h doc/mustek_usb/mustek_usb.CHANGES:
-	  200 dpi support for 600 CU. Some internal reorganizations.
-	  New version: 1.0-5.
-
-2001-09-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek_usb.c backend/mustek_usb.conf
-	  backend/mustek_usb.desc backend/mustek_usb.h
-	  backend/mustek_usb_high.c backend/mustek_usb_high.h
-	  backend/mustek_usb_low.c backend/mustek_usb_low.h
- 	  backend/mustek_usb_mid.c backend/mustek_usb_mid.h:
-	  Added backend mustek_usb for Mustek USB scanners. Currently the 
-	  600 CU, 1200 CU, 1200 CU Plus and 1200 UB are supported.
-	* backend/Makefile.in dll.conf: Added entries for mustek_usb.
-	* doc/Makefile.in doc/mustek_usb/mustek_usb.CHANGES
-	  doc/mustek_usb/mustek_usb.TODO doc/sane-mustek_usb.man:
-	  Added mustek_usb documentation.
-	* doc/sane.man: Updated concerning mustek_usb.
-	* PROJECTS TODO: Updated concerning mustek_usb.
-	* doc/.cvsignore: Added sane-mustek_usb.5.
-	* AUTHORS: Added mustek_usb authors.
-	* backend/pnm.c: Fixed SANE-standard compliancy bug in sane_read:
-	  length must be set to 0 if status != SANE_STATUS_GOOD.
-
-2001-09-08 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* added information for device filesystem permissions
-	  in doc/sane-scsi.man
-
-2001-09-06  Peter Fales <peter@fales.com>
-
-	* backend/gphoto2.c, backend/gphoto2.h, backend/gphoto2.conf,
-	  backend/gphoto2.desc, doc/sane-gphoto2.man:  Initial files
-	  for gphoto2 backend (interface to cameras supported by the
-	  gphoto2 commands/libraries).  Makefile changes coming soon.
-
-2001-09-06  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c: made CmdSetDataBuffer static
-	* backend/Makefile.in: removed sanei_config2 from 
-	  umax_pp depencies
-	  
-2001-09-05  Jochen Eisinger <jochen.eisinger@gmx.de>
-
-        * backend/net.c: ignoring size of parameter value for
-          SANE_ACTION_SET_AUTO (as described in the SANE standard)
-
-2001-09-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/sanei_ab306.c: Added FreeBSD support.
-	* include/sane/sanei_usb.h sanei/sanei_config2.c sanei/sanei_usb.c:
-	  Moved the function to check the "usb VENDOR PRODUCT" config
-	  lines to sanei_usb to avoid linking problems.
-	* backend/Makefile.in: Fixed spelling mistakes concerning st400.
-	* Makefile.in: make libcheck now also prints the name(s) of the
-	  `illegal' functions.
-
-2001-09-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* PROJECTS: Added m3096g updates and website. Added 600CU to list
-	  of supported Mustek USB scanners.
-
-2001-09-04  Jochen Eisinger <jochen.eisinger@gmx.de>
-
-	* backend/net.desc doc/saned.man doc/sane-net.man: added
-	  pointer to new saned homepage 
-	  (http://home.nexgo.de/jochen.eisinger/saned/)
-
-2001-09-04  Peter Kirchgessner <peter@kirchgessner.net>
-
-        * backend/hp-device.[hc] hp-handle.c hp-scl.[hc]
-            hp-option.[hc] hp.[hc] hp.desc
-          doc/sane-hp.man:
-          Add support for active XPA
-          Check if paper in ADF for ADF scan
-          Add option lamp off
-          Remove some really unused parameters
-
-2001-09-04  Peter Fales <peter@fales.com>
-
-	* backend/PROJECTS:  Added gphoto2 project to provide support
-	  for some or all of the cameras supported by gphoto2.  (See
-	  http://www.gphoto.org)
-
-2001-09-03  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c backend/umax_pp_mid.c
-	  backend/umax_pp_mid.h backend/umax_pp.c tools/umax_pp.c:
-	  Make use of ppdev char device when available, so that
-	  the backend does not require root priviledges anymore.
-
-2001-08-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/Makefile.in: Added sanei_usb dependency.
-
-2001-08-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/dll.c doc/sane.man frontend/scanimage.c sanei/sanei_usb.c
-	  tools/sane-find-scanner.c : Fixed minor bugs in debug output and
-	  documentation.
-	* backend/mustek.c backend/mustek.desc doc/sane-mustek.man
-	  doc/mustek/mustek.CHANGES: Update to backend version 1.0-112.
-	  Some minor fixes for returning the scan slider and OS/2.
-	  
-2001-08-26 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* backend/umax.c backend/umax.desc doc/umax/umax.CHANGES:
-          umax scsi backend update to version 1.0 build 29
-
-2001-08-19  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c tools/umax_pp.c:
-	  Finished probe code cleaning, increased version number
-	  
-2001-08-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Fixed bug concerning libusb that
-	  broke compilation on NetBSD.
-	* doc/sane-find-scanner.man doc/sane-usb.man sanei/sanei_usb.c
-	  tools/sane-find-scanner.c: Added (limited) support for FreeBSD.
-
-2001-08-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* include/sane/sanei_thread.h sanei/sanei_thread.c: Updated
-	  sanei_thread functions (from Yuri Dario) and made clear that
-	  they shouldn't be used directly.
-	* include/sane/sanei_usb.h sanei/Makefile.in sanei/sanei_usb.c
-	  doc/Makefile.in doc/sane-usb.man: Added sane USB interface.
-	* include/sane/sanei_config.h sanei/sanei_config2.c: Added support
-	  for searching USB devices ("usb vendor product").
-	* doc/sane-find-scanner.man tools/Makefile.in 
-	  tools/sane-find-scanner.c: Added USB support.
-	* doc/sane.man: Added information for USB scanners.
-	* TODO: Removed USB entries. Removed entry about checking for
-	  /etc/ld.so.conf, this shouldn't be necessary any longer. Removed
-	  entry about saned freezing, no bug reports about this for a long
-	  time. Removed entry about moving .desc files, this doesn't seem to
-	  be necessary. Added proposal to include libieeee1284. 
-	* doc/.cvsignore: Updated concerning sane-usb.5.
-	
-2001-08-05  Peter Fales <peter@fales.com>
-
-	* backend/dc240.c - Previously, the backend always assumed that
-          the images were stored in the 100DC240 directory in the
-	  camera.  It now determines the directory automatically.  If
-          multiple directories are present, it will eventually let you 
-	  pick the directory, but that feature hasn't been completed
-	  yet.
-
-2001-08-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek_usb.desc: New file. This backend supports
-	  the Mustek 1200UB, 1200CU and 1200CU Plus.
-
-	* PROJECTS TODO: Updated concerning mustek_usb backend.
-
-2001-08-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* PROJECTS TODO: Added UMAX Astra 1220U backend.
-
-2001-08-01  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* doc/sane-umax_pp.man backend/umax_pp_low.c:
-	  One more step toward cleaner scanner probing. Added
-	  message about EPP mode not being available. Slight man
-	  update to emphasize EPP mode setting.
-
-2001-07-24  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp.c backend/umax_pp_low.c:
-	  Fixed higlight parsing bug in conf file. Fixed 'greenish'
-	  looking scans bug. Started probe sequence rewrite/cleanup.
-
-2001-07-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/sanei_init_debug.c: Use syslog.h instead of sys/syslog.h.
-
-2001-07-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek.c backend/mustek.desc doc/mustek/mustek.CHANGES:
-	  Call stop_scan only when scan was cancelled. Some more debug
-	  messages. New version: 1.0-111.
-
-2001-07-11  Peter Fales <peter@fales.com>
-
-	* backend/dc240.c - Using scanimage with the "thumbnails" option
-	  and attempting to connect to a powered off camera was causing
-	  a core dump.
-
-2001-07-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek.c backend/mustek.desc backend/mustek.h
-	  doc/mustek/mustek.CHANGES: Fixed bug in fix_line_distance_block 
-	  that resulted in too much data transfered to the frontend.
-	  New version: 1.0-110.
-	
-2001-07-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek.c backend/mustek.conf backend/mustek.desc
-	  backend/mustek.h doc/sane-mustek.man doc/mustek/mustek.CHANGES:
-	  Fixed problem with SCSI command queuing. Fixed problem that
-	  resulted in black images on some Paragon 6000SP scanners. Added
-	  option to disable backtracking. New version: 1.0-109.
-	
-2001-07-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/Makefile.in: Use 6 lines as top/bottom margin for man2html
-	  to avoid losing 2 lines at every page break.
-	* backend/mustek.c backend/mustek.conf backend/mustek.desc
-	  doc/sane-mustek.man doc/mustek/mustek.CHANGES: Added option
-	  for disabling double-buffering. Updated man page. New version:
-	  1.0-108.
-
-2001-07-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Enabled warnings by default.
-
-Older entries can be found in ChangeLog-1.0.5.
diff --git a/ChangeLog-1.0.7 b/ChangeLog-1.0.7
deleted file mode 100644
index d0cabcd..0000000
--- a/ChangeLog-1.0.7
+++ /dev/null
@@ -1,856 +0,0 @@
-******  Release of sane-backends 1.0.7. End of code freeze ******
-
-2002-02-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* acinclude.m4 aclocal.m4 configure: Added a missing "test" command
-	  in check for gphoto2. This fixes error messages while testing for
-	  gphoto2 and a false positive result.
-	* TODO: Added entries about config.h, sane-backends.html, device file
-	  types, the HPUX -ansi problem, and make distclean.
-	* backend/Makefile.in backend/coolscan2.desc: Added description file
-	  for coolscan2 backend (from Major Andras 
-	  <andras@users.sourceforge.net>).
-	* backend/gphoto2.desc: gphoto2 is no longer "NEW".
-
-2002-02-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* PROJECTS: Added info about Canon N670U project. Added info about
-	  Sceptre S1200 project.
-	* backend/sceptre.desc backend/Makefile.in: New file (from Frank Zago 
-	  <fzago@greshamstorage.com>).
-	* backend/microtek2.desc doc/sane-microtek2.man: Updated microtek2
-	  documentation (from karsten.festag@t-online.de (Karsten Festag)).
-	* Makefile.in README.netbsd: New file. Information about problems
-	  with shared libs.
-	* configure configure.in: Include <sys/types.h> and <sys/ipc.h> also
-	  when checking for struct semun in <sys/sem.h>. This fixes a 
-	  compilation problem on FreeBSD.
-
-2002-01-31  Peter Fales <peter@fales.com>
-
-	* configure, acinclude.m4, aclocal.m4 - Latest gphoto2 updates
-	  changed the version number, breaking the gphoto2 backend.  This
-	  is a one line change to correct that.
-	
-2002-01-31  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* PROJECTS: Added info about GT-68xx backend.
-
-2002-01-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: New version: 1.0.7. Disabled extra version.
-	  Disabled warnings by default.
-	* TODO: Added entry about adding well known types and manufacturers
-	  to sane.tex.
-
----- CODE FREEZE FOR SANE 1.0.7 ---
----- sane-backends-1.0.7-beta2 ----
-
-2002-01-27  Gerhard Jaeger <g.jaeger@earthling.net>
-
-	* backend/plustek-usbhw.c: Fixed LM9831 problem...
-	
-2002-01-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/microtek.c backend/microtek2.h: Fixed undefined behaviour
-	  problem and Scanmaker X12 problems. New version: 20020127. Code from
-	  karsten.festag@t-online.de (Karsten Festag).
-	* lib/inet_ntop.c: Fixed problem with header include order on Irix.
-	* configure configure.in backend/snapscan-usb.c
-	  include/sane/config.h.in: Only define union semun if not already
-	  defined in <sys/sem.h>. Fixes compilation bugs on Irix and FreeBSD.
-
-2002-01-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* NEWS: Updated for sane-backends 1.0.7.
-	* TODO: Added point about sane-find-scanner. Added details about
-	  NetBSD linking problem.
-
-2002-01-25 Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.desc, doc/sane-epson.man: Added Perfection
-	  1650 and 2450 scanners to supported scanners list.
-
-2002-01-25 Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* frontend/scanimage.c: illegal placeholders in the -f format
-	  string are now replaced by "%%". (Bug found by Peter Fales)
-
-2002-01-25  Gerhard Jaeger <g.jaeger@earthling.net>
-
-	* backend/plustek-usb.h: changed according to avoid
-	  some gcc-3 warnings
-	* docb/sane-plustek.man: Update
-
-2002-01-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/Makefile.in: Added SHELL variable. Fixes po generation on OS/2.
-	* po/README: Added some comments on what the Makefile actually does.
-	* doc/backend-writing.txt doc/sane.man: Added note about doxygen
-	  configuration for sanei.
-
-2002-01-24  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c: corrected 2000P mis-detection by adding
-	  pauses in epat wake-up.
-
-2002-01-23  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c backend/snapscan-scsi.c backend/snapscan.h
-          Fix recognition of Acer 320U, Fix for spaces in model ID strings,
-          Change snapscan version to 1.4.7
-          
-2002-01-23  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek.c backend/mustek_usb.c doc/mustek/mustek.CHANGES
-	  doc/mustek_usb/mustek_usb.CHANGES: Fixed undefined operation
-	  warnings.
-
-2002-01-22  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c:
-          Do not use quantization for scan areas
-	* backend/snapscan-scsi.c:
-	  Add sense handling for sense code 0x0b to avoid infinite loops,
-          Change snapscan version to 1.4.6
-        * backend/snapscan.conf
-          Use /dev/sg0 as default instead of the more uncommon /dev/sga
-          
----- sane-backends-1.0.7-beta1 ----
-
-2002-01-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Made entry about TL_X < BR_X, jpeg->sanei, and sanei_scsi
-	  more exact. Added entry about new version of libtool. Removed entry
-	  about exit().
-	* backend/Makefile.in po/Makefile.in: Added missing files to DISTFILES.
-	  Fixed incompatibilities with older versions of gmake.
-
-2002-01-21 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* doc/sane-umax.man, backend/umax.conf:
-	  added new umax.conf options and explaination
-
-2002-01-20  Gerhard Jaeger <g.jaeger@earthling.net>
-
-	* backend/plustek.c: change the options names to match SANE standard
-	* backend/plustek-usbhw.c backend/plustek-usbio.c
-	  backend/plustek-usbscan.c:
-	  Minor fixes, according to the National Sources
-
-2002-01-20  Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* sanei/sanei_scsi.c: set timeout value for all operating
-	  systems to 1 minute. The timeout value is now derived from
-	  the macro SANE_SCSICMD_TIMEOUT.
-
-2002-01-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek.c backend/mustek.desc doc/mustek/mustek.CHANGES:
-	  Fixed calibration bug for the 1200 Pro. New version: 1.0-118.
-	* include/sane/sanei_thread.h: Removed */.
-	* backend/tamarack.c: Used return SANE_STATUS_INVAL instead of exit.
-
-2002-01-19  Peter Fales <peter@fales.com>
-
-	* backend/gphoto2.c - Fixed a bug that can cause driver errors
-	  following image capture, and bug that was incorrectly disabling
-	  thumbail previews.
-
-2002-01-19 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* updated umax.de.po
-
-2002-01-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Removed entries about kill(-1,...), wrong .desc links,
-	  sanei documentation, added entries about exit(), and sanei
-	  doxygen documentation.
-	* backend/mustek.c doc/mustek/mustek.CHANGES: Fixed some option
-	  name issues.
-	* doc/sane-mustek-usb.man: Fixed typo.
-	* po/Makefile.in po/README po/epson.de.po po/mustek.de.po
-	  po/mustek_usb.de.po po/plustek.de.po po/pnm.de.po po/saneopts.de.po
-	  po/umax.de.po: Moved the options contained in saneopts.h into a
-	  seperate file. So the backend po files are much smaller and easier to
-	  read and the saneopts translations are consistent through backends.
-	* backend/microtek2.c backend/microtek2.h: Update to backend 
-	  0.95-20020112 (from karsten.festag@t-online.de (Karsten Festag)).
-	* include/sane/sanei.h include/sane/sanei_config.h
-	  include/sane/sanei_thread.h sanei/sanei_config.c: Made documentation
-	  doxygen-compatible. Move comments from sanei_config.c to
-	  sanei_config.h.
-
-2002-01-18  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Also recognize the GT-xxxx scanners when connected via
-	  SCSI or IEEE-1394 interface
-
-2002-01-17  Peter Fales <peter@fales.com>
-
-	* configure, acinclude.m4, aclocal.m4 - Update gphoto2 version check
-	* backend/gphoto2.c - Improved support for options not
-	  supported by camera.  Cosmetic cleanup.
-	  	
-2002-01-18  Rene Rebe <rene.rebe@gmx.net>
-
-        * docs/sane-avision.man: added the new disable-gamma-table option
-	  to the sane-avision man-page.
-
-2002-01-18  Rene Rebe <rene.rebe@gmx.net>
-
-        * backend/avision.h, backend/avision.c, backend/avision.conf:
-	  many cleanups, fixed sane_cancel to not hang - but perform the
-	  cancel, added a disable-gamma-table option and added the possible
-	  options into the avision.conf file
-
-2002-01-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/Makefile.in: Added doxygen-sanei.conf to DIST_FILES.
-
-2002-01-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* include/sanei/sanei_usb.h: Made documentation doxygen compatible.
-
-2002-01-17  Peter Fales <peter@fales.com>
-
-	* backend/gphoto2.c, doc/sane-gphoto2.man
-	  Remove calls to exit()
-	  Support cameras which store all files in top-level directory
-
-2002-01-17  Peter Fales <peter@fales.com>
-
-	* configure, acinclude.m4, aclocal.m4 - (Really) disable
-	  gphoto2 backend unless specifically requested by the user (using
-	  --with-gphoto2) and the right CVS version of gphoto2 is found
-
-2002-01-17  Rene Rebe <rene.rebe@gmx.net>
-
-        * backend/avision.c removed to call exit in a debug case
-
-2002-01-17  Gerhard Jaeger <g.jaeger@earthling.net>
-
-	* backend/plustek.c backend/plustek.h
-	  Fixed conditional compilation problem
-	  Updated localization strings
-	* doc/sane-plustek.man: Updated
-	* po/plustek.de.po: Updated
-	* doc/doxygen-sanei.conf: Added doxygen configuration file for
-	  the sane libs
-	* include/sane/sanei.h include/sane/sanei_ab306.h
-	  include/sane/sanei_lm983x.h sanei/sanei_lm983x.c:
-	  Updated to support doxygen comments
-
-2002-01-17  Peter Fales <peter@fales.com>
-
-	* configure.in, configure, acinclude.m4, aclocal.m4 - Disable
-	  gphoto2 backend unless specifically requested by the user (using
-	  --with-gphoto2) and the right CVS version of gphoto2 is found
-
-2002-01-17  Rene Rebe <rene.rebe@gmx.net>
-
-	* backend/avision.h backend/avision.c backend/avision.desc
-	  doc/sane-avision.man: Merged the Avision v0.3.0 backend. It
-	  includes overall cleanups, improved supported device detection,
-	  memory-leak fixes, new config-options, initial USB device and
-	  color calibration support. Also upadted the homepage-url and the
-	  sane-avision man-page.
-
-2002-01-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/abaton.desc backend/dmc.desc backend/m3096g.desc
-	  backend/mustek.c backend/sp15c.desc backend/v4l.desc:
-	  Updated broken URLs for which I could find new ones. Commented out
-	  all the others.
-
-2002-01-15  Peter Fales <peter@fales.com>
-
-	* backend/gphoto2.c:  Following yet another gphoto2 API change -
-	  converted gp_debug_printf to gp_log
-
-	  configure.in, configure, acinclude.m4, aclocal.m4 - Improvements
-	  to the way gphoto2 is detected and used based on using 
-	  gphoto2-config. 
-
-2002-01-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/pnm.c backend/pnm.desc po/pnm.de.po: Removed descripions
-	  of options of type SANE_TYPE_GROUP. Fixed some translations.
-	  Fixed header. New version: 1.0.4.
-	* backend/plustek.c backend/plustek.h po/Makefile.in po/plusetk.de.po:
-	  Added German translation of Plustek backend options. Marked
-	  translatable text in backend sources.
-
-2002-01-14  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-	
-	* backend/snapscan.c   backend/snapscan-usb.c:
-          Added workaround for bug in semctl() on PPC;
-          backend version 1.4.5
-        
-2002-01-14  Peter Fales <peter@fales.com>
-	* backend/gphoto2.c:  Was requiring the device to have the
-	  IMAGE_CAPTURE capability - changed this to a warning instead
-	  of an error so the "Directory Browse" camera can be used.
-	  Don't require a port to be specified for the "Directory
-	  Browse" camera.  Fixed a bug that can result in extra data 
-	  at the end of the iamge.  Allow the returned image image to be 
-	  larger than the "estimate" specified in the configuration file.
-
-2002-01-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* frontend/scanimage.c: Added help message for --formatted-device-list.
-	  Added va_end() and #include <stdarg.h>. Used fprintf to print errors.
-	  Fixed some typos.
-
-2002-01-13  Abel Deuring <a.deuring@satzbau.gmbh.de>
-	* frontend/scanimage.c, doc/scaniamge.man: Added the option -f /
-	  --formatted-device-list to allow arbirtarily formatted device
-	  lists. Suggested by Klaas Freitag.
-
-2002-01-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* acinclude.m4 aclocal.m4 configure: Included AC_PROG_LIBTOOL into
-	  acinclude.m4 to avoid trouble with newer versions of libtool.
-	* backend/niash.desc: New file for the niash backend (from Bertrik
-	  Sikken <bertrik@zonnet.nl>).
-
-2002-01-12  Peter Fales <peter@fales.com>
-
-    * backend/gphoto2.c - Fixed breakage due to gphoto2 API changes
-      (Added context parameter to functions calls)
-
-2002-01-12  Gerhard Jaeger <g.jaeger@earthling.net>
-
-    * doc/sane-plustek.man: Update
-    * backend/plustek-devs.c backend/plustek-usb.c backend/plustek-usbhw.c
-      backend/plustek-usbio.c backend/plustek-usbscan.c
-      backend/plustek-usbshading.c backend/plustek.c:
-      Updated to reflect the current feedback upon the code and
-      added some minor fixes
-    * backend/plustek.desc: Added Mustek and HP entry
-
-2002-01-12  Gerhard Jaeger <g.jaeger@earthling.net>
-
-    * include/sane/sanei_lm983x.h sanei/sanei_lm983x.c:
-      added sanei_lm983x_init(), updated comments and fixed the u_long
-    * AUTHORS: Added myself to the list of sanei authors.
-
-2002-01-12  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane.man doc/scanimage.man: Added link to scanadf.
-
-2002-01-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/qcam.c: Create lockfile with O_EXCL even when using fcntl
-	  locking. Remove it in any case after exiting. Log file handling
-	  is still buggy but this has to be done by someone who has a qcam.
-	* sanei/sanei_lm983x.c: Added #include <sys/types.h> (OS/2 complains
-	  otherwise).
-	* backend/pnm.c backend/pnm.desc po/pnm.de.po: hand_scanner and
-	  three_pass options need SANE_INFO_RELOAD_PARAMETERS. All options
-	  have a symbolic name now. Removed bogus translation from po. New
-	  version: 1.0.3.
-	* frontend/saned.c: Check that the IP addresses of the peer are the
-	  same for control and data connections. Exit, if this is not the
-	  case. Changed some debug levels.
-	* PROJECTS: Updated some URLs. Removed m3096g and Mustek BearPaw 
-	  (both are included now in SANE). Added test backend and SaneTwain.
-	* TODO: Removed primax (not a backend), fixed viceo URL, updated 
-	  qcam entries, added entries about ipv6 support, removed saned
-	  address validation entry. Added entry about scanimage + NLS.
-	* backend/mustek_usb.c backend/mustek_usb.desc
-	  backend/mustek_usb_high.c backend/mustek_usb_high.h
-	  backend/mustek_usb_mid.c backend/mustek_usb_mid.h
-	  doc/mustek_usb/mustek_usb.CHANGES po/mustek_usb.de.po:
-	  Removed some warnings. Fixed segfault while exiting. Using empty
-	  devicename works now. New version: 1.0-10.
-
-2002-01-10  Tom Martone <tom@martoneconsulting.com>
-        * backend/bh.c
-          addressed security issue with tempfile
-
-2002-01-10  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-	
-	* backend/snapscan.c   backend/snapscan.h  backend/snapscan.desc:
-	  Update to snapscan-20020110 (Version 1.4.4) 
-          - add support for SnapScan e42	  
-
-2002-01-10  Gerhard Jaeger <g.jaeger@earthling.net>
-
-    * include/sane/sanei_lm983x.h sanei/sanei_lm983x.c sanei/Makefile.in:
-      Added to support for the National Semiconductor LM9831/2/3 chipsets
-      (read/write functions)
-    * backend/plustek.desc: Updated, added missing, now supported devices
-    * backend/plustek.c backend/plustek-share.h backend/plustek.h
-      backend/plustek.conf backend/plustek-usb.c backend/plustek-devs.c
-      backend/plustek-pp.c backend/plustek-usbhw.c backend/plustek-usbimg.c
-      backend/plustek-usbio.c backend/plustek-usbmap.c
-      backend/plustek-usbscan.c backend/plustek-usbshading.c
-      backend/plustek-usb.h:
-      Major changes to use the new sanei_lm983x functions
-      Changed the configuration file to reflect all the possible config-options
-    * backend/Makefile.in: Changed to compile the Plustek backend
-
-2002-01-10  Henning Meier-Geinitz <henning@meier-geinitz.de>
-	
-	* po/pnm.de.po: Added German translation for pnm backend.
-	* po/mustek.de.po po/mustek_usb.de.po: Updated German translations.
-	  They should be complete now.
-	* po/Makefile.in README: Made Makefile more intelligent. Targets
-	  are only updated if necessary. No manual copying necessary.
-	  Added pnm.de.po to DISTFILES. Added comment about DISTFILES.
-	* backend/mustek_usb.desc: New status: beta.
-	* README: Added description of --enable-translations.
-	* doc/sane.man: Added comment about translations.
-	* Makefile.in: Added Changelogs to DISTFILES. test/Makefile is
-	  removed in make distclean now. 
-	* doc/backend-writing.txt: Added paragraph about getting started.
-	  Added comments about ANSI C, compilation warnings, testing and 
-	  keeping manpages up-to-date.
-	* backend/pnm.c: Added SANE_I18N() marks.
-	* TODO: Cleanup. Moved several entries to doc/backend-writing.txt.
-	  Moved some entries to more appropriate paragraphs. Added entry about
-	  missing or defective links in the .desc files. Removed entry about
-	  translations.
-	* lib/inet_ntop.c: Changed order of includes for OS/2 compatibility.
-	* frontend/scanimage.c: Added output of bytes scanned in total.
-	  Added warning that's printed if scanimage gets more data then
-	  expected from the parameters.
-	* include/Makefile.in: Added sanei_lm983x.h to DISTFILES.
-	* backend/qcam.c: Actually close the lock file when unlocking.
-
-2002-01-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* ChangeLog ChangeLog-1.0.0 ChangeLog-1.0.1 ChangeLog-1.0.2
-	  ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5: Splitted
-	  ChangeLog to limit filesize. Editing became slow on smaller systems.
-
-2002-01-08  Marcio Teixeira <marciot@users.sourceforge.net>
-
-	* backend/umax1220u.c: fixed compile warnings
-	* backend/umax1220u-common.c: fixed compile warnings
-	* backend/umax1220u.desc: added info about 2000U, 2200U, 2200US
-
-2002-01-08  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Added V_EXTRA version number to mark
-	  CVS versions (-cvs) and snapshots/betas (e.g. -beta1).
-	  V_EXTRA=-pre1 would result in "sane-backends-1.0.7-pre1(.tar.gz)".
-	  For release, V_EXTRA is empty. Added NUMBER_VERSION to avoid
-	  confusing sane-config and frontends that rely on numbered versions.
-	* tools/sane-config.in: Use @NUMBER_VERSION@.
-	* sane-backends.lsm: Made more compatible with LSM standard. Fixed
-	  mostang.com directory. Added OpenBSD.
-	* include/Makefile.in: Added targed "dist". Moved include targets from
-	  root dir to this file. Added standard variables and .PHONY.
-	* backend/Makefile.in doc/Makefile.in frontend/Makefile.in
-	  japi/Makefile.in lib/Makefile.in po/Makefile.in sanei/Makefile.in
-	  testsuite/Makefile.in tools/Makefile.in: Added target "dist". 
-	  Fixed .PHONY.
-	* Makefile.in: Added targets "dist" and "sane-backends". make dist
-          creates sane-backends-x.y.z.tar.gz and make sane-backends also
-          creates the appropriate sane-x-y-z.lsm. Moved distclean to include/.
-          Fixed .PHONY. Made sane-backands-*.lsm look nicer.
-	* doc/backend-writing.txt: Point to po/README for the I18N details.
-	* doc/releases.txt: Added "make sane-backends" procedure.
-	* po/Makefile.in: make now creates all the files, make install does
-	  nothing but installation.
-	* README: Updated. Fixed minor bugs.
-	* AUTHORS: Added sanei authors.
-	* doc/saned.man: Added info about data connection.
-	* po/mustek.de.po: Updated German translation for the Mustek SCSI
-	  backend.
-	* frontend/.gdbinit: Removed unnecessary file.
-
-2002-01-08  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* configure.in: added help text for --enable-parport-directio
-
-2002-01-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* PROJECTS: Added link to backend for HP Scanjet 3300C / 3400C
-	  and 4300C scanners. Removed umax1220u project (now included in
-	  sane-backends).
-	* po/Makefile.in po/README: Added basic support for translating
-	  option descriptions and titles of SANE backends. This is really
-	  alpha!
-	* po/epson.de.po po/umax.de.po: Updated by make update-po.
-	* po/mustek.de.po mustek_usb.de.po: Added German translations
-	  for Mustek SCSI and USB backends. Translations for well-known
-	  options are missing.
-	* Makefile.in configure configure.in: Added option 
-	  --enable-translations to configure. I18N support is disabled by 
-	  default.
-	* po/.cvsignore: New file.
-	* doc/sane-mustek_usb.man doc/mustek_usb/mustek_usb.CHANGES:
-	  Added info about BearPaw scanners and plustek backend.
-	* backend/mustek.c backend/mustek.desc doc/sane-mustek.man
-	  doc/mustek/mustek.CHANGES:
-	  Small fix for Paragon 1200 Pro. Added some test code for this
-	  scanner. Added Trust Imagery 1200 to man page and .desc. New
-	  version: 1.0-117.
-	* backend/Makefile.in backend/dll.conf backend/umax1220u-common.c
-	  backend/umax1220u.c backend/umax1220u.conf backend/umax1220u.desc:
-	  Added new backend umax1220u for UMAX Astra 1220U and 2000U
-	  scanners (patch from Marcio Luis Teixeira 
-	  <marciot@holly.colostate.edu>).
-	* doc/Makefile.in doc/sane.man doc/sane-umax1220u.man: Added
-	  documentation fo umax1220u backend (patch from from Marcio Luis
-	  Teixeira <marciot@holly.colostate.edu>).
-	* AUTHORS: Added Marcio Luis Teixeira.
-	* TODO: Removed umax1220u project (now included in sane-backends).
-	  Added HP Scanjet 3300C / 3400C and 4300C project. Added entry about
-	  saned data port documentation. Removed saned race condition bug.
-	* doc/.cvsignore: Added sane-umax1220u.5.
-
-2002-01-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in include/sane/config.h.in: Added check
-	  for inet_ntop().
-	* lib/inet_ntop.c lib/Makefile.in backend/Makefile.in: Added
-	  implementation of inet_ntop() for platforms withouth this
-	  function based on inet_ntoa.
-	* backend/saned.conf frontend/saned.c doc/saned.man: Changed access
-	  control (function check host). Now IP addresses are used for
-	  comparison, not host names as before. It's possible to put
-	  hostnames, FQDNs and IP addresses into saned.conf. Limitations:
-	  Only the first IP address in struct hostent is checked. IPv6 is
-	  untested. The change is based on a patch by Petter Reinholdtsen 
-	  <pere@hungry.com>.
-	  Return SANE_STATUS_ACCESS_DENIED if access was not granted instead
-	  of SANE_STATUS_IO_ERROR.
-	  Removed isfdtype to avoid compilation problems.
-	  Added more debug output. Print function name in every DBG statement.
-	  Updated manual pages and saned.conf.
-	* net.c: Return SANE_STATUS_ACCESS_DENIED if access was not granted
-	  instead of SANE_STATUS_IO_ERROR.
-
-2001-01-06  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Undefine TEST_IOCTL again, which was enabled
-	  by accident. 
-
-2002-01-06  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c: improved warm up and color calibration
-	  of much better quality now. Manual settings now work correctly.
-	  Corrected parport mode being set before being claimed.
-	* backend/umax_pp.c: changed build number.
-	* tools/umax_pp.c: changed version.
-	  
-
-2002-01-05 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-	* backend/umax-scanner.c, umax.c, umax.conf, umax.desc, umax.h:
-	  update to backend version 1.0 build 32
-
-2002-01-05  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.[ch]: Check for (and set) s->fd to -1 when 
-	  scanner is closed. Removed black gamma table - only RGB
-	  is used, even for grayscale scans. Do not call access()
-	  when running on OS/2 or when using a parallel port scanner.
-
-2002-01-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/net.c backend/net.desc: Fixed race condition between saned
-	  sending NET_OPEN reply and net.c flushing the wire. New version:
-	  1.0.6.
-	* doc/saned.man frontend/saned.c: Changed debug handling. All debug
-	  messages use DBG now. If in inetd mode or dameon mode with "-s",
-	  the messages are printed to syslog as before. If option "-d" is used,
-	  the mesages are printed to stderr. Updated manual page.
-
-2002-01-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/sanei_wire.c: Added DBG message that warns if the read buffer
-	  is going to be deleted (data loss).
-
-2002-01-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README.os2: Updated URL of Franz Bakan's web site.
-	* include/sane/sanei_usb.h sanei/sanei_usb.c: Added support for USB
-	  control messages (patch from Marcio Luis Teixeira
-	  <marciot@holly.colostate.edu>).
-	* doc/sane-usb.man: Updated concerning backends supporting sanei_usb
-	  and OpenBSD. Other minor fixes.
-	* include/sane/sanei_pv8630.h sanei/sanei_pv8630.h sanei/Makefile.in:
-	  Added support for the PowerVision 8630 chip, a USB to parallel
-	  converter used in many scanners (patch from from Marcio Luis Teixeira
-	  <marciot@holly.colostate.edu>). Fixed sanei_thread Makefile.in entry.
-	* TODO: Added entries about saned/net freezes and parport-directio doc.
-	  Removed entries about sanei_usb control msg, sanei_pv8630 inclusion,
-	  OS/2 libsocket problem, and splitting --enable-directio.
-
-2001-12-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* frontend/scanimage.c: Fixed endless loop in sighandler.
-	* frontend/saned.c: Fixed sigpipe race in connection with
-	  select_fd. Added debug output.
-
-2001-12-30  Gerhard Jaeger <g.jaeger@earthling.net>
-
-	* backend/plustek_usbmap.c backend/plustek-usbimg.c
-	  backend/plustek_usb.c backend/plustek_usb.h:
-	  Fixed bug in lineart scaling and in brightness setting
-
-2001-12-29  Gerhard Jaeger <g.jaeger@earthling.net>
-
-    * backend/plustek.c backend/plustek-share.h backend/plustek.h
-      backend/plustek.conf:
-      Changed to support the LM983x based USB scanner
-    * backend/plustek.desc: Updated, added missing, now supported devices
-    * backend/plustek-usb.c backend/plustek-devs.c backend/plustek-pp.c
-      backend/plustek-usbhw.c backend/plustek-usbimg.c
-      backend/plustek-usbio.c backend/plustek-usbmap.c
-      backend/plustek-usbscan.c backend/plustek-usbshading.c
-      backend/plustek-usb.h: New files - added to support the Plustek
-      USB devices (LM9831/2 based) and other devices based on this
-      chipset
-    * backend/Makefile.in: Changed to compile the Plustek backend
-    * doc/sane-plustek.man: Added some USB information
-
-2001-12-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Changed order of tests for libsocket and
-	  libsyslog to avoid problems with OS/2. Small spelling and format
-	  fixes.
-
-2001-12-28  Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* configure.in, configure, sanei/sanei_scsi.c, umax_pp_low.c,
-	  README.linux: replaced --enable-directio and ENABLE_DIRECTIO
-	  with --enable-scsi-directio / --enable-parport-directio resp.
-	  ENABLE_SCSI_DIRECTIO / ENABLE_PARPORT_DIRECTIO
-
-2001-12-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* PROJECTS TODO: Updated info about "Relisys Scorpio Super 3 SCSI II".
-
-2001-12-25  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README.linux: Used "sane-find-scanner". Some minor changes.
-	* config.guess config.sub: Updated from 
-	  http://savannah.gnu.org/projects/config.
-	* TODO: New section: "platform-specific". Added some problems with
-	  *BSD. Some minor fixes and additions.
-	* tools/sane-find-scanner.c: Added OpenBSD device files.
-	* README.openbsd: New file. Some information on how to get SANE 
-	  running on top of OpenBSD.
-
-2001-12-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek_usb.c backend/mustek_usb.conf backend/mustek_usb.desc
-	  backend/mustek_usb_low.c backend/mustek_usb_low.h 
-	  doc/sane-mustek_usb.man doc/mustek_usb/mustek_usb.CHANGES:
-	  Made usb_low_read_rows more robust. Limited maximum block size and
-	  added option for this. New version: 1.0-9.
-	
-2001-12-21  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c    backend/snapscan.h
-          Remove tmpfname var
-
-2001-12-20  Peter Fales <peter@fales.com>
-
-	* backend/dc25.c - Fixed a potential security problem due to a 
-	  race condition involving temporary file creation.  Also did some
-	  cosmetic cleanup and removed some un-needed code.
-
-2001-12-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/dll.conf: Added (commented out) st400 entry.
-
-2001-12-18  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c    backend/snapscan.h
-          Remove temporary file
-
-2001-12-18  Ingo Wilken <Ingo.Wilken@informatik.uni-oldenburg.de>
-
-	* backend/st400.c backend/st400.conf
-	  Security fix: Dump inquiry data to $HOME/st400.dump instead
-	  of /tmp/st400.dump.
-
-2001-12-17  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan-scsi.c    backend/snapscan.h
-	  backend/snapscan-usb.h     backend/snapscan-usb.c
-	  backend/snapscan-sources.h backend/snapscan-sources.c
-	  backend/snapscan.c         backend/snapscan.desc
-	  Update to snapscan-20011212 (snapscan backend 1.4.3):
-          - Use sense handler for USB scanners
-          - Correct color alignment for Snapscan 600
-          - Fix dither matrix computation
-          - Add support for Snapscan e26 and e52
-          - Guard for TL_X < BR_X and TL_Y < BR_Y
-
-2001-12-16  Peter Kirchgessner <peter@kirchgessner.net>
-	* frontend/stiff.c
-	  Add fillorder tag for b/w-TIFF-files
-	  Include stiff.h to avoid warning "no previous prototype"
-
-2001-12-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek.c backend/mustek.desc doc/mustek/mustek.CHANGES:
-	  Fixed a possible segfault in sane_control_option. Added more
-	  debug output for SCSI commands. New version: 1.0-116.
-
-2001-12-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/sanei_ab306: Removed warning: `dev_io_fd' defined but not
-	  used. Variable used only by FreeBSD. Added test for FreeBSD.
-	  Patch from Stephen Torri <storri@ameritech.net>.
-	
-2001-11-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* testsuite/Makefile.in testsuite/README: Added comment about
-	  the need to enable pnm. Made output easier to read.
-
-2001-11-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-	
-	* backend/mustek.c backend/mustek.desc doc/mustek/mustek.CHANGES: 
-	  Added check for TL_X > BR_X or TL_Y > BR_Y. New version: 1.0-115.
-	* TODO: Added entry about TL_X < BR_X problems and semaphores for OS/2.
-	  Removed entry about BearPaw scanners.
-	
-2001-11-26 Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* backend/sharp.c: added an additional check to prevent OS/2 from
-	  define "#define USE_FORK"
-
-2001-11-24 Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* backend/sharp.c: removed an unconditional "#define USE_FORK"
-
-2001-11-22  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c: fixed color calibration bug. Scans are
-	  of much better quality now. Manual settings now work correctly.
-	* tools/umax_pp.c: changed version.
-	  
-
-2001-11-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* config.guess config.sub: Fetched new versions from
-	  http://savannah.gnu.org/projects/config.
-	* mkinstalldirs: Updated for OS/2 (from "Franz Bakan" 
-	  <fbakan@gmx.net>).
-	* backend/mustek.c backend/mustek.desc backend/mustek.h
-	  doc/mustek/mustek.CHANGES: Added OS/2 compatibility fixes
-	  (from "Franz Bakan" <fbakan@gmx.net>). New version: 1.0-114.
-	* sanei/sanei_scsi.c: OS/2 changes: Removed semaphore code and
-	  increased MAX_DATA to 64k (from "Franz Bakan" <fbakan@gmx.net>).
-	* tools/sane-config.in: Also return -ldl (necessary fo IA64?).
-	* TODO: Added entry about .exe and similar file extentions.
-	  Removed sane-config.in -ldl issue.
-
-2001-11-22  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c: fixed build problem on non i386 linux when
-	  there is no <sys/io.h>.
-
-2001-11-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Added entries about the fork/kill(-1,...) issue, the inb/outb
-	  problems, config.guess and sane-config.in.
-	* sanei/Makefile.in: Added sanei_thread for OS/2 portability.
-
-2001-11-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/scanimage.man frontend/scanimage.c: Use out%d.tif by default if
-	  --format tiff was selected. Update documentation about default
-	  formats. Fixed spelling mistakes.
-	* AUTHORS: I think this was planned in alphabetical order...
-
-2001-11-18  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Fixed Wait for Button functionality.
-	  Don't call access() for par port scanners.
-
-2001-11-18  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.h: Added missing defines for USB IOCTLs
-
-2001-11-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek.desc doc/sane-mustek.man doc/mustek/mustek.CHANGES:
-	  Added enries for Primax Compact 4800.
-
-2001-11-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek_usb.c backend/mustek_usb.conf backend/mustek_usb.desc
-	  backend/mustek_usb.h backend/mustek_usb_high.c 
-	  backend/mustek_usb_high.h backend/mustek_usb_low.c
-	  backend/mustek_usb_low.h backend/mustek_usb_mid.c
-	  backend/mustek_usb_mid.h doc/sane-mustek_usb.man
-	  doc/mustek_usb/mustek_usb.CHANGES doc/mustek_usb/mustek_usb.TODO:
-	  FreeBSD is supported to some degree now. Started 1200 USB support.
-	  Documentation updates. New version: 1.0-8.
-
-2001-11-12  Peter Fales <peter@fales.com>
-
-	* gphoto2.c - Debug message was not getting printed because DBG_INIT
-	  was not called first.
-
-2001-11-12  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane-scsi.man: More details and examples for the "scsi * ..."
-	  directive for config files. Added information about debug level 255
-	  printing (Linux) kernel debug messages. Added link to sane-usb(5).
-
-2001-11-10  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c: correct PPC compile problem by removing
-	  buggy extra ifdef
-
-2001-11-11  Peter Fales <peter@fales.com>
-
-	* gphoto2.c - Number of images was not getting updated after
-	  capturing a new image
-
-2001-11-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/dll.c backend/dll.desc doc/sane-dll.man: Added some debug
-	  messages (e.g. if dll.conf isn't found). Some adjustments concerning
-	  debug levels. Removed some compilation warnings. New version: 1.0.5.
-
-2001-11-11 Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* sanei/sanei_scsi.c (Linux part): 
-          - improved handling of status codes returned by the SG driver. 
-          Device status INTERMEDIATE GOOD and CONDITION MET are now mapped 
-          to SANE_STATUS_GOOD; device status BUSY and a few driver status 
-          codes are mapped to SANE_STATUS_DEVICE_BUSY
-          - On SCSI command completion, the (sometimes bogus) residual count 
-          is no longer subtracted from *req->dstlen
-        * backend/sharp.c: if a READ command fails with SANE_STATUS_DEVICE_BUSY,
-          retry a few times.
-
-2001-11-10  Karl Heinz Kremer <khk@khk.net>
-
-	* backends/epson.[ch]: all strings tagged with I18N macro
-	  Added support for scan button, scanner waits for button if the
-	  option "wait-for-button" is activated.
-
-2001-11-10  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c backend/umax_pp_low.h backend/umax_pp_mid.c
-	  backend/umax_pp_mid.h backend/umax_pp.c backend/umax_pp.h:
-	  use ENABLE_DIRECTIO to compile in direct I/O. Corrected the long 
-	  standing scan area origin detection bug. Improved parport mode
-	  negociation.
-
-2001-11-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/sanei_usb.c: Fixed debug messages.
-
-2001-11-06  Peter Fales <peter@fales.com>
-
-	* dc240.c - fix a bug that causes the backend's internal directory
-	  to get out of sync with the camera directory when a file is deleted
-	* gphoto2.c - include the gphoto2 port name as part of the SANE
-	  device name and improve reliability when using the gphoto2
-	  serial port libs.
-
-2001-11-04  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Enabled warnings by default.
-	* sane-backends.lsm: Made more compatible with template.
-	  Added myself as maintainer to avoid problems when uploading
-	  to tsx-11 and sunsite in future.
-
-Older entries can be found in ChangeLog-1.0.6.
diff --git a/ChangeLog-1.0.8 b/ChangeLog-1.0.8
deleted file mode 100644
index 29517a9..0000000
--- a/ChangeLog-1.0.8
+++ /dev/null
@@ -1,1060 +0,0 @@
-******  Release of sane-backends 1.0.8. End of code freeze ******
-
-2002-05-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/plustek-usbscan.c: Critical bugfix to avoid bumping the
-	  scan slider at the end of the scan. Commited on behalf of 
-	  g-jaeger@t-online.de (G. Jaeger).
-
-2002-05-26  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/descriptions/epson.desc
-	  doc/sane-epson.man
-	  backend/epson.conf: Updated man page, added one more
-	  comment to the conf file and adjusted the version in
-	  the desc file.
-
-2002-05-26  Frank Zago  <fzago at austin dot rr dot com>
-
-	* doc/descriptions-external/teco2.desc
-	  doc/descriptions-external/teco3.desc: new backends descriptions.
-	* AUTHORS: changed my email address
-	* doc/descriptions/teco1.desc: added the mising connection type
-	  for the vm3520
-
-2002-05-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/Makefile.in: Added workaround for GNU make 3.79. This version
-	  of make insisted on at least one argument for "basename" which broke
-	  compilation.
-	* doc/descriptions/leo.desc doc/descriptions/teco1.desc: Changed
-	  status to ":new" for release.
-	* doc/descriptions/umax1220u.desc: Changed status from :new to :alpha
-	  as the baceknd was already in SANE 1.0.7.
-		
-2002-05-25  Andras Major <andras@users.sourceforge.net>
-
-	* doc/descriptions/coolscan2.desc: changed status to :new.
-
-2002-05-25  Matthew Duggan <stauff1@users.sourceforge.net>
-
-	* doc/descriptions/canon_pp.desc: Changed status to :new.
-
-2002-05-25  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* AUTHORS backend/microtek2.c doc/sane-microtek2.man
-	  doc/descriptions/microtek2.desc: Updated Karsten Festag's email
-	  address and website.
-	* NEWS: Added OPENSTEP to the list of portability fixes.
-	* doc/descriptions/test.desc: Changed status to :new.
-	* configure configure.in: Set version to 1.0.8. Disabled warnings
-	  by default.
-
-2002-05-23 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* doc/umax/sane-umax-powerlook-doc.html
-	* doc/descriptions/umax.desc update
-
----- CODE FREEZE FOR SANE 1.0.8 ---
---- snapshot 1.0.8-pre1
-
-2002-05-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/sanei_scsi.c: Fixed sanei_scsi_cmd2() for OPENSTEP (from 
-	  Oliver Schirrmeister <oschirr@abm.de>).
-
-2002-05-21  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* include/Makefile.in (install): Make it possible to install when
-	  building in a subdirectory.
-
-2002-05-14  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.conf: Added additional USB IDs for Acer 320U and 
-	  Acer 620U
-
-2002-05-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in frontend/scanimage.c
-	  include/sane/config.h.in: Fixed 16 bit pnm output. The byte-order
-	  was wrong for little-endian systems. Based on code from Roland
-	  Roberts <roland@astrofoto.org>.
-	* NEWS: Minor updates.
-	* TODO: Removed entry about 16 bit scanimage problem. Added entry about
-	  scanimage and width/height ranges.
-
-2002-05-07  Frank Zago  <fzago@greshamstorage.com>
-
-	* doc/descriptions-external/tevion9693usb.desc: new backend,
-	  from mh <crapsite@gmx.net>.
-
-2002-05-06  Andras Major <andras@users.sourceforge.net>
-
-	* doc/sane.man: coolscan2 entry updated.
-	* doc/sane-usb.man: added coolscan2 to sanei_usb users' list.
-
-2002-05-05  Frank Zago  <fzago@greshamstorage.com>
-
-	* backend/umax-usb.c backend/teco1.c backend/matsushita.c
-	backend/matsushita.h backend/leo.c backend/sceptre.c: minor fixes.
-
-2002-05-05  Andras Major <andras@users.sourceforge.net>
-
-	* backend/coolscan2.c: version number replaces "CVS"
-	* doc/coolscan2.man doc/descriptions/coolscan2.desc: added
-	  man page for coolscan2.
-
-2002-05-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/test.c doc/descriptions/test.desc: Check return value
-	  of waitpid. Don't evaluate status of children if waitpid wasn't
-	  successful.
-	* backend/mustek.c doc/descriptions/mustek.desc: Check return value
-	  of waitpid. Don't evaluate status of children if waitpid wasn't
-	  successful.
-	* TODO doc/backend-writing.txt: Add an entry about the return value
-	  of wait/waitpid.
-
----- FEATURE FREEZE FOR SANE 1.0.8 ---
-
-2002-05-02  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* doc/description/snapscan.desc: Fix URL
-
-2002-05-02  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c   backend/snapscan-options.c
-	  backend/snapscan-scsi.c backend/snapscan-usb.c po/snapscan.de.po: 
-	  Snapscan backend version 1.4.13
-	  - Support for ADF
-	  - Fixed status handling after cancel
-	* doc/description/snapscan.desc: 
-	  - Add Guillemot Scan@home 1248 USB
-	  - Fix vendor URLs
-
-2002-04-21 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* sane-umax: updated umax.CHANGES
-
-2002-04-30  Jochen Eisinger <jochen.eisinger@gmx.de>
-
-	* doc/saned.man doc/sane-net.man doc/descriptions/net.desc:
-	  Updated URL of the sane-net homepage to
-	  http://www.penguin-breeder.org/?page=sane-net
-
-	* doc/sane-mustek_pp.man doc/descriptions/mustek_pp.desc:
-	  Updated URL of the mustek_pp homepage to
-	  http://www.penguin-breeder.org/?page=mustek_pp
-
-	* TODO:
-	  Added entry to saned section:
-     	  - Add support for IP ranges in saned.conf (like 10.0.0.0/8)
-	  
-2002-04-28  Frank Zago <fzago@greshamstorage.com>
-
-	* tools/Makefile.in tools/sane-find-scanner.c: bug fixes, better
-	  error reporting and display the inquiry in verbose mode.
-
-2002-04-29  Kazuya Fukuda <kaafuu@mug.biglobe.ne.jp>
-	* backend/nec.c: fixed a compile problem for Dec Unix v4
-          and probably other 64 bit platform. 
-	* AUTHORS:  Update email address for Kazuya Fukuda
-
-2002-04-27  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c   backend/snapscan.h   backend/snapscan-options.c
-	  backend/snapscan-scsi.c backend/snapscan-usb.c po/snapscan.de.po: 
-	  Snapscan backend version 1.4.12
-	  - Removed SCSI debug options
-	  - Fixed option handling (errors found by tstbackend)
-
-2002-04-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* frontend/scanimage.c: Fixed scanimage SANE_CAP_AUTOMATIC bug 
-	  (from David Paschal <paschal@rcsis.com>).
-
-2002-04-26  Peter Fales <peter@fales-lorenz.net>
-
-	* backend/dc240.c backend/gphoto2.c:  Various minor bug fixes for
-	  problems found by tstbackend.  Fix a core dump when debugging
-	  is enabled.
-
-2002-04-26  Jochen Eisinger <jochen.eisinger@gmx.de>
-
-	* backend/mustek_pp.c: fixed a typo, thanks to Henning for
-	  pointing this one out to me
-
-2002-04-26  Andras Major <andras@users.sourceforge.net>
-
-	* backend/coolscan2.c doc/descriptions/coolscan2.desc:
-	  update to release 0.1.5, various saned-related problems fixed.
-
-2002-04-25  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Updated backend list. Added entry for sanei_scsi/Mac OS X.
-
-2002-04-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek.c backend/mustek.h doc/descriptions/mustek.desc
-	  doc/mustek/mustek.CHANGES: Print usefull DBG messages for options
-	  without a name. Undef MIN and MAX macros before defining them.
-	* backend/mustek_usb.c backend/mustek_usb_low.h
-	  doc/descriptions/mustek_usb.desc doc/mustek_usb/mustek_usb.CHANGES:
-	  Free devlist on exit. Undef MIN and MAX macros before defining them.
-	* backend/Makefile.in frontend/Makefile.in: Added missing files to
-	  DISTFILES.
-	* config.guess: Updated from ftp.gnu.org.
-
-2002-04-24  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c   backend/snapscan.h   backend/snapscan-options.c
-          backend/snapscan-scsi.c: Snapscan backend version 1.4.11
-          - Improve scan area option setting
-          - Cleanup of DBG messages
-          - Improve config file reading
-
----- BACKEND FREEZE FOR SANE 1.0.8 ---
-
-2002-04-23  Frank Zago <fzago@greshamstorage.com>
-
-	* backend/coolscan2.c: Fixed the version reporting problem.
-	* backend/dll.conf: added coolscan2 entry.
-
-2002-04-23  Peter Fales <peter@fales-lorenz.net>
-
-	* backend/dc240.c backend/gphoto2.c:  Various minor bug fixes for
-	  problems found by tstbackend
-	* AUTHORS:  Upate email address for Peter Fales 
-
-2002-04-22  Frank Zago <fzago@greshamstorage.com>
-
-	* AUTHORS PROJECTS backend/Makefile.in backend/coolscan2.c
-	  backend/coolscan2.conf doc/descriptions/coolscan2.conf
-	  doc/sane.man: added coolscan2 backend
-
-2002-04-22  Abel Deuring <a.deuring@satzbau.gmbh.de>
-	* backend/sharp.c: fixed a compile problem for Dec Unix v4
-          and probably other 64 bit platform.
-
-2002-04-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/backend-writing.txt: More details for the exported symbols
-	  issue. Used test.c instead of pnm.c as example. Fixed paths for
-	  .desc files.
-	* doc/sane.man: Added paragraph about testing with the test backend.
-	* TODO: Removed several avision bug entries.
-	* NEWS: First version of entry for 1.0.8.
-
-2002-04-21  Frank Zago <fzago@greshamstorage.com>
-
-	* backend/teco1.c doc/descriptions/teco1.desc: updates.
-
-2002-04-21  Frank Zago <fzago@greshamstorage.com>
-
-	* backend/sceptre.c doc/descriptions/sceptre.desc: updates.
-
-2002-04-21  Frank Zago <fzago@greshamstorage.com>
-
-	* AUTHORS PROJECT backend/Makefile.in backend/leo.c backend/leo.h
-	  backend/leo.conf doc/sane.man doc/sane-leo.man
-	  doc/descriptions/leo.desc doc/Makefile.in: added leo backend
-
-2002-04-22  Rene Rebe <rene.rebe@gmx.net>
-
-	* backend/avision.c next backend version, several new scsi id's,
-	  and bug fixes
-
-2002-04-22 Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Declare close_scanner() and open_scanner() before
-	  they are used
-
-2002-04-21 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* sane-umax backend update to version 1.0 build 34
-
-2002-04-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/test.c doc/descriptions/test.desc: Check if sane_init was
-	  called before any other SANE function.
-	* backend/dll.c doc/descriptions/dll.desc: Don't call sane_exit twice.
-	  Call sane_init after sane_exit. Try to load from $LD_LIBRARY_PATH
-	  ($SHLIB_PATH, $LIBPATH) first and only check LIBDIR if opening
-	  failed. New version: 1.0.6.
-	* backend/v4l.c: Fixed some warnings.
-	* backend/artec.c: Don't export cap_data.
-	* backend/canon.h: Don't export option_name.
-	* TODO: Updated entries about compilation warnings for various
-	  backends. Removed entries about canon update and dll sane_exit
-	  problems.
-	* PROJECTS: Removed canon update.
-
-2002-04-21  Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* backend/sharp.c: added a "free(devlist)" call to sane_exit
-
-2002-04-21  Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* backend/canon-sane.c, backend/canon-scsi.c, backend/canon.c,
-	  backend/canon.h, doc/sane-canon.man,
-	  doc/descriptions/canon.desc: added support for FB620S and
-	  and FS2700, by Mitsuru Okaniwa <m-okaniwa@bea.hi-ho.ne.jp>
-	  and Ulrich Deiters <ukd@xenon.pc.Uni-Koeln.DE>
-
-2002-04-19  Frank Zago <fzago@greshamstorage.com> 
-
-	* AUTHORS: fixed typos, formatting and added the tstbackend frontend.
-	* frontend/Makefile.in frontend/tstbackend.c: a frontend to test
-	  backends
-	* doc/backend-writing.txt: added info about tstbackend
-
-2002-04-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/test.c doc/descriptions/test.desc: Added missing include.
-
-2002-04-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/net.c doc/descriptions/net.desc: Fixed bug in sane_read that
-	  cause garbled data to be sent to the frontend. Fixed some long lines.
-
-2002-04-18  Marian Eichholz <eichholz@computer.org>
-	* backend/sm3600.c : compiles without warnings now.
-	* backend/sm3600.h : FakeCalibration prototype conditionalised, too.
-
-2002-04-17  Frank Zago <fzago@greshamstorage.com>
-
-	* TODO: changed Relisys Scorpio Super 3 contact info.
-
-2002-04-17  Marian Eichholz <eichholz@computer.org>
-	* doc/descriptions/sm3600.desc : specific models listed
-	* doc/sane-sm3600.man : warning for libusb-versions.
-	* backend/sm3600-homerun.c : FakeCalibration() conditionalised.
-	* backend/sm3600.c : Improved portability, less warnings
-
-2002-04-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/fujitsu-scsi.h backend/fujitsu.c backend/fujitsu.conf
-	  backend/fujitsu.h doc/sane-fujitsu.man 
-	  doc/descriptions/fujitsu.desc: Added new fujitsu backend (from
-	  Oliver Schirrmeister <oschirr@abm.de>). This backend supersedes the
-	  m3096g backend and also includes the m3091 backend.
-	* backend/m3096g.c backend/m3096g.h backend/m3096g.conf
-	  backend/m3096g-scsi.h: Removed, support is now in fujitsu-backend.
-	* backend/Makefile.in backend/dll.conf: Adjusted for new fujitsu
-	  backend.
-	* doc/sane-sp15c.c: Added new manpage for sp15c. Extracted from the old
-	  sane-fujitsu manpage.
-	* doc/.cvsignore doc/Makefile.in doc/sane.man: Adjusted for fujitsu
-	  and sp15c manpages.
-	* AUTHORS: Updated for fujitsu backend.
-	* doc/descriptions-external/m3091.desc doc/descriptions/m3096g.desc:
-	  Removed, now in doc/descriptions/fujitsu.desc.
-	* PROJECTS: Removed m3091 project.
-	* TODO: Added coolscan2 backend, bh and coolscan warnings, scanimage
-	  16 bit problem. Removed fujitsu m391 entries, sm3600 non-static
-	  symbol, plustek-backend OS/2 problem.
-
-2002-04-15  Marian Eichholz <eichholz@computer.org>
-	* sm3600 imported from sm3600.sf.net
-	  featuring infrastructure for various models and the (new) SM 3750i.
-	  backend/sm3600.h
-	  backend/sm3600.c
-	  backend/sm3600-color.c
-	  backend/sm3600-homerun.c
-	  backend/sm3600-scantool.h
-	  backend/sm3600-scanutil.c
-	  backend/sm3600-gray.c
-	  backend/sm3600-scanmtek.c
-	  backend/sm3600-scanusb.c
-	  doc/sane-sm3600.man
-
-2002-04-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/mustek_usb.desc: Commented out 1200 USB as it is not
-	  really supported yet.
-
-2002-04-14  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek.[ch], backend/plustek-usbhw.c, backend/plustek-usbio.c,
-	  backend/plustek-usbscan.c, backend/plustek-usbshading.c 
-	  backend/plustek-usb.c, backend/plustek-devs.c backend/plustek-usb.h
-	  backend/plustek-share.h: Code cleanup, fixed OS/2 compilation breakage
-	  fixed problem that causes non LM983x based devices to crash, minor fixes
-	  added CANON N650U device structure
-
-2002-04-13  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.[ch]: Added new product IDs for Perfection 1650 and
-	  2450. Check if scanner needs to be opened for the reset() call.
-
-2002-04-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/canon630u-common.c: Added #include <sys/types.h> to
-	  fix compilation on OS/2.
-	* sanei/sanei_scsi.c: Use O_NONBLOCK when opening an sg device under
-	  Linux. Return SANE_STATUS_DEVICE_BUSY if EBUSY. Check for buffer==0
-	  for OS/2.
-	* doc/sane-scsi.man: Added more information about NCR/Symbios 810 and
-	  Tekram DC315 controllers under Linux.
-	* backend/Makefile.in backend/test.c backend/test.conf backend/test.h
-	  backend/test-picture.c: Added new test backend.
-	* doc/Makefile.in: Added sane-test man page. Added teco doc directory.
-	* doc/sane.man doc/sane-test.man doc/.cvsignore: Added sane-test
-	  manual page.
-	* doc/descriptions-external/test.desc doc/descriptions/test.desc:
-	  Moved test.desc to doc/descriptions and updated this file.
-	* PROJECTS: Removed test backend.
-	* AUTHORS: Added myself for test backend.
-	* TODO: Added entries about SANE_CAP_ADVANCED in groups, a wip marker
-	  for sorted sane-backends.html, and saneopts.??.po problem.
-	  Removed backends from list of inclusion beacuse of lack of response:
-	  v4l2, lhii, viceo (they stay in PROJECTS). Removed snapscan from
-	  exported symbols bug list. Updated doxygen list. 
-
-2002-04-12  Frank Zago <fzago@greshamstorage.com>
-
-	* doc/descriptions-external/leo.desc PROJECTS: Added leo backend
-	  info.
-
-2002-04-12  Matthew Duggan <stauff1@users.sourceforge.net>
-	
-	* backend/canon_pp-io.c: Updated for new libieee1284 interface 
-	  (version 0.1.5)
-	* acinclude.m4 aclocal.m4 configure configure.in: 
-	  Added check for libieee1284 > 0.1.5
-
-2002-04-08  Rene Rebe <rene.rebe@gmx.net>
-
-        * backend/avision.h backend/avision.c backend/avision.conf: bug-
-	  fixes
-
-2002-04-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* include/sane/sanei_pa4s2.h include/sane/sanei_scsi.h: Added/adjusted
-	  documentation for doxygen.
-
-2002-04-11  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c:  fixed 8 bits I/O support
-
-2002-04-10  Oliver Schwartz <oliver.schwartz@gmx.de>
- 
-	* backend/snapscan-scsi.c
-          Removed illegal character
-        * backend/snapscan-usb.h
-          Removed declaration of bqelements
-
-2002-04-10  Oliver Schwartz <oliver.schwartz@gmx.de>
- 
-	* backend/snapscan-usb.c
-          make bqelements static
-        * backend/snapscan-scsi.c
-          disable send_diagnostic() for SnapScan 1236
-
-2002-04-10  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek_usb.c doc/descriptions/mustek_usb.desc
-	  doc/mustek_usb/mustek_usb.CHANGES: Cleanup in sane_control_option,
-	  sane_set_io_mode, sane_get_select_fd and sane_exit. New version:
-	  1.0-13.
-	* backend/mustek_usb.c backend/mustek_usb_high.c
-	  backend/mustek_usb_high.h backend/mustek_usb_low.c
-	  backend/mustek_usb_low.h backend/mustek_usb_mid.c
-	  backend/mustek_usb_mid.h: Fixed coding-style.
-	* backend/pnm.c doc/descriptins/pnm.desc: sane_set_io_mode
-	  checks for !non_blocking and scanning now. Fixed coding-style.
-	  New version: 1.0.8.
-	* TODO: Added dll init/exit problem. Added non-static symbol problem.
-	  Added info about missing definition of 1-bit modes in sane.tex.
-	  Added entry about sane-find-scanner searching directories.
-	* backend/mustek.c backend/mustek.h doc/desacriptions/mustek.desc
-	  doc/mustek/mustek.CHANGES: Set freed variables to 0 in sane_exit.
-	  Fixed coding style. New version: 1.0-121.
-
-2002-04-09  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* sanei/sanei_pv8630.c (sanei_pv8630_bulkwrite): Avoid warning on
-	  Solaris. Correct type of second argument to sanei_usb_write_bulk()
-	  from (char*) to (SANE_Byte*).
-
-2002-04-08  Frank Zago <fzago@greshamstorage.com>
-
-	* backend/teco1.c backend/teco1.conf backend/teco1.h
-	doc/sane-teco1.man doc/descriptions/teco1.desc doc/teco/teco1.txt
-	doc/.cvsignore doc/Makefile.in doc/sane.man po/Makefile.in
-	po/teco1.fr.po backend/Makefile.in backend/dll.conf
-	sane-backends/AUTHORS sane-backends/ChangeLog
-	sane-backends/PROJECTS: added teco1 backend
-
-2002-04-08  Rene Rebe <rene.rebe@gmx.net>
-i
-	* doc/descriptions/avision.desc: fixed syntax
-
-2002-04-08  Henning Meier-Geinitz <henning@meier-geinitz.de>
- 
-	* Makefile.in: make libcheck now also checks for non-static variables.
-	* v4l.c: Some variables haven't been static. sane_set_io_mode must
-	  return SANE_STATUS_GOOD if non_blocking == SANE_FALSE.
-
-2002-04-08  Rene Rebe <rene.rebe@gmx.net>
-	* backend/avision.c backend/avision.h doc/descriptions/avision.desc
-	  doc/sane-avision.man: updated to Avision backend build 25. More
-	  stable for HP usb scanners, suport for Misubishi scanners and
-	  various cleanups. - And corrected the avision.desc location.
-
-2002-04-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/canon_pp.c backend/canon_pp-dev.c backend/canon_pp-io.c
-	  backend/canon_pp-dev.h: Changed timeouts and added scanner sleeps 
-	  to improve reliability of 6x0P models.  Also corrected typo which 
-	  caused full bed scans to fail.  Disabled problematic detect for now, 
-	  will make detection slightly slower. Patch from Matthew Duggan 
-	  <stauff1@users.sourceforge.net>.
-	* doc/descriptions/canon_pp.desc: Added man page, incremented version.
-	  Patch from Matthew Duggan <stauff1@users.sourceforge.net>.
-	* doc/sane-canon_pp.man: Added more hints on getting canon_pp driver
-	  working. Patch from Matthew Duggan <stauff1@users.sourceforge.net>.
-	* backend/Makefile.in backend/canon630u-common.c backend/canon630u.c
-	  backend/canon630u.conf backend/dll.conf backend/lm9830.h: Added
-	  canon630u backend. This backend supports the CanoScan 630u and
-	  CanoScan 636u (hopefully). Patch from Nathan Rutman 
-	  <nathan@gordian.com>.
-	* doc/.cvsignore doc/Makefile.in doc/sane-canon630u.man
-	  doc/descriptions/canon630u.desc: Added documentation and description
-	  of canon630u backend. Patch from Nathan Rutman 
-	  <nathan@gordian.com>. 
-	* PROJECTS doc/sane.man: Updated for canon630u backend.
-	* AUTHORS: Updated for canon630u backend.
-	* doc/saned.man: The path in the xinetd example pinted to /usr/local
-	  unconditionally.
-	* backend/canon630u-common.c: Fixed compilation on non-Linux systems.
-	* configure configure.in: Added work-around for asm/io.h problems.
-
-2002-04-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek.c doc/descriptions/mustek.desc 
-	  doc/mustek/mustek.CHANGES: Fixed color three-pass scanning for some
-	  scanners.
-	* PROJECTS: Added Hewlett-Packard ScanJet 2200c project.
-	* sanei/sabei_constrain_value.c: Check that a SANE_Bool variable
-	  can only be SANE_TRUE or SANE_FALSE.
-
-2002-04-02  Peter Fales <peter@fales.com>
-
-	* configure, acinclude.m4, aclocal.m4 - Another tweak to the
-	  allowed gphoto2 version numbers
-	
-2002-04-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* acinclude.m4 aclocal.m4 configure configure.in: Added checks for
-	  libieee1284. Enable canon_pp backend if found. Patch from 
-	  "Matthew Duggan" <stauff@guarana.org>.
-	* backend/Makefile.in backend/canon_pp-dev.c backend/canon_pp-dev.h
-	  backend/canon_pp-io.c backend/canon_pp-io.h backend/canon_pp.c
-	  backend/canon_pp.conf backend/canon_pp.h backend/dll.conf:
-	  Added new canon_pp backend for the CanoScan FB330P, FB630P, N340P,
-	  and N640P scanners. Patch from "Matthew Duggan" <stauff@guarana.org>.
-	* AUTHORS doc/Makefile.in doc/sane-canon_pp.man doc/sane.man
-	  doc/descriptions/canon_pp.desc: Updated for canon_pp backend.
-	  Patch from "Matthew Duggan" <stauff@guarana.org>.
-	* PROJECTS TODO: Removed canon_pp.
-	* doc/.cvsignore: Added sane-canon_pp.5.
-	* doc/descriptions-external/canon_pp.desc: Removed.
-	
-2002-03-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/test.desc: Added description of the test 
-	  backend.
-	* PROJECTS: Added homepage of the test backend.
-
-2002-03-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/pnm.c doc/descriptions/pnm.desc: Check if option is settable
-	  when automatically setting it. New version: 1.0.7.
-	* backend/Makefile.in doc/Makefile.in frontend/Makefile.in 
-	  include/Makefile.in po/Makefile.in tools/Makefile.in:
-	  Support for variable DESTDIR. If set, all files are installed to that
-	  location. Also print the filename of the installed file, not only the
-	  path. Both changes are mostly for package creators/maintainers.
-	* configure configure.in: Another try to get the DISTCLEAN_FILES
-	  working.
-
-2002-03-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane-scsi.man: Updated info about SCSI-Howto and some SCSI
-	  adapters.
-
-2002-03-27 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* removed unused definitions in include/sane/saneopts.h:
-	  SMEAR, TEN_BIT_MODE, TWELVE_BIT_MODE, RGB_PREVIEW_PATCH, 
-	  START_SCAN_PATCH
-
-2002-03-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* PROJECTS: Updated canon_pp entry. Added Canon FB630U and Canon N650U
-	  USB entries. Updated test backend entry.
-
-2002-03-26  Frank Zago <fzago@greshamstorage.com>
-
-	* PROJECTS: Updated Relisys Scorpio Super 3 infos.
-
-2002-03-26  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* AUTHORS, sanei_lm983x.[ch], entire Plustek backend:
-	  Updated to new mail-address and backend URL
-
-2002-03-24  Oliver Schwartz <oliver.schwartz@gmx.de>
- 
-	* backend/snapscan.c: Fix segfault in sane_exit if no devices were 
-          found.
-
-2002-03-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* acinclude.m4 aclocal.m4 configure configure.in ltmain.sh:
-	  Update to libtool 1.4.2. Included local changes: use soname "libsane"
-	  for all os but AIX. Use "normal" shared libs (.so) instead of archives
-	  on AIX. Use 1 instead of 2 as major number with Irix.
-	* Makefile.in ltconfig: Removed ltconfig as it is no longer used by 
-	  libtool.
-	* TODO: More status indicators for backends to include. Removed
-	  entry about the grand Fujitsu reunification. Updated entry about the 
-	  DBG warnings. Removed entry about splitted sane-backends.html. 
-	  Removed entries about libtool problems. Added entry about plustek on
-	  OS/2 problem.
-	* backend/pnm.c doc/descriptions/pnm.desc: If fread returns 0, check
-	  for EOF and other errors and return appropriately.
-	* backend/mustek_usb_mid.h: Updated SANE header.
-	* backend/net.c doc/descriptions/net.desc: Fixed 16-bit byte-order
-	  handling in sane_read() (patch from Michael Herder <crapsite@gmx.net>).
-	  New version: 1.0.7.
-
-2002-03-24  Oliver Schwartz <oliver.schwartz@gmx.de>
-
-	* backend/snapscan-options.c: New file (option functions moved from 
-          snapscan.c)
-        * backend/snapscan-utils.c: Removed file
-        * backend/Makefile.in: Added snapscan-options.c, removed snapscan-utils.c
-        * backend/snapscan.c backend/snapscan.h backend/snapscan-scsi.c
-          backend/snapscan-usb.c backend/snapscan.h backend/snapscan.conf: 
-          Snapcan-backend ver. 1.4.9
-          - Moved option functions to snapscan-options.c
-          - Autodetect USB scanners on Linux
-          - Better error reporting
-	
-2002-03-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/backend-writing.txt: Updated concerning splitted .desc
-	  directories.
-	* doc/Makefile.in: Updated install-mostang concerning splitted HTML
-	  pages.
-	* configure configure.in README: Use only shared libraries by default.
-	  Fixed file patterns for distclean targets.
-	* doc/Makefile.in: Remove backup etc. files also in subdirs when
-	  using make distclean.
-	* backend/pnm.c doc/descriptions/pnm.desc: Don't allow to set options
-	  that don't have SANE_CAP_SOFT_SELECT and don't allow read and write
-	  for options that are inactive. New version: 1.0.5.
-	
-2002-03-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei_wire.c: Set allocated memory to 0 to avoid delivering
-	  garbage to the frontend.
-	* backend/mustek.c backend/mustek.desc backend/mustek.h 
-	  doc/mustek/mustek.CHANGES: Fixed halftone pattern handling. The
-	  buffer was way too small. Option 0 has an empty name. Better debug
-	  output for dev_cmd. Set size for group options to 0. Set size of
-	  halftone pattern to non 0.
-	* backend/mustek_usb.c backend/mustek_usb.desc 
-	  doc/mustek_usb/mustek_usb.CHANGES: Option 0 has an empty name now.
-	  Group options have size 0 now. Check also for SANE_ACTION_SET_AUTO.
-	  Removed buggy output in sane_control_option. Added more debug output
-	  in sane_control_option.
-	* backend/net.c backend/net.desc backend/net.h: Use copies of option
-	  descriptors to make sure their addresses aren't changed until
-	  sane_close. New version: 1.0.7.
-	* doc/descriptions/abaton.desc doc/descriptions/agfafocus.desc
-	  doc/descriptions/apple.desc doc/descriptions/artec.desc
-	  doc/descriptions/as6e.desc doc/descriptions/avision.desc
-	  doc/descriptions/bh.desc doc/descriptions/canon.desc
-	  doc/descriptions/coolscan.desc doc/descriptions/dc210.desc
-	  doc/descriptions/dc240.desc doc/descriptions/dc25.desc
-	  doc/descriptions/dll.desc doc/descriptions/dmc.desc
-	  doc/descriptions/epson.desc doc/descriptions/gphoto2.desc
-	  doc/descriptions/hp.desc doc/descriptions/m3096g.desc
-	  doc/descriptions/matsushita.desc doc/descriptions/microtek2.desc
-	  doc/descriptions/microtek.desc doc/descriptions/mustek.desc
-	  doc/descriptions/mustek_pp.desc doc/descriptions/mustek_usb.desc
-	  doc/descriptions/nec.desc doc/descriptions/net.desc
-	  doc/descriptions/pie.desc doc/descriptions/pint.desc
-	  doc/descriptions/plustek.desc doc/descriptions/pnm.desc
-	  doc/descriptions/qcam.desc doc/descriptions/ricoh.desc
-	  doc/descriptions/s9036.desc doc/descriptions/sceptre.desc
-	  doc/descriptions/sharp.desc doc/descriptions/sm3600.desc
-	  doc/descriptions/snapscan.desc doc/descriptions/sp15c.desc
-	  doc/descriptions/st400.desc doc/descriptions/tamarack.desc
-	  doc/descriptions/template.desc. doc/descriptions/umax1220u.desc 
-	  doc/descriptions/umax.desc doc/descriptions/umax_pp.desc
-	  doc/descriptions/v4l.desc:
-	  Moved descriptions of included backends from backend/*.desc.
-	* doc/descriptions-external/canon_pp.desc 
-	  doc/descriptions-external/coolscan2.desc
-	  doc/descriptions-external/hp4200.desc
-	  doc/descriptions-external/hpoj.desc
-	  doc/descriptions-external/ibm.desc
-	  doc/descriptions-external/lhii.desc
-	  doc/descriptions-external/m3091.desc
-	  doc/descriptions-external/niash.desc
-	  doc/descriptions-external/teco.desc
-	  doc/descriptions-external/v4l2.desc
-	  doc/descriptions-external/template.desc.:
-	  Moved descriptions of external backends from backend/*.desc.
-	* doc/Makefile.in: Updated for separated lists of backends.
-	* tools/Makefile.in tools/sane-desc.el.in tools/sane-desc-ext.el:
-	  Updated for separated lists of backends. Use package version in
-	  internal list. Don't use version and man page in external list.
-	* tools/sane-desc.el: Removed.
-	* configure configure.in: Added tools/sane-desc.el to output files.
-	* backend/Makefile.in: Updated DISTFILES.
-	* backend/*.desc backend/template.desc.: Removed (now in doc/).
-	* tools/.cvsignore: Added sane-desc.el.
-	
-2002-03-19  Frank Zago <fzago@greshamstorage.com>
-
-	* matsushita backend: updates and fixes.
-	* sceptre backend: updates and fixes.
-
-2002-03-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Marked backends that really should be included. Clearified
-	  comment about sane-backends.html. Added comment about sort order
-	  this list. Add comment about better linking of external libs.
-
-2002-03-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/hpoj.desc: New file (from David Paschal <paschal@rcsis.com>).
-	* backend/mustek_usb.c backend/mustek_usb.desc backend/mustek_usb.h
- 	  backend/mustek_usb_high.c backend/mustek_usb_high.h
-	  backend/mustek_usb_low.c backend/mustek_usb_low.h
-	  backend/mustek_usb_mid.c doc/mustek_usb/mustek_usb.CHANGES: Fixed
-	  segfault when opening device again after closing and possible
-	  segfault when name="". Type for option 0 must be set to
-	  SANE_TYPE_INT explicitely. Updated GPL/SANE headers.
-	* TODO: Added entry about auto-loading SCSI drivers. Removed entry
-	  about new SANE types. Moved entry about config.guess to 
-	  doc/releases.txt. Added more info about libtool problems.
-	* doc/releases.txt: Added info about config.guess and config.sub.
-	* config.guess config.sub: Updated from upstream.
-
-2002-03-17  Peter Fales <peter@fales.com>
-
-	* backend/gphoto2.c - Minor bug fixes for problems found by tstbackend
-	
-2002-03-16  Gerhard Jaeger  <g.jaeger@earthling.net>
-
-	* backend/plustek.[ch]: fixed a bug, that causes segfaulting the backend
-	  when using the USB autodetection stuff 
-
-2002-03-15  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c:  fixed 1200 dpi mode
-	* backend/umax_pp:  changes for translations support
-	* po/Makefile.in po/umax_pp.fr.po:  create french translations for 
-	  umax_pp backend
-	  
-2002-03-12  Frank Zago <fzago@greshamstorage.com>
-
-	* PROJECTS backend/teco.desc: new project
-
-2002-03-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README: Some more information on where to find the config files and
-	  a hint to make a backup.
-	* doc/sane.man: Updated mustek_usb and plustek backend entries. Added
-	  FILES section. Minor fixes and updates.
-
-2002-03-10  Frank Zago <fzago@greshamstorage.com>
-
-	* PROJECTS: removed matsushita project.
-	* backend/sceptre.desc backend/matsushita.desc: updated the backend 
-	  url.
-
-2002-03-10 Abel Deuring <a.dering@satzbau-gmbh.de>
-	* configure.in, configure: Added a second test for
-	  HAVE_SG_TARGET_STATUS: check /usr/src/linux/include/scsi/sg.h;
-	  added conditionals so that this test is done only for Linux
-
-2002-03-10  Gerhard Jaeger <g.jaeger@earthling.net>
-
-	* doc/sane-plustek.man: Update
-	* backend/plustek-usbhw.c backend/plustek-usbimg.c backend/plustek-usbio.c
-	  backend/plustek-usbmap.c backend/plustek-usbscan.c
-	  backend/plustek-usbshading.c backend/plustek.c backend/plustek-devs.c
-	  backend/plustek-pp.c backend/plustek.usb
-	  backend/plustek.h backend/plustek-share.h backend/plustek-usb.h:
-	  Added custom gamma tables, added patches to support EPSON1250,
-	  UMAX3400 and HP2100C devices, added warmup and timed lamp-off features,
-	  minor bug-fixes
-	* backend/plustek.desc: Added Umax entry
-	* backend/plustek.conf: Update
-
-2002-03-10 Abel Deuring <a.dering@satzbau-gmbh.de>
-	* configure.in, configure, include/sanei/config.h.in,
-	  sanei/sanei_scsi.c: Added HAVE_SG_TARGET_STATUS for compatibility
-	  with old Linux sg.h versions
-
-2002-03-10  Gerhard Jaeger  <g.jaeger@earthling.net>
-
-	* po/plustek.de.po:  Update
-	* po/plustek.es.po, po/saneopts.es.po:  Added spanish translation
-	  thanks to Gustavo D. Vranjes                                 
-
-2002-03-10  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c:  fast and adaptative scanner probe function.
-	  Improved CCD calibration.
-	* tools/umax_pp.c: revision change
-
-2002-03-08 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* backend/Makfile.in: added missing depenencies for
-	  new umax backends
-
-2002-03-08  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane.tex: Added "multi-function peripheral" to list of types in
-	  SANE standard.
-
-2002-03-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* include/sane/config.h.in: Fix comment for HAVE_USB_H.
-	* TODO: Added entry about md5/getopt license issues.
-	
-2002-03-07 Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* sanei/sanei_scsi.c: fixed a typo (Sg_scsi_id -> SG_scsi_id)
-
-2002-03-07 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* updated umax backend to version 1.0.7-build-33
-	  new file: umax-usb.c (by Frank Zago)
-
-2002-03-06  Frank Zago <fzago@greshamstorage.com>
-
-	* po/Makefile,in doc/sane.man doc/Makefile.in backend/matsushita.desc
-	  backend/dll.conf backend/Makefile.in sane-backends.lsm AUTHORS
-	  po/matsushita.fr.po doc/matsushita/matsushita.txt 
-	  doc/matsushita/matsushita10_trc.txt 
-	  doc/matsushita/matsushita11_trc.txt
-	  doc/matsushita/matsushita12_trc.txt 
-	  doc/matsushita/matsushita13_trc.txt 
-	  doc/matsushita/matsushita14_trc.txt 
-	  doc/matsushita/matsushita1_trc.txt 
-	  doc/matsushita/matsushita2_trc.txt
-	  doc/matsushita/matsushita3_trc.txt 
-	  doc/matsushita/matsushita4_trc.txt 
-	  doc/matsushita/matsushita5_trc.txt 
-	  doc/matsushita/matsushita6_trc.txt 
-	  doc/matsushita/matsushita7_trc.txt 
-	  doc/matsushita/matsushita8_trc.txt 
-	  doc/matsushita/matsushita9_trc.txt doc/sane-matsushita.man 
-	  backend/matsushita.h backend/matsushita.conf 
-	  backend/matsushita.c: Addition of the Matsushita / Panasonic backend
-	* doc/.cvsignore: added sane-matsushita.5
-
-2002-03-03  Frank Zago <fzago@greshamstorage.com>
-
-	* doc/.cvsignore: added sane-sceptre.5
-
-2002-03-03  Frank Zago <fzago@greshamstorage.com>
-
-	* doc/sane-sceptre.5: removed (auto-generated)
-
-2002-03-03  Frank Zago <fzago@greshamstorage.com>
-
-	* doc/sceptre/s1200.txt: doc updates
-	* backend/sceptre.desc: increased version
-	* backend/sceptre.c backend/sceptre.h: fixed a gamma table bug,
-	  fixed some color shifting problems, some cleanups.
-	* doc/sceptre.man: doc updates
-
-2002-02-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/Makefile.in: Removed getopt.o getopt1.o and md5.o from
-	  LIBLIB_FUNCS as they are not needed in backends.
-
-2002-02-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* PROJECTS: Added matsushita backend.
-	* backend/matsushita.desc: New file. Description for the matsushita
-	  backend.
-
-2002-02-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/Makefile.in backend/dll.conf backend/sceptre.c
-	  backend/sceptre.conf backend/sceptre.desc backend/sceptre.h:
-	  Added sceptre backend for the Sceptre VividScan 1200 (patch from
-	  Frank Zago <fzago@greshamstorage.com>).
-	* doc/Makefile.in doc/sane-sceptre.5 doc/sane-sceptre.man doc/sane.man 
-	  doc/sceptre/preview_trace.txt doc/sceptre/s1200.txt
-	  doc/sceptre/scan_trace.txt: Added documentation for sceptre backend
-	  (patch from Frank Zago <fzago@greshamstorage.com>).
-	* po/Makefile.in po/sceptre.fr.po: Added french translation for
-	  sceptre backend (patch from Frank Zago <fzago@greshamstorage.com>).
-	* AUTHORS PROJECTS sane-backends.lsm: Updated concerning sceptre
-	  backend (patch from Frank Zago <fzago@greshamstorage.com>).
-
-2002-02-20  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c backend/umax_pp.c:  corrected few bugs
-	  due to changing default model to 'none'.
-	* tools/umax_pp.c: fixed compile problem
-
-2002-02-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* lib/inet_pton.c: Use u_int32_t instead of in in_addr_t which isn't
-	  defined at least for OS/2.
-	* TODO: Added entry about DBG warnings.
-	* doc/sane.tex: Added some vendors (Abaton, Acer, Apple, Avision, 
-	  CANON, Fujitsu, IBM, NEC, Nikon, Plustek, Polaroid, Ricoh, Sharp, 
-	  Siemens, Tamarack) and device types (film scanner, sheetfed scanner)
-	  to the SANE standard. Updated date.
-	* doc/Makefile.in: Remove sanei-html in make distclean.
-	* PROJECTS: Added Acer ScanWit 2720S.
-	* backend/template.desc.: Added explanation for backend version, fixed
-	  typo.	
-
-2002-02-16 Abel Deuring <a.deuring@satzbau-gmbh.de>:
-	* frontend/scanimage.c / part for the "-f" command line option:
-	  replaced the vprintf call with a loop of printf calls; fixed
-	  a "too stingy" malloc 
-
-2002-02-16  Peter Fales <peter@fales.com>
-
-	* backend/dc240.c - Fix mismatches between format and 
-	  parameters in debug statements
-	
-2002-02-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* include/sane/sanei.h include/sane/sanei_ab306.h
-	  include/sane/sanei_auth.h include/sane/sanei_backend.h
-	  include/sane/sanei_codec_ascii.h include/sane/sanei_codec_bin.h
-	  include/sane/sanei_config.h include/sane/sanei_debug.h
-	  include/sane/sanei_lm983x.h include/sane/sanei_thread.h
-	  include/sane/sanei_usb.h: Added, fixed and updated documentation
-	  for sanei using doxygen.
-	* doc/.cvsignore: Added sanei-html.
-	* TODO: Updated entry about missing sanei documentation. Removed
-	  entry about make distclean issues.
-
-2002-02-15  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c backend/umax_pp_low.h backend/umax_pp_mid.h
-	  backend/umax_pp_mid.c backend/umax_pp.c backend/umax_pp.h
-	  backend/umax_pp.conf:  added ppdev character device name passing 
-	  from conf file. Allow model overide from conf option. DBG macros 
-	  clean-up. Fixed color inversion for 1660P models. Fixed potential 
-	  crash when custom dump files could not be opened for writing.
-	* doc/sane-umax_pp.man: updates to match backned new parameter and 
-	  behaviour
-	* tools/umax_pp.c: added device name argument
-		
-2002-02-14  Jochen Eisinger <jochen.eisinger@gmx.net>
-
-	* sanei/sanei_auth.h: remove strange line-ending handling code
-
-2002-02-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in include/sane/config.h.in lib/Makefile.in
-	  lib/inet_pton.c: Added wrapper for inet_pton(). If this function
-	  is not available, try first inet_aton() and then inet_addr().
-	* frontend/saned.c: Use inet_pton() instead of inet_aton() to avoid
-	  compilation errors on e.g. OS/2.
-	* include/Sane/sanei_debug.h: Added warnings for format problems
-	  in DBG messages (from Frank Zago <fzago@greshamstorage.com>).
-	* include/sane/sanei.h sanei/Makefile.in sanei/load_values.c
-	  sanei/save_values.c: Removed load_values and save_values as they
-	  are only used in sane_frontends.
-	* backend/mustek.c backend/mustek_usb_low.c backend/mustek_usb_high.c
-	  backend/net.c doc/mustek/mustek.CHANGES
-	  doc/mustek_usb/mustek_usb.CHANGES sanei/sanei_usb.c: Fixed some
-	  DBG format warnings.
-	* lib/inet_ntop.c: Only use inet_ntoa if it's available.
-
-2002-02-13  Peter Fales <peter@fales.com>
-
-	* configure, acinclude.m4, aclocal.m4 - Another tweak to the
-	  allowed gphoto2 version numbers
-	
-2002-02-13  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in Makefile.in backend/Makefile.in
-	  doc/Makefile.in frontend/Makefile.in include/Makefile.in
-	  japi/Makefile.in lib/Makefile.in sanei/Makefile.in
-	  tools/Makefile.in testsuite/Makefile.in po/Makefile.in: Added global
-	  list of file patterns for "make distclean". Some "make clean"
-	  and "make distclean" cleanup and additions.
-
-2002-02-12  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/sane-config.in: Avoid printing "-I/usr/include" as this
-	  changes the default include order (from Tim Waugh
-	  <twaugh@redhat.com>). Really check for entries in $cflags that
-	  are also in $includedir.
-	* frontend/saned.c: DNS queries for remote hosts are only done if
-	  necessary. It's now possible to use "+" without hosts/DNS entries
-	  for the connecting host.
-	* TODO: Removed entries for config.h, OpenBSD shared libs, and -ansi 
-	  on HP-UX. Updated device type entry.
-
-2002-02-10  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Link to functions in lib/ only
-	  if they are not available on the system. Use AC_PROG_LIBTOOL
-	  instead of the deprecated AM_PROG_LIBTOOL.
-	* backend/Makefile.in lib/Makefile.in: Link to functions in lib/ only
-	  if they are not available on the system. Avoid duplicating list of
-	  functions.
-	* sanei/sanei_usb.c: If get_vendor_product fails, don't try again for
-	  every device file.
-
-2002-02-10  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* po/Makefile.in: Added snapscan.de.po to DISTFILES
-
-2002-02-09  Abel Deuring <a.deuring@satzbau-gmbh.de>:
-	* sanei/sanei_scsi.c: Added checks to the Linux part of
-	  sanei_scsi_open_extended, if an SG device file is being
-	  opened
-
-2002-02-09  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* po/Makefile.in po/snapscan.de.po backend/snapscan.c:
-          Added language translation support for snapscan backend,
-          added german translations.
-
-2002-02-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/Makefile.in po/saneopts.fr.po po/umax.fr.po: Added french
-	  translation (from Frank Zago <fzago@greshamstorage.com>).
-
-2002-02-08  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* PROJECTS: Added info about HP Scanjet 5S.
-	* lib/inet_ntop.c: Removed OS/2 kludge: it's not necessary.
-
-2002-02-05  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c backend/umax_pp_low.h backend/umax_pp_mid.h
-	  backend/umax_pp_mid.c backend/umax_pp.c backend/umax_pp.h: 
-	  tuned down duration of pauses in scanner ringing. Indent'ing all
-	  files. Include header files according to HAVE_XXX_H defines in
-	  config.h .
-	* tools/umax_pp.c: updated version and added printing of config
-		options
-	  
-2002-02-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Version is 1.0.7-cvs. Enable warnings by
-	  default. Don't use "-ansi" for HPUX.
-	* sanei/sanei_thread.c: Make sure that waitpid returns something
-	  usefull on OS/2. Avoids the "Unknown SANE status code 128" errors.
-
-Older entries can be found in ChangeLog-1.0.7.
diff --git a/ChangeLog-1.0.9 b/ChangeLog-1.0.9
deleted file mode 100644
index c20a918..0000000
--- a/ChangeLog-1.0.9
+++ /dev/null
@@ -1,1148 +0,0 @@
-******  Release of sane-backends 1.0.9. End of code freeze ******
-
-2002-10-23  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/gt68xx.conf: Updated status of scanners.
-	* doc/doxygen.conf: Increased version to 1.0.9.
-	* configure configure.in: New version: 1.0.9. Disabled compilation
-	  warnings.
-
-2002-10-23  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c: added O_NONBLOCK to flags when opening ppdev
-	  character device, to get around hangs with 2.4.19 linux kernels in
-	  pure EPP mode.
-
-2002-10-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README.linux: Added comment about DEC cc on Linux Alpha.
-
-2002-10-19  Peter Fales <peter@fales-lorenz.net>
-
-	* backend/dc25.c - Moved use of UNUSEDARG macro to fix
-	  compilation failure on OS/X
-
-2002-10-19  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/tevion9693usb.desc: Added Trust 
-	  Easy Webscan 19200.
-
----- CODE FREEZE FOR SANE 1.0.9 ---
--- snapshot 1.0.9-pre2
-
-2002-10-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/dll.conf: Added commented out entries for hpoj and gt68xx.
-	* NEWS: Updated release date and backend list.
-	* TODO: Added scanimage short string-list options problem.
-
-2002-10-17  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek.c: removed internationalization stuff
-	* backend/plustek-usb.c: removed obsolete definitions
-	* backend/plustek-usbhw.c: fixed typos
-	* backend/plustek-usnshading.c: fixed bug that produces
-	  files > 700M in debug mode. Added some debug output.
-
-2002-10-16 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* backend/umax.c, umax-scanner.c: added Power Look 2000
-	  as supported device, build 38
-
-2002-10-15  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/sane-plustek.man: Major update
-	* doc/descriptions/plustek.desc: Added EPSON 1260 entry
-	* backend/plustek.conf updated options
-	* backend/plustek.c backend/plustek-devs.c backend/plustek-usb.c
-	  backend/plustek-usbhw.c backend/plustek-pp.c
-	  backend/plustek-usbmap.c backend/plustek-usbimg.c
-	  backend/plustek-usbscan.c backend/plustek-usbshading.c
-	  backend/plustek.h backend/plustek-share.h backend/plustek-usb.h
-	  Bug fixes and workarounds
-
-2002-10-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane.tex: Backend behaviour is undefined if sane_init
-	  doesn't return SANE_STATUS_GOOD. Added SANE_STATUS_INVAL to
-	  return codes for sane_start. Description of sane_set_io_mode is
-	  more precise.
-	* sanei/sanei_usb.c: Really check for bulk_out ep when writing.
-	* TODO: Added microtek2 problem. Updated sane.tex and desc sections.
-	  Added scanimage width/height problem. Added possible solution to po
-	  file mess.
-	* doc/Makefile.in doc/sane-config.man: Added man page for sane-config.
-	* doc/.cvsignore: Added sane-config.1.
-
-2002-10-15  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* backend/hp.conf: Added comment for USB-scanner
-
-2002-10-14  Peter Fales <peter@fales-lorenz.net>
-
-	* backend/dc240.h,backend/dc240.c: Use portable code for camera
-	  structures that does not depend on gcc or little-endian byte order
-
-2002-10-14  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.h backend/snapscan.c backend/snapscan.conf
-	  doc/descriptions/snapscan.desc: SnapScan backend 1.4.17 -
-	  added ID string for SnapScan e10, added Mitsubishi Diamandview
-	  648UT in desc file.
-
-2002-10-11  Peter Fales <peter@fales-lorenz.net>
-
-	* backend/dc240.h - Add message to #error as required by ANSI
-
-2002-10-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek.c doc/mustek/mustek.CHANGES: Fixed shutting off
-	  the lamp for the Paragon 1200 A3 Pro.
-	* doc/descriptions/mustek.desc: Updated version number and A3 Pro
-	  information.
-
-2002-10-10  Petter Reinholdtsen <pere@td.org.uit.no>
-
-	* backend/canon630u-common.c: Change type of size parameter from
-	  'unsigned int' to 'size_t' for gl640WriteBulk() and
-	  gl640ReadBulk() to avoid crash on platforms where
-	  'sizeof(size_t) > sizeof(int)'.
-
-	* backend/coolscan.c: Remove semicolon at the end of functions.
-
-2002-10-09  Frank Zago  <fzago at austin dot rr dot com>
-
-	* backend/teco1.c backend/teco1.conf doc/descriptions/teco1.desc:
-	  Added entry for AVEC color 2412.
-
-2002-10-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/microtek2.desc: Added per-scanner status (from
-	  Karsten Festag <karsten.festag@gmx.de>).
-
-2002-10-09  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp.c: disable scanner protocol debug facility
-	 
-2002-10-08  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: force color channel re-order for GT-2200 scanner
-
-2002-10-08  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp.c: use macros from saneopts.h to fix translations
-	  problems
-
-2002-10-08  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* po/plustek.de.po: Cleanup
-
-2002-10-08  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/saned.man doc/sane-net.man: Removed comment about saned port not
-	  officially assigned.
-	* po/plustek.de.po po/umax_pp.fr.po: Fixed double msgids.
-
-2002-10-05  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.c: Fixed problem with incorrect response to 
-	  sane_get_parameters() in certain situations.
-
-2002-10-04  Jochen Eisinger <jochen.eisinger@gmx.de>
-
-	* doc/descriptions/mustek_pp.desc: add :status tags to each
-	  scanner
-
-2002-10-04  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* backend/plustek.conf fixed option enableTPA
-	* po/plustek.de.po po/plustek.es.po removed "Negative"
-	* backend/plustek.c backend/plustek-devs.c backend/plustek-usb.c 
-	  backend/plustek-usbhw.c backend/plustek-usbimg.c
-	  backend/plustek-usbmap.c backend/plustek-usbscan.c
-	  backend/plustek-usbshading.c
-	  Minor bug fixes
-
-2002-10-04  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/sane-epson.man: Added quotes around halftoning options.
-
-2002-10-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Updated list of backends scheduled for inclusion. Updated
-	  v4l bug list. Added entry about vendor/product ids for .desc.
-	  Removed TL_X > BR_X (->TODO), dll ltdl rewrite, wait return
-	  value (->TODO), sane.tex comment about 1 bit color mode,
-	  sane-plustek.man issue.
-
-2002-10-02  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* tools/umax_pp.c: changed version and added handling of 4 digits
-          port address
-	* po/umax_pp.de.po: removed redundant entry
-	* backend/umax_pp.conf: comment fixings
-	* backend/umax_pp_low.c backend/umax_pp.c:  added handling of ppdev
-	  ioctl return code, allow 4 digits port number
-
-2002-10-02  Matto Marjanovic  <maddog@mir.com>
-
-	* doc/descriptions/microtek.desc: Updated version number.
-	* backend/microtek.c:  
-	  Fixed bug in sane_read() [had failed to set return length to zero
-           in non-STATUS_GOOD conditions].
-	  Fixed bug in sane_set_io_mode() [had returned SANE_STATUS_UNSUPPORTED
-           if blocking mode was requested].
-	  Bumped version up to 0.13.1.
-
-2002-10-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/gt68xx.desc: Added new scanners. Updated
-	  status of supported scanners.
-	* doc/sane.tex: Added explanation of bit order for 1 bit modes. Added
-	  comment about 1 bit color modes. Fixed missing \code command. New 
-	  version: 1.03.
-	* doc/backend-writing.txt: Added paragraph about checking geometry
-	  (from TODO).
-
-2002-09-30  Peter Fales <peter@fales-lorenz.net>
-
-	* configure, acinclude.m4, aclocal.m4 - Update the
-	  allowed gphoto2 version numbers
-
-2002-09-30 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* doc/descriptions/umax.desc: removed remark that Astra 2200U via USB
-	  only works on linux (because need of USB control messages)
-
-2002-09-30  Matthew Duggan <stauff1@users.sourceforge.net>
-	* backend/canon_pp.c backend/canon_pp-dev.c backend/canon_pp-dev.h:  
-	  Finally fixed cancelling, which I broke some time ago in the quest 
-	  for speed.  FB620P still doesn't abort nicely (firmware bug?).
-	* doc/sane-canon_pp.man: Added notes on FB620P problems.
-	* doc/descriptions/canon_pp.desc: Bumped version number.
-
-2002-09-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/test.c backend/test-picture.c doc/descriptions/test.desc:
-	  Fixed bytes_per_line in 1 bit mode. Fixed 1 bit color three-pass
-	  mode (grid). Changed bit order for 1 bit color to most significant
-	  bit is first pixel.
-
-2002-09-29  Peter Fales <peter@fales-lorenz.net>
-
-	* backend/dc25.[ch]:  Fix compiler warnings, and correct
-	  errors found by tstbackend.
-
----- FEATURE FREEZE FOR SANE 1.0.9 ---
--- snapshot 1.0.9-pre1
-
-2002-09-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-	
-	* doc/descriptions/mustek_usb.desc: Added "ScanExpress" for all models
-	  to avoid confusion with BearPaw models.
-	* Makefile.in: Added ChangeLog-1.0.6 ChangeLog-1.0.7 ChangeLog-1.0.8
-	  to DISTFILES.
-
-2002-09-29  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/sane-epson.man: Updated information, cleanup
-	* doc/descriptions/epson.desc: Added 1660 and 2400 models
-
-2002-09-28 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* backend/umax.c:
-	  update to build 37
-
-2002-09-28  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* sanei/sanei_lm983x.c: cleanup in reset function
-	* doc/descriptions/plustek.desc: Update according to the new
-	  entry definitions
-	* doc/sane-plustek.man: Fixed format and updated info
-	* backend/plustek.c backend/plustek-devs.c backend/plustek-pp.c
-	  backend/plustek-share.h backend/plustek-usb.c backend/plustek-usb.h
-	  backend/plustek-usbhw.c backend/plustek-usbimg.c
-	  backend/plustek-usbmap.c backend/plustek-usbscan.c
-	  backend/plustek-usbshading.c backend/plustek.conf:
-	  Major update to support CIS based devices
-	  Added register dump and raw picturue/calibration data dump
-	  Added support for Canon N650U and N670U (currently 8-bit color mode only)
-
-2002-09-28  Andras Major <andras@users.sourceforge.net>
-
-	* backends/coolscan2.c doc/descriptions/coolscan2.desc
-	  doc/sane-coolscan2.man: update to 0.1.8
-
-2002-09-26  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* config.sub config.guess: Updated to current versions.
-	* doc/releases.txt: Added paragraph about the different freeze types
-	  and a timetable.
-	
-2002-09-26  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* doc/snapscan.desc backend/snapscan.c backend/snapscan.h
-	  backend/snapscan.conf backend/snapscan-scsi.c:
-	  SnapScan backend 1.4.16 (added support for Acer/Benq 5000)
-
-2002-09-24  Peter Fales <peter@fales-lorenz.net>
-
-	* backend/dc25.c:  Backend returning too much data for image size
-
-2002-09-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/tevion9693usb.desc: Added MD9693, updated
-	  Artec E+ 48U (from Michael Herder <crapsite@gmx.net>).
-
-2002-09-23  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/fujitsu.desc: Changed status to beta and added
-	  URLs.
-	* doc/descriptions-external/gt68xx.desc: Added some untested scanners.
-	  Updated Mustek entries.
- 	* TODO: Removed hpsj5s .desc file problem.
-	
-2002-09-22  Peter Fales <peter@fales-lorenz.net>
-
-	* doc/sane-dc25.man, backend/dc25.c, backend/dc25.h, 
-	  backend/gphoto2.c, backend/gphoto2.h, backend/dc240.c, 
-	  backend/dc240.h:  Update authors email address
-
-2002-09-19  Frank Zago  <fzago at austin dot rr dot com>
-
-	* backend/leo.c backend/leo.conf doc/sane-leo.man
-	  doc/descriptions/leo.desc: added support for the leoscan S3.
-	* backend/teco2.c backend/teco2.h: added some stuff.
-
-2002-09-18  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/hpsj5s.desc: Used "Hewlett-Packard" instead
-	  of "HP".
-
-2002-09-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions-external/gt68xx.desc: Updated Mustek
-	  information. Added Plustek OpticPro 1248U.
-	* backend/mustek.c: Fixed version number.
-	* NEWS: Updated backend list.
-
-2002-09-17  Oliver Schirrmeister <oschirr@abm.de>
-        * backend/fujitsu.c fujitsu.h fujitsu-scsi.h:
-          added m3092 support
-        * doc/descriptions/fujitsu doc/sane-fujitsu
-          added description 
-
-2002-09-17  Matthew Duggan <stauff1@users.sourceforge.net>
-	* backend/canon_pp.c backend/canon_pp.h backend/canon_pp.conf:
-	  Added init_mode option to conf file for faster starts.
-	* doc/sane-canon_pp.man : Added description of init_mode option.
-
-2002-09-16  Matthew Duggan <stauff1@users.sourceforge.net>
-	* backend/canon_pp-dev.c backend/canon_pp-dev.h backend/canon_pp-io.c 
-	  backend/canon_pp-io.h backend/canon_pp.c backend/canon_pp.h:
-	  Fix init problem, add changes to facilitate configurable wakeup mode
-	  (for faster starts on FB320P and FB620P).
-	* doc/sane-canon_pp.man doc/descriptions/canon_pp.desc: Updates 
-	  regarding FB310P and FB610P (rebadged Avisions)
-
-2002-09-16  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/.cvsignore frontend/.cvsignore tools/.cvsignore: Added .libs.
-	  Patch from Sylvain Petreolle <spetreolle@yahoo.fr>.
-	* TODO: Added gt68xx project and viceo.desc entry.
-	* PROJECTS doc/descriptions-external/gt68xx.desc: Added gt68xx 
-	  information.
-
-2002-09-15  Karl Heinz Kremer <khk@khk.net>
-
-	* doc/sane-epson.man: Fixed typo (PIP->PIO)
-
-2002-09-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/sane-find-scanner.c: Format of output for devices
-	  supported by libusb and scanner module is the same now. Minor
-	  output fixes.
-	* doc/sane-find-scanner.man: Updated -v description.
-	* doc/sane-usb.man: Added info about "unable to access minor data"
-	  messages.
-
-2002-09-13 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* backend/umax-scanner.c, backend/umax.conf
-	  doc/descriptions/umax.desc:
-	  added Linotype Hell SAPHIR3 as supported scanner
-
-2002-09-12  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README.beos Makefile.in doc/Makefile.in: Added BeOS platform
-	  information. Updated Makefiles concerning READMEs.
-
-2002-09-11 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* doc/descriptions/umax.desc: corrected some urls
-
-2002-09-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/canon630u.desc: Added fb636u as unsupported.
-	  Added status information.
-	* frontend/scanimage.c: Added option --dont-scan. Resorted usage
-	  output.
-	* doc/scanimage.man: Reordered options. Added info about ICC profiles,
-	  gamma4scanimage, and --dont-scan option. Fixed example.
-	* doc/gamma4scanimage.man: Formatting updates. Added default values.
-	  Minor fixes.
-	* TODO: Updated backend list. Added comments for additions to sane.tex.
-	  Updated .desc file bug list. Removed scanimage entries. Added
-	  plustek man page issue.
-	
-2002-09-10  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* doc/sane-hp.man: Added hints about special USB device names
-
-2002-09-07  Frank Zago  <fzago at austin dot rr dot com>
-
-	* backend/teco1.c backend/teco1.h teco1.desc: added threshold
-	  option
-
-2002-09-07 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* backend/umax.c, umax.h, umax-scanner.c, umax.conf
-	  doc/descriptions/umax.desc
-	  Update to sane-umax build 36
-
-2002-09-07  Matthew Duggan <stauff1@users.sourceforge.net>
-
-	* backend/canon_pp-dev.c backend/canon_pp-dev.h:
-	  Changes to improve calibration quality on FB620P.
-
-2002-09-06  Frank Zago  <fzago at austin dot rr dot com>
-
-	* README.aix: added mention of the AIX 5.1 version of the passthru
-	  driver.
-
-2002-09-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/sane-config.in: Removed "function" keyword (bourne shell
-	  compatibility).
-
-2002-09-03  Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* sanei/sanei_scci.c doc/sanei-scsi.man:
-	  default timeout for SCSI commmands is now 120 seconds; added
-	  the environment variable SANE_SCSICMD_TIMEOUT to override
-	  the default value.
-
-2002-09-01  Matthew Duggan <stauff1@users.sourceforge.net>
-
-	* doc/sane-canon_pp.man doc/descriptions/canon_pp.desc:
-	  Added FB320P to supported scanners after report of successful test.
-	  Added FB310P and FB610P to desc as specifically not supported yet.
-
-2002-09-01  Karl Henz Kremer <khk@khk.net>
-
-	* backend/epson_scsi.c: Fixed alloca compile problem.
-
-2002-09-01  Karl Henz Kremer <khk@khk.net>
-
-        * backend/epson.[ch] backend/epson_scsi.[ch] backend/epson_usb.[ch]
-          backend/Makefile.in: USB scanners are now using sanei_usb_ functions,
-          split out SCSI related functions to their own source/header file,
-          added source/header file for USB interface
-
-2002-09-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Updated desc and SANE standard sections. Removed ptal entry.
-	* doc/Makefile.in: Make sure that sane-desc is compiled when generating
-	  HTML pages. Fixed typo.
-	* doc/sane-usb.man: Minor updates and fixes.
-
-2002-09-01  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* configure.in, doc/sane-hp.man, doc/descriptions/hp.desc
-	  applied patch by David Paschal to remove PTAL-support from hp-backend
-
-2002-09-01  Matthew Duggan <stauff1@users.sourceforge.net>
-
-	* backend/canon_pp.c backend/canon_pp-dev.c backend/canon_pp-dev.h 
-	  backend/canon_pp-io.c: Support for FB620P.
-	* doc/sane-canon_pp.man doc/descriptions/canon_pp.desc: Added notes
-	  on support of FB620P
-
-2002-08-31  Frank Zago  <fzago at austin dot rr dot com>
-
-	* PROJECTS AUTHORS TODO NEWS backend/dll.conf backend/Makefile.in
-	  backend/teco2.conf backend/teco2.c backend/teco2.h
-	  doc/.cvsignore doc/sane.man doc/Makefile.in doc/sane-teco2.man
-	  doc/teco/teco2.txt doc/descriptions-external/teco2.desc
-	  doc/descriptions/teco2.desc: added teco2 backend.
-
-2002-08-30  Frank Zago  <fzago at austin dot rr dot com>
-
-	* backend/teco1.c backend/teco1.h backend/teco1.conf
-	  doc/descriptions/teco1.desc doc/teco/teco1.txt
-	  doc/sane-teco1.man: Added support for another museum piece, the
-	  Dextra DF-600P, a rebadged VM3510.
-
-2002-08-30  Rene Rebe <rene.rebe@gmx.net>
-
-	* backend/avision.h backend/avision.c backend/avision.conf
-	  doc/sane-avision.man descriptions/avision.desc: latest avision
-	  backend
-
-2002-08-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/v4l.c backend/v4l.h doc/descriptions/v4l.desc:
-	  Big clean up of Video for Linux backend. Removed old unused
-	  stuff from qcam and others including unused options and variables
-	  concerning direct port access. Removed wcam license (no 
-	  "substantial portions of code" are used any more). Removed
-	  unuesed headers. Made lots of global variables local. Lots
-	  of checks for null pointer dereferences and errors when opening
-	  files or using ioctl/mmap. Added option to select grey or color
-	  mode. Added support for different channels. Fixed lots of options.
-	  Made sure ioctls are only used when necessary. 
-	  Used vendor == "Noname".  Added ??? comments for suspicious code.
-	  Lots of minor fixes and cleanup. Added version number: 1.0-2.
-	* backend/v4l-grab.h: Deleted (unused).
-	* backend/Makefile.in: Removed v4l-grab.h. 
-	* AUTHORS: Added myself as active maintainer of v4l.
-	* doc/sane-v4l.man: Added warning about ALPHA software and bugs.
-	  Minor updates.
-	* doc/descriptions/bh.desc doc/descriptions/canon630u.desc 
-	  doc/descriptions/dmc.desc doc/descriptions/sm3600.desc
-	  doc/descriptions/umax1220u.desc: Minor fixes and updates for the new
-	  .desc file format.
-	* TODO: Updated .desc and v4l section. Added entries for scanimage.
-	* NEWS: First draft for 1.0.9.
-
-2002-08-18 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* frontend/scanimage.c, frontend/stiff.h, frontend/stiff.c:
-	  Added option "-i filename"/"--icc-profile filename":
-	  When image is saved in tiff format then this icc-profile is
-	  added to the tiff file as tiff tag
-
-2002-08-25  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/Makefile.in: Fixed gamma4scanimage target for OS/2.
-	* backend/v4l.c: Fixed device list. Added more verbose error output.
-	  Unified DBG messages. Fixed depth option. Reordered options in
-	  init_options to reflect real order. Added some markers (/* ??? */)
-	  for suspicious code. Used GNU indent style.
-	* backend/v4l.h backend/v4l-frequencies.h backend/v4l-grab.h:  Used GNU
-	  indent style.
-
-2002-08-22  Frank Zago  <fzago at austin dot rr dot com>
-
-	* backend/ricoh.c backend/ricoh.h backend/apple.c
-	  backend/agfafocus.c backend/abaton.c
-	  sanei/sanei_pv8630.c: Fixed some warnings.
-
-2002-08-22  Frank Zago  <fzago at austin dot rr dot com>
-
-	* doc/sane-teco1.man: Added Dextra scanner to the list of
-	  untested, but potentialy supported, scanners.
-	* doc/teco/teco1.txt: Added RELI 4830 inquiry string.
-	* doc/descriptions/teco3.desc: Increased version number.
-	* backend/: teco3.c, teco3.h: Added threshold option for black &
-	  white.
-	* doc/descriptions/teco1.desc: Added 3 new (untested) scanners.
-	* backend/teco1.conf: Fixed the scsi inquiry string for the
-	  VM4542.
-	* backend/teco1.c backend/teco1.h: Enlarged the gamma table for
-	  the VM4542 (1024 entries as opposed to 256 for the previous
-	  scanners).
-
-2002-08-22  Andras Major <andras@users.sourceforge.net>
-
-	* backend/coolscan2.c doc/descriptions/coolscan2.desc
-	  doc/sane-coolscan2.man: updated to 0.1.7.
-
-2002-08-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/.cvsignore: Added gamma4scanimage.1
-
-2002-08-20  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* PROJECTS: Added Hewlett-Packard ScanJet 4470C project.
-	* tools/.cvsignore: Added gamma4scanimage.
-	* tools/MAkefile.in: Added gamma4scanimage.c to DISTFILES.
-
-2002-08-18 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-	* tools/gamma4scanimage.c: Bugfix (atof->atoi)
-	* tools/README: added gamma4scanimage
-	* doc/Makefile.in: added manpage for gamma4scanimage
-	* doc/gamma4scanimage.man: added manpage for gamma4scanimage
-
-2002-08-17  Karl Heinz Kremer <khk@khk.net>
-
-	* backend/epson.[ch]: Fixed typo in variable name. Fixed IEEE-1394 
-	  problem with Perfection-2450. Fixed problem with older B3 level 
-	  SCSI scanners that do not support the extended status request.
-
-2002-08-17 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-	* tools/gamma4scanimage.c: NEW: tool to create gamma table for scanimage
-	* tools/Makefile.in: changed file to compile and install gamma4scanimage
-
-2002-08-16  Gerhard Jaeger <gerhard@gjaeger.de>
-
-	* doc/descriptions/plustek.desc: Update according to the new
-	  entry definitions
-	* po/saneopts.es.po: More complete spanish translation
-	  (Thanks to Gustavo Vranjes)
-	* backend/plustek.c backend/plustek-devs.c backend/plustek-pp.c
-	  backend/plustek-share.h backend/plustek-usb.c backend/plustek-usb.h
-	  backend/plustek-usbhw.c backend/plustek-usbimg.c
-	  backend/plustek-usbmap.c backend/plustek-usbscan.c
-	  backend/plustek-usbshading.c backend/plustek.conf:
-	  Major update to support better control of all LM983x based devices
-	  HP2200C, Mustek Bearpaw 1200 and 2400 are now working correctly
-
-2002-08-15  Peter Fales <peter@fales-lorenz.net>
-
-	* configure, acinclude.m4, aclocal.m4 - Another tweak to the
-	  allowed gphoto2 version numbers
-
-2002-08-15  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* tools/umax_pp.c: upped version number
-	* backend/umax_pp_low.c backend/umax_pp.c: corrected ppdev usage,
-	  minor option fix
-
-2002-08-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* AUTHORS: Made Ulrich Deiters the active maintainer of the canon
-	  backend.
-	* TODO: Updated concerning HP backend and manufacturer names.
-
-2002-08-07  Matthew Duggan <stauff1@users.sourceforge.net>
-
-	* backend/canon_pp.c backend/canon_pp-dev.c backend/caon_pp-io.c
-	  backend/canon_pp-dev.h: Many changes: Bug fixes, less memory leaks 
-	  (none left now?), more reliable, faster.  Biggest changes are 
-	  speculative reads (ask scanner to read more while data processing 
-	  occurs) and more reliable sending of commands.  Slight performance
-	  increase over previous version.
-	* doc/sane-canon_pp.man: Added discussion noting that scanning 
-	  greyscale in green is bad for colour.
-
-2002-08-07  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* backend/hp.h: Add missing structure member got_connect_type
-
-2002-08-06  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* doc/descriptions/hp.desc: Use Hewlett-Packard instead of HP
-
-2002-08-01  Matthew Duggan <stauff1@users.sourceforge.net>
-
-	* backend/canon_pp-dev.c: Misc bug fixes for fast machines, more
-	  useful debug messages, more reliable file reads/writes.
-
-2002-07_31  Peter Kirchgessner <peter@kirchgessner.net>
-
-	* backend/hp.c, backend/hp-scl.c: hp-backend V0.96
-	  Check device names to prevent USB-devices to be opened as SCSI.
-
-2002-07-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* po/Makefile.in: Use awk to filter out duplicate .po file headers.
-	* po/umax_pp.de.po po/umax_pp.fr.po: Avoided including duplicate
-	  msgids. Made sure that header is not marked fuzzy.
-	* Makefile.in doc/Makefile.in japi/Makefile.in tools/Makefile.in:
-	  Minor DISTFILES and distclean updates.
-	* backend/mustek.c doc/descriptions/mustek.desc 
-	  doc/mustek/mustek.CHANGES: Fixed some warnings.
-	* TODO: Removed entries about "echo -e" and po problems.
-
-2002-07-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/sane-config.in: Avoid using "echo -e" for compatibility
-	  reasons.
-
-2002-07-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* sanei/sanei_usb.c: Made libusb_timeout static.
-	* TODO: Updated .desc entries. Removed entry about scanimage i18n
-	  support.
-
-2002-07-25  Matthew Duggan <stauff1@users.sourceforge.net>
-
-	* backend/canon_pp.c: Now always uses as much scanner buffer as
-	  possible, then feeds data to frontend.  Results in large speed 
-	  increase in ECP mode.  Also fixed problems with saned compatibility.
-	* backend/canon_pp.h: Added bytes_sent to scanner data structure.
-	* doc/sane-canon_pp.man: Discuss hardware problems at high
-	  resolutions.
-
-2002-07-25  Frank Zago  <fzago at austin dot rr dot com>
-
-	* doc/sane.man doc/teco/teco3.txt doc/.cvsignore
-	  doc/sane-teco3.man doc/Makefile.in
-	  doc/descriptions-external/teco3.desc doc/descriptions/teco3.desc
-	  backend/teco3.c backend/teco3.h backend/teco3.conf
-	  backend/Makefile.in sane-backends/TODO sane-backends/AUTHORS
-	  backend/dll.conf: teco3 integration
-	* sane-backends/Makefile.in: added an etags rule to create an
-	  emacs tag file
-	* doc/backend-writing.txt: Enlarged the "SUBMITTING A NEW BACKEND"
-	  section.
-
-
-2002-07-25  Matthew Duggan <stauff1@users.sourceforge.net>
-
-	* backend/canon_pp.c: Now uses mm instead of pixel measurements, better
-	  behaved in xsane etc as a result.
-	* backend/canon_pp.h: Tweaked up max buffer size to size avaialable in
-	  hardware.
-	* doc/descriptions/canon_pp.desc: increment version no.
-
-2002-07-24  Frank Zago  <fzago at austin dot rr dot com>
-
-	* doc/backend-writing.txt: Added a SUBMITTING CHECKLIST section.
-
-2002-07-24  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* frontend/stiff.c: Fixed 16 bit tiff output.
-	* backend/test.c backend/test.conf backend/test.h
-	  backend/test-picture.c doc/descriptions/test.desc doc/sane-test.man:
-	  Added option invert-endianess to test 16 bit modes.
-
-2002-07-24  Kazuya Fukuda <kaafuu@mug.biglobe.ne.jp>
-
-	* doc/descriptions/nec.desc:
-	  Remove unsupported scanner and update url.
-
-2002-07-24  Matthew Duggan <stauff1@users.sourceforge.net>
-
-	* src/canon_pp-io.c: Minor bugfix checking return of read
-
-2002-07-23  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* TODO: Updated desc file entries. Removed entries about microtek
-	  fprintf issue and fujitsu mem leak.
-
-2002-07-23  Simon Munton <simon@munton.demon.co.uk>
-	* backend/pie.c: added consistency check for TL_X < BR_X and
-	  TL_Y < BR_Y
-
-2002-07-23  Peter Fales <peter@fales-lorenz.net>
-
-	* doc/descriptions/gphoto2.desc:  Comment out :interface line
-
-2002-07-23  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* doc/descriptions/umax_pp.desc: tagged 610P as unsupported
-
-2002-07-22  Frank Zago  <fzago at austin dot rr dot com>
-
-	* TODO: scheduled teco2 and teco3 backends for 1.0.9
-
-2002-07-22  Matto Marjanovic  <maddog@mir.com>
-
-	* doc/descriptions/microtek.desc: 
-	  Updated (status keywords, mostly).
-	* backend/microtek.c:
-	* backend/microtek.h:
-	  Replaced fprintf()/printf() with various DBG() statements.
-	  Removed #include <stdio.h>!
-	  Eliminated a few "unused parameter" compiler warnings.
-	  Updated the copyright date.
-	  Bumped version up to lucky 0.13.0
-
-2002-07-23  Matthew Duggan <stauff1@users.sourceforge.net>
-
-	* doc/sane-canon_pp.man: Added N640Pex to the man page too..
-
-2002-07-22  Chris Pinkham <cpinkham@infi.net>
-
-	* doc/descriptions/artec.desc: Changed status of AT6 model to alpha.
-	  Deleted entries for USB & parallel port scanners which are
-	  unsupported.
-
-2002-07-23  Matthew Duggan <stauff1@users.sourceforge.net>
-
-	* doc/descriptions/canon_pp.desc: Added "N640P ex" model to supported 
-	  scanners after report of successful test. Also, "EPP" really should 
-	  have been "ECP".
-
-2002-07-22  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* frontend/scanimage.c: Fail if there are arguments without a preceding
-	  option on the command line. Fixed indenting.
-	* TODO: Updated concerning .desc files. Added comment about USB
-	  problems on *BSD.
-
-2002-07-21  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/template.desc.
-	  doc/descriptions-external/template.desc.: Updated and added more
-	  examples.
-
-2002-07-19 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* doc/descriptions/umax.desc: added per scanner status
-
-2002-07-17  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/sane-desc.c: Models are sorted alphanumerically now. Added
-	  support for priorities if one model is mentioned by two backends.
-	  Don't print tables when no suitable backend was found.
-	  More comments. Fixed some warnings. Code cleanup. 
-	* doc/Makefile.in: Added support for sane-desc.c.
-	* doc/backend-writing.txt: Updated concerning sane-desc.c.
-	* backend/mustek_usb.c backend/mustek_usb_high.h
-	  backend/mustek_usb_low.c doc/descriptions/mustek_usb.desc
-	  doc/mustek_usb/mustek_usb.CHANGES: Added manufacturer comment in
-	  mustek_usb.desc. Changed brightness to threshold. Fixed some
-	  warnings. Really check the status in usb_low_open.
-	* sanei/sanei_usb.c: Check if file is already closed.
-
-2013-07-15  Frank Zago  <fzago at austin dot rr dot com>
-
-	* doc/descriptions/leo.desc doc/descriptions/sceptre.desc
-	  doc/descriptions/teco1.desc doc/descriptions/matsushita.desc:
-	  added new per backend status, added more scanners.
-
-2002-07-15  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* README.darwin: New file. Added some basic information for
-	  Darwin (Mac OS X) users.
-	* Makefile.in: Added the new README files to DISTFILES.
-	* tools/sane-find-scanner.c: Print USB descriptors (libusb) in
-	  -v -v mode. Print vendor and product names (when available).
-	  Rewrote libusb heuristics.
-	* backend/Makefile.in: Removed deleted files from DISFILES.
-
-2002-07-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* include/sane/sanei_usb.h: Made buffer const SANE_Byte * in
-	  sanei_usb_bulk_write(). Try to call usb_find_busses only once.
-	  Make sure that already opened devices aren't opened again. Exit
-	  libusb scan loop if one device is found. Make error values
-	  more expressive. Check for missing config descriptors before
-	  using them to avoid segfaults.
-	* README.openbsd: Updated concerning USB scanners.
-	* README.openbsd README.netbsd: New files. Added some information 
-	  about SCSI and USB problems.
-	* tools/sane-find-scanner.c: Made verbosity option more flexible and
-	  added quiet option. In quiet mode, print only the devices we have 
-	  found. Don't check USB devices with SCSI functions and vice versa if
-	  option force is not given. Don't do the libusb scan if an explicit
-	  device name was given.
-	* doc/sane-usb.man: Updated supported platforms list. Minor wording
-	  improvements.
-	* doc/sane-find-scanner.man: Documentation for the new options.
-	  Splitted USB and SCSI parts. 
-	* doc/descriptions/hpsj5s.desc: Added missing space in ":new :yes"
-	  line.
-	* TODO: Added entry about desc files. Removed entries about
-	  sane-backends.html, sanei_usb.c libusb support, and the OS/2
-	  strncasecmp problem. Updated entries about checking device file
-	  types and OS X in sanei_scsi.c.
-
-2002-07-13  Simon Munton <simon@munton.demon.co.uk>
-	* doc/descriptions/pie.desc: removed unsupported scanner types, 
-	use :status :untested for untested models, added AdLib scanners
-	that are supported
-
-2002-07-13  Oliver Schwartz <Oliver.Schwartz@gmx.de>
-
-	* backend/snapscan.c         backend/snapscan.h 
-	  backend/snapscan-options.c backend/snapscan-usb.c
-	  backend/snapscan-scsi.c    backend/snapscan.conf:  
-	  Snapscan backend version 1.4.15
-	  - Improve support for Acer / Benq 5300
-	  - use usb_sanei_read_bulk() and usb_sanei_write_bulk()
-	  - correct scan area for e52 with TPO	  
-	* doc/description/snapscan.desc: 
-	  - Adapted file to new syntax
-	  - Mark most scanners as "stable"
-
-2002-07-12  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/sane-desc.c: Added backends mode with splitted tables.
-	  Fixed HTML colors. Spelling and other minor fixes.
-	* doc/descriptions-external/hp4200.desc
-	  doc/descriptions-external/hpoj.desc
-	  doc/descriptions-external/ibm.desc
-	  doc/descriptions-external/lhii.desc
-	  doc/descriptions-external/niash.desc
-	  doc/descriptions-external/teco2.desc
-	  doc/descriptions-external/teco3.desc
-	  doc/descriptions-external/tevion9693usb.desc
-	  doc/descriptions-external/v4l2.desc: Minor fixes for the new
-	  sane-desc.c. Commented out version numbers and manpages. Added
-	  :status :untested if the comment suggests this. Fixed double
-	  and bad device types.
-	* tools/sane-find-scanner.c: Added support for libusb. Made comments
-	  better readable and positioned after the output of the devices.
-	  Shorter output to fit into 80 chars.
-
-2002-07-08  Karl Heinz Kremer <khk@khk.net>
-	* doc/descriptions/epson.desc: fixed typo in URL
-	  added :status lines to the scanner entries
-
-2002-07-09  Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* doc/descriptions/sharp.desc: Added ":status" lines
-	  to the scanner entries
-
-2002-07-08  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions/sp15c.desc: Added missing slash in URL.
-	* doc/descriptions/fujitsu.desc: Changed status to :beta. Added
-	  some URLs.
-	* frontend/Makefile.in: Use LIBS = @LIBS@ to make sure that 
-	  -lsyslog and -lsocket are linked for OS/2.
-	* doc/descriptions/abaton.desc: Added :status :untested for 
-	  Scan 300/S.
-	* doc/descriptions/agfafocus.desc: Added status and comments (from
-	  the manpage).
-	* doc/descriptions/ricoh.desc: Removed unused version and comment
-	  tokens.
-	* doc/descriptions/s9036.desc: Changed :devicetype to :scanner.
-	  I guess :vidcam is not appropriate for a flatbed scanner :-)
-	* doc/descriptions/net.desc doc/descriptions/test.desc: No bugs for
-	  quite some time, changed status to stable (knocking on wood).
-	  Updated comments.
-	* doc/descriptions.txt doc/descriptions/template.desc. 
-	  doc/descriptions-external/template.desc.: Updated concerning 
-	  model status.
-	* tools/sane-desc.c: Added support for :status :unsupported.
-
-2002-07-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/sane-desc.c: Added status per model. Added quicklist for
-	  manufacturers. All manufacturer URLs are printed now. Code cleanup.
-	  Added status column for non-hardware devices. Fixed legends. Minor
-	  output fixes.
-	* backend/mustek.c doc/descriptions/mustek.desc
-	  doc/mustek/mustek.CHANGES: Increased width and height of Paragon
-	  800 and 600.
-	* doc/descriptions/mustek_usb.desc: Changed status to stable 
-	  (knocking on wood...). Added more Mustek URLs, fixed the existing
-	  one. Added per-model status. Added "compatible" comments.
-	* doc/descriptions/mustek.desc: Fixed Mustek URL. Added Trust comment
-	  about similar names. Added comments about compatible scanners.
-	  Fixed Primax URL.
-	* doc/descriptions/sp15c.desc: Fixed manpage link. Use "Fujitsu"
-	  consistently. Updated manufacturer links.
-
-2002-07-06  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/sane-desc.c: Added <br> after backend name. Colors can be
-	  changed by macros now. Centered entries. Code cleanup. Manufacturer
-	  page split up into seperate tables. Added links and comment display
-	  on the top of each table. Manufacturers are case-insensitive.
-	  OS/2 fix.
-	* configure: Regenerated from configure.in.
-	* doc/sane-usb.man: Mentioned control messages, usbfs, and more
-	  methods for permission adjustment.
-	* configure configure.in include/sane/config.h.in: Added define
-	  for strcasecmp on OS/2.
-
-2002-07-06  Max Vorobiev <pcwizard@yandex.ru>
-
-	* backend/hpsj5s.c: Rewrote to depend on libieee1284.
-	* backend/hpsj5s.h: Added register description defines
-	* backend/hpsj5s.conf: Default config setted for parport0
-	* backend/hpsj5s_int.h: Removed. All important stuff moved to hpsj5s.h
-	* backend/Makefile.in: hpsj5s backend build depend on libieee1284 present
-	* doc/hpsj5s.man: Comments about libieee1284 added
-	* configure.in: hpsj5s backend will be compiled if libieee1284 detected
-
-2002-07-05  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/.cvsignore tools/Makefile.in rools/README tools/sane-desc.c:
-	  Added new file sane-desc.c. sane-desc is inended as an replacement
-	  for the Emacs Lisp file sane-desc.el. It can generate ASCI and HTML
-	  lists from the backends' .desc files.
-	* doc/sane.man: Added security to the list of topics that can be
-	  reported to me.
-	* doc/descripions/template.desc. 
-	  doc/descriptions-external/template.desc.: Updated concerning ":new".
-
-2002-07-03  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in include/sane/config.h.in: Added HAVE_LIBUSB
-	  #define. Check for usb_get_busses to make sure, we have at least 
-	  version 0.1.6. Added OS/2 substitution for strncasecmp.
-	* include/sane/sanei_usb.h sanei/sanei_usb.c: Added support for libusb.
-	* README.netbsd: Removed. Shared libraries are supported since 1.0.8.
-	* README.openbsd: Updated for libusb.
-	* README: Added section about libraries like libiee1284 and libusb.
-	* doc/doxygen-sanei.conf: Updated version number.
-	* include/sane/sanei_usb.h sanei/sanei_usb.c: Used dn (device number)
-	  instead of fd (file descriptor) to avoid confusion. Updated doxygen
-	  documentation.
-	* doc/sane-usb.man: Updated concerning libusb. Added tips for access 
-	  via the kernel scanner drivers.
-
-2002-06-29  Matthew Duggan <stauff1@users.sourceforge.net>
-
-	* backend/canon_pp.c: Workaround for ppdev bug on <= Linux 2.4.19rc1.
-	* backend/canon_pp-io.c: Fixed reading on hardware with small buffers.
-	* doc/descriptions/canon_pp.desc: Status changed from new to alpha.
-
-2002-06-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/sane-find-scanner.c: For HP-UX, check the complete 
-	  /dev/rscsi/ directory for SCSI sscanners, not only the device
-	  files for the first two host adapters.
-	* TODO: Added entries about sanei_usb/ibusb, config.h/OS/2, echo -e
-	  in shell scrips, and japi.  Updated dll entry.  Removed entry about
-	  sane-find-scanner.
-
-2002-06-27  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/sane-fujitsu.man doc/sane-tamarack.man: Added newline at 
-	  the end to keep Solaris' sed happy.
-	* sanei/sanei_scsi.c: Set buffer size to 64 kB for 
-	  SOLARIS_USCSI_INTERFACE (reported by Ed Randall 
-	  <ed.randall@ingenotech.com>).
-
-2002-06-25  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* tools/sane-find-scanner.c: Added support for scanning whole
-	  directories for SCSI and USB device files.  Moved SCSI and USB
-	  detection routines to their own functions.  Renamed functions
-	  related to SCSI for clarity. Fixed indentation.
-
-2002-06-21  Max Vorobiev <pcwizard@yandex.ru>
-
-	* backend/hpsj5s.c: added fcntl.h include directive.
-	
-2002-06-15  Andras Major <andras@users.sourceforge.net>
-
-	* doc/sane-coolscan2.man: corrected stupid mistake.
-
-2002-06-14  Andras Major <andras@users.sourceforge.net>
-
-	* backend/coolscan2.c doc/sane-coolscan2.man
-	  doc/descriptions/coolscan2.desc: updated to 0.1.6.
-
-2002-06-11  Henning Meier-Geinitz <henning@meier-geinitz.de>q
-
-	* README.solaris: Added comment about SCSI-only support.
-	* doc/sane-usb.man: Updated list of backends that use sanei_usb.
-	  Fixed some minor spelling issues. Really used decimal numbers
-	  in example.
-
-2002-06-09  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/descriptions.txt: New file. Specification of the format of
-	  backend description files (*.desc).
-	* configure configure.in: Added some sanity checks. Configure
-	  now stops if one of the essential headers isn't found.
-	* backend/dll.conf: Added entry for test backend (commented out).
-	* doc/backend-writing.txt: Mentioned descriptions.txt.
-	* bachend/test.c backend/test.conf backend/test.h 
-	  backend/test-picture.c doc/descriptions/test.desc doc/sane-test.man:
-	  Added support for lineart mode with pixels_per_line not divisible by
-	  8. Added support for padded image formats. Added documentation for
-	  all options.
-
-2002-06-07  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/mustek.c doc/descriptions/mustek.desc 
-	  doc/mustek/mustek.CHANGES: Fixed problem for Paragon 6000SP (color
-	  and gray modes produced solid black images). Minor cleanups.
-	  New version: 1.0-125.
-	* config.guess config.sub: Updated to latest versions (from
-	  ftp://ftp.gnu.org/pub/gnu/config/).
-	* configure configure.in: Print CPPFLAGS, CFLAGS, LDFLAGS and LIBS
-	  for easier debugging. Moved AC_SUBST to the variable definitions
-	  they belong to.
-
-2002-06-05  Abel Deuring <a.deuring@satzbau-gmbh.de>
-	* doc/descriptions/sharp.desc: added "interface" parameter
-
-2002-06-05  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp.c:  reverted a change in color reordering for 1600P
-	* po/Makefile.in po/umax_pp.de.po: added german translation courtesy
-	  of Heiko Schaefer <heiko@burmagroup.de>
-	  
-
-2002-06-04  Rene Rebe <rene.rebe@gmx.net>
-
-        * backend/avision.c backend/avision.h backend/avision.conf: next
-	  backend version. Should work for the HP 5300 and HP 5370 now.
-	  Serveral other minor fixes.
-
-2002-06-04  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c:  relaxed scanner detection not to fail on
-	  some parports.
-          
-2002-06-02  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in backend/Makefile.in: Added option 
-	  --disable-local-backends to configure. Only net and dll will be
-	  compiled if set. Also a warning is printed.
-	* TODO: Removed entries about config.h.in macros and disabling local
-	  backends.
-	
-2002-06-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* backend/pnm.c-bad: Removed because it was out-of-date and buggy.
-	  The features of this modified pnm backend are now in test.c.
-
-2002-05-30 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* corrected wrong version number in umax.desc
-
-2002-05-30  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_mid.c backend/umax_pp.c:  software lineart for real
-          this time.
-
-2002-05-30  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* doc/saned.man: Added explicit path to tcpd example.
-	* sanei/sanei_usb.c: Explicitely initialize vendorID and productID.
-	* sanei/sanei_config.c sanei/sanei_config2.c: Fixed possible segfault.
-
-2002-05-30  Stéphane Voltz  <svoltz@wanadoo.fr>
-
-	* backend/umax_pp_low.c backend/umax_pp.c:  fixed 1600P detection, 
-	  IRIX compile fixes, final bits of software lineart
-
-2002-05-29  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* AUTHORS backend/Makefile.in backend/dll.conf backend/hpsj5s.c
-	  backend/hpsj5s.conf backend/hpsj5s.h backend/hpsj5s_int.h
-	  doc/sane-hpsj5s.man doc/descriptions/hpsj5s.desc doc/.cvsignore
-	  doc/Makefile.in doc/sane.man: Added hpsj5s backend for the
-	  Hewlett-Packard ScanJet 5S parport scanner (from Max Vorobiev
-	  <pcwizard@zelmail.ru>).
-	* PROJECTS: Removed hpsj5s.
-
-2002-05-29  Frank Zago  <fzago at austin dot rr dot com>
-
-	* configure.in: Added test for long long. Fixed declaration for
-	  HAVE_ASM_IO_H
-	* configure include/sane/config.h.in: regenerated
-	* frontend/tstbackend: add test for long long.
-
-2002-05-28  Frank Zago  <fzago at austin dot rr dot com>
-
-	* po/matsushita.fr.po po/saneopts.fr.po po/sceptre.fr.po
-	  po/teco1.fr.po po/umax.fr.po backend/leo.c backend/leo.h
-	  backend/matsushita.c backend/matsushita.h backend/sceptre.c
-	  backend/sceptre.h backend/teco1.c backend/teco1.h
-	  frontend/tstbackend.c: new email address.
-
-2002-05-28  Henning Meier-Geinitz <henning@meier-geinitz.de>
-
-	* configure configure.in: Warnings enabled by default.
-	* sanei/sanei_scsi.c: Fixed request-sense handling for OpenStep
-	  (from Oliver Schirrmeister <oschirr@abm.de>).
-	* backend/mustek.c doc/descriptions/mustek.desc
-	  doc/mustek/mustek.CHANGES: Set X minimum value to 0 for Paragon
-	  6000SP.
-
-2002-05-27 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
-
-	* configure.in/configure: V_EXTRA=-cvs
-
-Older entries can be found in ChangeLog-1.0.8.
diff --git a/INSTALL b/INSTALL
index 007e939..2099840 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,8 +12,8 @@ without warranty of any kind.
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented
diff --git a/Makefile.am b/Makefile.am
index a638eec..ae02ee3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,20 +12,20 @@ dist_doc_DATA = AUTHORS ChangeLog COPYING LICENSE NEWS PROBLEMS PROJECTS \
  README.hp-ux README.linux README.netbsd README.openbsd README.os2 \
  README.solaris README.unixware2 README.unixware7 README.windows \
  README.zeta
-EXTRA_DIST = ChangeLog-1.0.0 ChangeLog-1.0.1  ChangeLog-1.0.2 \
- ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 ChangeLog-1.0.6 \
- ChangeLog-1.0.7 ChangeLog-1.0.8 ChangeLog-1.0.9 ChangeLog-1.0.10 \
- ChangeLog-1.0.12 ChangeLog-1.0.13 ChangeLog-1.0.14 ChangeLog-1.0.15 \
- ChangeLog-1.0.16 ChangeLog-1.0.17 ChangeLog-1.0.18 ChangeLog-1.0.19 \
- ChangeLog-1.0.20 ChangeLog-1.0.21 ChangeLog-1.0.22 ChangeLog-1.0.23 \
- $(PACKAGE).lsm
+EXTRA_DIST = $(PACKAGE).lsm
 
 #
-# Keep the .cvsignore files sorted, and use this target to do it.
+# Keep the .gitignore files sorted, and use this target to do it.
+# Note that git's negated ignore patterns introduce order dependency
+# and should therefor be sorted with much more care than we do here.
+# Until that has been taken care of, such files are best left alone.
 #
 PERL=perl
-sort-cvsignore:
-	for f in `find . -name .cvsignore`; do \
+sort-gitignore:
+	for f in `find . -name .gitignore`; do \
+	  if test -n "`sed -n '/^\!/p' $$f`"; then \
+	    echo "$$f: skipping file with negated pattern" >&2; \
+	  fi; \
 	  $(PERL) -e 'print sort <>;' < $$f > $$f.tmptmp; \
 	  mv $$f.tmptmp $$f; \
 	done
@@ -92,3 +92,5 @@ clean-local:
 distclean-local:
 	rm -f include/_stdint.h
 	rm -f include/byteorder.h
+
+ACLOCAL_AMFLAGS = -I m4
diff --git a/Makefile.in b/Makefile.in
index 141a15f..204f510 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -82,15 +82,20 @@ subdir = .
 DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
 	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) \
-	$(top_srcdir)/include/sane/config.h.in mkinstalldirs \
-	$(dist_doc_DATA) COPYING compile config.guess config.sub \
-	depcomp install-sh missing ltmain.sh
+	$(top_srcdir)/include/sane/config.h.in mkinstalldirs ABOUT-NLS \
+	$(dist_doc_DATA) COPYING ar-lib compile config.guess \
+	config.rpath config.sub depcomp install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ltoptions.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/byteorder.m4 \
-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/byteorder.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -228,7 +233,10 @@ distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -249,7 +257,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISTCLEAN_FILES = @DISTCLEAN_FILES@
+DLH = @DLH@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
@@ -262,34 +270,42 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FIG2DEV = @FIG2DEV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
 GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
+GS = @GS@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
 IEEE1284_LIBS = @IEEE1284_LIBS@
-INCLUDES = @INCLUDES@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LOCKPATH = @INSTALL_LOCKPATH@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JPEG_LIBS = @JPEG_LIBS@
 LATEX = @LATEX@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
-LINKER_RPATH = @LINKER_RPATH@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCKPATH_GROUP = @LOCKPATH_GROUP@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINDEX = @MAKEINDEX@
@@ -298,10 +314,10 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MATH_LIB = @MATH_LIB@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
-NUMBER_VERSION = @NUMBER_VERSION@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -314,10 +330,13 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PNG_LIBS = @PNG_LIBS@
+POSUB = @POSUB@
+PPMTOGIF = @PPMTOGIF@
 PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@
 PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -339,12 +358,16 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 V_MAJOR = @V_MAJOR@
 V_MINOR = @V_MINOR@
 V_REV = @V_REV@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -408,19 +431,16 @@ dist_doc_DATA = AUTHORS ChangeLog COPYING LICENSE NEWS PROBLEMS PROJECTS \
  README.solaris README.unixware2 README.unixware7 README.windows \
  README.zeta
 
-EXTRA_DIST = ChangeLog-1.0.0 ChangeLog-1.0.1  ChangeLog-1.0.2 \
- ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 ChangeLog-1.0.6 \
- ChangeLog-1.0.7 ChangeLog-1.0.8 ChangeLog-1.0.9 ChangeLog-1.0.10 \
- ChangeLog-1.0.12 ChangeLog-1.0.13 ChangeLog-1.0.14 ChangeLog-1.0.15 \
- ChangeLog-1.0.16 ChangeLog-1.0.17 ChangeLog-1.0.18 ChangeLog-1.0.19 \
- ChangeLog-1.0.20 ChangeLog-1.0.21 ChangeLog-1.0.22 ChangeLog-1.0.23 \
- $(PACKAGE).lsm
-
+EXTRA_DIST = $(PACKAGE).lsm
 
 #
-# Keep the .cvsignore files sorted, and use this target to do it.
+# Keep the .gitignore files sorted, and use this target to do it.
+# Note that git's negated ignore patterns introduce order dependency
+# and should therefor be sorted with much more care than we do here.
+# Until that has been taken care of, such files are best left alone.
 #
 PERL = perl
+ACLOCAL_AMFLAGS = -I m4
 all: all-recursive
 
 .SUFFIXES:
@@ -926,8 +946,11 @@ uninstall-am: uninstall-dist_docDATA
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am uninstall-dist_docDATA
 
-sort-cvsignore:
-	for f in `find . -name .cvsignore`; do \
+sort-gitignore:
+	for f in `find . -name .gitignore`; do \
+	  if test -n "`sed -n '/^\!/p' $$f`"; then \
+	    echo "$$f: skipping file with negated pattern" >&2; \
+	  fi; \
 	  $(PERL) -e 'print sort <>;' < $$f > $$f.tmptmp; \
 	  mv $$f.tmptmp $$f; \
 	done
diff --git a/NEWS b/NEWS
index 31b46ba..bf78d65 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,41 @@
 -*-Mode: outline-*-
+New with 1.0.27 (see Note 1), released 2017-05-22:
+
+* Significant enhancements to canon_dr, epjitsu, epsonds, fujitsu,
+  genesys, hp3500, pixma and xerox-mfp backends.
+* Minor updates, bugfixes or scanners added in several backends.
+* 30+ new scanner models supported.
+* Made libusb-1.0 the default for USB support (see Note 2).
+* Switched code from C90 to C99 (Thanks to Volker Diels-Grabsch).
+* Updated Linux USB3 workaround (see Note 3). 
+* Documentation and translation updates.
+* Bugfixes (Avahi, threading, USB, ICC/PNG/JPEG, etc).
+* Reduced compiler warnings, improved code (see Note 4).
+
+Note 1: There is no 1.0.26 release of sane-backends. That number was
+skipped so that our development version numbers would more clearly be
+an extension of the prior release. This should make packaging a little
+easier for our downstream users.
+
+Note 2: On all systems, the --enable-libusb* flags are now ignored. 
+Instead, the --with-usb and --without-usb flags now control support.
+When neither is given, USB support will be enabled if possible and
+disabled otherwise.  If --with-usb is requested but not possible,
+./configure will fail.  There is no support to prefer libusb-0.1 over
+libusb-1.0.  When libusb-1.0 is not found, libusb-0.1 will be tried.
+
+Note 3: The Linux USB3 workaround which was added in version 1.0.25 is
+now disabled by default. If you have difficulty using a scanner which
+previously worked, or intermittent scanner availability, try setting
+the new environment variable SANE_USB_WORKAROUND=1 before starting
+your frontend.
+
+Note 4: A special thanks goes to Olaf Meeuwissen for picking up the
+janitorial duties in sane-backends. He has found and fixed a large
+number of long-standing bugs, curated our bug tracker, improved our
+build scripts and docs, and provided user support. Thank you Olaf!
+
+
 New with 1.0.25, released 2015-10-03:
 
 * New backends: epsonds (Epson DS, PX and WF series),
diff --git a/README b/README
index 5841f3b..694165a 100644
--- a/README
+++ b/README
@@ -10,7 +10,7 @@ You always find the most recent version of SANE on:
 
   http://www.sane-project.org/
 
-At the same location there are also links to snapshots of the CVS server and
+At the same location there are also links to snapshots of the Git server and
 sometimes beta releases of sane-backends. These are unstable development
 versions, so be careful when using them. Please report any problems to us. See
 contact section for details.
@@ -36,8 +36,9 @@ In order to build SANE, the following tools and libraries are required:
 
 	- GNU make: version 3.70 or newer
 
-	- ANSI C compiler: GNU C (gcc) is recommended for best performance,
-	  but any ANSI-compliant compiler should do
+	- ISO C99 compiler: GNU C (gcc) is recommended for best results,
+	  but any ISO C99 compliant compiler should do
+
 
 Some more libraries are not strictly necessary to compile SANE, but some
 functionality may be lost if they are not available. Make sure that these
@@ -46,7 +47,7 @@ configure. On some Linux distributions the header files are part of separate
 packages (e.g. usb.h in libusb-devel or libusb-dev). These must also be
 installed.
 
-        - libusb (>=0.1.8): Strongly recommended if you use a USB scanner.
+        - libusb: Strongly recommended if you use a USB scanner.
           Some backends won't work without libusb at all.
 
         - libjpeg (>=6B): For the dc210, dc240, and gphoto2 backends.
@@ -110,11 +111,6 @@ configure options, there are the following SANE specific options:
 	configuration file. Please refer to the backend's man pages for
 	details.
 
---disable-translations
-	Disable installation of translated backend options. If you get
-	errors in the po/ directory during build, use this option.
-	See po/README for details.
-
 --enable-locking
 	Means, that some backends will use a lockfile for allowing multiple
 	access to one scanner. This is useful, i.e. one frontend is scanning
diff --git a/README.linux b/README.linux
index 6f7aec0..f255c3b 100644
--- a/README.linux
+++ b/README.linux
@@ -45,132 +45,6 @@ Gentoo information:
 Gentoo users: If your USB scanner is not detected at all check that USE=usb is
 set when emerging.
 
-Quick install:
---------------
-
-$ ./configure
-$ make
-$ make install
-
-Step by step install on Linux 2.6.* and 3.*, both with udev:
-------------------------------------------------------------
-
-1. Install with your preferred package manager:
-   (a) the development environment for your Linux distibution
-       - mandatory: gcc, make, kernel header files
-       - optional:  git
-   (b) missing development packages
-	   - libusb-dev or libusb-devel or libusb-compat-devel
-
-2. Get the latest SANE backend from git:
-	You can download "daily git snapshot" from here:
-
-	http://www.sane-project.org/snapshots/
-
-	If you prefer to use git, you can fetch a read-only copy of the git tree
-	with this command:
-
-	$ git clone git://git.debian.org/sane/sane-backends.git
-
-	If you already are using a self compiled SANE backend and just fetched a
-	new copy of the git tree or if you patched some source files, there is no
-	need to follow the installation procedure again. You only need to make and
-	install libsane:
-
-	$ make && sudo make install
-
-3. Configure, make and install latest SANE backend:
-	We install a new SANE dynamically linked shared object library in
-	/usr/local/lib beside your system's SANE library.
-
-	$ ./configure
-	$ make && sudo make install
-
-3.1. SANE library:
-	Register new installed SANE dynamically linked shared object library.
-
-	$ sudo ldconfig -v | grep libsane
-		libsane.so.1 -> libsane.so.1.0.25
-		libsane.so.1 -> libsane.so.1.0.23
-
-	This example shows that the system first find version 1.0.25 and then 1.0.23.
-	This is the correct order.
-
-	If your system first find the old version and then the new installed one,
-	then you must change the order for library paths in /etc/ld.so.conf or you
-	must create the new configuration file /etc/ld.so.conf.d/1-sane.conf.
-
-	$ echo "/usr/local/lib" | sudo tee -a /etc/ld.so.conf.d/1-sane.conf
-
-	Then you must repeat this step.
-
-3.2. Localization file:
-
-	$ cd /usr/share/locale/<language>/LC_MESSAGES
-	$ sudo ln -sf /usr/local/share/locale/<language>/LC_MESSAGES/sane-backends.mo .
-	$ cd -
-
-3.3. udev rules file:
-
-	$ sudo cp tools/udev/libsane.rules /etc/udev/rules.d
-
-	Reconnect your scanner to the USB bus to activate the new rules file.
-
-3.4. Use the scanner with normal user rights:
-
-	Your user must be a member of the group scanner.
-
-	$ cat /etc/group | grep scanner
-	scanner:x:107:<user>
-
-	Create a new group scanner, if it doesn't exist.
-
-	$ sudo addgroup scanner
-
-	Add an existing user to group scanner.
-
-	$ sudo adduser <username> scanner
-
-	After this you must logoff and login again.
-
-4. Test your scanner:
-
-4.1. Check the used backend version:
-
-	The programs must use the installed SANE backend version, e.g. 1.0.25.
-
-	$ scanimage -V
-	scanimage (sane-backends) 1.0.25git; backend version 1.0.25
-
-	This example shows that backend and scanimage are version 1.0.25.
-
-	$ /usr/bin/scanimage -V
-	scanimage (sane-backends) 1.0.23; backend version 1.0.25
-
-	This example shows that an old scanimage (1.0.23) uses the backend 1.0.25.
-
-	If you want to use xsane, start xsane and check the used version with
-	CTRL - i.
-
-4.2. Access scanner with normal user rights:
-
-	$ scanimage -L
-
-	If your scanner isn't recognised here, try this:
-
-	$ sudo scanimage -L
-
-	If this works, your user doesn't have the rights to access the scanner.
-
-	However, please check and redo the installation described above.
-	If this doesn't help, you can ask the mailing list
-	<sane-devel@lists.alioth.debian.org> for further support.
-
-4.3. Testscan:
-
-	$ cd ~
-	$ scanimage > test.pnm
-
 Information about SCSI scanners:
 ================================
 
diff --git a/README.unixware7 b/README.unixware7
index dd75ebe..9e6d3cd 100644
--- a/README.unixware7
+++ b/README.unixware7
@@ -19,7 +19,7 @@ found here:
 However, please note that the SANE package that is available from the 
 Skunkware server will most likely contain the latest stable version of 
 SANE. Since SANE is continously being worked on, you might want to download 
-the latest source from the CVS repository and build the source yourself. 
+the latest source from the Git repository and build the source yourself.
 
 To build SANE on a UnixWare 7.1.X system the following packages are required: 
 
diff --git a/acinclude.m4 b/acinclude.m4
index 7a86a0b..476d536 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,16 +1,15 @@
 dnl
 dnl Contains the following macros
-dnl   SANE_SET_CFLAGS(is_release)
+dnl   SANE_SET_AM_CFLAGS(is_release)
 dnl   SANE_CHECK_MISSING_HEADERS
-dnl   SANE_SET_LDFLAGS
+dnl   SANE_SET_AM_LDFLAGS
 dnl   SANE_CHECK_DLL_LIB
 dnl   SANE_EXTRACT_LDFLAGS(LIBS, LDFLAGS)
 dnl   SANE_CHECK_JPEG
 dnl   SANE_CHECK_IEEE1284
 dnl   SANE_CHECK_PTHREAD
 dnl   SANE_CHECK_LOCKING
-dnl   JAPHAR_GREP_CFLAGS(flag, cmd_if_missing, cmd_if_present)
-dnl   SANE_LINKER_RPATH
+dnl   JAPHAR_GREP_AM_CFLAGS(flag, cmd_if_missing, cmd_if_present)
 dnl   SANE_CHECK_U_TYPES
 dnl   SANE_CHECK_GPHOTO2
 dnl   SANE_CHECK_IPV6
@@ -19,61 +18,38 @@ dnl   SANE_PROTOTYPES
 dnl   AC_PROG_LIBTOOL
 dnl
 
-# SANE_SET_CFLAGS(is_release)
-# Set CFLAGS. Enable/disable compilation warnings if we gcc is used.
-# Warnings are enabled by default when in development cycle but disabled
-# when a release is made. The argument is_release is either yes or no.
-AC_DEFUN([SANE_SET_CFLAGS],
+# SANE_SET_AM_CFLAGS(is_release)
+# Set default AM_CFLAGS if gcc is used.  Enable/disable additional
+# compilation warnings.  The extra warnings are enabled by default
+# during the development cycle but disabled for official releases.
+# The argument is_release is either yes or no.
+AC_DEFUN([SANE_SET_AM_CFLAGS],
 [
 if test "${ac_cv_c_compiler_gnu}" = "yes"; then
-  NORMAL_CFLAGS="\
-      -W \
+  DEFAULT_CFLAGS="\
       -Wall"
-  WARN_CFLAGS="\
-      -W \
-      -Wall \
-      -Wcast-align \
-      -Wcast-qual \
-      -Wmissing-declarations \
-      -Wmissing-prototypes \
-      -Wpointer-arith \
-      -Wreturn-type \
-      -Wstrict-prototypes \
+  EXTRA_WARNINGS="\
+      -Wextra \
       -pedantic"
 
-  # Some platforms are overly strict with -ansi enabled.  Exclude those.
-  ANSI_FLAG=-ansi
-  case "${host_os}" in  
-    solaris* | hpux* | os2* | darwin* | cygwin* | mingw*)
-      ANSI_FLAG=
-      ;;
-  esac
-  NORMAL_CFLAGS="${NORMAL_CFLAGS} ${ANSI_FLAG}"
-  WARN_CFLAGS="${WARN_CFLAGS} ${ANSI_FLAG}"
+  for flag in $DEFAULT_CFLAGS; do
+    JAPHAR_GREP_AM_CFLAGS($flag, [ AM_CFLAGS="$AM_CFLAGS $flag" ])
+  done
 
   AC_ARG_ENABLE(warnings,
-    AC_HELP_STRING([--enable-warnings],
+    AS_HELP_STRING([--enable-warnings],
                    [turn on tons of compiler warnings (GCC only)]),
     [
       if eval "test x$enable_warnings = xyes"; then 
-        for flag in $WARN_CFLAGS; do
-          JAPHAR_GREP_CFLAGS($flag, [ CFLAGS="$CFLAGS $flag" ])
-        done
-      else
-        for flag in $NORMAL_CFLAGS; do
-          JAPHAR_GREP_CFLAGS($flag, [ CFLAGS="$CFLAGS $flag" ])
+        for flag in $EXTRA_WARNINGS; do
+          JAPHAR_GREP_AM_CFLAGS($flag, [ AM_CFLAGS="$AM_CFLAGS $flag" ])
         done
       fi
     ],
     [if test x$1 = xno; then
        # Warnings enabled by default (development)
-       for flag in $WARN_CFLAGS; do
-         JAPHAR_GREP_CFLAGS($flag, [ CFLAGS="$CFLAGS $flag" ])
-       done
-    else
-       # Warnings disabled by default (release)
-       for flag in $NORMAL_CFLAGS; do
-         JAPHAR_GREP_CFLAGS($flag, [ CFLAGS="$CFLAGS $flag" ])
+       for flag in $EXTRA_WARNINGS; do
+         JAPHAR_GREP_AM_CFLAGS($flag, [ AM_CFLAGS="$AM_CFLAGS $flag" ])
        done
     fi])
 fi # ac_cv_c_compiler_gnu
@@ -106,9 +82,9 @@ AC_DEFUN([SANE_CHECK_MISSING_HEADERS],
   fi
 ])
 
-# SANE_SET_LDFLAGS
-# Add special LDFLAGS
-AC_DEFUN([SANE_SET_LDFLAGS],
+# SANE_SET_AM_LDFLAGS
+# Add special AM_LDFLAGS
+AC_DEFUN([SANE_SET_AM_LDFLAGS],
 [
   # Define stricter linking policy on GNU systems.  This is not
   # added to global LDFLAGS because we may want to create convenience
@@ -123,7 +99,7 @@ AC_DEFUN([SANE_SET_LDFLAGS],
   AC_SUBST(STRICT_LDFLAGS)
   case "${host_os}" in  
     aix*) #enable .so libraries, disable archives
-      LDFLAGS="$LDFLAGS -Wl,-brtl"
+      AM_LDFLAGS="$AM_LDFLAGS -Wl,-brtl"
       ;;
     darwin*) #include frameworks
       LIBS="$LIBS -framework CoreFoundation -framework IOKit"
@@ -203,10 +179,10 @@ AC_DEFUN([SANE_CHECK_IEEE1284],
 [
   AC_CHECK_HEADER(ieee1284.h, [
     AC_CACHE_CHECK([for libieee1284 >= 0.1.5], sane_cv_use_libieee1284, [
-      AC_TRY_COMPILE([#include <ieee1284.h>], [
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <ieee1284.h>]], [[
 	struct parport p; char *buf; 
 	ieee1284_nibble_read(&p, 0, buf, 1);
- 	], 
+	]])],
         [sane_cv_use_libieee1284="yes"; IEEE1284_LIBS="-lieee1284"
       ],[sane_cv_use_libieee1284="no"])
     ],)
@@ -236,7 +212,7 @@ AC_DEFUN([SANE_CHECK_PTHREAD],
   # the user
 
   AC_ARG_ENABLE([pthread],
-    AC_HELP_STRING([--enable-pthread],
+    AS_HELP_STRING([--enable-pthread],
                    [use pthread instead of fork (default=yes for Linux/MacOS X/MINGW, no for everything else)]),
     [
       if test $enableval = yes ; then
@@ -256,7 +232,7 @@ AC_DEFUN([SANE_CHECK_PTHREAD],
        AC_CHECK_FUNCS([pthread_create pthread_kill pthread_join pthread_detach pthread_cancel pthread_testcancel],
 	,[ have_pthread=no; use_pthread=no ])
        LIBS="$save_LIBS"
-    ],)
+    ],[ have_pthread=no; use_pthread=no ])
   fi
  
   if test $use_pthread = yes ; then
@@ -267,7 +243,7 @@ AC_DEFUN([SANE_CHECK_PTHREAD],
     PTHREAD_LIBS=""
   fi
   if test "$have_pthread" = "yes" ; then
-    CPPFLAGS="${CPPFLAGS} -D_REENTRANT"
+    AM_CPPFLAGS="${AM_CPPFLAGS} -D_REENTRANT"
   fi
   AC_SUBST(PTHREAD_LIBS)
   AC_MSG_CHECKING([whether to enable pthread support])
@@ -341,7 +317,7 @@ AC_DEFUN([SANE_CHECK_LOCKING],
   #
   # we check the user
   AC_ARG_ENABLE( [locking],
-    AC_HELP_STRING([--enable-locking],
+    AS_HELP_STRING([--enable-locking],
                    [activate device locking (default=yes, but only used by some backends)]),
     [
       if test $enableval = yes ; then
@@ -352,7 +328,7 @@ AC_DEFUN([SANE_CHECK_LOCKING],
     ])
   if test $use_locking = yes ; then
     AC_ARG_WITH([group],
-      AC_HELP_STRING([--with-group],
+      AS_HELP_STRING([--with-group],
                      [use the specified group for lock dir @<:@default=uucp@:>@]),
         [LOCKPATH_GROUP="$withval"]
     )
@@ -384,12 +360,12 @@ AC_DEFUN([SANE_CHECK_LOCKING],
 ])
 
 dnl
-dnl JAPHAR_GREP_CFLAGS(flag, cmd_if_missing, cmd_if_present)
+dnl JAPHAR_GREP_AM_CFLAGS(flag, cmd_if_missing, cmd_if_present)
 dnl
 dnl From Japhar.  Report changes to japhar@hungry.com
 dnl
-AC_DEFUN([JAPHAR_GREP_CFLAGS],
-[case "$CFLAGS" in
+AC_DEFUN([JAPHAR_GREP_AM_CFLAGS],
+[case "$AM_CFLAGS" in
 "$1" | "$1 "* | *" $1" | *" $1 "* )
   ifelse($#, 3, [$3], [:])
   ;;
@@ -400,42 +376,6 @@ esac
 ])
 
 dnl
-dnl SANE_LINKER_RPATH
-dnl
-dnl Detect how to set runtime link path (rpath).  Set variable
-dnl LINKER_RPATH.  Typical content will be '-Wl,-rpath,' or '-R '.  If
-dnl set, add '${LINKER_RPATH}${libdir}' to $LDFLAGS
-dnl
-
-AC_DEFUN([SANE_LINKER_RPATH],
-[dnl AC_REQUIRE([AC_SUBST])dnl This line resulted in an empty AC_SUBST() !!
-  AC_MSG_CHECKING([whether runtime link path should be used])
-  AC_ARG_ENABLE([rpath],
-    [AS_HELP_STRING([--enable-rpath],
-      [use runtime library search path @<:@default=yes@:>@])])
-
-  LINKER_RPATH=
-  AS_IF([test "x$enable_rpath" != xno],
-  AC_MSG_RESULT([yes])
-    [AC_CACHE_CHECK([linker parameter to set runtime link path], my_cv_LINKER_RPATH,
-      [my_cv_LINKER_RPATH=
-      case "$host_os" in
-      linux* | freebsd* | netbsd* | openbsd* | irix*)
-        # I believe this only works with GNU ld [pere 2001-04-16]
-        my_cv_LINKER_RPATH="-Wl,-rpath,"
-        ;;
-      solaris*)
-        my_cv_LINKER_RPATH="-R "
-        ;;
-      esac
-      ])
-      LINKER_RPATH="$my_cv_LINKER_RPATH"],
-    [AC_MSG_RESULT([no])
-      LINKER_RPATH=])
-  AC_SUBST(LINKER_RPATH)dnl
-])
-
-dnl
 dnl   SANE_CHECK_U_TYPES
 dnl
 AC_DEFUN([SANE_CHECK_U_TYPES],
@@ -452,7 +392,7 @@ AC_CHECK_TYPES([u_char, u_short, u_int, u_long],,,)
 AC_DEFUN([SANE_CHECK_GPHOTO2],
 [
   AC_ARG_WITH(gphoto2,
-	      AC_HELP_STRING([--with-gphoto2],
+	      AS_HELP_STRING([--with-gphoto2],
 			     [include the gphoto2 backend @<:@default=yes@:>@]),
 	      [# If --with-gphoto2=no or --without-gphoto2, disable backend
                # as "$with_gphoto2" will be set to "no"])
@@ -491,6 +431,10 @@ AC_DEFUN([SANE_CHECK_GPHOTO2],
         GPHOTO2_LIBS="" 
       else
         SANE_EXTRACT_LDFLAGS(GPHOTO2_LIBS, GPHOTO2_LDFLAGS)
+        if pkg-config --atleast-version=2.5.0 libgphoto2; then
+          AC_DEFINE([GPLOGFUNC_NO_VARGS], [1],
+                    [Define if GPLogFunc does not take a va_list.])
+        fi
       fi
     fi
   fi
@@ -506,7 +450,7 @@ AC_DEFUN([SANE_CHECK_IPV6],
 [
   AC_MSG_CHECKING([whether to enable IPv6]) 
   AC_ARG_ENABLE(ipv6, 
-    AC_HELP_STRING([--disable-ipv6],[disable IPv6 support]), 
+    AS_HELP_STRING([--disable-ipv6],[disable IPv6 support]),
       [  if test "$enableval" = "no" ; then
          AC_MSG_RESULT([no, manually disabled]) 
          ipv6=no 
@@ -514,16 +458,16 @@ AC_DEFUN([SANE_CHECK_IPV6],
       ])
 
   if test "$ipv6" != "no" ; then
-    AC_TRY_COMPILE([
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 	#define INET6 
 	#include <sys/types.h> 
-	#include <sys/socket.h> ], [
+	#include <sys/socket.h> ]], [[
 	 /* AF_INET6 available check */  
  	if (socket(AF_INET6, SOCK_STREAM, 0) < 0) 
    	  exit(1); 
  	else 
    	  exit(0); 
-      ],[
+      ]])],[
         AC_MSG_RESULT(yes) 
         AC_DEFINE([ENABLE_IPV6], 1, [Define to 1 if the system supports IPv6]) 
         ipv6=yes
@@ -535,27 +479,27 @@ AC_DEFUN([SANE_CHECK_IPV6],
 
   if test "$ipv6" != "no" ; then
     AC_MSG_CHECKING([whether struct sockaddr_storage has an ss_family member])
-    AC_TRY_COMPILE([
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 	#define INET6
 	#include <sys/types.h>
-	#include <sys/socket.h> ], [
+	#include <sys/socket.h> ]], [[
 	/* test if the ss_family member exists in struct sockaddr_storage */
 	struct sockaddr_storage ss;
 	ss.ss_family = AF_INET;
 	exit (0);
-    ], [
+    ]])], [
 	AC_MSG_RESULT(yes)
 	AC_DEFINE([HAS_SS_FAMILY], 1, [Define to 1 if struct sockaddr_storage has an ss_family member])
     ], [
-		AC_TRY_COMPILE([
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 		#define INET6
 		#include <sys/types.h>
-		#include <sys/socket.h> ], [
+		#include <sys/socket.h> ]], [[
 		/* test if the __ss_family member exists in struct sockaddr_storage */
 		struct sockaddr_storage ss;
 		ss.__ss_family = AF_INET;
 		exit (0);
-	  ], [
+	  ]])], [
 		AC_MSG_RESULT([no, but __ss_family exists])
 		AC_DEFINE([HAS___SS_FAMILY], 1, [Define to 1 if struct sockaddr_storage has __ss_family instead of ss_family])
 	  ], [
@@ -627,7 +571,7 @@ for be in ${BACKENDS}; do
 
     gphoto2)
     if test "${HAVE_GPHOTO2}" != "true" \
-      -o "${sane_cv_use_libjpeg}" != "yes"; then
+      || test "${sane_cv_use_libjpeg}" != "yes"; then
       echo "*** $be backend requires gphoto2 and JPEG libraries - $DISABLE_MSG"
       backend_supported="no"
     fi
diff --git a/aclocal.m4 b/aclocal.m4
index 0b29a4c..e21d691 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -256,6 +256,66 @@ m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_AR([ACT-IF-FAIL])
+# -------------------------
+# Try to determine the archiver interface, and trigger the ar-lib wrapper
+# if it is needed.  If the detection of archiver interface fails, run
+# ACT-IF-FAIL (default is to abort configure with a proper error message).
+AC_DEFUN([AM_PROG_AR],
+[AC_BEFORE([$0], [LT_INIT])dnl
+AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([ar-lib])dnl
+AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
+: ${AR=ar}
+
+AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
+  [AC_LANG_PUSH([C])
+   am_cv_ar_interface=ar
+   AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
+     [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([am_ar_try])
+      if test "$ac_status" -eq 0; then
+        am_cv_ar_interface=ar
+      else
+        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+        AC_TRY_EVAL([am_ar_try])
+        if test "$ac_status" -eq 0; then
+          am_cv_ar_interface=lib
+        else
+          am_cv_ar_interface=unknown
+        fi
+      fi
+      rm -f conftest.lib libconftest.a
+     ])
+   AC_LANG_POP([C])])
+
+case $am_cv_ar_interface in
+ar)
+  ;;
+lib)
+  # Microsoft lib, so override with the ar-lib wrapper script.
+  # FIXME: It is wrong to rewrite AR.
+  # But if we don't then we get into trouble of one sort or another.
+  # A longer-term fix would be to have automake use am__AR in this case,
+  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
+  # similar.
+  AR="$am_aux_dir/ar-lib $AR"
+  ;;
+unknown)
+  m4_default([$1],
+             [AC_MSG_ERROR([could not determine $AR interface])])
+  ;;
+esac
+AC_SUBST([AR])dnl
+])
+
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
@@ -967,6 +1027,38 @@ else
 fi
 ])
 
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for 'mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl FIXME we are no longer going to remove this! adjust warning
+dnl FIXME message accordingly.
+AC_DIAGNOSE([obsolete],
+[$0: this macro is deprecated, and will soon be removed.
+You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead,
+and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.])
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
 # Helper functions for option handling.                     -*- Autoconf -*-
 
 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
@@ -1383,8 +1475,17 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([m4/gettext.m4])
+m4_include([m4/iconv.m4])
+m4_include([m4/intlmacosx.m4])
+m4_include([m4/lib-ld.m4])
+m4_include([m4/lib-link.m4])
+m4_include([m4/lib-prefix.m4])
 m4_include([m4/ltoptions.m4])
 m4_include([m4/ltsugar.m4])
 m4_include([m4/ltversion.m4])
 m4_include([m4/lt~obsolete.m4])
+m4_include([m4/nls.m4])
+m4_include([m4/po.m4])
+m4_include([m4/progtest.m4])
 m4_include([acinclude.m4])
diff --git a/ar-lib b/ar-lib
new file mode 100755
index 0000000..fe2301e
--- /dev/null
+++ b/ar-lib
@@ -0,0 +1,270 @@
+#! /bin/sh
+# Wrapper for Microsoft lib.exe
+
+me=ar-lib
+scriptversion=2012-03-01.08; # UTC
+
+# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Written by Peter Rosin <peda@lysator.liu.se>.
+#
+# 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, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+
+# func_error message
+func_error ()
+{
+  echo "$me: $1" 1>&2
+  exit 1
+}
+
+file_conv=
+
+# func_file_conv build_file
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv in
+	mingw)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_at_file at_file operation archive
+# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE
+# for each of them.
+# When interpreting the content of the @FILE, do NOT use func_file_conv,
+# since the user would need to supply preconverted file names to
+# binutils ar, at least for MinGW.
+func_at_file ()
+{
+  operation=$2
+  archive=$3
+  at_file_contents=`cat "$1"`
+  eval set x "$at_file_contents"
+  shift
+
+  for member
+  do
+    $AR -NOLOGO $operation:"$member" "$archive" || exit $?
+  done
+}
+
+case $1 in
+  '')
+     func_error "no command.  Try '$0 --help' for more information."
+     ;;
+  -h | --h*)
+    cat <<EOF
+Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]
+
+Members may be specified in a file named with @FILE.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "$me, version $scriptversion"
+    exit $?
+    ;;
+esac
+
+if test $# -lt 3; then
+  func_error "you must specify a program, an action and an archive"
+fi
+
+AR=$1
+shift
+while :
+do
+  if test $# -lt 2; then
+    func_error "you must specify a program, an action and an archive"
+  fi
+  case $1 in
+    -lib | -LIB \
+    | -ltcg | -LTCG \
+    | -machine* | -MACHINE* \
+    | -subsystem* | -SUBSYSTEM* \
+    | -verbose | -VERBOSE \
+    | -wx* | -WX* )
+      AR="$AR $1"
+      shift
+      ;;
+    *)
+      action=$1
+      shift
+      break
+      ;;
+  esac
+done
+orig_archive=$1
+shift
+func_file_conv "$orig_archive"
+archive=$file
+
+# strip leading dash in $action
+action=${action#-}
+
+delete=
+extract=
+list=
+quick=
+replace=
+index=
+create=
+
+while test -n "$action"
+do
+  case $action in
+    d*) delete=yes  ;;
+    x*) extract=yes ;;
+    t*) list=yes    ;;
+    q*) quick=yes   ;;
+    r*) replace=yes ;;
+    s*) index=yes   ;;
+    S*)             ;; # the index is always updated implicitly
+    c*) create=yes  ;;
+    u*)             ;; # TODO: don't ignore the update modifier
+    v*)             ;; # TODO: don't ignore the verbose modifier
+    *)
+      func_error "unknown action specified"
+      ;;
+  esac
+  action=${action#?}
+done
+
+case $delete$extract$list$quick$replace,$index in
+  yes,* | ,yes)
+    ;;
+  yesyes*)
+    func_error "more than one action specified"
+    ;;
+  *)
+    func_error "no action specified"
+    ;;
+esac
+
+if test -n "$delete"; then
+  if test ! -f "$orig_archive"; then
+    func_error "archive not found"
+  fi
+  for member
+  do
+    case $1 in
+      @*)
+        func_at_file "${1#@}" -REMOVE "$archive"
+        ;;
+      *)
+        func_file_conv "$1"
+        $AR -NOLOGO -REMOVE:"$file" "$archive" || exit $?
+        ;;
+    esac
+  done
+
+elif test -n "$extract"; then
+  if test ! -f "$orig_archive"; then
+    func_error "archive not found"
+  fi
+  if test $# -gt 0; then
+    for member
+    do
+      case $1 in
+        @*)
+          func_at_file "${1#@}" -EXTRACT "$archive"
+          ;;
+        *)
+          func_file_conv "$1"
+          $AR -NOLOGO -EXTRACT:"$file" "$archive" || exit $?
+          ;;
+      esac
+    done
+  else
+    $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member
+    do
+      $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
+    done
+  fi
+
+elif test -n "$quick$replace"; then
+  if test ! -f "$orig_archive"; then
+    if test -z "$create"; then
+      echo "$me: creating $orig_archive"
+    fi
+    orig_archive=
+  else
+    orig_archive=$archive
+  fi
+
+  for member
+  do
+    case $1 in
+    @*)
+      func_file_conv "${1#@}"
+      set x "$@" "@$file"
+      ;;
+    *)
+      func_file_conv "$1"
+      set x "$@" "$file"
+      ;;
+    esac
+    shift
+    shift
+  done
+
+  if test -n "$orig_archive"; then
+    $AR -NOLOGO -OUT:"$archive" "$orig_archive" "$@" || exit $?
+  else
+    $AR -NOLOGO -OUT:"$archive" "$@" || exit $?
+  fi
+
+elif test -n "$list"; then
+  if test ! -f "$orig_archive"; then
+    func_error "archive not found"
+  fi
+  $AR -NOLOGO -LIST "$archive" || exit $?
+fi
diff --git a/backend/Makefile.am b/backend/Makefile.am
index b672490..f7fb403 100644
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@@ -4,33 +4,9 @@
 ##  This file is part of the "Sane" build infra-structure.  See
 ##  included LICENSE file for license information.
 
-INSTALL_LOCKPATH = @INSTALL_LOCKPATH@
-LOCKPATH_GROUP = @LOCKPATH_GROUP@
-
-BACKEND_LIBS_ENABLED=@BACKEND_LIBS_ENABLED@
-BACKEND_CONFS_ENABLED=@BACKEND_CONFS_ENABLED@
-
-DL_LIBS = @DL_LIBS@ 
-LIBV4L_LIBS = @LIBV4L_LIBS@ 
-MATH_LIB = @MATH_LIB@ 
-IEEE1284_LIBS = @IEEE1284_LIBS@ 
-TIFF_LIBS = @TIFF_LIBS@ 
-JPEG_LIBS = @JPEG_LIBS@ 
-GPHOTO2_LIBS = @GPHOTO2_LIBS@
-GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
-SOCKET_LIBS = @SOCKET_LIBS@ 
-AVAHI_LIBS = @AVAHI_LIBS@
-USB_LIBS = @USB_LIBS@ 
-SCSI_LIBS = @SCSI_LIBS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-
-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="\"$(libdir)/sane\""
-
-V_MAJOR = @V_MAJOR@
-V_MINOR = @V_MINOR@
-V_REV = @V_REV@
-
-AM_LDFLAGS = @STRICT_LDFLAGS@
+AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include $(USB_CFLAGS) -DLIBDIR="\"$(libdir)/sane\""
+
+AM_LDFLAGS += $(STRICT_LDFLAGS)
 # The -rpath option is added because we are creating _LTLIBRARIES based
 # on configure substitution.  This causes automake to not know the
 # correct $libdir and must be added here.
@@ -38,7 +14,7 @@ DIST_SANELIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)/sane' -version-number $(
 DIST_LIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)' -version-number $(V_MAJOR):$(V_MINOR):$(V_REV)
 
 # LIBTOOL install is a little to noisy for my liking.
-LIBTOOL = @LIBTOOL@ --silent
+LIBTOOL += --silent
 FIRMWARE_DIRS = artec_eplus48u gt68xx snapscan epjitsu
 
 EXTRA_DIST = sane_strstatus.c
@@ -50,15 +26,15 @@ EXTRA_DIST += stubs.c
 # FIXME: % is a GNU extension... This is only thing left requiring
 # use to use GNU make.
 %-s.c: $(srcdir)/stubs.c
-	rm -f $@
-	$(LN_S) $(srcdir)/stubs.c $@
+	$(AM_V_at)rm -f $@
+	$(AM_V_at)$(LN_S) $(srcdir)/stubs.c $@
 
 dll-preload.h:
-	rm -f $@
-	list="$(PRELOADABLE_BACKENDS)"; for be in $$list; do \
+	$(AM_V_at)rm -f $@
+	$(AM_V_at)list="$(PRELOADABLE_BACKENDS)"; for be in $$list; do \
 	  echo "PRELOAD_DECL($$be)" >> $@; \
-	done
-	echo "static struct backend preloaded_backends[] = {" >> $@
+	done; \
+	echo "static struct backend preloaded_backends[] = {" >> $@; \
 	sep=""; \
 	list="$(PRELOADABLE_BACKENDS)"; \
 	if test -z "$${list}"; then \
@@ -68,7 +44,7 @@ dll-preload.h:
 	    echo "$${sep}PRELOAD_DEFN($$be)" >> $@; \
 	    sep=","; \
 	  done; \
-	fi
+	fi; \
 	echo "};" >> $@
 
 # TODO: This really belongs together with the saned sources and
@@ -86,6 +62,7 @@ BACKEND_CONFS= abaton.conf agfafocus.conf apple.conf artec.conf \
 	       epson.conf epsonds.conf fujitsu.conf genesys.conf gphoto2.conf \
 	       gt68xx.conf hp3900.conf hp4200.conf hp5400.conf \
 	       hp.conf hpsj5s.conf hs2p.conf ibm.conf kodak.conf kodakaio.conf\
+	       kvs1025.conf \
 	       leo.conf lexmark.conf ma1509.conf magicolor.conf \
 	       matsushita.conf microtek2.conf microtek.conf mustek.conf \
 	       mustek_pp.conf mustek_usb.conf nec.conf net.conf \
@@ -351,7 +328,7 @@ libcanon_dr_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=canon_dr
 nodist_libsane_canon_dr_la_SOURCES = canon_dr-s.c 
 libsane_canon_dr_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=canon_dr
 libsane_canon_dr_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
-libsane_canon_dr_la_LIBADD = $(COMMON_LIBS) libcanon_dr.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo $(MATH_LIB) $(SCSI_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
+libsane_canon_dr_la_LIBADD = $(COMMON_LIBS) libcanon_dr.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_magic.lo $(MATH_LIB) $(SCSI_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
 EXTRA_DIST += canon_dr.conf.in
 
 libcanon_pp_la_SOURCES = canon_pp.c canon_pp.h canon_pp-io.c canon_pp-io.h canon_pp-dev.c canon_pp-dev.h
@@ -414,7 +391,7 @@ libdc210_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dc210
 nodist_libsane_dc210_la_SOURCES = dc210-s.c
 libsane_dc210_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dc210
 libsane_dc210_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
-libsane_dc210_la_LIBADD = $(COMMON_LIBS) libdc210.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ $(JPEG_LIBS)
+libsane_dc210_la_LIBADD = $(COMMON_LIBS) libdc210.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo $(SANEI_SANEI_JPEG_LO) $(JPEG_LIBS)
 EXTRA_DIST += dc210.conf.in
 
 libdc240_la_SOURCES = dc240.c dc240.h
@@ -423,7 +400,7 @@ libdc240_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dc240
 nodist_libsane_dc240_la_SOURCES = dc240-s.c
 libsane_dc240_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dc240
 libsane_dc240_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
-libsane_dc240_la_LIBADD = $(COMMON_LIBS) libdc240.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ $(JPEG_LIBS)
+libsane_dc240_la_LIBADD = $(COMMON_LIBS) libdc240.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo $(SANEI_SANEI_JPEG_LO) $(JPEG_LIBS)
 EXTRA_DIST += dc240.conf.in
 
 libdell1600n_net_la_SOURCES = dell1600n_net.c
@@ -472,7 +449,8 @@ libsane_epson2_la_LIBADD = $(COMMON_LIBS) libepson2.la ../sanei/sanei_init_debug
 EXTRA_DIST += epson2.conf.in
 
 libepsonds_la_SOURCES = epsonds.c epsonds.h epsonds-usb.c epsonds-usb.h epsonds-io.c epsonds-io.h \
-		epsonds-cmd.c epsonds-cmd.h epsonds-ops.c epsonds-ops.h epsonds-jpeg.c epsonds-jpeg.h
+		epsonds-cmd.c epsonds-cmd.h epsonds-ops.c epsonds-ops.h epsonds-jpeg.c epsonds-jpeg.h \
+		epsonds-net.c epsonds-net.h
 libepsonds_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=epsonds
 
 nodist_libsane_epsonds_la_SOURCES = epsonds-s.c
@@ -481,7 +459,8 @@ libsane_epsonds_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
 libsane_epsonds_la_LIBADD = $(COMMON_LIBS) libepsonds.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \
 				../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo \
 				../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo \
-				@SANEI_SANEI_JPEG_LO@ $(JPEG_LIBS) $(USB_LIBS) $(MATH_LIB) $(RESMGR_LIBS)
+				../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo \
+				$(SANEI_SANEI_JPEG_LO) $(JPEG_LIBS) $(USB_LIBS) $(MATH_LIB) $(RESMGR_LIBS) $(SOCKET_LIBS)
 EXTRA_DIST += epsonds.conf.in
 
 libfujitsu_la_SOURCES = fujitsu.c fujitsu.h fujitsu-scsi.h
@@ -505,12 +484,12 @@ EXTRA_DIST += genesys.conf.in
 EXTRA_DIST += genesys_conv.c genesys_conv_hlp.c genesys_devices.c
 
 libgphoto2_i_la_SOURCES = gphoto2.c gphoto2.h
-libgphoto2_i_la_CPPFLAGS = $(AM_CPPFLAGS) @GPHOTO2_CPPFLAGS@ -DBACKEND_NAME=gphoto2
+libgphoto2_i_la_CPPFLAGS = $(AM_CPPFLAGS) $(GPHOTO2_CPPFLAGS) -DBACKEND_NAME=gphoto2
 
 nodist_libsane_gphoto2_la_SOURCES = gphoto2-s.c 
 libsane_gphoto2_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=gphoto2
 libsane_gphoto2_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
-libsane_gphoto2_la_LIBADD = $(GPHOTO2_LDFLAGS) $(COMMON_LIBS) libgphoto2_i.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ $(GPHOTO2_LIBS) $(JPEG_LIBS)
+libsane_gphoto2_la_LIBADD = $(GPHOTO2_LDFLAGS) $(COMMON_LIBS) libgphoto2_i.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo $(SANEI_SANEI_JPEG_LO) $(GPHOTO2_LIBS) $(JPEG_LIBS)
 EXTRA_DIST += gphoto2.conf.in
 
 libgt68xx_la_SOURCES = gt68xx.c gt68xx.h
@@ -541,7 +520,7 @@ libhp3500_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=hp3500
 nodist_libsane_hp3500_la_SOURCES = hp3500-s.c
 libsane_hp3500_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=hp3500
 libsane_hp3500_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
-libsane_hp3500_la_LIBADD = $(COMMON_LIBS) libhp3500.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_thread.lo $(USB_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
+libsane_hp3500_la_LIBADD = $(COMMON_LIBS) libhp3500.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_thread.lo $(MATH_LIB) $(USB_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
 
 libhp3900_la_SOURCES = hp3900.c
 libhp3900_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=hp3900
@@ -651,6 +630,7 @@ nodist_libsane_kvs1025_la_SOURCES = kvs1025-s.c
 libsane_kvs1025_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kvs1025
 libsane_kvs1025_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
 libsane_kvs1025_la_LIBADD = $(COMMON_LIBS) libkvs1025.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_magic.lo $(MATH_LIB) $(USB_LIBS) $(RESMGR_LIBS)
+EXTRA_DIST += kvs1025.conf.in
 
 libkvs20xx_la_SOURCES = kvs20xx.c kvs20xx_cmd.c kvs20xx_opt.c \
  kvs20xx_cmd.h kvs20xx.h 
@@ -788,10 +768,10 @@ libsane_nec_la_LIBADD = $(COMMON_LIBS) libnec.la ../sanei/sanei_init_debug.lo ..
 EXTRA_DIST += nec.conf.in
 
 libnet_la_SOURCES = net.c net.h
-libnet_la_CPPFLAGS = $(AM_CPPFLAGS) @AVAHI_CFLAGS@ -DBACKEND_NAME=net
+libnet_la_CPPFLAGS = $(AM_CPPFLAGS) $(AVAHI_CFLAGS) -DBACKEND_NAME=net
 
 nodist_libsane_net_la_SOURCES = net-s.c
-libsane_net_la_CPPFLAGS = $(AM_CPPFLAGS) @AVAHI_CFLAGS@ -DBACKEND_NAME=net
+libsane_net_la_CPPFLAGS = $(AM_CPPFLAGS) $(AVAHI_CFLAGS) -DBACKEND_NAME=net
 libsane_net_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
 libsane_net_la_LIBADD = $(COMMON_LIBS) libnet.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo $(AVAHI_LIBS) $(SOCKET_LIBS)
 EXTRA_DIST += net.conf.in
@@ -1088,7 +1068,7 @@ libsane_umax_pp_la_LIBADD = $(COMMON_LIBS) libumax_pp.la ../sanei/sanei_init_deb
 EXTRA_DIST += umax_pp.conf.in
 
 libv4l_la_SOURCES = v4l.c v4l.h v4l-frequencies.h
-libv4l_la_CPPFLAGS = $(AM_CPPFLAGS) @LIBV4L_CFLAGS@ -DBACKEND_NAME=v4l
+libv4l_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBV4L_CFLAGS) -DBACKEND_NAME=v4l
 
 nodist_libsane_v4l_la_SOURCES = v4l-s.c
 libsane_v4l_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=v4l
@@ -1102,7 +1082,7 @@ libxerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
 nodist_libsane_xerox_mfp_la_SOURCES = xerox_mfp-s.c
 libsane_xerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
 libsane_xerox_mfp_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
-libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
+libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ $(JPEG_LIBS) ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
 EXTRA_DIST += xerox_mfp.conf.in
 
 libdll_preload_la_SOURCES =  dll.c
@@ -1142,7 +1122,7 @@ EXTRA_DIST += dll.aliases
 nodist_libsane_la_SOURCES =  dll-s.c
 libsane_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll
 libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
-libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo $(DL_LIBS) $(LIBV4L_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(GPHOTO2_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(AVAHI_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
+libsane_la_LIBADD = $(COMMON_LIBS) $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo $(DL_LIBS) $(LIBV4L_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(GPHOTO2_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(AVAHI_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
 
 # WARNING: Automake is getting this wrong so have to do it ourselves.
-libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo @SANEI_SANEI_JPEG_LO@
+libsane_la_DEPENDENCIES = $(COMMON_LIBS) $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo $(SANEI_SANEI_JPEG_LO)
diff --git a/backend/Makefile.in b/backend/Makefile.in
index 1860295..4e070f0 100644
--- a/backend/Makefile.in
+++ b/backend/Makefile.in
@@ -82,11 +82,16 @@ subdir = backend
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ltoptions.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/byteorder.m4 \
-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/byteorder.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -215,7 +220,7 @@ libepsonds_la_LIBADD =
 am_libepsonds_la_OBJECTS = libepsonds_la-epsonds.lo \
 	libepsonds_la-epsonds-usb.lo libepsonds_la-epsonds-io.lo \
 	libepsonds_la-epsonds-cmd.lo libepsonds_la-epsonds-ops.lo \
-	libepsonds_la-epsonds-jpeg.lo
+	libepsonds_la-epsonds-jpeg.lo libepsonds_la-epsonds-net.lo
 libepsonds_la_OBJECTS = $(am_libepsonds_la_OBJECTS)
 libfujitsu_la_LIBADD =
 am_libfujitsu_la_OBJECTS = libfujitsu_la-fujitsu.lo
@@ -491,8 +496,9 @@ libsane_canon_dr_la_DEPENDENCIES = $(COMMON_LIBS) libcanon_dr.la \
 	../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \
 	../sanei/sanei_config.lo ../sanei/sanei_config2.lo \
 	sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo \
+	../sanei/sanei_magic.lo $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 nodist_libsane_canon_dr_la_OBJECTS =  \
 	libsane_canon_dr_la-canon_dr-s.lo
 libsane_canon_dr_la_OBJECTS = $(nodist_libsane_canon_dr_la_OBJECTS)
@@ -567,7 +573,7 @@ libsane_coolscan3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 libsane_dc210_la_DEPENDENCIES = $(COMMON_LIBS) libdc210.la \
 	../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \
 	../sanei/sanei_config.lo sane_strstatus.lo \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 nodist_libsane_dc210_la_OBJECTS = libsane_dc210_la-dc210-s.lo
 libsane_dc210_la_OBJECTS = $(nodist_libsane_dc210_la_OBJECTS)
 libsane_dc210_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -577,7 +583,7 @@ libsane_dc210_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 libsane_dc240_la_DEPENDENCIES = $(COMMON_LIBS) libdc240.la \
 	../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \
 	../sanei/sanei_config.lo sane_strstatus.lo \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 nodist_libsane_dc240_la_OBJECTS = libsane_dc240_la-dc240-s.lo
 libsane_dc240_la_OBJECTS = $(nodist_libsane_dc240_la_OBJECTS)
 libsane_dc240_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -669,6 +675,8 @@ libsane_epsonds_la_DEPENDENCIES = $(COMMON_LIBS) libepsonds.la \
 	../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \
 	../sanei/sanei_config.lo ../sanei/sanei_config2.lo \
 	sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo \
+	../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 nodist_libsane_epsonds_la_OBJECTS = libsane_epsonds_la-epsonds-s.lo
@@ -704,7 +712,8 @@ libsane_genesys_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 libsane_gphoto2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(COMMON_LIBS) \
 	libgphoto2_i.la ../sanei/sanei_init_debug.lo \
 	../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo \
-	sane_strstatus.lo $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	sane_strstatus.lo $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 nodist_libsane_gphoto2_la_OBJECTS = libsane_gphoto2_la-gphoto2-s.lo
 libsane_gphoto2_la_OBJECTS = $(nodist_libsane_gphoto2_la_OBJECTS)
 libsane_gphoto2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -739,7 +748,7 @@ libsane_hp3500_la_DEPENDENCIES = $(COMMON_LIBS) libhp3500.la \
 	../sanei/sanei_config.lo sane_strstatus.lo \
 	../sanei/sanei_usb.lo ../sanei/sanei_thread.lo \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 nodist_libsane_hp3500_la_OBJECTS = libsane_hp3500_la-hp3500-s.lo
 libsane_hp3500_la_OBJECTS = $(nodist_libsane_hp3500_la_OBJECTS)
 libsane_hp3500_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -1421,9 +1430,10 @@ libsane_v4l_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 libsane_xerox_mfp_la_DEPENDENCIES = $(COMMON_LIBS) libxerox_mfp.la \
 	../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \
 	../sanei/sanei_config.lo sane_strstatus.lo \
-	../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo \
+	$(am__DEPENDENCIES_1) ../sanei/sanei_usb.lo \
+	../sanei/sanei_tcp.lo $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 nodist_libsane_xerox_mfp_la_OBJECTS =  \
 	libsane_xerox_mfp_la-xerox_mfp-s.lo
 libsane_xerox_mfp_la_OBJECTS = $(nodist_libsane_xerox_mfp_la_OBJECTS)
@@ -1740,7 +1750,12 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \
+	-I$(top_srcdir)/include $(USB_CFLAGS) \
+	-DLIBDIR="\"$(libdir)/sane\""
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@ $(STRICT_LDFLAGS)
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -1761,9 +1776,9 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISTCLEAN_FILES = @DISTCLEAN_FILES@
+DLH = @DLH@
 DLLTOOL = @DLLTOOL@
-DL_LIBS = @DL_LIBS@ 
+DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 DVIPS = @DVIPS@
@@ -1774,48 +1789,56 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FIG2DEV = @FIG2DEV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
 GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
+GS = @GS@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
-IEEE1284_LIBS = @IEEE1284_LIBS@ 
-INCLUDES = @INCLUDES@
+IEEE1284_LIBS = @IEEE1284_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LOCKPATH = @INSTALL_LOCKPATH@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JPEG_LIBS = @JPEG_LIBS@ 
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JPEG_LIBS = @JPEG_LIBS@
 LATEX = @LATEX@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 
 # LIBTOOL install is a little to noisy for my liking.
 LIBTOOL = @LIBTOOL@ --silent
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
-LIBV4L_LIBS = @LIBV4L_LIBS@ 
-LINKER_RPATH = @LINKER_RPATH@
+LIBV4L_LIBS = @LIBV4L_LIBS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCKPATH_GROUP = @LOCKPATH_GROUP@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINDEX = @MAKEINDEX@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
-MATH_LIB = @MATH_LIB@ 
+MATH_LIB = @MATH_LIB@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
-NUMBER_VERSION = @NUMBER_VERSION@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -1828,10 +1851,13 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PNG_LIBS = @PNG_LIBS@
+POSUB = @POSUB@
+PPMTOGIF = @PPMTOGIF@
 PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@
 PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -1846,19 +1872,23 @@ SHELL = @SHELL@
 SNMP_CFLAGS = @SNMP_CFLAGS@
 SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
 SNMP_LIBS = @SNMP_LIBS@
-SOCKET_LIBS = @SOCKET_LIBS@ 
+SOCKET_LIBS = @SOCKET_LIBS@
 STRICT_LDFLAGS = @STRICT_LDFLAGS@
 STRIP = @STRIP@
 SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
-TIFF_LIBS = @TIFF_LIBS@ 
-USB_LIBS = @USB_LIBS@ 
+TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
+USB_LIBS = @USB_LIBS@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 V_MAJOR = @V_MAJOR@
 V_MINOR = @V_MINOR@
 V_REV = @V_REV@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -1914,8 +1944,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="\"$(libdir)/sane\""
-AM_LDFLAGS = @STRICT_LDFLAGS@
 # The -rpath option is added because we are creating _LTLIBRARIES based
 # on configure substitution.  This causes automake to not know the
 # correct $libdir and must be added here.
@@ -1978,16 +2006,16 @@ EXTRA_DIST = sane_strstatus.c stubs.c saned.conf.in abaton.conf.in \
 	hp5590_cmds.c hp5590_cmds.h hp5590_low.c hp5590_low.h \
 	hpsj5s.conf.in hs2p.conf.in hs2p-scsi.c hs2p-scsi.h \
 	ibm.conf.in ibm-scsi.c kodak.conf.in kodakaio.conf.in \
-	leo.conf.in lexmark.conf.in lexmark_models.c lexmark_sensors.c \
-	ma1509.conf.in magicolor.conf.in matsushita.conf.in \
-	microtek.conf.in microtek2.conf.in mustek.conf.in \
-	mustek_scsi_pp.c mustek_scsi_pp.h mustek_pp.conf.in \
-	mustek_pp_ccd300.c mustek_pp_ccd300.h mustek_pp_cis.c \
-	mustek_pp_cis.h mustek_pp_null.c mustek_usb.conf.in \
-	mustek_usb_high.c mustek_usb_high.h mustek_usb_low.c \
-	mustek_usb_low.h mustek_usb_mid.c mustek_usb_mid.h \
-	mustek_usb2_asic.c mustek_usb2_asic.h mustek_usb2_high.c \
-	mustek_usb2_high.h mustek_usb2_reflective.c \
+	kvs1025.conf.in leo.conf.in lexmark.conf.in lexmark_models.c \
+	lexmark_sensors.c ma1509.conf.in magicolor.conf.in \
+	matsushita.conf.in microtek.conf.in microtek2.conf.in \
+	mustek.conf.in mustek_scsi_pp.c mustek_scsi_pp.h \
+	mustek_pp.conf.in mustek_pp_ccd300.c mustek_pp_ccd300.h \
+	mustek_pp_cis.c mustek_pp_cis.h mustek_pp_null.c \
+	mustek_usb.conf.in mustek_usb_high.c mustek_usb_high.h \
+	mustek_usb_low.c mustek_usb_low.h mustek_usb_mid.c \
+	mustek_usb_mid.h mustek_usb2_asic.c mustek_usb2_asic.h \
+	mustek_usb2_high.c mustek_usb2_high.h mustek_usb2_reflective.c \
 	mustek_usb2_transparent.c nec.conf.in net.conf.in niash_core.c \
 	niash_core.h niash_xfer.c niash_xfer.h pie.conf.in \
 	pieusb.conf.in p5.conf.in p5_device.c pixma.conf.in \
@@ -2035,6 +2063,7 @@ BACKEND_CONFS = abaton.conf agfafocus.conf apple.conf artec.conf \
 	       epson.conf epsonds.conf fujitsu.conf genesys.conf gphoto2.conf \
 	       gt68xx.conf hp3900.conf hp4200.conf hp5400.conf \
 	       hp.conf hpsj5s.conf hs2p.conf ibm.conf kodak.conf kodakaio.conf\
+	       kvs1025.conf \
 	       leo.conf lexmark.conf ma1509.conf magicolor.conf \
 	       matsushita.conf microtek2.conf microtek.conf mustek.conf \
 	       mustek_pp.conf mustek_usb.conf nec.conf net.conf \
@@ -2213,7 +2242,7 @@ libcanon_dr_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=canon_dr
 nodist_libsane_canon_dr_la_SOURCES = canon_dr-s.c 
 libsane_canon_dr_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=canon_dr
 libsane_canon_dr_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
-libsane_canon_dr_la_LIBADD = $(COMMON_LIBS) libcanon_dr.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo $(MATH_LIB) $(SCSI_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
+libsane_canon_dr_la_LIBADD = $(COMMON_LIBS) libcanon_dr.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_magic.lo $(MATH_LIB) $(SCSI_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
 libcanon_pp_la_SOURCES = canon_pp.c canon_pp.h canon_pp-io.c canon_pp-io.h canon_pp-dev.c canon_pp-dev.h
 libcanon_pp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=canon_pp
 nodist_libsane_canon_pp_la_SOURCES = canon_pp-s.c
@@ -2255,13 +2284,13 @@ libdc210_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dc210
 nodist_libsane_dc210_la_SOURCES = dc210-s.c
 libsane_dc210_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dc210
 libsane_dc210_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
-libsane_dc210_la_LIBADD = $(COMMON_LIBS) libdc210.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ $(JPEG_LIBS)
+libsane_dc210_la_LIBADD = $(COMMON_LIBS) libdc210.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo $(SANEI_SANEI_JPEG_LO) $(JPEG_LIBS)
 libdc240_la_SOURCES = dc240.c dc240.h
 libdc240_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dc240
 nodist_libsane_dc240_la_SOURCES = dc240-s.c
 libsane_dc240_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dc240
 libsane_dc240_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
-libsane_dc240_la_LIBADD = $(COMMON_LIBS) libdc240.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ $(JPEG_LIBS)
+libsane_dc240_la_LIBADD = $(COMMON_LIBS) libdc240.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo $(SANEI_SANEI_JPEG_LO) $(JPEG_LIBS)
 libdell1600n_net_la_SOURCES = dell1600n_net.c
 libdell1600n_net_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dell1600n_net
 nodist_libsane_dell1600n_net_la_SOURCES = dell1600n_net-s.c
@@ -2293,7 +2322,8 @@ libsane_epson2_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=epson2
 libsane_epson2_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
 libsane_epson2_la_LIBADD = $(COMMON_LIBS) libepson2.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo $(SCSI_LIBS) $(USB_LIBS) $(SOCKET_LIBS) $(MATH_LIB) $(RESMGR_LIBS)
 libepsonds_la_SOURCES = epsonds.c epsonds.h epsonds-usb.c epsonds-usb.h epsonds-io.c epsonds-io.h \
-		epsonds-cmd.c epsonds-cmd.h epsonds-ops.c epsonds-ops.h epsonds-jpeg.c epsonds-jpeg.h
+		epsonds-cmd.c epsonds-cmd.h epsonds-ops.c epsonds-ops.h epsonds-jpeg.c epsonds-jpeg.h \
+		epsonds-net.c epsonds-net.h
 
 libepsonds_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=epsonds
 nodist_libsane_epsonds_la_SOURCES = epsonds-s.c
@@ -2302,7 +2332,8 @@ libsane_epsonds_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
 libsane_epsonds_la_LIBADD = $(COMMON_LIBS) libepsonds.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \
 				../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo \
 				../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo \
-				@SANEI_SANEI_JPEG_LO@ $(JPEG_LIBS) $(USB_LIBS) $(MATH_LIB) $(RESMGR_LIBS)
+				../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo \
+				$(SANEI_SANEI_JPEG_LO) $(JPEG_LIBS) $(USB_LIBS) $(MATH_LIB) $(RESMGR_LIBS) $(SOCKET_LIBS)
 
 libfujitsu_la_SOURCES = fujitsu.c fujitsu.h fujitsu-scsi.h
 libfujitsu_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=fujitsu
@@ -2317,11 +2348,11 @@ libsane_genesys_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=genesys
 libsane_genesys_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
 libsane_genesys_la_LIBADD = $(COMMON_LIBS) libgenesys.la  ../sanei/sanei_magic.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo $(MATH_LIB) $(USB_LIBS) $(RESMGR_LIBS)
 libgphoto2_i_la_SOURCES = gphoto2.c gphoto2.h
-libgphoto2_i_la_CPPFLAGS = $(AM_CPPFLAGS) @GPHOTO2_CPPFLAGS@ -DBACKEND_NAME=gphoto2
+libgphoto2_i_la_CPPFLAGS = $(AM_CPPFLAGS) $(GPHOTO2_CPPFLAGS) -DBACKEND_NAME=gphoto2
 nodist_libsane_gphoto2_la_SOURCES = gphoto2-s.c 
 libsane_gphoto2_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=gphoto2
 libsane_gphoto2_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
-libsane_gphoto2_la_LIBADD = $(GPHOTO2_LDFLAGS) $(COMMON_LIBS) libgphoto2_i.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ $(GPHOTO2_LIBS) $(JPEG_LIBS)
+libsane_gphoto2_la_LIBADD = $(GPHOTO2_LDFLAGS) $(COMMON_LIBS) libgphoto2_i.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo $(SANEI_SANEI_JPEG_LO) $(GPHOTO2_LIBS) $(JPEG_LIBS)
 libgt68xx_la_SOURCES = gt68xx.c gt68xx.h
 libgt68xx_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=gt68xx
 nodist_libsane_gt68xx_la_SOURCES = gt68xx-s.c 
@@ -2339,7 +2370,7 @@ libhp3500_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=hp3500
 nodist_libsane_hp3500_la_SOURCES = hp3500-s.c
 libsane_hp3500_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=hp3500
 libsane_hp3500_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
-libsane_hp3500_la_LIBADD = $(COMMON_LIBS) libhp3500.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_thread.lo $(USB_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
+libsane_hp3500_la_LIBADD = $(COMMON_LIBS) libhp3500.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_thread.lo $(MATH_LIB) $(USB_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
 libhp3900_la_SOURCES = hp3900.c
 libhp3900_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=hp3900
 nodist_libsane_hp3900_la_SOURCES = hp3900-s.c
@@ -2497,9 +2528,9 @@ libsane_nec_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=nec
 libsane_nec_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
 libsane_nec_la_LIBADD = $(COMMON_LIBS) libnec.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_scsi.lo $(MATH_LIB) $(SCSI_LIBS) $(RESMGR_LIBS)
 libnet_la_SOURCES = net.c net.h
-libnet_la_CPPFLAGS = $(AM_CPPFLAGS) @AVAHI_CFLAGS@ -DBACKEND_NAME=net
+libnet_la_CPPFLAGS = $(AM_CPPFLAGS) $(AVAHI_CFLAGS) -DBACKEND_NAME=net
 nodist_libsane_net_la_SOURCES = net-s.c
-libsane_net_la_CPPFLAGS = $(AM_CPPFLAGS) @AVAHI_CFLAGS@ -DBACKEND_NAME=net
+libsane_net_la_CPPFLAGS = $(AM_CPPFLAGS) $(AVAHI_CFLAGS) -DBACKEND_NAME=net
 libsane_net_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
 libsane_net_la_LIBADD = $(COMMON_LIBS) libnet.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo $(AVAHI_LIBS) $(SOCKET_LIBS)
 libniash_la_SOURCES = niash.c
@@ -2683,7 +2714,7 @@ libsane_umax_pp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=umax_pp
 libsane_umax_pp_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
 libsane_umax_pp_la_LIBADD = $(COMMON_LIBS) libumax_pp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo $(MATH_LIB)
 libv4l_la_SOURCES = v4l.c v4l.h v4l-frequencies.h
-libv4l_la_CPPFLAGS = $(AM_CPPFLAGS) @LIBV4L_CFLAGS@ -DBACKEND_NAME=v4l
+libv4l_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBV4L_CFLAGS) -DBACKEND_NAME=v4l
 nodist_libsane_v4l_la_SOURCES = v4l-s.c
 libsane_v4l_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=v4l
 libsane_v4l_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
@@ -2693,7 +2724,7 @@ libxerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
 nodist_libsane_xerox_mfp_la_SOURCES = xerox_mfp-s.c
 libsane_xerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
 libsane_xerox_mfp_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
-libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
+libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ $(JPEG_LIBS) ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
 libdll_preload_la_SOURCES = dll.c
 libdll_preload_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll -DENABLE_PRELOAD
 libdll_la_SOURCES = dll.c
@@ -2726,10 +2757,10 @@ libsane_dll_la_LIBADD = $(COMMON_LIBS) libdll.la ../sanei/sanei_init_debug.lo ..
 nodist_libsane_la_SOURCES = dll-s.c
 libsane_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll
 libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
-libsane_la_LIBADD = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo $(DL_LIBS) $(LIBV4L_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(GPHOTO2_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(AVAHI_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
+libsane_la_LIBADD = $(COMMON_LIBS) $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo $(DL_LIBS) $(LIBV4L_LIBS) $(MATH_LIB) $(IEEE1284_LIBS) $(TIFF_LIBS) $(JPEG_LIBS) $(GPHOTO2_LIBS) $(SOCKET_LIBS) $(USB_LIBS) $(AVAHI_LIBS) $(SCSI_LIBS) $(PTHREAD_LIBS) $(RESMGR_LIBS)
 
 # WARNING: Automake is getting this wrong so have to do it ourselves.
-libsane_la_DEPENDENCIES = $(COMMON_LIBS) @PRELOADABLE_BACKENDS_ENABLED@ libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo @SANEI_SANEI_JPEG_LO@
+libsane_la_DEPENDENCIES = $(COMMON_LIBS) $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo ../sanei/sanei_config2.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_pv8630.lo ../sanei/sanei_pp.lo ../sanei/sanei_thread.lo  ../sanei/sanei_lm983x.lo ../sanei/sanei_access.lo ../sanei/sanei_net.lo ../sanei/sanei_wire.lo ../sanei/sanei_codec_bin.lo ../sanei/sanei_pa4s2.lo ../sanei/sanei_ab306.lo ../sanei/sanei_pio.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo ../sanei/sanei_magic.lo $(SANEI_SANEI_JPEG_LO)
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -3428,6 +3459,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libepsonds_la-epsonds-cmd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libepsonds_la-epsonds-io.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libepsonds_la-epsonds-jpeg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libepsonds_la-epsonds-net.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libepsonds_la-epsonds-ops.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libepsonds_la-epsonds-usb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libepsonds_la-epsonds.Plo@am__quote@
@@ -3626,22 +3658,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxerox_mfp_la-xerox_mfp.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -3947,6 +3982,13 @@ libepsonds_la-epsonds-jpeg.lo: epsonds-jpeg.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libepsonds_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libepsonds_la-epsonds-jpeg.lo `test -f 'epsonds-jpeg.c' || echo '$(srcdir)/'`epsonds-jpeg.c
 
+libepsonds_la-epsonds-net.lo: epsonds-net.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libepsonds_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libepsonds_la-epsonds-net.lo -MD -MP -MF $(DEPDIR)/libepsonds_la-epsonds-net.Tpo -c -o libepsonds_la-epsonds-net.lo `test -f 'epsonds-net.c' || echo '$(srcdir)/'`epsonds-net.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libepsonds_la-epsonds-net.Tpo $(DEPDIR)/libepsonds_la-epsonds-net.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='epsonds-net.c' object='libepsonds_la-epsonds-net.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libepsonds_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libepsonds_la-epsonds-net.lo `test -f 'epsonds-net.c' || echo '$(srcdir)/'`epsonds-net.c
+
 libfujitsu_la-fujitsu.lo: fujitsu.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfujitsu_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfujitsu_la-fujitsu.lo -MD -MP -MF $(DEPDIR)/libfujitsu_la-fujitsu.Tpo -c -o libfujitsu_la-fujitsu.lo `test -f 'fujitsu.c' || echo '$(srcdir)/'`fujitsu.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfujitsu_la-fujitsu.Tpo $(DEPDIR)/libfujitsu_la-fujitsu.Plo
@@ -5526,15 +5568,15 @@ all: becfg
 # FIXME: % is a GNU extension... This is only thing left requiring
 # use to use GNU make.
 %-s.c: $(srcdir)/stubs.c
-	rm -f $@
-	$(LN_S) $(srcdir)/stubs.c $@
+	$(AM_V_at)rm -f $@
+	$(AM_V_at)$(LN_S) $(srcdir)/stubs.c $@
 
 dll-preload.h:
-	rm -f $@
-	list="$(PRELOADABLE_BACKENDS)"; for be in $$list; do \
+	$(AM_V_at)rm -f $@
+	$(AM_V_at)list="$(PRELOADABLE_BACKENDS)"; for be in $$list; do \
 	  echo "PRELOAD_DECL($$be)" >> $@; \
-	done
-	echo "static struct backend preloaded_backends[] = {" >> $@
+	done; \
+	echo "static struct backend preloaded_backends[] = {" >> $@; \
 	sep=""; \
 	list="$(PRELOADABLE_BACKENDS)"; \
 	if test -z "$${list}"; then \
@@ -5544,7 +5586,7 @@ dll-preload.h:
 	    echo "$${sep}PRELOAD_DEFN($$be)" >> $@; \
 	    sep=","; \
 	  done; \
-	fi
+	fi; \
 	echo "};" >> $@
 becfg: $(BACKEND_CONFS)
 .conf.in.conf:
diff --git a/backend/agfafocus.c b/backend/agfafocus.c
index 45d103f..c2c5664 100644
--- a/backend/agfafocus.c
+++ b/backend/agfafocus.c
@@ -947,7 +947,7 @@ do_cancel (AgfaFocus_Scanner * s)
 
   do_eof (s);
 
-  if (s->reader_pid != -1)
+  if (sanei_thread_is_valid (s->reader_pid))
     {
       int exit_status;
 
@@ -2054,7 +2054,7 @@ sane_cancel (SANE_Handle handle)
 {
   AgfaFocus_Scanner *s = handle;
 
-  if (s->reader_pid != -1)
+  if (sanei_thread_is_valid (s->reader_pid))
     sanei_thread_kill (s->reader_pid);
   s->scanning = SANE_FALSE;
 }
diff --git a/backend/apple.c b/backend/apple.c
index a8e9979..487d743 100644
--- a/backend/apple.c
+++ b/backend/apple.c
@@ -2634,7 +2634,7 @@ sane_cancel (SANE_Handle handle)
       if (s->AbortedByUser)
 	{
 	  DBG (FLOW_CONTROL,
-	       "sane_cancel: Allready Aborted. Please Wait...\n");
+	       "sane_cancel: Already Aborted. Please Wait...\n");
 	}
       else
 	{
@@ -2648,7 +2648,7 @@ sane_cancel (SANE_Handle handle)
       if (s->AbortedByUser)
 	{
 	  DBG (FLOW_CONTROL, "sane_cancel: Scan has not been Initiated yet, "
-	       "or it is allready aborted.\n");
+	       "or it is already aborted.\n");
 	  s->AbortedByUser = SANE_FALSE;
 	  sanei_scsi_cmd (s->fd, test_unit_ready,
 				sizeof (test_unit_ready), 0, 0);
diff --git a/backend/artec.c b/backend/artec.c
index 46aa8b6..2d564a5 100644
--- a/backend/artec.c
+++ b/backend/artec.c
@@ -1711,7 +1711,6 @@ static SANE_Status
 artec_get_cap_data (ARTEC_Device * dev, int fd)
 {
   int cap_model, loop;
-  SANE_Status status;
   u_char cap_buf[256];		/* buffer for cap data */
 
   DBG (7, "artec_get_cap_data()\n");
@@ -1746,11 +1745,11 @@ artec_get_cap_data (ARTEC_Device * dev, int fd)
 
   dev->height = cap_data[cap_model].height;
 
-  status = artec_str_list_to_word_list (&dev->horz_resolution_list,
-				   cap_data[cap_model].horz_resolution_str);
+  artec_str_list_to_word_list (&dev->horz_resolution_list,
+                               cap_data[cap_model].horz_resolution_str);
 
-  status = artec_str_list_to_word_list (&dev->vert_resolution_list,
-				   cap_data[cap_model].vert_resolution_str);
+  artec_str_list_to_word_list (&dev->vert_resolution_list,
+                               cap_data[cap_model].vert_resolution_str);
 
   dev->contrast_range.min = 0;
   dev->contrast_range.max = 255;
diff --git a/backend/artec_eplus48u.c b/backend/artec_eplus48u.c
index bc3b2f8..f31bf5c 100644
--- a/backend/artec_eplus48u.c
+++ b/backend/artec_eplus48u.c
@@ -1785,14 +1785,14 @@ artec48u_device_read_prepare (Artec48U_Device * dev, size_t expected_count)
   return SANE_STATUS_GOOD;
 }
 
-static RETSIGTYPE
+static void
 reader_process_sigterm_handler (int signal)
 {
   XDBG ((1, "reader_process: terminated by signal %d\n", signal));
   _exit (SANE_STATUS_GOOD);
 }
 
-static RETSIGTYPE
+static void
 usb_reader_process_sigterm_handler (int signal)
 {
   XDBG ((1, "reader_process (usb): terminated by signal %d\n", signal));
@@ -3372,12 +3372,10 @@ close_pipe (Artec48U_Scanner * s)
     }
   return SANE_STATUS_EOF;
 }
-static RETSIGTYPE
-sigalarm_handler (int signal)
+static void
+sigalarm_handler (int __sane_unused__ signal)
 {
-  int dummy;			/*Henning doesn't like warnings :-) */
   XDBG ((1, "ALARM!!!\n"));
-  dummy = signal;
   cancelRead = SANE_TRUE;
 }
 
@@ -3483,7 +3481,7 @@ do_cancel (Artec48U_Scanner * s, SANE_Bool closepipe)
 
   s->scanning = SANE_FALSE;
 
-  if (s->reader_pid != -1)
+  if (sanei_thread_is_valid (s->reader_pid))
     {
       /*parent */
       XDBG ((1, "killing reader_process\n"));
@@ -3906,17 +3904,15 @@ sane_open (SANE_String_Const devicename, SANE_Handle * handle)
 void
 sane_close (SANE_Handle handle)
 {
-  Artec48U_Scanner *prev, *s;
+  Artec48U_Scanner *s;
 
   XDBG ((5, "sane_close: start\n"));
 
   /* remove handle from list of open handles: */
-  prev = 0;
   for (s = first_handle; s; s = s->next)
     {
       if (s == handle)
 	break;
-      prev = s;
     }
   if (!s)
     {
@@ -4301,7 +4297,7 @@ sane_start (SANE_Handle handle)
   s->reader_pipe = fds[1];
   s->reader_pid = sanei_thread_begin (reader_process, s);
   cancelRead = SANE_FALSE;
-  if (s->reader_pid == -1)
+  if (!sanei_thread_is_valid (s->reader_pid))
     {
       s->scanning = SANE_FALSE;
       XDBG ((2, "sane_start: sanei_thread_begin failed (%s)\n", strerror (errno)));
diff --git a/backend/as6e.c b/backend/as6e.c
index 0fb9e31..76241fb 100644
--- a/backend/as6e.c
+++ b/backend/as6e.c
@@ -576,8 +576,8 @@ as6e_open (AS6E_Scan * s)
 	    execlp ("as6edriver", "as6edriver", "-s", inpipe_desc,
 		    outpipe_desc, datapipe_desc, (char *) 0);
 	  DBG (1, "The SANE backend was unable to start \"as6edriver\".\n");
-	  DBG (1, "This must be installed in a driectory in your PATH.\n");
-	  DBG (1, "To aquire the as6edriver program,\n");
+	  DBG (1, "This must be installed in a directory in your PATH.\n");
+	  DBG (1, "To acquire the as6edriver program,\n");
 	  DBG (1, "go to http://as6edriver.sourceforge.net.\n");
 	  write (ctlinpipe[WRITEPIPE], &exec_result, sizeof (exec_result));
 	  exit (-1);
diff --git a/backend/avision.c b/backend/avision.c
index 146125c..61491a2 100644
--- a/backend/avision.c
+++ b/backend/avision.c
@@ -1277,6 +1277,9 @@ static SANE_Bool force_calibration = SANE_FALSE;
 static SANE_Bool force_a4 = SANE_FALSE;
 static SANE_Bool force_a3 = SANE_FALSE;
 
+/* trust ADF-presence flag, even if ADF model is nonzero */
+static SANE_Bool skip_adf = SANE_FALSE;
+
 /* hardware resolutions to interpolate from */
 static const int  hw_res_list_c5[] =
   {
@@ -2736,7 +2739,7 @@ wait_4_light (Avision_Scanner* s)
   struct command_read rcmd;
   char* light_status[] =
     { "off", "on", "warming up", "needs warm up test", 
-      "light check error", "RESERVED" };
+      "light check error", "backlight on", "RESERVED" };
   
   SANE_Status status;
   uint8_t result;
@@ -2753,6 +2756,11 @@ wait_4_light (Avision_Scanner* s)
   set_triple (rcmd.transferlen, size);
   
   for (try = 0; try < 90; ++ try) {
+
+    if (s->cancelled) {
+      DBG (3, "wait_4_light: cancelled\n");
+      return SANE_STATUS_CANCELLED;
+    }
     
     DBG (5, "wait_4_light: read bytes %lu\n", (u_long) size);
     status = avision_cmd (&s->av_con, &rcmd, sizeof (rcmd), 0, 0, &result, &size);
@@ -2762,10 +2770,10 @@ wait_4_light (Avision_Scanner* s)
       return status;
     }
     
-    DBG (3, "wait_4_light: command is %d. Result is %s\n",
-	 status, light_status[(result>4)?5:result]);
+    DBG (3, "wait_4_light: command is %d. Result is %d (%s)\n",
+	 status, result, light_status[(result>5)?6:result]);
     
-    if (result == 1) {
+    if (result == 1 || result == 5) {
       return SANE_STATUS_GOOD;
     }
     else if (dev->hw->feature_type & AV_LIGHT_CHECK_BOGUS) {
@@ -3218,11 +3226,13 @@ get_accessories_info (Avision_Scanner* s)
     {
       dev->inquiry_duplex = 1;
       dev->inquiry_duplex_interlaced = 0;
-    } else if (result[0] == 0 && result[2] != 0) {
+    } else if (result[0] == 0 && result[2] != 0 && !skip_adf) {
       /* Sometimes the scanner will report that there is no ADF attached, yet
        * an ADF model number will still be reported.  This happens on the
        * HP8200 series and possibly others.  In this case we need to reset the
-       * the adf and try reading it again.
+       * the adf and try reading it again.  Skip this if the configuration says
+       * to do so, so that we don't fail out the scanner as being broken and
+       * unsupported if there isn't actually an ADF present.
        */
       DBG (3, "get_accessories_info: Found ADF model number but the ADF-present flag is not set. Trying to recover...\n");
       status = adf_reset (s);
@@ -4641,7 +4651,6 @@ set_calib_data (Avision_Scanner* s, struct calibration_format* format,
   struct command_send scmd;
   
   int i;
-  size_t out_size;
   
   DBG (3, "set_calib_data:\n");
   
@@ -4679,8 +4688,6 @@ set_calib_data (Avision_Scanner* s, struct calibration_format* format,
     }
   }
   
-  out_size = format->pixel_per_line * 2;
-  
   /* send data in one command? */
   /* FR: HP5370 reports one-pass, but needs multi (or other format in single) */
   if (format->channels == 1 ||
@@ -6215,8 +6222,9 @@ do_cancel (Avision_Scanner* s)
   s->prepared = s->scanning = SANE_FALSE;
   s->duplex_rear_valid = SANE_FALSE;
   s->page = 0;
+  s->cancelled = 1;
   
-  if (s->reader_pid != -1) {
+  if (sanei_thread_is_valid (s->reader_pid)) {
     int exit_status;
     
     /* ensure child knows it's time to stop: */
@@ -7630,6 +7638,11 @@ sane_reload_devices (void)
 		     linenumber);
 		force_a3 = SANE_TRUE;
 	      }
+	      else if (strcmp (word, "skip-adf") == 0) {
+		DBG (3, "sane_reload_devices: config file line %d: enabling skip-adf\n",
+		     linenumber);
+		skip_adf = SANE_TRUE;
+	      }
 	      else if (strcmp (word, "static-red-calib") == 0) {
 		DBG (3, "sane_reload_devices: config file line %d: static red calibration\n",
 		     linenumber);
@@ -8313,6 +8326,9 @@ sane_start (SANE_Handle handle)
   /* Make sure there is no scan running!!! */
   if (s->scanning)
     return SANE_STATUS_DEVICE_BUSY;
+
+  /* Clear cancellation status */
+  s->cancelled = 0;
  
   /* Make sure we have a current parameter set. Some of the
      parameters will be overwritten below, but that's OK. */
@@ -8365,6 +8381,14 @@ sane_start (SANE_Handle handle)
 	   sane_strstatus (status));
       goto stop_scanner_and_return;
     }
+    /* Re-check the light, as setting the window may have changed
+     * which light is to be turned on. */
+    if (s->prepared == SANE_FALSE && dev->inquiry_light_control) {
+      status = wait_4_light (s);
+      if (status != SANE_STATUS_GOOD) {
+	return status;
+      }
+    }
   }
 
 #ifdef DEBUG_TEST
diff --git a/backend/avision.h b/backend/avision.h
index 2122e09..b26907f 100644
--- a/backend/avision.h
+++ b/backend/avision.h
@@ -444,6 +444,7 @@ typedef struct Avision_Scanner
   SANE_Bool prepared;		/* first page marker */
   SANE_Bool scanning;           /* scan in progress */
   unsigned int page;            /* page counter, 0: uninitialized, 1: scanning 1st page, ... */
+  int cancelled;
 
   SANE_Parameters params;       /* scan window */
   Avision_Dimensions avdimen;   /* scan window - detailed internals */
diff --git a/backend/bh.h b/backend/bh.h
index 62115c6..545ffb1 100644
--- a/backend/bh.h
+++ b/backend/bh.h
@@ -652,7 +652,7 @@ _4btol(SANE_Byte *bytes)
 
 #define SANE_NAME_BARCODE_HMIN "barcode-hmin"
 #define SANE_TITLE_BARCODE_HMIN "Barcode Minimum Height"
-#define SANE_DESC_BARCODE_HMIN "Sets the Barcode Minimun Height (larger values increase recognition speed)"
+#define SANE_DESC_BARCODE_HMIN "Sets the Barcode Minimum Height (larger values increase recognition speed)"
 
 #define SANE_NAME_BARCODE_SEARCH_MODE "barcode-search-mode"
 #define SANE_TITLE_BARCODE_SEARCH_MODE "Barcode Search Mode"
diff --git a/backend/canon-sane.c b/backend/canon-sane.c
index 79ce0ba..a8efc7a 100644
--- a/backend/canon-sane.c
+++ b/backend/canon-sane.c
@@ -1,5 +1,5 @@
 SANE_Status
-sane_init (SANE_Int * version_code, SANE_Auth_Callback UNUSEDARG authorize)
+sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize)
 {
   char devnam[PATH_MAX] = "/dev/scanner";
   FILE *fp;
@@ -107,7 +107,7 @@ sane_exit (void)
 
 SANE_Status
 sane_get_devices (const SANE_Device *** device_list,
-SANE_Bool UNUSEDARG local_only)
+SANE_Bool __sane_unused__ local_only)
 {
   static const SANE_Device **devlist = 0;
   CANON_Device *dev;
@@ -1104,7 +1104,6 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters *params)
 SANE_Status
 sane_start (SANE_Handle handle)
 {
-  int mode;
   char *mode_str;
   CANON_Scanner *s = handle;
   SANE_Status status;
@@ -1301,33 +1300,27 @@ sane_start (SANE_Handle handle)
 
   if (!strcmp (mode_str, SANE_VALUE_SCAN_MODE_LINEART))
     {
-      mode = 4;
       s->image_composition = 0;
     }
   else if (!strcmp (mode_str, SANE_VALUE_SCAN_MODE_HALFTONE))
     {
-      mode = 4;
       s->image_composition = 1;
     }
   else if (!strcmp (mode_str, SANE_VALUE_SCAN_MODE_GRAY))
     {
-      mode = 5;
       s->image_composition = 2;
     }
   else if (!strcmp (mode_str, SANE_VALUE_SCAN_MODE_COLOR)
   || !strcmp (mode_str, SANE_I18N("Fine color")))
     {
-      mode = 6;
       s->image_composition = 5;
     }
   else if (!strcmp (mode_str, SANE_I18N("Raw")))
     {
-      mode = 6;
       s->image_composition = 5;
     }
   else
     {
-      mode = 6;
       s->image_composition = 5;
     }
 
@@ -2206,8 +2199,8 @@ sane_cancel (SANE_Handle handle)
 /**************************************************************************/
 
 SANE_Status
-sane_set_io_mode (SANE_Handle UNUSEDARG handle,
-SANE_Bool UNUSEDARG non_blocking)
+sane_set_io_mode (SANE_Handle __sane_unused__ handle,
+SANE_Bool __sane_unused__ non_blocking)
 {
   DBG (1, ">> sane_set_io_mode\n");
   DBG (1, "<< sane_set_io_mode\n");
@@ -2217,8 +2210,8 @@ SANE_Bool UNUSEDARG non_blocking)
 /**************************************************************************/
 
 SANE_Status
-sane_get_select_fd (SANE_Handle UNUSEDARG handle,
-SANE_Int UNUSEDARG * fd)
+sane_get_select_fd (SANE_Handle __sane_unused__ handle,
+SANE_Int __sane_unused__ * fd)
 {
   DBG (1, ">> sane_get_select_fd\n");
   DBG (1, "<< sane_get_select_fd\n");
diff --git a/backend/canon-scsi.c b/backend/canon-scsi.c
index 423a07e..a83e518 100644
--- a/backend/canon-scsi.c
+++ b/backend/canon-scsi.c
@@ -688,7 +688,7 @@ static SANE_Status
 set_parameters_fs2710 (SANE_Handle handle)
 {
   CANON_Scanner *s = handle;
-  int i, j, invert, shadow[4], hilite[4];
+  int i, j, shadow[4], hilite[4];
   double x, b, c;
 
   shadow[1] = s->ShadowR << 4;
@@ -700,8 +700,6 @@ set_parameters_fs2710 (SANE_Handle handle)
   c = ((double) s->contrast) / 128.0;
   b = ((double) (s->brightness - 128)) / 128.0;
 
-  invert = strcmp (filmtype_list[1], s->val[OPT_NEGATIVE].s);
-
   for (i = 1; i < 4; i++)
     {
       for (j = 0; j < 4096; j++)
diff --git a/backend/canon.h b/backend/canon.h
index 34f527b..c4dc9a8 100644
--- a/backend/canon.h
+++ b/backend/canon.h
@@ -46,12 +46,6 @@
 #ifndef canon_h
 #define canon_h 1
 
-#ifdef __GNUC__
-#define UNUSEDARG __attribute__ ((unused))
-#else
-#define UNUSEDARG
-#endif
-
 /* all the different possible model names. */
 #define FB1200S "IX-12015E      "
 #define FB620S  "IX-06035E      "
diff --git a/backend/canon630u-common.c b/backend/canon630u-common.c
index 4417141..a46424a 100644
--- a/backend/canon630u-common.c
+++ b/backend/canon630u-common.c
@@ -295,7 +295,7 @@ write_word (int fd, unsigned int addr, unsigned int data)
 
 /* write multiple bytes, one at a time (non-bulk) */
 static SANE_Status
-write_many (int fd, unsigned int addr, void *src, size_t count)
+write_many (int fd, unsigned int addr, const byte *src, size_t count)
 {
   SANE_Status status;
   size_t i;
@@ -303,8 +303,8 @@ write_many (int fd, unsigned int addr, void *src, size_t count)
   DBG (14, "multi write %lu\n", (u_long) count);
   for (i = 0; i < count; i++)
     {
-      DBG (15, " %04lx:%02x", (u_long) (addr + i), ((byte *) src)[i]);
-      status = write_byte (fd, addr + i, ((byte *) src)[i]);
+      DBG (15, " %04lx:%02x", (u_long) (addr + i), src[i]);
+      status = write_byte (fd, addr + i, src[i]);
       if (status != SANE_STATUS_GOOD)
 	{
 	  DBG (15, "\n");
@@ -741,9 +741,9 @@ plugin_cal (CANON_Handle * s)
   /* parallel port setting */
   write_byte (fd, PARALLEL_PORT, 0x06);
 
-  write_many (fd, 0x08, (byte *) seq002, sizeof (seq002));
+  write_many (fd, 0x08, seq002, sizeof (seq002));
   /* addr 0x28 isn't written */
-  write_many (fd, 0x29, (byte *) seq003, sizeof (seq003));
+  write_many (fd, 0x29, seq003, sizeof (seq003));
   /* Verification */
   buf = malloc (0x400);
   read_many (fd, 0x08, buf, sizeof (seq002));
diff --git a/backend/canon630u.c b/backend/canon630u.c
index 6bd3431..5c1a711 100644
--- a/backend/canon630u.c
+++ b/backend/canon630u.c
@@ -873,7 +873,6 @@ void
 sane_close (SANE_Handle handle)
 {
   Canon_Scanner *prev, *scanner;
-  SANE_Status res;
 
   DBG (3, "sane_close\n");
 
@@ -906,7 +905,7 @@ sane_close (SANE_Handle handle)
   else
     first_handle = scanner->next;
 
-  res = CANON_close_device (&scanner->scan);
+  CANON_close_device (&scanner->scan);
 
   free (scanner);
 }
diff --git a/backend/canon_dr.c b/backend/canon_dr.c
index 381cfd6..3c058ab 100644
--- a/backend/canon_dr.c
+++ b/backend/canon_dr.c
@@ -3,7 +3,7 @@
    This file is part of the SANE package, and implements a SANE backend
    for various Canon DR-series scanners.
 
-   Copyright (C) 2008-2010 m. allan noah
+   Copyright (C) 2008-2016 m. allan noah
 
    Yabarana Corp. www.yabarana.com provided significant funding
    EvriChart, Inc. www.evrichart.com provided funding and loaned equipment
@@ -314,8 +314,27 @@
       v50 2015-08-23, MAN
          - DR-C125 adds duplex padding on back side
          - initial support for DR-C225
-      v51 2015-08-25, MAN
+      v51 2015-08-25, MAN (SANE 1.0.25)
          - DR-C125 does not invert_tly, does need sw_lut
+      v52 2015-11-03, MAN
+         - set can_color=1 by default (recent models dont have 'C' in name)
+         - enable jpeg for DR-6080
+         - add must_downsample and must_fully_buffer
+         - improve dropout option handling
+         - add software dropout implementation for downsampled modes
+      v53 2015-11-06, MAN
+         - replace image processing methods with sanei_magic
+         - add swskip option
+         - reorder geometry group options
+         - use bg_color to fill missing image data
+      v54 2015-11-21, MAN
+         - br_x and br_y locked to page_width/height until changed
+      v55 2016-03-19, MAN
+         - fixed-width scanners were calculating left-side offset incorrectly in color
+         - initial support for DR-F120
+         - rename all DUPLEX_INTERLACE_* to indicate start and end of line
+      v56 2016-08-23, MAN
+         - initial support for P-150
 
    SANE FLOW DIAGRAM
 
@@ -360,12 +379,13 @@
 #include "../include/sane/sanei_usb.h"
 #include "../include/sane/saneopts.h"
 #include "../include/sane/sanei_config.h"
+#include "../include/sane/sanei_magic.h"
 
 #include "canon_dr-cmd.h"
 #include "canon_dr.h"
 
 #define DEBUG 1
-#define BUILD 51
+#define BUILD 56
 
 /* values for SANE_DEBUG_CANON_DR env var:
  - errors           5
@@ -618,7 +638,7 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
                   global_extra_status = buf;
               }
 
-              /* DUPLEXOFFSET: < 1200 */
+              /* DUPLEXOFFSET: < 2400 */
               else if (!strncmp (lp, "duplex-offset", 13) && isspace (lp[13])) {
     
                   int buf;
@@ -626,9 +646,9 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
                   lp = sanei_config_skip_whitespace (lp);
                   buf = atoi (lp);
     
-                  if (buf > 1200) {
+                  if (buf > 2400) {
                     DBG (5, "sane_get_devices: config option \"duplex-offset\" "
-                      "(%d) is > 1200, ignoring!\n", buf);
+                      "(%d) is > 2400, ignoring!\n", buf);
                     continue;
                   }
     
@@ -1262,18 +1282,21 @@ init_model (struct scanner *s)
   s->max_x_fb = s->max_x;
   s->max_y_fb = s->max_y;
 
-  /* generic settings missing from vpd */
-  if (strstr (s->model_name,"C")){
-    s->can_color = 1;
-  }
+  /* missing from vpd- we will unset this for b&w machines below */
+  s->can_color = 1;
 
   /* specific settings missing from vpd */
-  if (strstr (s->model_name,"DR-9080")
-    || strstr (s->model_name,"DR-7580")){
+  if (strstr (s->model_name,"DR-9080")){
     s->has_comp_JPEG = 1;
     s->rgb_format = 2;
   }
 
+  else if (strstr (s->model_name,"DR-6080")
+    || strstr (s->model_name,"DR-7580")){
+    s->has_comp_JPEG = 1;
+    s->can_color = 0;
+  }
+
   else if (strstr (s->model_name,"DR-7090")){
     s->has_flatbed = 1;
   }
@@ -1318,7 +1341,7 @@ init_model (struct scanner *s)
     s->color_interlace[SIDE_FRONT] = COLOR_INTERLACE_RRGGBB;
     s->color_interlace[SIDE_BACK] = COLOR_INTERLACE_rRgGbB;
     s->gray_interlace[SIDE_BACK] = GRAY_INTERLACE_gG;
-    s->duplex_interlace = DUPLEX_INTERLACE_FBFB;
+    s->duplex_interlace = DUPLEX_INTERLACE_FBfb;
     s->need_ccal = 1;
     s->need_fcal = 1;
     /*s->duplex_offset = 432; now set in config file*/
@@ -1398,7 +1421,7 @@ init_model (struct scanner *s)
     s->even_Bpl = 1;
     s->color_interlace[SIDE_FRONT] = COLOR_INTERLACE_RRGGBB;
     s->color_interlace[SIDE_BACK] = COLOR_INTERLACE_RRGGBB;
-    s->duplex_interlace = DUPLEX_INTERLACE_FBFB;
+    s->duplex_interlace = DUPLEX_INTERLACE_FBfb;
     s->need_fcal_buffer = 1;
     s->bg_color = 0x08;
     /*s->duplex_offset = 840; now set in config file*/
@@ -1422,6 +1445,7 @@ init_model (struct scanner *s)
     s->ppl_mod = 32;
     s->reverse_by_mode[MODE_LINEART] = 0;
     s->reverse_by_mode[MODE_HALFTONE] = 0;
+    s->can_color = 0;
   }
 
   else if (strstr (s->model_name,"DR-5020")){
@@ -1432,16 +1456,33 @@ init_model (struct scanner *s)
     s->ppl_mod = 32;
     s->reverse_by_mode[MODE_LINEART] = 0;
     s->reverse_by_mode[MODE_HALFTONE] = 0;
+    s->can_color = 0;
+  }
+
+  /* all copied from P-215 */
+  else if (strstr (s->model_name, "P-150")) {
+    s->color_interlace[SIDE_FRONT] = COLOR_INTERLACE_rRgGbB;
+    s->color_interlace[SIDE_BACK] = COLOR_INTERLACE_RRGGBB;
+    s->gray_interlace[SIDE_FRONT] = GRAY_INTERLACE_gG;
+    s->duplex_interlace = DUPLEX_INTERLACE_FBfb;
+    s->need_ccal = 1;
+    s->invert_tly = 1;
+    s->unknown_byte2 = 0x88;
+    s->rgb_format = 1;
+    s->has_ssm_pay_head_len = 1;
+    s->ppl_mod = 8;
+    s->ccal_version = 3;
+    s->can_read_sensors = 1;
+    s->has_card = 1;
   }
 
   else if (strstr (s->model_name, "P-208")) {
     s->color_interlace[SIDE_FRONT] = COLOR_INTERLACE_RRGGBB;
     s->color_interlace[SIDE_BACK] = COLOR_INTERLACE_rRgGbB;
     s->gray_interlace[SIDE_BACK] = GRAY_INTERLACE_gG;
-    s->duplex_interlace = DUPLEX_INTERLACE_FBFB;
+    s->duplex_interlace = DUPLEX_INTERLACE_FBfb;
     s->need_ccal = 1;
     s->invert_tly = 1;
-    s->can_color = 1;
     s->unknown_byte2 = 0x88;
     s->rgb_format = 1;
     s->has_ssm_pay_head_len = 1;
@@ -1454,10 +1495,9 @@ init_model (struct scanner *s)
     s->color_interlace[SIDE_FRONT] = COLOR_INTERLACE_rRgGbB;
     s->color_interlace[SIDE_BACK] = COLOR_INTERLACE_RRGGBB;
     s->gray_interlace[SIDE_FRONT] = GRAY_INTERLACE_gG;
-    s->duplex_interlace = DUPLEX_INTERLACE_FBFB;
+    s->duplex_interlace = DUPLEX_INTERLACE_FBfb;
     s->need_ccal = 1;
     s->invert_tly = 1;
-    s->can_color = 1;
     s->unknown_byte2 = 0x88;
     s->rgb_format = 1;
     s->has_ssm_pay_head_len = 1;
@@ -1485,7 +1525,6 @@ init_model (struct scanner *s)
     
     s->has_comp_JPEG = 1;
     s->rgb_format = 1;
-    s->can_color = 1;
     s->has_df_ultra = 1;
 
     s->color_inter_by_res[DPI_100] = COLOR_INTERLACE_GBR;
@@ -1500,7 +1539,7 @@ init_model (struct scanner *s)
     s->can_write_panel = 0;
     s->has_ssm = 0;
     s->has_ssm2 = 1;
-    s->duplex_interlace = DUPLEX_INTERLACE_FFBB;
+    s->duplex_interlace = DUPLEX_INTERLACE_FfBb;
     s->duplex_offset_side = SIDE_FRONT;
 
     /*lies*/
@@ -1526,7 +1565,6 @@ init_model (struct scanner *s)
     
     s->has_comp_JPEG = 1;
     s->rgb_format = 1;
-    s->can_color = 1;
     s->has_df_ultra = 1;
 
     s->color_inter_by_res[DPI_100] = COLOR_INTERLACE_GBR;
@@ -1541,7 +1579,7 @@ init_model (struct scanner *s)
     s->can_write_panel = 0;
     s->has_ssm = 0;
     s->has_ssm2 = 1;
-    s->duplex_interlace = DUPLEX_INTERLACE_FFBB;
+    s->duplex_interlace = DUPLEX_INTERLACE_FfBb;
     s->duplex_offset_side = SIDE_BACK;
 
     /*lies*/
@@ -1563,7 +1601,6 @@ init_model (struct scanner *s)
     s->ccal_version = 3;
     s->need_fcal = 1;
     s->sw_lut = 1;
-    s->can_color = 1;
     s->rgb_format = 1;
     /*s->duplex_offset = 400; now set in config file*/
 
@@ -1585,14 +1622,13 @@ init_model (struct scanner *s)
     s->color_interlace[SIDE_FRONT] = COLOR_INTERLACE_RRGGBB;
     s->color_interlace[SIDE_BACK] = COLOR_INTERLACE_rRgGbB;
     s->gray_interlace[SIDE_BACK] = GRAY_INTERLACE_gG;
-    s->duplex_interlace = DUPLEX_INTERLACE_FBFB;
+    s->duplex_interlace = DUPLEX_INTERLACE_FBfb;
 
     s->unknown_byte2 = 0x88;
     s->need_ccal = 1;
     s->ccal_version = 3;
     s->need_fcal = 1;
     s->invert_tly = 1;
-    s->can_color = 1;
     s->rgb_format = 1;
     /*s->duplex_offset = 400; now set in config file*/
 
@@ -1609,6 +1645,51 @@ init_model (struct scanner *s)
     s->valid_x = 8.5 * 1200;
   }
 
+  else if (strstr (s->model_name,"DR-F120")){
+    /* TODO items:
+     * * has_rif = 0 ? is this correct
+     * * has_comp_JPEG = 0 ? is this correct
+     * * need_ccal = need_fcal = need_fcal_buffer = ccal_version = 0 ? is this correct
+     */
+
+    /* Required for USB coms */
+    s->has_ssm = 0;
+    s->has_ssm2 = 1;
+
+    /*missing*/
+    s->std_res_x[DPI_100] = 1;
+    s->std_res_y[DPI_100] = 1;
+    // DPI_150 not supported
+    s->std_res_x[DPI_200] = 1;
+    s->std_res_y[DPI_200] = 1;
+    s->std_res_x[DPI_300] = 1;
+    s->std_res_y[DPI_300] = 1;
+    // DPI_400 not supported
+    s->std_res_x[DPI_600]= 1;
+    s->std_res_y[DPI_600] = 1;
+    // DPI_1200 not supported
+    // NOTE: This scanner supports higher resolutions
+    // in the Y direction, but 600 is maximum in X
+
+    // This is true however only the ADF is ever selected in hardware
+    // FIXME: What extra option is needed to select this in the USB comms
+    s->has_flatbed = 1;
+
+    /* duplex */
+    s->duplex_interlace = DUPLEX_INTERLACE_fFBb;
+    s->color_interlace[SIDE_FRONT] = COLOR_INTERLACE_GBR;
+    s->color_interlace[SIDE_BACK] = COLOR_INTERLACE_GBR;
+    s->color_inter_by_res[DPI_100] = COLOR_INTERLACE_RGB;
+    s->color_inter_by_res[DPI_600] = COLOR_INTERLACE_RGB;
+    s->duplex_offset_side = SIDE_BACK;
+
+    /* weirdness */
+    s->fixed_width = 1;
+
+    /* lies */
+    s->can_halftone = 0;
+  }
+
   DBG (10, "init_model: finish\n");
 
   return SANE_STATUS_GOOD;
@@ -2239,7 +2320,7 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
     if (i > 1){
       opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
-      if (s->u.mode != MODE_COLOR && s->u.mode != MODE_GRAYSCALE){
+      if ( must_downsample(s) || s->s.mode < MODE_GRAYSCALE ){
         opt->cap |= SANE_CAP_INACTIVE;
       }
     }
@@ -2361,6 +2442,24 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
      opt->cap = SANE_CAP_INACTIVE;
   }
 
+  /* Software blank page skip */
+  if(option==OPT_SWSKIP){
+
+    opt->name = "swskip";
+    opt->title = SANE_I18N ("Software blank skip percentage");
+    opt->desc = SANE_I18N("Request driver to discard pages with low percentage of dark pixels");
+    opt->type = SANE_TYPE_FIXED;
+    opt->unit = SANE_UNIT_PERCENT;
+    opt->constraint_type = SANE_CONSTRAINT_RANGE;
+    opt->constraint.range = &s->swskip_range;
+
+    s->swskip_range.quant=SANE_FIX(0.10001);
+    s->swskip_range.min=SANE_FIX(0);
+    s->swskip_range.max=SANE_FIX(100);
+
+    opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
+  }
+
   /*staple detection*/
   if(option==OPT_STAPLEDETECT){
     opt->name = "stapledetect";
@@ -2751,12 +2850,16 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
           *val_p = s->swcrop;
           return SANE_STATUS_GOOD;
 
+        case OPT_SWSKIP:
+          *val_p = SANE_FIX(s->swskip);
+          return SANE_STATUS_GOOD;
+
         case OPT_STAPLEDETECT:
           *val_p = s->stapledetect;
           return SANE_STATUS_GOOD;
 
         case OPT_DROPOUT_COLOR_F:
-          switch (s->dropout_color_f) {
+          switch (s->dropout_color[SIDE_FRONT]) {
             case COLOR_NONE:
               strcpy (val, STRING_NONE);
               break;
@@ -2782,7 +2885,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
           return SANE_STATUS_GOOD;
 
         case OPT_DROPOUT_COLOR_B:
-          switch (s->dropout_color_b) {
+          switch (s->dropout_color[SIDE_BACK]) {
             case COLOR_NONE:
               strcpy (val, STRING_NONE);
               break;
@@ -3003,6 +3106,14 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
           if (s->u.page_x == FIXED_MM_TO_SCANNER_UNIT(val_c))
               return SANE_STATUS_GOOD;
 
+          /* if full width image, and paper size is changed,
+             change the image size to match new paper */
+          if (s->u.tl_x == 0 && s->u.br_x == s->u.page_x){
+              DBG (20, "sane_control_option: br_x tracking page_width\n");
+              s->u.br_x = FIXED_MM_TO_SCANNER_UNIT(val_c);
+              *info |= SANE_INFO_RELOAD_PARAMS;
+          }
+
           s->u.page_x = FIXED_MM_TO_SCANNER_UNIT(val_c);
 
           *info |= SANE_INFO_RELOAD_OPTIONS;
@@ -3012,6 +3123,14 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
           if (s->u.page_y == FIXED_MM_TO_SCANNER_UNIT(val_c))
               return SANE_STATUS_GOOD;
 
+          /* if full height image, and paper size is changed,
+             change the image size to match new paper */
+          if (s->u.tl_y == 0 && s->u.br_y == s->u.page_y){
+              DBG (20, "sane_control_option: br_y tracking page_height\n");
+              s->u.br_y = FIXED_MM_TO_SCANNER_UNIT(val_c);
+              *info |= SANE_INFO_RELOAD_PARAMS;
+          }
+
           s->u.page_y = FIXED_MM_TO_SCANNER_UNIT(val_c);
 
           *info |= SANE_INFO_RELOAD_OPTIONS;
@@ -3072,42 +3191,46 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
           s->swcrop = val_c;
           return SANE_STATUS_GOOD;
 
+        case OPT_SWSKIP:
+          s->swskip = SANE_UNFIX(val_c);
+          return SANE_STATUS_GOOD;
+
         case OPT_STAPLEDETECT:
           s->stapledetect = val_c;
           return SANE_STATUS_GOOD;
 
         case OPT_DROPOUT_COLOR_F:
           if (!strcmp(val, STRING_NONE))
-            s->dropout_color_f = COLOR_NONE;
+            s->dropout_color[SIDE_FRONT] = COLOR_NONE;
           else if (!strcmp(val, STRING_RED))
-            s->dropout_color_f = COLOR_RED;
+            s->dropout_color[SIDE_FRONT] = COLOR_RED;
           else if (!strcmp(val, STRING_GREEN))
-            s->dropout_color_f = COLOR_GREEN;
+            s->dropout_color[SIDE_FRONT] = COLOR_GREEN;
           else if (!strcmp(val, STRING_BLUE))
-            s->dropout_color_f = COLOR_BLUE;
+            s->dropout_color[SIDE_FRONT] = COLOR_BLUE;
           else if (!strcmp(val, STRING_EN_RED))
-            s->dropout_color_f = COLOR_EN_RED;
+            s->dropout_color[SIDE_FRONT] = COLOR_EN_RED;
           else if (!strcmp(val, STRING_EN_GREEN))
-            s->dropout_color_f = COLOR_EN_GREEN;
+            s->dropout_color[SIDE_FRONT] = COLOR_EN_GREEN;
           else if (!strcmp(val, STRING_EN_BLUE))
-            s->dropout_color_f = COLOR_EN_BLUE;
+            s->dropout_color[SIDE_FRONT] = COLOR_EN_BLUE;
           return SANE_STATUS_GOOD;
 
         case OPT_DROPOUT_COLOR_B:
           if (!strcmp(val, STRING_NONE))
-            s->dropout_color_b = COLOR_NONE;
+            s->dropout_color[SIDE_BACK] = COLOR_NONE;
           else if (!strcmp(val, STRING_RED))
-            s->dropout_color_b = COLOR_RED;
+            s->dropout_color[SIDE_BACK] = COLOR_RED;
           else if (!strcmp(val, STRING_GREEN))
-            s->dropout_color_b = COLOR_GREEN;
+            s->dropout_color[SIDE_BACK] = COLOR_GREEN;
           else if (!strcmp(val, STRING_BLUE))
-            s->dropout_color_b = COLOR_BLUE;
+            s->dropout_color[SIDE_BACK] = COLOR_BLUE;
           else if (!strcmp(val, STRING_EN_RED))
-            s->dropout_color_b = COLOR_EN_RED;
+            s->dropout_color[SIDE_BACK] = COLOR_EN_RED;
           else if (!strcmp(val, STRING_EN_GREEN))
-            s->dropout_color_b = COLOR_EN_GREEN;
+            s->dropout_color[SIDE_BACK] = COLOR_EN_GREEN;
           else if (!strcmp(val, STRING_EN_BLUE))
-            s->dropout_color_b = COLOR_EN_BLUE;
+            s->dropout_color[SIDE_BACK] = COLOR_EN_BLUE;
           return SANE_STATUS_GOOD;
 
         case OPT_BUFFERMODE:
@@ -3344,6 +3467,11 @@ ssm_do (struct scanner *s)
    return ret;
  }
   
+ if(s->s.mode == MODE_COLOR){
+   DBG (10, "ssm_do: unneeded, finishing\n");
+   return ret;
+ }
+
  if(s->has_ssm){
 
     unsigned char cmd[SET_SCAN_MODE_len];
@@ -3366,7 +3494,7 @@ ssm_do (struct scanner *s)
   
     set_SSM_DO_unk1(out, 0x03);
   
-    switch(s->dropout_color_f){
+    switch(s->dropout_color[SIDE_FRONT]){
       case COLOR_RED:
         set_SSM_DO_unk2(out, 0x05);
         set_SSM_DO_f_do(out,SSM_DO_red);
@@ -3393,7 +3521,7 @@ ssm_do (struct scanner *s)
         break;
     }
   
-    switch(s->dropout_color_b){
+    switch(s->dropout_color[SIDE_BACK]){
       case COLOR_RED:
         set_SSM_DO_unk2(out, 0x05);
         set_SSM_DO_b_do(out,SSM_DO_red);
@@ -3444,7 +3572,7 @@ ssm_do (struct scanner *s)
   
     memset(out,0,outLen);
   
-    switch(s->dropout_color_f){
+    switch(s->dropout_color[SIDE_FRONT]){
       case COLOR_RED:
         set_SSM2_DO_do(out,SSM_DO_red);
         break;
@@ -4138,9 +4266,7 @@ sane_start (SANE_Handle handle)
    * tell the user the size of the image. the sane 
    * API has no way to inform the frontend of this,
    * so we block and buffer. yuck */
-  if( (s->swdeskew || s->swdespeck || s->swcrop)
-    && s->s.format != SANE_FRAME_JPEG
-  ){
+  if(must_fully_buffer(s)){
 
     /* get image */
     while(!s->s.eof[s->side] && !ret){
@@ -4166,7 +4292,16 @@ sane_start (SANE_Handle handle)
     if(s->swdespeck){
       buffer_despeck(s,s->side);
     }
-
+    if(s->swskip){
+      /* Skipping means throwing out this image.
+       * Pretend the user read the whole thing 
+       * and call sane_start again.
+       * This assumes we are running in batch mode. */
+      if(buffer_isblank(s,s->side)){
+        s->u.eof[s->side] = 1;
+        return sane_start(handle);
+      }
+    }
   }
 
   ret = check_for_cancel(s);
@@ -4752,23 +4887,7 @@ read_from_scanner(struct scanner *s, int side, int exact)
 
     /* this is non-jpeg data, fill remainder, change rx'd size */
     else{
-
-      DBG (15, "read_from_scanner: eof: %d %d\n", s->i.bytes_tot[side], s->i.bytes_sent[side]);
-
-      /* clone the last line repeatedly until the end */
-      while(s->i.bytes_tot[side] > s->i.bytes_sent[side]){
-        memcpy(
-          s->buffers[side]+s->i.bytes_sent[side]-s->i.Bpl,
-          s->buffers[side]+s->i.bytes_sent[side],
-          s->i.Bpl
-        );
-        s->i.bytes_sent[side] += s->i.Bpl;
-      }
-
-      DBG (15, "read_from_scanner: eof2: %d %d\n", s->i.bytes_tot[side], s->i.bytes_sent[side]);
-
-      /* pretend we got all the data from scanner */
-      s->s.bytes_sent[side] = s->s.bytes_tot[side];
+      fill_image(s,side);
     }
 
     s->i.eof[side] = 1;
@@ -4890,40 +5009,8 @@ read_from_scanner_duplex(struct scanner *s,int exact)
 
     /* this is non-jpeg data, fill remainder, change rx'd size */
     else{
-
-      DBG (15, "read_from_scanner_duplex: eof: %d %d %d %d\n",
-        s->i.bytes_tot[SIDE_FRONT], s->i.bytes_sent[SIDE_FRONT],
-        s->i.bytes_tot[SIDE_BACK], s->i.bytes_sent[SIDE_BACK]
-      );
-
-      /* clone the last line repeatedly until the end */
-      while(s->i.bytes_tot[SIDE_FRONT] > s->i.bytes_sent[SIDE_FRONT]){
-        memcpy(
-          s->buffers[SIDE_FRONT]+s->i.bytes_sent[SIDE_FRONT]-s->i.Bpl,
-          s->buffers[SIDE_FRONT]+s->i.bytes_sent[SIDE_FRONT],
-          s->i.Bpl
-        );
-        s->i.bytes_sent[SIDE_FRONT] += s->i.Bpl;
-      }
-
-      /* clone the last line repeatedly until the end */
-      while(s->i.bytes_tot[SIDE_BACK] > s->i.bytes_sent[SIDE_BACK]){
-        memcpy(
-          s->buffers[SIDE_BACK]+s->i.bytes_sent[SIDE_BACK]-s->i.Bpl,
-          s->buffers[SIDE_BACK]+s->i.bytes_sent[SIDE_BACK],
-          s->i.Bpl
-        );
-        s->i.bytes_sent[SIDE_BACK] += s->i.Bpl;
-      }
-
-      DBG (15, "read_from_scanner_duplex: eof2: %d %d %d %d\n",
-        s->i.bytes_tot[SIDE_FRONT], s->i.bytes_sent[SIDE_FRONT],
-        s->i.bytes_tot[SIDE_BACK], s->i.bytes_sent[SIDE_BACK]
-      );
-
-      /* pretend we got all the data from scanner */
-      s->s.bytes_sent[SIDE_FRONT] = s->s.bytes_tot[SIDE_FRONT];
-      s->s.bytes_sent[SIDE_BACK] = s->s.bytes_tot[SIDE_BACK];
+      fill_image(s,SIDE_FRONT);
+      fill_image(s,SIDE_BACK);
     }
 
     s->i.eof[SIDE_FRONT] = 1;
@@ -5222,16 +5309,20 @@ copy_duplex(struct scanner *s, unsigned char * buf, int len)
   }
 
   /* full line of front, then full line of back */
-  else if(s->duplex_interlace == DUPLEX_INTERLACE_FFBB){
+  else if(s->duplex_interlace == DUPLEX_INTERLACE_FfBb || s->duplex_interlace == DUPLEX_INTERLACE_fFBb){
     for(i=0; i<len; i+=dbwidth){
-      memcpy(front+flen,buf+i,bwidth);
+      if(s->duplex_interlace == DUPLEX_INTERLACE_FfBb){
+        memcpy(front+flen,buf+i,bwidth);
+      }else{
+        rmemcpy(front+flen,buf+i,bwidth,3); // only 24bit color is supported
+      }
       flen+=bwidth;
       memcpy(back+blen,buf+i+bwidth,bwidth);
       blen+=bwidth;
     }
   }
 
-  /*just alternating bytes, FBFBFB*/
+  /*just alternating bytes, FBfb*/
   else {
     for(i=0; i<len; i+=2){
       front[flen++] = buf[i];
@@ -5250,6 +5341,22 @@ copy_duplex(struct scanner *s, unsigned char * buf, int len)
   return ret;
 }
 
+/*
+ * Reverse memcpy designed to mirror a line of data.
+ * Use stride size to account for the number of bytes per pixel
+ */
+static void rmemcpy(void* dest, const void* src, size_t count, size_t stride) {
+  char* dstptr = (char*)dest;
+  char* srcptr = (char*)src;
+  srcptr += count;
+  while (count) {
+    srcptr -= stride;
+    memcpy(dstptr, srcptr, stride);
+    dstptr += stride;
+    count -= stride;
+  }
+}
+
 /* downsample a single line from scanner's size to user's size */
 /* and copy into final buffer */
 static SANE_Status
@@ -5288,7 +5395,46 @@ copy_line(struct scanner *s, unsigned char * buff, int side)
   switch (s->s.mode) {
 
     case MODE_COLOR:
-      memcpy(line, buff, sbwidth);
+      if(must_downsample(s) && s->dropout_color[side]){
+        switch(s->dropout_color[side]){
+          case COLOR_RED:
+            for(i=0;i<spwidth;i++)
+              line[i*3] = line[i*3+1] = line[i*3+2] = buff[i*3];
+            break;
+          case COLOR_GREEN:
+            for(i=0;i<spwidth;i++)
+              line[i*3] = line[i*3+1] = line[i*3+2] = buff[i*3+1];
+            break;
+          case COLOR_BLUE:
+            for(i=0;i<spwidth;i++)
+              line[i*3] = line[i*3+1] = line[i*3+2] = buff[i*3+2];
+            break;
+          case COLOR_EN_RED:
+            for(i=0;i<spwidth;i++){
+              line[i*3] = (buff[i*3+1] + buff[i*3+2])/2;
+              line[i*3+1] = buff[i*3+1];
+              line[i*3+2] = buff[i*3+2];
+            }
+            break;
+          case COLOR_EN_GREEN:
+            for(i=0;i<spwidth;i++){
+              line[i*3] = buff[i*3];
+              line[i*3+1] = (buff[i*3] + buff[i*3+2])/2;
+              line[i*3+2] = buff[i*3+2];
+            }
+            break;
+          case COLOR_EN_BLUE:
+            for(i=0;i<spwidth;i++){
+              line[i*3] = buff[i*3];
+              line[i*3+1] = buff[i*3+1];
+              line[i*3+2] = (buff[i*3] + buff[i*3+1])/2;
+            }
+            break;
+        }
+      }
+      else{
+        memcpy(line, buff, sbwidth);
+      }
       break;
 
     case MODE_GRAYSCALE:
@@ -5337,7 +5483,7 @@ copy_line(struct scanner *s, unsigned char * buff, int side)
   switch (s->i.mode) {
   
     case MODE_COLOR:
-      memcpy(s->buffers[side]+s->i.bytes_sent[side], line+offset, ibwidth);
+      memcpy(s->buffers[side]+s->i.bytes_sent[side], line+(offset*3), ibwidth);
       s->i.bytes_sent[side] += ibwidth;
       break;
   
@@ -5410,6 +5556,43 @@ read_from_buffer(struct scanner *s, SANE_Byte * buf, SANE_Int max_len,
   return ret;
 }
 
+/* fill remainder of buffer with background if scanner stops early */
+static SANE_Status
+fill_image(struct scanner *s,int side)
+{
+  SANE_Status ret=SANE_STATUS_GOOD;
+
+  unsigned char bg_color = calc_bg_color(s);
+  int fill_bytes = s->i.bytes_tot[side]-s->i.bytes_sent[side];
+
+  if(!fill_bytes){
+    return ret;
+  }
+
+  DBG (15, "fill_image: side:%d bytes:%d bg_color:%02x\n", side, fill_bytes, bg_color);
+
+  /* fill the rest with bg_color */
+  memset(s->buffers[side]+s->i.bytes_sent[side],bg_color,fill_bytes);
+
+  /* pretend we got all the data from scanner */
+  s->i.bytes_sent[side] = s->i.bytes_tot[side];
+  s->s.bytes_sent[side] = s->s.bytes_tot[side];
+
+  return ret;
+}
+
+/* return the bg color based on scanner settings */
+static unsigned char
+calc_bg_color(struct scanner *s)
+{
+  unsigned char bg_color = s->lut[s->bg_color];
+
+  if(s->u.mode <= MODE_HALFTONE)
+    bg_color = (bg_color<s->threshold)?0xff:0x00;
+
+  return bg_color;
+}
+
 /*
  * @@ Section 5 - calibration functions
  */
@@ -7144,18 +7327,20 @@ wait_scanner(struct scanner *s)
     NULL, 0,
     NULL, NULL
   );
-  
+
+  // some scanners (such as DR-F120) are OK but will not respond to commands
+  // when in sleep mode. By checking the sense it wakes them up.
   if (ret != SANE_STATUS_GOOD) {
-    DBG(5,"WARNING: Brain-dead scanner. Hitting with stick\n");
+    DBG(5,"WARNING: Brain-dead scanner. Hitting with request sense.\n");
     ret = do_cmd (
-      s, 0, 1,
+      s, 1, 1,
       cmd, cmdLen,
       NULL, 0,
       NULL, NULL
     );
   }
   if (ret != SANE_STATUS_GOOD) {
-    DBG(5,"WARNING: Brain-dead scanner. Hitting with stick again\n");
+    DBG(5,"WARNING: Brain-dead scanner. Hitting with stick instead.\n");
     ret = do_cmd (
       s, 0, 1,
       cmd, cmdLen,
@@ -7168,7 +7353,7 @@ wait_scanner(struct scanner *s)
     DBG (5, "wait_scanner: error '%s'\n", sane_strstatus (ret));
   }
 
-  DBG (10, "wait_scanner: finish\n");
+  DBG (10, "wait_scanner: finish (status=%d)\n", ret);
 
   return ret;
 }
@@ -7350,102 +7535,40 @@ buffer_deskew(struct scanner *s, int side)
 {
   SANE_Status ret = SANE_STATUS_GOOD;
 
-  int pwidth = s->i.width;
-  int width = s->i.Bpl;
-  int height = s->i.height;
-
-  double TSlope = 0;
-  int TXInter = 0;
-  int TYInter = 0;
-  double TSlopeHalf = 0;
-  int TOffsetHalf = 0;
-
-  double LSlope = 0;
-  int LXInter = 0;
-  int LYInter = 0;
-  double LSlopeHalf = 0;
-  int LOffsetHalf = 0;
-
-  int rotateX = 0;
-  int rotateY = 0;
-
-  int * topBuf = NULL, * botBuf = NULL;
+  unsigned char bg_color = calc_bg_color(s);
 
   DBG (10, "buffer_deskew: start\n");
 
-  /* get buffers for edge detection */
-  topBuf = getTransitionsY(s,side,1);
-  if(!topBuf){
-    DBG (5, "buffer_deskew: cant gTY\n");
-    ret = SANE_STATUS_NO_MEM;
-    goto cleanup;
-  }
+  ret = sane_get_parameters((SANE_Handle) s, &s->s_params);
 
-  if(0){
-    int i;
-    for(i=0;i<width;i++){
-      if(topBuf[i] >=0 && topBuf[i] < height)
-        s->buffers[side][topBuf[i]*width+i] = 0;
-    }
-  }
+  /*only find skew on first image from a page, or if first image had error */
+  if(s->side == SIDE_FRONT || s->u.source == SOURCE_ADF_BACK || s->deskew_stat){
 
-  botBuf = getTransitionsY(s,side,0);
-  if(!botBuf){
-    DBG (5, "buffer_deskew: cant gTY\n");
-    ret = SANE_STATUS_NO_MEM;
-    goto cleanup;
-  }
+    s->deskew_stat = sanei_magic_findSkew(
+      &s->s_params,s->buffers[side],s->u.dpi_x,s->u.dpi_y,
+      &s->deskew_vals[0],&s->deskew_vals[1],&s->deskew_slope);
 
-  /* find best top line */
-  ret = getEdgeIterate (pwidth, height, s->i.dpi_y, topBuf,
-    &TSlope, &TXInter, &TYInter);
-  if(ret){
-    DBG(5,"buffer_deskew: gEI error: %d",ret);
-    goto cleanup;
-  }
-  DBG(15,"top: %04.04f %d %d\n",TSlope,TXInter,TYInter);
-
-  /* slope is too shallow, don't want to divide by 0 */
-  if(fabs(TSlope) < 0.0001){
-    DBG(15,"buffer_deskew: slope too shallow: %0.08f\n",TSlope);
-    goto cleanup;
+    if(s->deskew_stat){
+      DBG (5, "buffer_deskew: bad findSkew, bailing\n");
+      goto cleanup;
+    }
   }
-
-  /* find best left line, perpendicular to top line */
-  LSlope = (double)-1/TSlope;
-  ret = getEdgeSlope (pwidth, height, topBuf, botBuf, LSlope,
-    &LXInter, &LYInter);
-  if(ret){
-    DBG(5,"buffer_deskew: gES error: %d",ret);
-    goto cleanup;
+  /* backside images can use a 'flipped' version of frontside data */
+  else{
+    s->deskew_slope *= -1;
+    s->deskew_vals[0] = s->s_params.pixels_per_line - s->deskew_vals[0];
   }
-  DBG(15,"buffer_deskew: left: %04.04f %d %d\n",LSlope,LXInter,LYInter);
-
-  /* find point about which to rotate */
-  TSlopeHalf = tan(atan(TSlope)/2);
-  TOffsetHalf = LYInter;
-  DBG(15,"buffer_deskew: top half: %04.04f %d\n",TSlopeHalf,TOffsetHalf);
-
-  LSlopeHalf = tan((atan(LSlope) + ((LSlope < 0)?-M_PI_2:M_PI_2))/2);
-  LOffsetHalf = - LSlopeHalf * TXInter;
-  DBG(15,"buffer_deskew: left half: %04.04f %d\n",LSlopeHalf,LOffsetHalf);
 
-  rotateX = (LOffsetHalf-TOffsetHalf) / (TSlopeHalf-LSlopeHalf);
-  rotateY = TSlopeHalf * rotateX + TOffsetHalf;
-  DBG(15,"buffer_deskew: rotate: %d %d\n",rotateX,rotateY);
+  ret = sanei_magic_rotate(&s->s_params,s->buffers[side],
+    s->deskew_vals[0],s->deskew_vals[1],s->deskew_slope,bg_color);
 
-  ret = rotateOnCenter (s, side, rotateX, rotateY, TSlope);
   if(ret){
-    DBG(5,"buffer_deskew: gES error: %d",ret);
+    DBG(5,"buffer_deskew: rotate error: %d",ret);
+    ret = SANE_STATUS_GOOD;
     goto cleanup;
   }
 
   cleanup:
-  if(topBuf)
-    free(topBuf);
-  if(botBuf)
-    free(botBuf);
-
   DBG (10, "buffer_deskew: finish\n");
   return ret;
 }
@@ -7458,173 +7581,50 @@ buffer_crop(struct scanner *s, int side)
 {
   SANE_Status ret = SANE_STATUS_GOOD;
 
-  int bwidth = s->i.Bpl;
-  int width = s->i.width;
-  int height = s->i.height;
-
-  int top = 0;
-  int bot = 0;
-  int left = width;
-  int right = 0;
-
-  int * topBuf = NULL, * botBuf = NULL;
-  int * leftBuf = NULL, * rightBuf = NULL;
-  int leftCount = 0, rightCount = 0, botCount = 0;
-  int i;
-
   DBG (10, "buffer_crop: start\n");
 
-  /* get buffers to find sides and bottom */
-  topBuf = getTransitionsY(s,side,1);
-  if(!topBuf){
-    DBG (5, "buffer_crop: no topBuf\n");
-    ret = SANE_STATUS_NO_MEM;
-    goto cleanup;
-  }
-
-  botBuf = getTransitionsY(s,side,0);
-  if(!botBuf){
-    DBG (5, "buffer_crop: no botBuf\n");
-    ret = SANE_STATUS_NO_MEM;
-    goto cleanup;
-  }
+  ret = sane_get_parameters((SANE_Handle) s, &s->s_params);
 
-  leftBuf = getTransitionsX(s,side,1);
-  if(!leftBuf){
-    DBG (5, "buffer_crop: no leftBuf\n");
-    ret = SANE_STATUS_NO_MEM;
-    goto cleanup;
-  }
+  ret = sanei_magic_findEdges(
+    &s->s_params,s->buffers[side],s->u.dpi_x,s->u.dpi_y,
+    &s->crop_vals[0],&s->crop_vals[1],&s->crop_vals[2],&s->crop_vals[3]);
 
-  rightBuf = getTransitionsX(s,side,0);
-  if(!rightBuf){
-    DBG (5, "buffer_crop: no rightBuf\n");
-    ret = SANE_STATUS_NO_MEM;
+  if(ret){
+    DBG (5, "buffer_crop: bad edges, bailing\n");
+    ret = SANE_STATUS_GOOD;
     goto cleanup;
   }
 
-  /* loop thru top and bottom lists, look for l and r extremes */
-  for(i=0; i<width; i++){
-    if(botBuf[i] > topBuf[i]){
-      if(left > i){
-        left = i;
-      }
-
-      leftCount++;
-      if(leftCount > 3){
-        break;
-      }
-    }
-    else{
-      leftCount = 0;
-      left = width;
-    }
-  }
-
-  for(i=width-1; i>=0; i--){
-    if(botBuf[i] > topBuf[i]){
-      if(right < i){
-        right = i;
-      }
-
-      rightCount++;
-      if(rightCount > 3){
-        break;
-      }
-    }
-    else{
-      rightCount = 0;
-      right = -1;
-    }
-  }
-
-  /* loop thru left and right lists, look for bottom extreme */
-  for(i=height-1; i>=0; i--){
-    if(rightBuf[i] > leftBuf[i]){
-      if(bot < i){
-        bot = i;
-      }
+  DBG (15, "buffer_crop: t:%d b:%d l:%d r:%d\n",
+    s->crop_vals[0],s->crop_vals[1],s->crop_vals[2],s->crop_vals[3]);
 
-      botCount++;
-      if(botCount > 3){
-        break;
-      }
-    }
-    else{
-      botCount = 0;
-      bot = -1;
-    }
+  /* if we will later binarize this image, make sure the width
+   * is a multiple of 8 pixels, by adjusting the right side */
+  if ( must_downsample(s) && s->u.mode < MODE_GRAYSCALE ){ 
+    s->crop_vals[3] -= (s->crop_vals[3]-s->crop_vals[2]) % 8;
   }
 
-  DBG (15, "buffer_crop: t:%d b:%d l:%d r:%d\n",top,bot,left,right);
-
   /* now crop the image */
-  /*FIXME: crop duplex backside at same time?*/
-  if(left < right && top < bot){
-
-    int pixels = 0;
-    int bytes = 0;
-    unsigned char * line = NULL;
-
-    /*convert left and right to bytes, figure new byte and pixel width */
-    switch (s->i.mode) {
-
-      case MODE_COLOR:
-        pixels = right-left;
-        bytes = pixels * 3;
-        left *= 3;
-        right *= 3;
-        break;
-
-      case MODE_GRAYSCALE:
-        pixels = right-left;
-        bytes = right-left;
-        break;
-
-      case MODE_LINEART:
-      case MODE_HALFTONE:
-        left /= 8;
-        right = (right+7)/8;
-        bytes = right-left;
-        pixels = bytes * 8;
-        break;
-    }
+  ret = sanei_magic_crop(&s->s_params,s->buffers[side],
+      s->crop_vals[0],s->crop_vals[1],s->crop_vals[2],s->crop_vals[3]);
 
-    DBG (15, "buffer_crop: l:%d r:%d p:%d b:%d\n",left,right,pixels,bytes);
-
-    line = malloc(bytes);
-    if(!line){
-      DBG (5, "buffer_crop: no line\n");
-      ret = SANE_STATUS_NO_MEM;
-      goto cleanup;
-    }
-
-    s->i.bytes_sent[side] = 0;
-
-    for(i=top; i<bot; i++){
-      memcpy(line, s->buffers[side] + i*bwidth + left, bytes);
-      memcpy(s->buffers[side] + s->i.bytes_sent[side], line, bytes);
-      s->i.bytes_sent[side] += bytes;
-    }
-
-    s->i.bytes_tot[side] = s->i.bytes_sent[side];
-    s->i.width = pixels;
-    s->i.height = bot-top;
-    s->i.Bpl = bytes;
-
-    free(line);
+  if(ret){
+    DBG (5, "buffer_crop: bad crop, bailing\n");
+    ret = SANE_STATUS_GOOD;
+    goto cleanup;
   }
 
-  cleanup:
-  if(topBuf)
-    free(topBuf);
-  if(botBuf)
-    free(botBuf);
-  if(leftBuf)
-    free(leftBuf);
-  if(rightBuf)
-    free(rightBuf);
-
+  /* need to update user with new size */
+  s->i.width = s->s_params.pixels_per_line;
+  s->i.height = s->s_params.lines;
+  s->i.Bpl = s->s_params.bytes_per_line;
+  
+  /* update image size counter to new, smaller size */
+  s->i.bytes_tot[side] = s->s_params.lines * s->s_params.bytes_per_line;
+  s->i.bytes_sent[side] = s->i.bytes_tot[side];
+  s->u.bytes_sent[side] = 0;
+  
+  cleanup: 
   DBG (10, "buffer_crop: finish\n");
   return ret;
 }
@@ -7636,938 +7636,77 @@ static SANE_Status
 buffer_despeck(struct scanner *s, int side)
 {
   SANE_Status ret = SANE_STATUS_GOOD;
-  int i,j,k,l,n;
-  int w = s->i.Bpl;
-  int pw = s->i.width;
-  int h = s->i.height;
-  int t = w*h;
-  int d = s->swdespeck;
 
   DBG (10, "buffer_despeck: start\n");
 
-  switch (s->i.mode){
-
-    case MODE_COLOR:
-      for(i=w; i<t-w-(w*d); i+=w){
-        for(j=1; j<pw-1-d; j++){
-
-          int thresh = 255*3;
-          int outer[] = {0,0,0};
-          int hits = 0;
-
-          /*loop over rows and columns in window */
-          for(k=0; k<d; k++){
-            for(l=0; l<d; l++){
-              int tmp = 0;
-
-              for(n=0; n<3; n++){
-                tmp += s->buffers[side][i + j*3 + k*w + l*3 + n];
-              }
-
-              if(tmp < thresh)
-                thresh = tmp;
-            }
-          }
-
-          thresh = (thresh + 255*3 + 255*3)/3;
-    
-          /*loop over rows and columns around window */
-          for(k=-1; k<d+1; k++){
-            for(l=-1; l<d+1; l++){
-
-              int tmp[3];
-  
-              /* dont count pixels in the window */
-              if(k != -1 && k != d && l != -1 && l != d)
-                continue;
-  
-              for(n=0; n<3; n++){
-                tmp[n] = s->buffers[side][i + j*3 + k*w + l*3 + n];
-                outer[n] += tmp[n];
-              }
-              if(tmp[0]+tmp[1]+tmp[2] < thresh){
-                hits++;
-                break;
-              }
-            }
-          }
-
-          for(n=0; n<3; n++){
-            outer[n] /= (4*d + 4);
-          }
-
-          /*no hits, overwrite with avg surrounding color*/
-          if(!hits){
-            for(k=0; k<d; k++){
-              for(l=0; l<d; l++){
-                for(n=0; n<3; n++){
-                  s->buffers[side][i + j*3 + k*w + l*3 + n] = outer[n];
-                }
-              }
-            }
-          }
-
-        }
-      }
-      break;
-
-    case MODE_GRAYSCALE:
-      for(i=w; i<t-w-(w*d); i+=w){
-        for(j=1; j<w-1-d; j++){
-
-          int thresh = 255;
-          int outer = 0;
-          int hits = 0;
-
-          for(k=0; k<d; k++){
-            for(l=0; l<d; l++){
-              if(s->buffers[side][i + j + k*w + l] < thresh)
-                thresh = s->buffers[side][i + j + k*w + l];
-            }
-          }
-
-          thresh = (thresh + 255 + 255)/3;
-    
-          /*loop over rows and columns around window */
-          for(k=-1; k<d+1; k++){
-            for(l=-1; l<d+1; l++){
-
-              int tmp = 0;
+  ret = sane_get_parameters((SANE_Handle) s, &s->s_params);
 
-              /* dont count pixels in the window */
-              if(k != -1 && k != d && l != -1 && l != d)
-                continue;
-  
-              tmp = s->buffers[side][i + j + k*w + l];
-
-              if(tmp < thresh){
-                hits++;
-                break;
-              }
-
-              outer += tmp;
-            }
-          }
-
-          outer /= (4*d + 4);
-
-          /*no hits, overwrite with avg surrounding color*/
-          if(!hits){
-            for(k=0; k<d; k++){
-              for(l=0; l<d; l++){
-                s->buffers[side][i + j + k*w + l] = outer;
-              }
-            }
-          }
-
-        }
-      }
-      break;
-
-    case MODE_LINEART:
-    case MODE_HALFTONE:
-      for(i=w; i<t-w-(w*d); i+=w){
-        for(j=1; j<pw-1-d; j++){
-          
-          int curr = 0;
-          int hits = 0;
-
-          for(k=0; k<d; k++){
-            for(l=0; l<d; l++){
-              curr += s->buffers[side][i + k*w + (j+l)/8] >> (7-(j+l)%8) & 1;
-            }
-          }
-
-          if(!curr)
-            continue;
-
-          /*loop over rows and columns around window */
-          for(k=-1; k<d+1; k++){
-            for(l=-1; l<d+1; l++){
-
-              /* dont count pixels in the window */
-              if(k != -1 && k != d && l != -1 && l != d)
-                continue;
-  
-              hits += s->buffers[side][i + k*w + (j+l)/8] >> (7-(j+l)%8) & 1;
-
-              if(hits)
-                break;
-            }
-          }
-
-          /*no hits, overwrite with white*/
-          if(!hits){
-            for(k=0; k<d; k++){
-              for(l=0; l<d; l++){
-                s->buffers[side][i + k*w + (j+l)/8] &= ~(1 << (7-(j+l)%8));
-              }
-            }
-          }
-
-        }
-      }
-      break;
-
-    default:
-      break;
-  }
-
-  DBG (10, "buffer_despeck: finish\n");
-  return ret;
-}
-
-/* Loop thru the image width and look for first color change in each column.
- * Return a malloc'd array. Caller is responsible for freeing. */
-int * 
-getTransitionsY (struct scanner *s, int side, int top)
-{
-  int * buff;
-
-  int i, j, k;
-  int near, far;
-  int winLen = 9;
-
-  int width = s->i.width;
-  int height = s->i.height;
-  int depth = 1;
-
-  /* defaults for bottom-up */
-  int firstLine = height-1;
-  int lastLine = -1;
-  int direction = -1;
-
-  DBG (10, "getTransitionsY: start\n");
-
-  buff = calloc(width,sizeof(int));
-  if(!buff){
-    DBG (5, "getTransitionsY: no buff\n");
-    return NULL;
-  }
-
-  /* override for top-down */
-  if(top){
-    firstLine = 0;
-    lastLine = height;
-    direction = 1;
-  }
-
-  /* load the buff array with y value for first color change from edge
-   * gray/color uses a different algo from binary/halftone */
-  switch (s->i.mode) {
-
-    case MODE_COLOR:
-      depth = 3;
-
-    case MODE_GRAYSCALE:
-
-      for(i=0; i<width; i++){
-        buff[i] = lastLine;
-  
-        /* load the near and far windows with repeated copy of first pixel */
-        near = 0;
-        for(k=0; k<depth; k++){
-          near += s->buffers[side][(firstLine*width+i) * depth + k];
-        }
-        near *= winLen;
-        far = near;
-  
-        /* move windows, check delta */
-        for(j=firstLine+direction; j!=lastLine; j+=direction){
-  
-          int farLine = j-winLen*2*direction;
-          int nearLine = j-winLen*direction;
-
-          if(farLine < 0 || farLine >= height){
-            farLine = firstLine;
-          }
-          if(nearLine < 0 || nearLine >= height){
-            nearLine = firstLine;
-          }
-
-          for(k=0; k<depth; k++){
-            far -= s->buffers[side][(farLine*width+i)*depth+k];
-            far += s->buffers[side][(nearLine*width+i)*depth+k];
-
-            near -= s->buffers[side][(nearLine*width+i)*depth+k];
-            near += s->buffers[side][(j*width+i)*depth+k];
-          }
-  
-          if(abs(near - far) > winLen*depth*9){
-            buff[i] = j;
-            break;
-          }
-        }
-      }
-      break;
-
-    case MODE_LINEART:
-    case MODE_HALFTONE:
-      for(i=0; i<width; i++){
-        buff[i] = lastLine;
-  
-        /* load the near window with first pixel */
-        near = s->buffers[side][(firstLine*width+i)/8] >> (7-(i%8)) & 1;
-  
-        /* move */
-        for(j=firstLine+direction; j!=lastLine; j+=direction){
-          if((s->buffers[side][(j*width+i)/8] >> (7-(i%8)) & 1) != near){
-            buff[i] = j;
-            break;
-          }
-        }
-      }
-      break;
-
-  }
-
-  /* blast any stragglers with no neighbors within .5 inch */
-  for(i=0;i<width-7;i++){
-    int sum = 0;
-    for(j=1;j<=7;j++){
-      if(abs(buff[i+j] - buff[i]) < s->i.dpi_y/2)
-        sum++;
-    }
-    if(sum < 2)
-      buff[i] = lastLine;
-  }
-
-  DBG (10, "getTransitionsY: finish\n");
-
-  return buff;
-}
-
-/* Loop thru the image height and look for first color change in each row.
- * Return a malloc'd array. Caller is responsible for freeing. */
-int * 
-getTransitionsX (struct scanner *s, int side, int left)
-{
-  int * buff;
-
-  int i, j, k;
-  int near, far;
-  int winLen = 9;
-
-  int bwidth = s->i.Bpl;
-  int width = s->i.width;
-  int height = s->i.height;
-  int depth = 1;
-
-  /* defaults for right-first */
-  int firstCol = width-1;
-  int lastCol = -1;
-  int direction = -1;
-
-  DBG (10, "getTransitionsX: start\n");
-
-  buff = calloc(height,sizeof(int));
-  if(!buff){
-    DBG (5, "getTransitionsY: no buff\n");
-    return NULL;
-  }
-
-  /* override for left-first*/
-  if(left){
-    firstCol = 0;
-    lastCol = width;
-    direction = 1;
-  }
-
-  /* load the buff array with x value for first color change from edge
-   * gray/color uses a different algo from binary/halftone */
-  switch (s->i.mode) {
-
-    case MODE_COLOR:
-      depth = 3;
-
-    case MODE_GRAYSCALE:
-
-      for(i=0; i<height; i++){
-        buff[i] = lastCol;
-  
-        /* load the near and far windows with repeated copy of first pixel */
-        near = 0;
-        for(k=0; k<depth; k++){
-          near += s->buffers[side][i*bwidth + k];
-        }
-        near *= winLen;
-        far = near;
-  
-        /* move windows, check delta */
-        for(j=firstCol+direction; j!=lastCol; j+=direction){
-  
-          int farCol = j-winLen*2*direction;
-          int nearCol = j-winLen*direction;
-
-          if(farCol < 0 || farCol >= width){
-            farCol = firstCol;
-          }
-          if(nearCol < 0 || nearCol >= width){
-            nearCol = firstCol;
-          }
-
-          for(k=0; k<depth; k++){
-            far -= s->buffers[side][i*bwidth + farCol*depth + k];
-            far += s->buffers[side][i*bwidth + nearCol*depth + k];
-
-            near -= s->buffers[side][i*bwidth + nearCol*depth + k];
-            near += s->buffers[side][i*bwidth + j*depth + k];
-          }
-  
-          if(abs(near - far) > winLen*depth*9){
-            buff[i] = j;
-            break;
-          }
-        }
-      }
-      break;
-
-    case MODE_LINEART:
-    case MODE_HALFTONE:
-      for(i=0; i<height; i++){
-        buff[i] = lastCol;
-  
-        /* load the near window with first pixel */
-        near = s->buffers[side][i*bwidth + firstCol/8] >> (7-(firstCol%8)) & 1;
-  
-        /* move */
-        for(j=firstCol+direction; j!=lastCol; j+=direction){
-          if((s->buffers[side][i*bwidth + j/8] >> (7-(j%8)) & 1) != near){
-            buff[i] = j;
-            break;
-          }
-        }
-      }
-      break;
-
-  }
-
-  /* blast any stragglers with no neighbors within .5 inch */
-  for(i=0;i<height-7;i++){
-    int sum = 0;
-    for(j=1;j<=7;j++){
-      if(abs(buff[i+j] - buff[i]) < s->i.dpi_x/2)
-        sum++;
-    }
-    if(sum < 2)
-      buff[i] = lastCol;
-  }
-
-  DBG (10, "getTransitionsX: finish\n");
-
-  return buff;
-}
-
-/* Loop thru a getTransitions array, and use a simplified Hough transform
- * to divide likely edges into a 2-d array of bins. Then weight each
- * bin based on its angle and offset. Return the 'best' bin. */
-static SANE_Status
-getLine (int height, int width, int * buff,
- int slopes, double minSlope, double maxSlope,
- int offsets, int minOffset, int maxOffset,
- double * finSlope, int * finOffset, int * finDensity)
-{
-  SANE_Status ret = 0;
-
-  int ** lines = NULL;
-  int i, j;
-  int rise, run;
-  double slope;
-  int offset;
-  int sIndex, oIndex;
-  int hWidth = width/2;
-
-  double * slopeCenter = NULL;
-  int * slopeScale = NULL;
-  double * offsetCenter = NULL;
-  int * offsetScale = NULL;
-
-  int maxDensity = 1;
-  double absMaxSlope = fabs(maxSlope);
-  double absMinSlope = fabs(minSlope);
-  int absMaxOffset = abs(maxOffset);
-  int absMinOffset = abs(minOffset);
-
-  DBG(10,"getLine: start %+0.4f %+0.4f %d %d\n",
-    minSlope,maxSlope,minOffset,maxOffset);
-
-  /*silence compiler*/
-  height = height;
-
-  if(absMaxSlope < absMinSlope)
-    absMaxSlope = absMinSlope;
-
-  if(absMaxOffset < absMinOffset)
-    absMaxOffset = absMinOffset;
-
-  /* build an array of pretty-print values for slope */
-  slopeCenter = calloc(slopes,sizeof(double));
-  if(!slopeCenter){
-    DBG(5,"getLine: cant load slopeCenter\n");
-    ret = SANE_STATUS_NO_MEM;
-    goto cleanup;
-  }
-
-  /* build an array of scaling factors for slope */
-  slopeScale = calloc(slopes,sizeof(int));
-  if(!slopeScale){
-    DBG(5,"getLine: cant load slopeScale\n");
-    ret = SANE_STATUS_NO_MEM;
-    goto cleanup;
-  }
-
-  for(j=0;j<slopes;j++){
-
-    /* find central value of this 'bucket' */
-    slopeCenter[j] = (
-      (double)j*(maxSlope-minSlope)/slopes+minSlope 
-      + (double)(j+1)*(maxSlope-minSlope)/slopes+minSlope
-    )/2;
-
-    /* scale value from the requested range into an inverted 100-1 range
-     * input close to 0 makes output close to 100 */
-    slopeScale[j] = 101 - fabs(slopeCenter[j])*100/absMaxSlope;
-  }
-
-  /* build an array of pretty-print values for offset */
-  offsetCenter = calloc(offsets,sizeof(double));
-  if(!offsetCenter){
-    DBG(5,"getLine: cant load offsetCenter\n");
-    ret = SANE_STATUS_NO_MEM;
-    goto cleanup;
-  }
-
-  /* build an array of scaling factors for offset */
-  offsetScale = calloc(offsets,sizeof(int));
-  if(!offsetScale){
-    DBG(5,"getLine: cant load offsetScale\n");
-    ret = SANE_STATUS_NO_MEM;
-    goto cleanup;
-  }
-
-  for(j=0;j<offsets;j++){
-
-    /* find central value of this 'bucket'*/
-    offsetCenter[j] = (
-      (double)j/offsets*(maxOffset-minOffset)+minOffset
-      + (double)(j+1)/offsets*(maxOffset-minOffset)+minOffset
-    )/2;
-
-    /* scale value from the requested range into an inverted 100-1 range
-     * input close to 0 makes output close to 100 */
-    offsetScale[j] = 101 - fabs(offsetCenter[j])*100/absMaxOffset;
-  }
-
-  /* build 2-d array of 'density', divided into slope and offset ranges */
-  lines = calloc(slopes, sizeof(int *));
-  if(!lines){
-    DBG(5,"getLine: cant load lines\n");
-    ret = SANE_STATUS_NO_MEM;
+  ret = sanei_magic_despeck(&s->s_params,s->buffers[side],s->swdespeck);
+  if(ret){
+    DBG (5, "buffer_despeck: bad despeck, bailing\n");
+    ret = SANE_STATUS_GOOD;
     goto cleanup;
   }
 
-  for(i=0;i<slopes;i++){
-    if(!(lines[i] = calloc(offsets, sizeof(int)))){
-      DBG(5,"getLine: cant load lines %d\n",i);
-      ret = SANE_STATUS_NO_MEM;
-      goto cleanup;
-    }
-  }
-
-  for(i=0;i<width;i++){
-    for(j=i+1;j<width && j<i+width/3;j++){
-
-      /*FIXME: check for invalid (min/max) values?*/
-      rise = buff[j] - buff[i];
-      run = j-i;
-
-      slope = (double)rise/run;
-      if(slope >= maxSlope || slope < minSlope)
-        continue;
-
-      /* offset in center of width, not y intercept! */
-      offset = slope * hWidth + buff[i] - slope * i;
-      if(offset >= maxOffset || offset < minOffset)
-        continue;
-
-      sIndex = (slope - minSlope) * slopes/(maxSlope-minSlope);
-      if(sIndex >= slopes)
-        continue;
-
-      oIndex = (offset - minOffset) * offsets/(maxOffset-minOffset);
-      if(oIndex >= offsets)
-        continue;
-
-      lines[sIndex][oIndex]++;
-    }
-  }
-
-  /* go thru array, and find most dense line (highest number) */
-  for(i=0;i<slopes;i++){
-    for(j=0;j<offsets;j++){
-      if(lines[i][j] > maxDensity)
-        maxDensity = lines[i][j];
-    }
-  }
-  
-  DBG(15,"getLine: maxDensity %d\n",maxDensity);
-
-  *finSlope = 0;
-  *finOffset = 0;
-  *finDensity = 0;
-
-  /* go thru array, and scale densities to % of maximum, plus adjust for
-   * prefered (smaller absolute value) slope and offset */
-  for(i=0;i<slopes;i++){
-    for(j=0;j<offsets;j++){
-      lines[i][j] = lines[i][j] * slopeScale[i] * offsetScale[j] / maxDensity;
-      if(lines[i][j] > *finDensity){
-        *finDensity = lines[i][j];
-        *finSlope = slopeCenter[i];
-        *finOffset = offsetCenter[j];
-      }
-    }
-  }
-  
-  if(0){
-    DBG(15,"offsetCenter:       ");
-    for(j=0;j<offsets;j++){
-      DBG(15," %+04.0f",offsetCenter[j]);
-    }
-    DBG(15,"\n");
-  
-    DBG(15,"offsetScale:        ");
-    for(j=0;j<offsets;j++){
-      DBG(15," %04d",offsetScale[j]);
-    }
-    DBG(15,"\n");
-  
-    for(i=0;i<slopes;i++){
-      DBG(15,"slope: %02d %+02.2f %03d:",i,slopeCenter[i],slopeScale[i]);
-      for(j=0;j<offsets;j++){
-        DBG(15,"% 5d",lines[i][j]/100);
-      }
-      DBG(15,"\n");
-    }
-  }
-
-  /* dont forget to cleanup */
   cleanup:
-  for(i=0;i<10;i++){
-    if(lines[i])
-      free(lines[i]);
-  }
-  if(lines)
-    free(lines);
-  if(slopeCenter)
-    free(slopeCenter);
-  if(slopeScale)
-    free(slopeScale);
-  if(offsetCenter)
-    free(offsetCenter);
-  if(offsetScale)
-    free(offsetScale);
-
-  DBG(10,"getLine: finish\n");
-
+  DBG (10, "buffer_despeck: finish\n");
   return ret;
 }
 
-/* Repeatedly find the best range of slope and offset via Hough transform.
- * Shift the ranges thru 4 different positions to avoid splitting data
- * across multiple bins (false positive). Home-in on the most likely upper
- * line of the paper inside the image. Return the 'best' line. */
-SANE_Status
-getEdgeIterate (int width, int height, int resolution,
-int * buff, double * finSlope, int * finXInter, int * finYInter)
+/* Look if image has too few dark pixels.*/
+static int
+buffer_isblank(struct scanner *s, int side)
 {
   SANE_Status ret = SANE_STATUS_GOOD;
+  int status = 0;
 
-  int slopes = 11;
-  int offsets = 11;
-  double maxSlope = 1;
-  double minSlope = -1;
-  int maxOffset = resolution/6;
-  int minOffset = -resolution/6;
+  DBG (10, "buffer_isblank: start\n");
 
-  double topSlope = 0;
-  int topOffset = 0;
-  int topDensity = 0;
-  
-  int i,j;
-  int pass = 0;
-
-  DBG(10,"getEdgeIterate: start\n");
-
-  while(pass++ < 7){
-    double sStep = (maxSlope-minSlope)/slopes;
-    int oStep = (maxOffset-minOffset)/offsets;
-
-    double slope = 0;
-    int offset = 0;
-    int density = 0;
-    int go = 0;
-
-    topSlope = 0;
-    topOffset = 0;
-    topDensity = 0;
-
-    /* find lines 4 times with slightly moved params,
-     * to bypass binning errors, highest density wins */
-    for(i=0;i<2;i++){
-      double sStep2 = sStep*i/2;
-      for(j=0;j<2;j++){
-        int oStep2 = oStep*j/2;
-        ret = getLine(height,width,buff,slopes,minSlope+sStep2,maxSlope+sStep2,offsets,minOffset+oStep2,maxOffset+oStep2,&slope,&offset,&density);
-        if(ret){
-          DBG(5,"getEdgeIterate: getLine error %d\n",ret);
-          return ret;
-        }
-        DBG(15,"getEdgeIterate: %d %d %+0.4f %d %d\n",i,j,slope,offset,density);
-
-        if(density > topDensity){
-          topSlope = slope;
-          topOffset = offset;
-          topDensity = density;
-        }
-      }
-    }
+  ret = sane_get_parameters((SANE_Handle) s, &s->s_params);
 
-    DBG(15,"getEdgeIterate: ok %+0.4f %d %d\n",topSlope,topOffset,topDensity);
+  ret = sanei_magic_isBlank2(&s->s_params, s->buffers[side],
+    s->u.dpi_x, s->u.dpi_y, s->swskip);
 
-    /* did not find anything promising on first pass,
-     * give up instead of fixating on some small, pointless feature */
-    if(pass == 1 && topDensity < width/5){
-      DBG(5,"getEdgeIterate: density too small %d %d\n",topDensity,width);
-      topOffset = 0;
-      topSlope = 0;
-      break;
-    }
-
-    /* if slope can zoom in some more, do so. */
-    if(sStep >= 0.0001){
-      minSlope = topSlope - sStep;
-      maxSlope = topSlope + sStep;
-      go = 1;
-    }
-
-    /* if offset can zoom in some more, do so. */
-    if(oStep){
-      minOffset = topOffset - oStep;
-      maxOffset = topOffset + oStep;
-      go = 1;
-    }
-
-    /* cannot zoom in more, bail out */
-    if(!go){
-      break;
-    }
-
-    DBG(15,"getEdgeIterate: zoom: %+0.4f %+0.4f %d %d\n",
-      minSlope,maxSlope,minOffset,maxOffset);
-  }
-
-  /* topOffset is in the center of the image,
-   * convert to x and y intercept */
-  if(topSlope != 0){
-    *finYInter = topOffset - topSlope * width/2;
-    *finXInter = *finYInter / -topSlope;
-    *finSlope = topSlope;
+  if(ret == SANE_STATUS_NO_DOCS){
+    DBG (5, "buffer_isblank: blank!\n");
+    status = 1;
   }
-  else{
-    *finYInter = 0;
-    *finXInter = 0;
-    *finSlope = 0;
+  else if(ret){
+    DBG (5, "buffer_isblank: error %d\n",ret);
   }
 
-  DBG(10,"getEdgeIterate: finish\n");
-
-  return 0;
+  DBG (10, "buffer_isblank: finished\n");
+  return status;
 }
 
-/* find the left side of paper by moving a line 
- * perpendicular to top slope across the image
- * the 'left-most' point on the paper is the
- * one with the smallest X intercept
- * return x and y intercepts */
-SANE_Status 
-getEdgeSlope (int width, int height, int * top, int * bot,
- double slope, int * finXInter, int * finYInter)
+/* certain options require the entire image to 
+ * be collected from the scanner before we can
+ * tell the user the size of the image. */
+static int
+must_fully_buffer(struct scanner *s)
 {
 
-  int i;
-  int topXInter, topYInter;
-  int botXInter, botYInter;
-  int leftCount;
-
-  DBG(10,"getEdgeSlope: start\n");
-
-  topXInter = width;
-  topYInter = 0;
-  leftCount = 0;
-
-  for(i=0;i<width;i++){
-    
-    if(top[i] < height){
-      int tyi = top[i] - (slope * i);
-      int txi = tyi/-slope;
-
-      if(topXInter > txi){
-        topXInter = txi;
-        topYInter = tyi;
-      }
-
-      leftCount++;
-      if(leftCount > 5){
-        break;
-      }
-    }
-    else{
-      topXInter = width;
-      topYInter = 0;
-      leftCount = 0;
-    }
-  }
-
-  botXInter = width;
-  botYInter = 0;
-  leftCount = 0;
-
-  for(i=0;i<width;i++){
-    
-    if(bot[i] > -1){
-
-      int byi = bot[i] - (slope * i);
-      int bxi = byi/-slope;
-
-      if(botXInter > bxi){
-        botXInter = bxi;
-        botYInter = byi;
-      }
-
-      leftCount++;
-      if(leftCount > 5){
-        break;
-      }
-    }
-    else{
-      botXInter = width;
-      botYInter = 0;
-      leftCount = 0;
-    }
-  }
-
-  if(botXInter < topXInter){
-    *finXInter = botXInter;
-    *finYInter = botYInter;
-  }
-  else{
-    *finXInter = topXInter;
-    *finYInter = topYInter;
+  if(
+    (s->swdeskew || s->swdespeck || s->swcrop)
+    && s->s.format != SANE_FRAME_JPEG
+  ){
+    return 1;
   }
 
-  DBG(10,"getEdgeSlope: finish\n");
-
   return 0;
 }
 
-/* function to do a simple rotation by a given slope, around
- * a given point. The point can be outside of image to get
- * proper edge alignment. Unused areas filled with bg color
- * FIXME: Do in-place rotation to save memory */
-SANE_Status
-rotateOnCenter (struct scanner *s, int side,
-  int centerX, int centerY, double slope)
+/* certain scanners require the mode of the 
+ * image to be changed in software. */
+static int
+must_downsample(struct scanner *s)
 {
-  double slopeRad = -atan(slope);
-  double slopeSin = sin(slopeRad);
-  double slopeCos = cos(slopeRad);
-
-  int bwidth = s->i.Bpl;
-  int pwidth = s->i.width;
-  int height = s->i.height;
-  int depth = 1;
-  int bg_color = s->lut[s->bg_color];
-
-  unsigned char * outbuf;
-  int i, j, k;
-
-  DBG(10,"rotateOnCenter: start: %d %d\n",centerX,centerY);
-
-  outbuf = malloc(s->i.bytes_tot[side]);
-  if(!outbuf){
-    DBG(15,"rotateOnCenter: no outbuf\n");
-    return SANE_STATUS_NO_MEM;
-  }
-
-  switch (s->i.mode){
-
-    case MODE_COLOR:
-      depth = 3;
-
-    case MODE_GRAYSCALE:
-      memset(outbuf,bg_color,s->i.bytes_tot[side]);
-
-      for (i=0; i<height; i++) {
-        int shiftY = centerY - i;
-    
-        for (j=0; j<pwidth; j++) {
-          int shiftX = centerX - j;
-          int sourceX, sourceY;
-    
-          sourceX = centerX - (int)(shiftX * slopeCos + shiftY * slopeSin);
-          if (sourceX < 0 || sourceX >= pwidth)
-            continue;
-    
-          sourceY = centerY + (int)(-shiftY * slopeCos + shiftX * slopeSin);
-          if (sourceY < 0 || sourceY >= height)
-            continue;
-    
-          for (k=0; k<depth; k++) {
-            outbuf[i*bwidth+j*depth+k]
-              = s->buffers[side][sourceY*bwidth+sourceX*depth+k];
-          }
-        }
-      }
-      break;
-
-    case MODE_LINEART:
-    case MODE_HALFTONE:
-      memset(outbuf,(bg_color<s->threshold)?0xff:0x00,s->i.bytes_tot[side]);
-
-      for (i=0; i<height; i++) {
-        int shiftY = centerY - i;
-    
-        for (j=0; j<pwidth; j++) {
-          int shiftX = centerX - j;
-          int sourceX, sourceY;
-    
-          sourceX = centerX - (int)(shiftX * slopeCos + shiftY * slopeSin);
-          if (sourceX < 0 || sourceX >= pwidth)
-            continue;
-    
-          sourceY = centerY + (int)(-shiftY * slopeCos + shiftX * slopeSin);
-          if (sourceY < 0 || sourceY >= height)
-            continue;
-
-          /* wipe out old bit */
-          outbuf[i*bwidth + j/8] &= ~(1 << (7-(j%8)));
-
-          /* fill in new bit */
-          outbuf[i*bwidth + j/8] |= 
-            ((s->buffers[side][sourceY*bwidth + sourceX/8]
-            >> (7-(sourceX%8))) & 1) << (7-(j%8));
-        }
-      }
-      break;
+  if(s->s.mode != s->i.mode
+    && s->compress != COMP_JPEG
+  ){
+    return 1;
   }
 
-  memcpy(s->buffers[side],outbuf,s->i.bytes_tot[side]);
-
-  free(outbuf);
-
-  DBG(10,"rotateOnCenter: finish\n");
-
   return 0;
 }
 
diff --git a/backend/canon_dr.conf.in b/backend/canon_dr.conf.in
index 453065b..29b6db1 100644
--- a/backend/canon_dr.conf.in
+++ b/backend/canon_dr.conf.in
@@ -74,6 +74,7 @@ option duplex-offset 432
 usb 0x04a9 0x1608
 
 # DR-3080CII
+option padded-read  1
 usb 0x04a9 0x1609
 
 # DR-2050C/SP (uses weird protocol)
@@ -133,6 +134,9 @@ usb 0x1083 0x1626
 # CR-190i
 usb 0x1083 0x162b
 
+# P-150M
+usb 0x1083 0x162c
+
 # DR-6030C
 usb 0x1083 0x1638
 
@@ -186,6 +190,7 @@ usb 0x1083 0x1651
 usb 0x1083 0x1652
 
 # DR-F120
+option duplex-offset 1640
 usb 0x1083 0x1654
 
 # DR-M1060
diff --git a/backend/canon_dr.h b/backend/canon_dr.h
index 4a19f55..d96fbba 100644
--- a/backend/canon_dr.h
+++ b/backend/canon_dr.h
@@ -21,12 +21,12 @@ enum scanner_Option
   OPT_RES,    /*a range or a list*/
 
   OPT_GEOMETRY_GROUP,
+  OPT_PAGE_WIDTH,
+  OPT_PAGE_HEIGHT,
   OPT_TL_X,
   OPT_TL_Y,
   OPT_BR_X,
   OPT_BR_Y,
-  OPT_PAGE_WIDTH,
-  OPT_PAGE_HEIGHT,
 
   OPT_ENHANCEMENT_GROUP,
   OPT_BRIGHTNESS,
@@ -43,6 +43,7 @@ enum scanner_Option
   OPT_SWDESKEW,
   OPT_SWDESPECK,
   OPT_SWCROP,
+  OPT_SWSKIP,
   OPT_STAPLEDETECT,
   OPT_DROPOUT_COLOR_F,
   OPT_DROPOUT_COLOR_B,
@@ -253,6 +254,7 @@ struct scanner
   SANE_String_Const compress_list[3];
   SANE_Range compress_arg_range;
   SANE_Range swdespeck_range;
+  SANE_Range swskip_range;
   SANE_String_Const do_color_list[8];
 
   /*sensor group*/
@@ -276,13 +278,13 @@ struct scanner
   int compress_arg;
   int df_length;
   int df_thickness;
-  int dropout_color_f;
-  int dropout_color_b;
+  int dropout_color[2];
   int buffermode;
   int rollerdeskew;
   int swdeskew;
   int swdespeck;
   int swcrop;
+  int swskip;
   int stapledetect;
 
   /* --------------------------------------------------------------------- */
@@ -299,6 +301,24 @@ struct scanner
   unsigned char lut[256];
 
   /* --------------------------------------------------------------------- */
+  /* values used by the software enhancment code (deskew, crop, etc)       */
+  SANE_Status deskew_stat;
+  int deskew_vals[2];
+  double deskew_slope;
+
+  int crop_vals[4];
+
+  /* this is defined in sane spec as a struct containing:
+        SANE_Frame format;
+        SANE_Bool last_frame;
+        SANE_Int lines;
+        SANE_Int depth; ( binary=1, gray=8, color=8 (!24) )
+        SANE_Int pixels_per_line;
+        SANE_Int bytes_per_line;
+  */
+  SANE_Parameters s_params;
+
+  /* --------------------------------------------------------------------- */
   /* values which are set by calibration functions                         */
   int c_res;
   int c_mode;
@@ -429,9 +449,10 @@ enum {
 #define COLOR_INTERLACE_2510 7
 
 #define DUPLEX_INTERLACE_NONE 0
-#define DUPLEX_INTERLACE_FFBB 1
-#define DUPLEX_INTERLACE_FBFB 2
+#define DUPLEX_INTERLACE_FfBb 1
+#define DUPLEX_INTERLACE_FBfb 2
 #define DUPLEX_INTERLACE_2510 3
+#define DUPLEX_INTERLACE_fFBb 4
 
 #define JPEG_INTERLACE_ALT 0 
 #define JPEG_INTERLACE_NONE 1 
@@ -563,27 +584,16 @@ static SANE_Status read_from_scanner_duplex(struct scanner *s, int exact);
 static SANE_Status copy_simplex(struct scanner *s, unsigned char * buf, int len, int side);
 static SANE_Status copy_duplex(struct scanner *s, unsigned char * buf, int len);
 static SANE_Status copy_line(struct scanner *s, unsigned char * buf, int side);
+static SANE_Status fill_image(struct scanner *s,int side);
+
+static int must_downsample (struct scanner *s);
+static int must_fully_buffer (struct scanner *s);
+static unsigned char calc_bg_color(struct scanner *s);
 
 static SANE_Status buffer_despeck(struct scanner *s, int side);
 static SANE_Status buffer_deskew(struct scanner *s, int side);
 static SANE_Status buffer_crop(struct scanner *s, int side);
-
-int * getTransitionsY (struct scanner *s, int side, int top);
-int * getTransitionsX (struct scanner *s, int side, int top);
-
-SANE_Status getEdgeIterate (int width, int height, int resolution,
-  int * buff, double * finSlope, int * finXInter, int * finYInter);
-
-SANE_Status getEdgeSlope (int width, int height, int * top, int * bot,
-  double slope, int * finXInter, int * finYInter);
-
-SANE_Status rotateOnCenter (struct scanner *s, int side,
-  int centerX, int centerY, double slope);
-
-static SANE_Status getLine (int height, int width, int * buff,
- int slopes, double minSlope, double maxSlope,
- int offsets, int minOffset, int maxOffset,
- double * finSlope, int * finOffset, int * finDensity);
+static int buffer_isblank(struct scanner *s, int side);
 
 static SANE_Status load_lut (unsigned char * lut, int in_bits, int out_bits,
   int out_min, int out_max, int slope, int offset);
@@ -606,4 +616,6 @@ static void default_globals (void);
 
 static size_t maxStringSize (const SANE_String_Const strings[]);
 
+static void rmemcpy(void* dest, const void* src, size_t count, size_t stride);
+
 #endif /* CANON_DR_H */
diff --git a/backend/cardscan.c b/backend/cardscan.c
index 6442458..eab6500 100644
--- a/backend/cardscan.c
+++ b/backend/cardscan.c
@@ -3,7 +3,9 @@
    This file is part of the SANE package, and implements a SANE backend
    for various Corex Cardscan scanners.
 
-   Copyright (C) 2007-2010 m. allan noah
+   Copyright (C) 2007-2015 m. allan noah
+
+   --------------------------------------------------------------------------
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -43,8 +45,6 @@
 
    --------------------------------------------------------------------------
 
-   This file implements a SANE backend for the Corex Cardscan 800C
-
    The source code is divided in sections which you can easily find by
    searching for the tag "@@".
 
@@ -65,6 +65,8 @@
 	- add has_cal_buffer config option
 	- basic support for 600c
         - clean #include lines
+      v3, 2015-11-04, MAN
+        - add USB IDs for newer model 800c
 
 ##################################################
    DATA FROM TRACE OF WINDOWS DRIVER:
@@ -224,7 +226,7 @@ four times {
 #include "cardscan.h"
 
 #define DEBUG 1
-#define BUILD 2 
+#define BUILD 3 
 
 /* values for SANE_DEBUG_CARDSCAN env var:
  - errors           5
@@ -490,6 +492,16 @@ attach_one (const char *device_name)
             s->product_name = "Unknown";
         }
     }
+    else if(vid == 0x0451){
+        s->vendor_name = "Sanford";
+        if(pid == 0x6250){
+            s->product_name = "800c";
+        }
+        else{
+            DBG (5, "Unknown product, using default settings\n");
+            s->product_name = "Unknown";
+        }
+    }
     else{
         DBG (5, "Unknown vendor/product, using default settings\n");
         s->vendor_name = "Unknown";
@@ -862,7 +874,6 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
   }
   else if (action == SANE_ACTION_SET_VALUE) {
       int tmp;
-      SANE_Word val_c;
       SANE_Status status;
 
       DBG (20, "sane_control_option: set value for '%s' (%d)\n", s->opt[option].name,option);
@@ -883,9 +894,6 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
         return status;
       }
 
-      /* may have been changed by constrain, so dont copy until now */
-      val_c = *(SANE_Word *)val;
-
       /*
        * Note - for those options which can assume one of a list of
        * valid values, we can safely assume that they will have
diff --git a/backend/cardscan.conf.in b/backend/cardscan.conf.in
index 3c49f26..a978e0d 100644
--- a/backend/cardscan.conf.in
+++ b/backend/cardscan.conf.in
@@ -11,6 +11,9 @@
 # Corex Cardscan 800c
 usb 0x08f0 0x0005
 
+# Sanford Cardscan 800c
+usb 0x0451 0x6250
+
 # Corex Cardscan 600c
 has_cal_buffer 0
 lines_per_block 1
diff --git a/backend/coolscan.c b/backend/coolscan.c
index 6828a16..239b546 100644
--- a/backend/coolscan.c
+++ b/backend/coolscan.c
@@ -238,7 +238,7 @@ request_sense_parse (unsigned char *sensed_data)
 
     case 0x6:
       if ((0x29 == asc) && (0x0 == ascq))
-	DBG (1, "\t%d/%d/%d: Power On, Reset, or Bus Device Reset Occured\n", sense, asc, ascq);
+	DBG (1, "\t%d/%d/%d: Power On, Reset, or Bus Device Reset Occurred\n", sense, asc, ascq);
       else if ((0x2a == asc) && (0x1 == ascq))
 	DBG (1, "\t%d/%d/%d: Mode Parameters Changed\n", sense, asc, ascq);
       else
@@ -1465,21 +1465,20 @@ static int
 get_inquiery_part_LS30 (Coolscan_t * s, unsigned char part)
 { 
   int size;
-  int ret;
 
   /* Get length of reponse */
   inquiry.cmd[1]=0x01;
   inquiry.cmd[2]=part;
   size=4;
   set_inquiry_return_size (inquiry.cmd, size);
-  ret = do_scsi_cmd (s->sfd, inquiry.cmd, inquiry.size,
-		     s->buffer, size);
+  do_scsi_cmd (s->sfd, inquiry.cmd, inquiry.size,
+               s->buffer, size);
   size=get_inquiry_length(s->buffer); 
   size+=4;
   /* then get inquiry with actual size */
   set_inquiry_return_size (inquiry.cmd, size);
-  ret = do_scsi_cmd (s->sfd, inquiry.cmd, inquiry.size,
-		     s->buffer, size);
+  do_scsi_cmd (s->sfd, inquiry.cmd, inquiry.size,
+               s->buffer, size);
   return size;
 }
 
@@ -1511,18 +1510,17 @@ get_inquiery_LS30 (Coolscan_t * s)
 { 
   unsigned char part;
   unsigned char parts[5];
-  int size;
   int i;
 
   /* Get vector of inquiery parts */
-  size=get_inquiery_part_LS30(s, (unsigned char) 0);
+  get_inquiery_part_LS30(s, (unsigned char) 0);
   /* Get the parts of inquiery */  
   for(i=0;i<5;i++)
   { parts[i]=((unsigned char *)s->buffer)[4+11+i];
   }
   for(i=0;i<5;i++)
   { part=parts[i];
-    size=get_inquiery_part_LS30 (s, part);
+    get_inquiery_part_LS30 (s, part);
     switch(part)
     {  case 0x0c1:/* max size and resolution */                   
                     s->adbits = 8;
@@ -2029,7 +2027,7 @@ do_cancel (Coolscan_t * scanner)
 
   do_eof (scanner);		/* close pipe and reposition scanner */
 
-  if (scanner->reader_pid != -1)
+  if (sanei_thread_is_valid (scanner->reader_pid))
     {
       int exit_status;
 
@@ -2156,7 +2154,7 @@ attach_one (const char *devName)
   return attach_scanner(devName, 0);
 }
 
-static RETSIGTYPE
+static void
 sigterm_handler (int signal)
 {
   signal = signal;
@@ -4093,7 +4091,7 @@ sane_start (SANE_Handle handle)
   scanner->pipe       = fds[0];
   scanner->reader_fds = fds[1];
   scanner->reader_pid = sanei_thread_begin( reader_process, (void*)scanner );
-  if (scanner->reader_pid == -1)
+  if (!sanei_thread_is_valid (scanner->reader_pid))
     {
       DBG (1, "sane_start: sanei_thread_begin failed (%s)\n",
              strerror (errno));
@@ -4153,7 +4151,7 @@ sane_cancel (SANE_Handle handle)
 {
   Coolscan_t *s = handle;
 
-  if (s->reader_pid != -1)
+  if (sanei_thread_is_valid (s->reader_pid))
     {
       sanei_thread_kill   ( s->reader_pid );
       sanei_thread_waitpid( s->reader_pid, NULL );
diff --git a/backend/coolscan2.c b/backend/coolscan2.c
index 9f9efde..d54bf39 100644
--- a/backend/coolscan2.c
+++ b/backend/coolscan2.c
@@ -1755,7 +1755,8 @@ cs2_open (const char *device, cs2_interface_t interface, cs2_t ** sp)
 {
   SANE_Status status;
   cs2_t *s;
-  char *prefix = NULL, *line, *device2;
+  char *prefix = NULL, *line;
+  const char *device2;
   int i;
   int alloc_failed = 0;
   SANE_Device **device_list_new;
diff --git a/backend/coolscan3.c b/backend/coolscan3.c
index a1d6fe6..42814d1 100644
--- a/backend/coolscan3.c
+++ b/backend/coolscan3.c
@@ -290,7 +290,7 @@ static SANE_Status cs3_convert_options(cs3_t * s);
 static SANE_Status cs3_scan(cs3_t * s, cs3_scan_t type);
 static void *cs3_xmalloc(size_t size);
 static void *cs3_xrealloc(void *p, size_t size);
-static void cs3_xfree(const void *p);
+static void cs3_xfree(void *p);
 
 
 /* ========================================================================= */
@@ -332,9 +332,9 @@ sane_exit(void)
 	DBG(10, "%s\n", __func__);
 
 	for (i = 0; i < n_device_list; i++) {
-		cs3_xfree(device_list[i]->name);
-		cs3_xfree(device_list[i]->vendor);
-		cs3_xfree(device_list[i]->model);
+		cs3_xfree((void *)device_list[i]->name);
+		cs3_xfree((void *)device_list[i]->vendor);
+		cs3_xfree((void *)device_list[i]->model);
 		cs3_xfree(device_list[i]);
 	}
 	cs3_xfree(device_list);
@@ -1969,9 +1969,9 @@ cs3_open(const char *device, cs3_interface_t interface, cs3_t ** sp)
 		device_list[n_device_list]->type = "film scanner";
 
 		if (alloc_failed) {
-			cs3_xfree(device_list[n_device_list]->name);
-			cs3_xfree(device_list[n_device_list]->vendor);
-			cs3_xfree(device_list[n_device_list]->model);
+			cs3_xfree((void *)device_list[n_device_list]->name);
+			cs3_xfree((void *)device_list[n_device_list]->vendor);
+			cs3_xfree((void *)device_list[n_device_list]->model);
 			cs3_xfree(device_list[n_device_list]);
 		} else
 			n_device_list++;
@@ -3181,8 +3181,8 @@ cs3_xrealloc(void *p, size_t size)
 }
 
 static void
-cs3_xfree(const void *p)
+cs3_xfree(void *p)
 {
 	if (p)
-		free(p);
+          free(p);
 }
diff --git a/backend/dc210.c b/backend/dc210.c
index acfe99a..32da710 100644
--- a/backend/dc210.c
+++ b/backend/dc210.c
@@ -1232,7 +1232,6 @@ sane_start (SANE_Handle handle)
       my_src_ptr src;
 
       struct jpeg_error_mgr jerr;
-      int row_stride;
 
       pic_pck[3] = (unsigned char) Camera.current_picture_number - 1;
 
@@ -1263,8 +1262,6 @@ sane_start (SANE_Handle handle)
       (void) jpeg_read_header (&cinfo, TRUE);
       dest_mgr = sanei_jpeg_jinit_write_ppm (&cinfo);
       (void) jpeg_start_decompress (&cinfo);
-      row_stride = cinfo.output_width * cinfo.output_components;
-
     }
 
   Camera.scanning = SANE_TRUE;	/* don't overlap scan requests */
diff --git a/backend/dc240.c b/backend/dc240.c
index 001a937..74ab2e0 100644
--- a/backend/dc240.c
+++ b/backend/dc240.c
@@ -810,7 +810,7 @@ change_res (SANE_Int fd, SANE_Byte res)
 }
 
 SANE_Status
-sane_init (SANE_Int * version_code, SANE_Auth_Callback UNUSEDARG authorize)
+sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize)
 {
 
   SANE_Char f[] = "sane_init";
@@ -962,7 +962,7 @@ static const SANE_Device *devlist[] = {
 
 SANE_Status
 sane_get_devices (const SANE_Device *** device_list, SANE_Bool
-		  UNUSEDARG local_only)
+		  __sane_unused__ local_only)
 {
 
   DBG (127, "sane_get_devices called\n");
@@ -1290,7 +1290,7 @@ my_source_mgr;
 typedef my_source_mgr *my_src_ptr;
 
 METHODDEF (void)
-jpeg_init_source (j_decompress_ptr UNUSEDARG cinfo)
+jpeg_init_source (j_decompress_ptr __sane_unused__ cinfo)
 {
   /* nothing to do */
 }
@@ -1336,7 +1336,7 @@ static SANE_Int linebuffer_index = 0;
 
 
 METHODDEF (void)
-jpeg_term_source (j_decompress_ptr UNUSEDARG cinfo)
+jpeg_term_source (j_decompress_ptr __sane_unused__ cinfo)
 {
   /* no work necessary here */
 }
@@ -1417,7 +1417,7 @@ sane_start (SANE_Handle handle)
     my_src_ptr src;
 
     struct jpeg_error_mgr jerr;
-    SANE_Int row_stride, n;
+    SANE_Int n;
     SANE_Char f[] = "sane_start";
     SANE_Char path[256];
     struct cam_dirlist *e;
@@ -1476,7 +1476,6 @@ sane_start (SANE_Handle handle)
     (void) jpeg_read_header (&cinfo, TRUE);
     dest_mgr = sanei_jpeg_jinit_write_ppm (&cinfo);
     (void) jpeg_start_decompress (&cinfo);
-    row_stride = cinfo.output_width * cinfo.output_components;
 
     linebuffer_size = 0;
     linebuffer_index = 0;
@@ -1488,7 +1487,7 @@ sane_start (SANE_Handle handle)
 }
 
 SANE_Status
-sane_read (SANE_Handle UNUSEDARG handle, SANE_Byte * data,
+sane_read (SANE_Handle __sane_unused__ handle, SANE_Byte * data,
 	   SANE_Int max_length, SANE_Int * length)
 {
   SANE_Int lines = 0;
@@ -1582,7 +1581,7 @@ sane_read (SANE_Handle UNUSEDARG handle, SANE_Byte * data,
 }
 
 void
-sane_cancel (SANE_Handle UNUSEDARG handle)
+sane_cancel (SANE_Handle __sane_unused__ handle)
 {
   unsigned char cancel_byte[] = { 0xe4 };
 
@@ -1621,8 +1620,8 @@ sane_cancel (SANE_Handle UNUSEDARG handle)
 }
 
 SANE_Status
-sane_set_io_mode (SANE_Handle UNUSEDARG handle, SANE_Bool
-		  UNUSEDARG non_blocking)
+sane_set_io_mode (SANE_Handle __sane_unused__ handle, SANE_Bool
+		  __sane_unused__ non_blocking)
 {
   /* sane_set_io_mode() is only valid during a scan */
   if (Camera.scanning)
@@ -1644,7 +1643,7 @@ sane_set_io_mode (SANE_Handle UNUSEDARG handle, SANE_Bool
 }
 
 SANE_Status
-sane_get_select_fd (SANE_Handle UNUSEDARG handle, SANE_Int * UNUSEDARG fd)
+sane_get_select_fd (SANE_Handle __sane_unused__ handle, SANE_Int __sane_unused__ * fd)
 {
   return SANE_STATUS_UNSUPPORTED;
 }
diff --git a/backend/dc240.h b/backend/dc240.h
index 3323fed..fae3628 100644
--- a/backend/dc240.h
+++ b/backend/dc240.h
@@ -203,12 +203,6 @@ struct cam_dirent
   long size;
 };
 
-#ifdef __GNUC__
-#define UNUSEDARG __attribute__ ((unused))
-#else
-#define UNUSEDARG
-#endif
-
 #ifdef OLD
 
 /* This is the layout of the directory in the camera - Unfortunately,
diff --git a/backend/dc25.c b/backend/dc25.c
index 2c9e78c..fd7a0db 100644
--- a/backend/dc25.c
+++ b/backend/dc25.c
@@ -1308,7 +1308,7 @@ convert_pic (char *base_name, int format)
 {
   FILE *ifp;
   unsigned char pic[MAX_IMAGE_SIZE];
-  int res, image_size, image_width, net_width, camera_header, components;
+  int res, image_width, net_width, components;
   struct pixmap *pp2;
 
   DBG (127, "convert_pic() called\n");
@@ -1374,10 +1374,8 @@ convert_pic (char *base_name, int format)
    *      Setup image size with resolution
    */
 
-  image_size = IMAGE_SIZE (res);
   image_width = WIDTH (res);
   net_width = image_width - LEFT_MARGIN - RIGHT_MARGIN (res);
-  camera_header = CAMERA_HEADER (res);
   components = (format & SAVE_24BITS) ? 3 : 1;
 
   /*
@@ -1833,7 +1831,7 @@ change_res (int fd, unsigned char res)
 }
 
 SANE_Status
-sane_init (SANE_Int * version_code, SANE_Auth_Callback UNUSEDARG authorize)
+sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize)
 {
   char dev_name[PATH_MAX], *p;
   size_t len;
@@ -1980,7 +1978,7 @@ static const SANE_Device dev[] = {
 
 SANE_Status
 sane_get_devices (const SANE_Device *** device_list,
-		  SANE_Bool UNUSEDARG local_only)
+		  SANE_Bool __sane_unused__ local_only)
 {
   static const SANE_Device *devlist[] = {
     dev + 0, 0
@@ -2555,7 +2553,7 @@ sane_start (SANE_Handle handle)
 
 
 SANE_Status
-sane_read (SANE_Handle UNUSEDARG handle, SANE_Byte * data,
+sane_read (SANE_Handle __sane_unused__ handle, SANE_Byte * data,
 	   SANE_Int max_length, SANE_Int * length)
 {
   DBG (127, "sane_read called, maxlen=%d\n", max_length);
@@ -2724,15 +2722,15 @@ sane_read (SANE_Handle UNUSEDARG handle, SANE_Byte * data,
 }
 
 void
-sane_cancel (SANE_Handle UNUSEDARG handle)
+sane_cancel (SANE_Handle __sane_unused__ handle)
 {
   DBG (127, "sane_cancel() called\n");
   started = SANE_FALSE;
 }
 
 SANE_Status
-sane_set_io_mode (SANE_Handle UNUSEDARG handle,
-		  SANE_Bool UNUSEDARG non_blocking)
+sane_set_io_mode (SANE_Handle __sane_unused__ handle,
+		  SANE_Bool __sane_unused__ non_blocking)
 {
   /* sane_set_io_mode() is only valid during a scan */
   if (started)
@@ -2754,7 +2752,7 @@ sane_set_io_mode (SANE_Handle UNUSEDARG handle,
 }
 
 SANE_Status
-sane_get_select_fd (SANE_Handle UNUSEDARG handle, SANE_Int UNUSEDARG * fd)
+sane_get_select_fd (SANE_Handle __sane_unused__ handle, SANE_Int __sane_unused__ * fd)
 {
   return SANE_STATUS_UNSUPPORTED;
 }
diff --git a/backend/dc25.h b/backend/dc25.h
index df95271..fe12f74 100644
--- a/backend/dc25.h
+++ b/backend/dc25.h
@@ -211,12 +211,6 @@ struct pixmap {
 	unsigned char	*planes;
 };
 
-#ifdef __GNUC__
-#define UNUSEDARG __attribute__ ((unused))
-#else
-#define UNUSEDARG
-#endif
-
 /*
  *	Rotations
  */
diff --git a/backend/dell1600n_net.c b/backend/dell1600n_net.c
index d19059b..3586215 100644
--- a/backend/dell1600n_net.c
+++ b/backend/dell1600n_net.c
@@ -929,6 +929,7 @@ HexDump (int debugLevel, const unsigned char *buf, size_t bufSize)
 {
 
   unsigned int i, j;
+  size_t lineBufFree;
 
   char itemBuf[16] = { 0 }, lineBuf[256] = { 0 };
 
@@ -943,7 +944,8 @@ HexDump (int debugLevel, const unsigned char *buf, size_t bufSize)
 
       sprintf (itemBuf, "%02x ", (const unsigned int) buf[i]);
 
-      strncat (lineBuf, itemBuf, sizeof (lineBuf));
+      lineBufFree = sizeof (lineBuf) - strlen (lineBuf) - 1;
+      strncat (lineBuf, itemBuf, lineBufFree);
 
       if ((i + 1) % 16)
         continue;
@@ -960,7 +962,8 @@ HexDump (int debugLevel, const unsigned char *buf, size_t bufSize)
         {
           sprintf (itemBuf, ".");
         }
-    strncat (lineBuf, itemBuf, sizeof (lineBuf));
+      lineBufFree = sizeof (lineBuf) - strlen (lineBuf) - 1;
+      strncat (lineBuf, itemBuf, lineBufFree);
 
     } /* for j */
 
@@ -974,7 +977,8 @@ HexDump (int debugLevel, const unsigned char *buf, size_t bufSize)
 
       for (j = (i % 16); j < 16; ++j)
         {
-          strncat (lineBuf, "   ", sizeof (lineBuf));
+          lineBufFree = sizeof (lineBuf) - strlen (lineBuf) - 1;
+          strncat (lineBuf, "   ", lineBufFree);
         }
       for (j = 1 + i - ((i + 1) % 16); j < i; ++j)
         {
@@ -986,7 +990,8 @@ HexDump (int debugLevel, const unsigned char *buf, size_t bufSize)
             {
               strcpy (itemBuf, ".");
             }
-          strncat (lineBuf, itemBuf, sizeof (lineBuf));
+          lineBufFree = sizeof (lineBuf) - strlen (lineBuf) - 1;
+          strncat (lineBuf, itemBuf, lineBufFree);
         }
       DBG (debugLevel, "%s\n", lineBuf);
     }
@@ -1335,7 +1340,7 @@ ProcessUdpResponse (unsigned char *pData, size_t size,
 {
 
   unsigned short messageSize, nameSize, valueSize;
-  unsigned char *pItem, *pEnd, *pValue;
+  unsigned char *pItem, *pEnd;
   char sockBuf[SOCK_BUF_SIZE], *pName;
   struct ComBuf tcpBuf;
   int nread;
@@ -1376,8 +1381,6 @@ ProcessUdpResponse (unsigned char *pData, size_t size,
       valueSize = (((unsigned short) pItem[0]) << 8) | pItem[1];
       pItem += 2;
 
-      pValue = pItem;
-
       pItem += valueSize;
 
       /* process the item */
diff --git a/backend/dll.c b/backend/dll.c
index 5264f11..5eaa046 100644
--- a/backend/dll.c
+++ b/backend/dll.c
@@ -69,6 +69,26 @@
 #if defined(HAVE_DLOPEN) && defined(HAVE_DLFCN_H)
 # include <dlfcn.h>
 
+  /* This works around a pedantic GCC compiler warning.  The ISO C
+     standard says that the behaviour of converting an object pointer
+     like the void * returned by dlsym() to a function pointer like
+     void *(*)() is implementation defined.  POSIX though guarantees
+     that this works fine.
+
+     Workaround based on http://stackoverflow.com/a/36385690.  Turns
+     off pedantic warnings for the duration of the definition only.
+   */
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wpedantic"
+typedef void *(*func_ptr)(void);
+
+func_ptr
+posix_dlsym (void *handle, const char *func)
+{
+  return dlsym (handle, func);
+}
+# pragma GCC diagnostic pop
+
   /* Older versions of dlopen() don't define RTLD_NOW and RTLD_LAZY.
      They all seem to use a mode of 1 to indicate RTLD_NOW and some do
      not support RTLD_LAZY at all.  Hence, unless defined, we define
@@ -430,15 +450,17 @@ load (struct backend *be)
 
   if (path)
     {
-      src_len = strlen (path) + strlen (LIBDIR) + 1 + 1;
+      src_len = strlen (path) + strlen (DIR_SEP) + strlen(LIBDIR) + 1;
       src = malloc (src_len);
       if (!src)
 	{
 	  DBG (1, "load: malloc failed: %s\n", strerror (errno));
 	  return SANE_STATUS_NO_MEM;
 	}
+      if (orig_src)
+        free (orig_src);
       orig_src = src;
-      snprintf (src, src_len, "%s:%s", path, LIBDIR);
+      snprintf (src, src_len, "%s%s%s", path, DIR_SEP, LIBDIR);
     }
   else
     {
@@ -534,7 +556,7 @@ load (struct backend *be)
 
       /* First try looking up the symbol without a leading underscore. */
 #ifdef HAVE_DLOPEN
-      op = (void *(*)(void)) dlsym (be->handle, funcname + 1);
+      op = posix_dlsym (be->handle, funcname + 1);
 #elif defined(HAVE_SHL_LOAD)
       shl_findsym ((shl_t *) & (be->handle), funcname + 1, TYPE_UNDEFINED,
 		   &op);
@@ -559,7 +581,7 @@ load (struct backend *be)
 	{
 	  /* Try again, with an underscore prepended. */
 #ifdef HAVE_DLOPEN
-	  op = (void *(*)(void)) dlsym (be->handle, funcname);
+	  op = posix_dlsym (be->handle, funcname);
 #elif defined(HAVE_SHL_LOAD)
 	  shl_findsym (be->handle, funcname, TYPE_UNDEFINED, &op);
 #elif defined(HAVE_NSLINKMODULE)
diff --git a/backend/dll.conf.in b/backend/dll.conf.in
index ee6f2f1..3ee5428 100644
--- a/backend/dll.conf.in
+++ b/backend/dll.conf.in
@@ -1,4 +1,12 @@
-# enable the next line if you want to allow access through the network:
+# dll.conf - Configuration file for the SANE dynamic backend loader
+#
+# Backends can also be enabled by configuration snippets under the dll.d/
+# directory -- third party backends can drop their configuration file in
+# this in this directory, named after the backend.
+#
+# The next line enables the network backend; comment it out if you don't
+# need to use a remote SANE scanner over the network -- see sane-net(5)
+# and saned(8) for details.
 net
 abaton
 agfafocus
diff --git a/backend/dmc.c b/backend/dmc.c
index 7fc2ae9..c5c57c4 100644
--- a/backend/dmc.c
+++ b/backend/dmc.c
@@ -1030,7 +1030,6 @@ sane_control_option(SANE_Handle handle, SANE_Int option,
 {
     DMC_Camera *c;
     SANE_Word cap;
-    SANE_Status status;
     int i;
 
     if (info) *info = 0;
@@ -1069,7 +1068,7 @@ sane_control_option(SANE_Handle handle, SANE_Int option,
     case OPT_IMAGE_MODE:
 	for (i=0; i<NUM_IMAGE_MODES; i++) {
 	    if (!strcmp(val, ValidModes[i])) {
-		status = DMCSetMode(c, i);
+		DMCSetMode(c, i);
 		c->val[OPT_IMAGE_MODE].s = (SANE_String) ValidModes[i];
 		if (info) *info |= SANE_INFO_RELOAD_PARAMS | SANE_INFO_RELOAD_OPTIONS;
 		return SANE_STATUS_GOOD;
diff --git a/backend/epjitsu-cmd.h b/backend/epjitsu-cmd.h
index 77793df..40a5c1a 100644
--- a/backend/epjitsu-cmd.h
+++ b/backend/epjitsu-cmd.h
@@ -47,40 +47,36 @@ static unsigned char coarseCalData_S1100[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-/*************** fi-60F 150dpi *************/
-/* 1b d1 (set window) before coarse cal (read 1 line of 0x1c20 bytes) */
-static unsigned char setWindowCoarseCal_FI60F_150[] = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x01, 0x2c, 0x01, 0x2c, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x60, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x05, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+/*************** fi-60F 300dpi gray *************/
+#if 0
+static unsigned char setWindowScan_FI60F_300_g[] = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x01, 0x2c, 0x01, 0x2c, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 0x06, 0xd5, 0x00, 0x00,
+0x00, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x80, 0x80, 0x01, 0x6c, 0x01, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
-/* 1b d1 (set window) before fine cal (read 16 lines of 0x1c20 bytes) */
-static unsigned char setWindowFineCal_FI60F_150[] = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x01, 0x2c, 0x03, 0x20, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x60, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
-0x00, 0x05, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x80, 0x80, 0x00, 0x10, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+/*************** fi-60F 400dpi gray *************/
+static unsigned char setWindowScan_FI60F_400_g[] = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x02, 0x58, 0x01, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x60, 0x00, 0x00, 0x09, 0x1c, 0x00, 0x00,
+0x00, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x80, 0x80, 0x01, 0xca, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
-/* 1b d1 (set window) before gain/offset tables (write 1 line of 0x3840 bytes) */
-static unsigned char setWindowSendCal_FI60F_150[] = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x01, 0x2c, 0x03, 0x20, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x60, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
-0x00, 0x05, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+/*************** fi-60F 600dpi gray *************/
+static unsigned char setWindowScan_FI60F_600_g[] = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x02, 0x58, 0x02, 0x58, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x60, 0x00, 0x00, 0x0d, 0xaa, 0x00, 0x00,
+0x00, 0x02, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x80, 0x80, 0x01, 0xca, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
-/* 1b c3 (gain?) command header */
-static unsigned char sendCal1Header_FI60F_150[] = { /* plus 0x3840 data bytes */
-0x8c, 0x0f, 0x8c, 0x0f, 0x8c, 0x0f, 0x8c, 0x0f, 0x8c, 0x0f, 0x8c, 0x0f, 0x00, 0x04
-};
-/* 1b c4 (offset?) command header */
-static unsigned char sendCal2Header_FI60F_150[] = {
-0x39, 0x3f, 0x39, 0x3f, 0x39, 0x3f, 0x07
-};
-/* 1b d1 (set window) before scan */
+#endif
+
+/*************** fi-60F 150dpi *************/
 static unsigned char setWindowScan_FI60F_150[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x01, 0x2c, 0x00, 0x96, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x60, 0x00, 0x00, 0x03, 0x6b, 0x00, 0x00,
@@ -89,6 +85,15 @@ static unsigned char setWindowScan_FI60F_150[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
+/*************** fi-60F 200dpi *************/
+static unsigned char setWindowScan_FI60F_200[] = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x01, 0x2c, 0x00, 0xc8, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x60, 0x00, 0x00, 0x04, 0x8e, 0x00, 0x00,
+0x00, 0x05, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x80, 0x80, 0x01, 0x48, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
 /*************** fi-60F 300dpi *************/
 /* 1b d1 (set window) before coarse cal (read 1 line of 0x1c20 bytes) */
 static unsigned char setWindowCoarseCal_FI60F_300[] = {
@@ -131,6 +136,15 @@ static unsigned char setWindowScan_FI60F_300[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
+/*************** fi-60F 400dpi *************/
+static unsigned char setWindowScan_FI60F_400[] = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x02, 0x58, 0x01, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x20, 0x00, 0x00, 0x09, 0x1c, 0x00, 0x00,
+0x00, 0x05, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x80, 0x80, 0x01, 0x3d, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
 /*************** fi-60F 600dpi *************/
 /* 1b d1 (set window) before coarse cal (read 1 line of 0x2160 bytes) */
 static unsigned char setWindowCoarseCal_FI60F_600[] = {
diff --git a/backend/epjitsu.c b/backend/epjitsu.c
index 7d987dc..ce79a20 100644
--- a/backend/epjitsu.c
+++ b/backend/epjitsu.c
@@ -1,6 +1,14 @@
 /* sane - Scanner Access Now Easy.
 
-   This file is part of the SANE package.
+   This file implements a SANE backend for the Fujitsu fi-60F, the
+   ScanSnap S300/S1300, and (hopefully) other Epson-based scanners. 
+
+   Copyright 2007-2015 by m. allan noah <kitno455 at gmail dot com>
+   Copyright 2009 by Richard Goedeken <richard at fascinationsoftware dot com>
+
+   Development funded by Microdea, Inc., TrueCheck, Inc. and Archivista, GmbH
+
+   --------------------------------------------------------------------------
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -40,16 +48,6 @@
 
    --------------------------------------------------------------------------
 
-   This file implements a SANE backend for the Fujitsu fi-60F, the
-   ScanSnap S300/S1300, and (hopefully) other Epson-based scanners. 
-
-   Copyright 2007-2010 by m. allan noah <kitno455 at gmail dot com>
-   Copyright 2009 by Richard Goedeken <richard at fascinationsoftware dot com>
-
-   Development funded by Microdea, Inc., TrueCheck, Inc. and Archivista, GmbH
-
-   --------------------------------------------------------------------------
-
    The source code is divided in sections which you can easily find by
    searching for the tag "@@".
 
@@ -151,6 +149,14 @@
          - call change_params after changing page_width
       v28 2015-03-23, MAN
          - call get_hardware_status before starting scan
+      v29 2017-03-18, MAN
+         - fix infinite loop when scaling in Y direction
+      v30 2017-03-21, MAN
+         - fix image truncation when using 150 DPI in Y direction
+         - add 200 and 400 DPI Y direction support for fi-60F/65F
+      v31 2017-04-09, MAN
+         - hardware gray support for fi-60F/65F (disabled pending calibration)
+         - merge fi-60F/65F settings
 
    SANE FLOW DIAGRAM
 
@@ -199,7 +205,7 @@
 #include "epjitsu-cmd.h"
 
 #define DEBUG 1
-#define BUILD 28
+#define BUILD 31
 
 #ifndef MAX3
   #define MAX3(a,b,c) ((a) > (b) ? ((a) > (c) ? a : c) : ((b) > (c) ? b : c))
@@ -1770,6 +1776,7 @@ update_transfer_totals(struct transfer * t)
 /* we hard-code the list (determined from usb snoops) here */
 struct model_res {
   int model;
+  int mode;
   int x_res;
   int y_res;
   int usb_power;
@@ -1802,141 +1809,153 @@ struct model_res {
 static struct model_res settings[] = {
 
  /*S300 AC*/
-/* model       xres yres  u   mxx mnx   mxy mny   lin_s   pln_s pln_w  bh     cls     cps   cpw */
- { MODEL_S300,  150, 150, 0, 1296, 32, 2662, 32, 4256*3, 1480*3, 1296, 41, 8512*3, 2960*3, 2592, 
+/* model       mode        xres yres  u   mxx mnx   mxy mny   lin_s   pln_s pln_w  bh     cls     cps   cpw */
+ { MODEL_S300, MODE_COLOR,  150, 150, 0, 1296, 32, 2662, 32, 4256*3, 1480*3, 1296, 41, 8512*3, 2960*3, 2592, 
    setWindowCoarseCal_S300_150, setWindowFineCal_S300_150,
    setWindowSendCal_S300_150, sendCal1Header_S300_150,
    sendCal2Header_S300_150, setWindowScan_S300_150 },
 
- { MODEL_S300,  225, 200, 0, 1944, 32, 3993, 32, 6144*3, 2100*3, 1944, 28, 8192*3, 2800*3, 2592,
+ { MODEL_S300, MODE_COLOR,  225, 200, 0, 1944, 32, 3993, 32, 6144*3, 2100*3, 1944, 28, 8192*3, 2800*3, 2592,
    setWindowCoarseCal_S300_225, setWindowFineCal_S300_225,
    setWindowSendCal_S300_225, sendCal1Header_S300_225,
    sendCal2Header_S300_225, setWindowScan_S300_225 },
 
- { MODEL_S300,  300, 300, 0, 2592, 32, 5324, 32, 8192*3, 2800*3, 2592, 21, 8192*3, 2800*3, 2592,
+ { MODEL_S300, MODE_COLOR,  300, 300, 0, 2592, 32, 5324, 32, 8192*3, 2800*3, 2592, 21, 8192*3, 2800*3, 2592,
    setWindowCoarseCal_S300_300, setWindowFineCal_S300_300,
    setWindowSendCal_S300_300, sendCal1Header_S300_300,
    sendCal2Header_S300_300, setWindowScan_S300_300 },
 
- { MODEL_S300,  600, 600, 0, 5184, 32, 10648, 32, 16064*3, 5440*3, 5184, 10, 16064*3, 5440*3, 5184,
+ { MODEL_S300, MODE_COLOR,  600, 600, 0, 5184, 32, 10648, 32, 16064*3, 5440*3, 5184, 10, 16064*3, 5440*3, 5184,
    setWindowCoarseCal_S300_600, setWindowFineCal_S300_600,
    setWindowSendCal_S300_600, sendCal1Header_S300_600,
    sendCal2Header_S300_600, setWindowScan_S300_600 },
 
  /*S300 USB*/
-/* model       xres yres  u   mxx mnx   mxy mny   lin_s   pln_s pln_w  bh      cls     cps   cpw */
- { MODEL_S300,  150, 150, 1, 1296, 32, 2662, 32, 7216*3, 2960*3, 1296, 24, 14432*3, 5920*3, 2592,
+/* model       mode        xres yres  u   mxx mnx   mxy mny   lin_s   pln_s pln_w  bh      cls     cps   cpw */
+ { MODEL_S300, MODE_COLOR,  150, 150, 1, 1296, 32, 2662, 32, 7216*3, 2960*3, 1296, 24, 14432*3, 5920*3, 2592,
    setWindowCoarseCal_S300_150_U, setWindowFineCal_S300_150_U,
    setWindowSendCal_S300_150_U, sendCal1Header_S300_150_U,
    sendCal2Header_S300_150_U, setWindowScan_S300_150_U },
 
- { MODEL_S300,  225, 200, 1, 1944, 32, 3993, 32, 10584*3, 4320*3, 1944, 16, 14112*3, 5760*3, 2592,
+ { MODEL_S300, MODE_COLOR,  225, 200, 1, 1944, 32, 3993, 32, 10584*3, 4320*3, 1944, 16, 14112*3, 5760*3, 2592,
    setWindowCoarseCal_S300_225_U, setWindowFineCal_S300_225_U,
    setWindowSendCal_S300_225_U, sendCal1Header_S300_225_U,
    sendCal2Header_S300_225_U, setWindowScan_S300_225_U },
 
- { MODEL_S300,  300, 300, 1, 2592, 32, 5324, 32, 15872*3, 6640*3, 2592, 11, 15872*3, 6640*3, 2592,
+ { MODEL_S300, MODE_COLOR,  300, 300, 1, 2592, 32, 5324, 32, 15872*3, 6640*3, 2592, 11, 15872*3, 6640*3, 2592,
    setWindowCoarseCal_S300_300_U, setWindowFineCal_S300_300_U,
    setWindowSendCal_S300_300_U, sendCal1Header_S300_300_U,
    sendCal2Header_S300_300_U, setWindowScan_S300_300_U },
 
- { MODEL_S300,  600, 600, 1, 5184, 32, 10648, 32, 16064*3, 5440*3, 5184, 10, 16064*3, 5440*3, 5184,
+ { MODEL_S300, MODE_COLOR,  600, 600, 1, 5184, 32, 10648, 32, 16064*3, 5440*3, 5184, 10, 16064*3, 5440*3, 5184,
    setWindowCoarseCal_S300_600, setWindowFineCal_S300_600,
    setWindowSendCal_S300_600, sendCal1Header_S300_600,
    sendCal2Header_S300_600, setWindowScan_S300_600 },
 
  /*S1300i AC*/
-/* model         xres yres  u   mxx mnx   mxy mny lin_s   pln_s   pln_w   bh      cls     cps   cpw */
- { MODEL_S1300i,  150, 150, 0, 1296, 32, 2662, 32, 4016*3, 1360*3, 1296,  43, 8032*3,  2720*3, 2592,
+/* model         mode        xres yres  u   mxx mnx   mxy mny lin_s   pln_s   pln_w   bh      cls     cps   cpw */
+ { MODEL_S1300i, MODE_COLOR,  150, 150, 0, 1296, 32, 2662, 32, 4016*3, 1360*3, 1296,  43, 8032*3,  2720*3, 2592,
    setWindowCoarseCal_S1300i_150, setWindowFineCal_S1300i_150,
    setWindowSendCal_S1300i_150, sendCal1Header_S1300i_150,
    sendCal2Header_S1300i_150, setWindowScan_S1300i_150 },
 
- { MODEL_S1300i,  225, 200, 0, 1944, 32, 3993, 32, 6072*3, 2063*3, 1944,  28, 8096*3,  2752*3, 2592,
+ { MODEL_S1300i, MODE_COLOR,  225, 200, 0, 1944, 32, 3993, 32, 6072*3, 2063*3, 1944,  28, 8096*3,  2752*3, 2592,
    setWindowCoarseCal_S1300i_225, setWindowFineCal_S1300i_225,
    setWindowSendCal_S1300i_225, sendCal1Header_S1300i_225,
    sendCal2Header_S1300i_225, setWindowScan_S1300i_225 },
 
- { MODEL_S1300i,  300, 300, 0, 2592, 32, 5324, 32, 8096*3, 2751*3, 2592,  21, 8096*3,  2752*3, 2592,
+ { MODEL_S1300i, MODE_COLOR,  300, 300, 0, 2592, 32, 5324, 32, 8096*3, 2751*3, 2592,  21, 8096*3,  2752*3, 2592,
    setWindowCoarseCal_S1300i_300, setWindowFineCal_S1300i_300,
    setWindowSendCal_S1300i_300, sendCal1Header_S1300i_300,
    sendCal2Header_S1300i_300, setWindowScan_S1300i_300 },
 
  /*NOTE: S1300i uses S300 data blocks for remainder*/
- { MODEL_S1300i,  600, 600, 0, 5184, 32, 10648, 32, 16064*3, 5440*3, 5184, 10, 16064*3, 5440*3, 5184,
+ { MODEL_S1300i, MODE_COLOR,  600, 600, 0, 5184, 32, 10648, 32, 16064*3, 5440*3, 5184, 10, 16064*3, 5440*3, 5184,
    setWindowCoarseCal_S300_600, setWindowFineCal_S300_600,
    setWindowSendCal_S300_600, sendCal1Header_S300_600,
    sendCal2Header_S300_600, setWindowScan_S300_600 },
 
  /*S1300i USB*/
-/* model         xres yres  u   mxx mnx    mxy mny   lin_s    pln_s pln_w  bh      cls     cps   cpw */
- { MODEL_S1300i,  150, 150, 1, 1296, 32,  2662, 32, 7216*3,  2960*3, 1296, 24, 14432*3, 5920*3, 2592,
+/* model         mode        xres yres  u   mxx mnx    mxy mny   lin_s    pln_s pln_w  bh      cls     cps   cpw */
+ { MODEL_S1300i, MODE_COLOR,  150, 150, 1, 1296, 32,  2662, 32, 7216*3,  2960*3, 1296, 24, 14432*3, 5920*3, 2592,
    setWindowCoarseCal_S300_150_U, setWindowFineCal_S300_150_U,
    setWindowSendCal_S300_150_U, sendCal1Header_S1300i_USB,
    sendCal2Header_S1300i_USB, setWindowScan_S300_150_U },
 
- { MODEL_S1300i,  225, 200, 1, 1944, 32,  3993, 32, 10584*3, 4320*3, 1944, 16, 14112*3, 5760*3, 2592,
+ { MODEL_S1300i, MODE_COLOR,  225, 200, 1, 1944, 32,  3993, 32, 10584*3, 4320*3, 1944, 16, 14112*3, 5760*3, 2592,
    setWindowCoarseCal_S300_225_U, setWindowFineCal_S300_225_U,
    setWindowSendCal_S300_225_U, sendCal1Header_S1300i_USB,
    sendCal2Header_S1300i_USB, setWindowScan_S300_225_U },
 
- { MODEL_S1300i,  300, 300, 1, 2592, 32,  5324, 32, 15872*3, 6640*3, 2592, 11, 15872*3, 6640*3, 2592,
+ { MODEL_S1300i, MODE_COLOR,  300, 300, 1, 2592, 32,  5324, 32, 15872*3, 6640*3, 2592, 11, 15872*3, 6640*3, 2592,
    setWindowCoarseCal_S300_300_U, setWindowFineCal_S300_300_U,
    setWindowSendCal_S300_300_U, sendCal1Header_S1300i_USB,
    sendCal2Header_S1300i_USB, setWindowScan_S300_300_U },
 
- { MODEL_S1300i,  600, 600, 1, 5184, 32, 10648, 32, 16064*3, 5440*3, 5184, 10, 16064*3, 5440*3, 5184,
+ { MODEL_S1300i, MODE_COLOR,  600, 600, 1, 5184, 32, 10648, 32, 16064*3, 5440*3, 5184, 10, 16064*3, 5440*3, 5184,
    setWindowCoarseCal_S300_600, setWindowFineCal_S300_600,
    setWindowSendCal_S300_600, sendCal1Header_S1300i_USB,
    sendCal2Header_S1300i_USB, setWindowScan_S300_600 },
 
- /*fi-60F*/
-/* model       xres yres  u   mxx mnx   mxy mny   lin_s   pln_s pln_w   bh     cls    cps  cpw */
- { MODEL_FI60F, 300, 150, 0, 1296, 32,  875, 32, 2400*3,  958*3,  432,  72, 2400*3, 958*3, 432,
-   setWindowCoarseCal_FI60F_150, setWindowFineCal_FI60F_150,
-   setWindowSendCal_FI60F_150, sendCal1Header_FI60F_150,
-   sendCal2Header_FI60F_150, setWindowScan_FI60F_150 },
-
- { MODEL_FI60F, 300, 300, 0, 1296, 32, 1749, 32, 2400*3,  958*3,  432,  72, 2400*3, 958*3, 432,
+ /*fi-60F/65F GRAY */
+/* model          mode         xres yres  u   mxx mnx   mxy mny   lin_s   pln_s pln_w   bh     cls    cps  cpw */
+/* disabled until calibration code supports grayscale
+ { MODEL_FI60F | MODEL_FI65F, MODE_GRAYSCALE, 300, 300, 0, 1296, 32, 1749, 32,   1440,    480,  432, 364, 2400*3, 958*3, 432,
    setWindowCoarseCal_FI60F_300, setWindowFineCal_FI60F_300,
    setWindowSendCal_FI60F_300, sendCal1Header_FI60F_300,
-   sendCal2Header_FI60F_300, setWindowScan_FI60F_300 },
+   sendCal2Header_FI60F_300, setWindowScan_FI60F_300_g },
 
- { MODEL_FI60F, 600, 600, 0, 2592, 32, 3498, 32, 2848*3,  978*3,  864,  61, 2848*3, 978*3, 864,
+ { MODEL_FI60F | MODEL_FI65F, MODE_GRAYSCALE, 600, 400, 0, 2592, 32, 2332, 32,   2592,    864,  864, 202, 2848*3, 978*3, 864,
    setWindowCoarseCal_FI60F_600, setWindowFineCal_FI60F_600,
    setWindowSendCal_FI60F_600, sendCal1Header_FI60F_600,
-   sendCal2Header_FI60F_600, setWindowScan_FI60F_600 },
+   sendCal2Header_FI60F_600, setWindowScan_FI60F_400_g },
 
- /*fi-65F*/
-/* model       xres yres  u   mxx mnx   mxy mny   lin_s   pln_s pln_w   bh     cls     cps   cpw */
- { MODEL_FI65F, 300, 150, 0, 1296, 32,  875, 32, 2400*3,  958*3,  432,  72, 2400*3, 958*3, 432,
-   setWindowCoarseCal_FI60F_150, setWindowFineCal_FI60F_150,
-   setWindowSendCal_FI60F_150, sendCal1Header_FI60F_150,
-   sendCal2Header_FI60F_150, setWindowScan_FI60F_150 },
+ { MODEL_FI60F | MODEL_FI65F, MODE_GRAYSCALE, 600, 600, 0, 2592, 32, 3498, 32,   2592,    864,  864, 202, 2848*3, 978*3, 864,
+   setWindowCoarseCal_FI60F_600, setWindowFineCal_FI60F_600,
+   setWindowSendCal_FI60F_600, sendCal1Header_FI60F_600,
+   sendCal2Header_FI60F_600, setWindowScan_FI60F_600_g },
+*/
+
+ /*fi-60F/65F*/
+/* model                      mode       xres yres  u   mxx mnx   mxy mny   lin_s   pln_s pln_w   bh     cls    cps  cpw */
+ { MODEL_FI60F | MODEL_FI65F, MODE_COLOR, 300, 150, 0, 1296, 32,  875, 32, 2400*3,  958*3,  432,  72, 2400*3, 958*3, 432,
+   setWindowCoarseCal_FI60F_300, setWindowFineCal_FI60F_300,
+   setWindowSendCal_FI60F_300, sendCal1Header_FI60F_300,
+   sendCal2Header_FI60F_300, setWindowScan_FI60F_150 },
 
- { MODEL_FI65F, 300, 300, 0, 1296, 32, 1749, 32, 2400*3,  958*3,  432,  72, 2400*3,   958*3, 432,
+ { MODEL_FI60F | MODEL_FI65F, MODE_COLOR, 300, 200, 0, 1296, 32, 1166, 32, 2400*3,  958*3,  432,  72, 2400*3, 958*3, 432,
+   setWindowCoarseCal_FI60F_300, setWindowFineCal_FI60F_300,
+   setWindowSendCal_FI60F_300, sendCal1Header_FI60F_300,
+   sendCal2Header_FI60F_300, setWindowScan_FI60F_200 },
+
+ { MODEL_FI60F | MODEL_FI65F, MODE_COLOR, 300, 300, 0, 1296, 32, 1749, 32, 2400*3,  958*3,  432,  72, 2400*3, 958*3, 432,
    setWindowCoarseCal_FI60F_300, setWindowFineCal_FI60F_300,
    setWindowSendCal_FI60F_300, sendCal1Header_FI60F_300,
    sendCal2Header_FI60F_300, setWindowScan_FI60F_300 },
 
- { MODEL_FI65F, 600, 600, 0, 2592, 32, 3498, 32, 2848*3,  978*3,  864,  61, 2848*3,   978*3, 864,
+ { MODEL_FI60F | MODEL_FI65F, MODE_COLOR, 600, 400, 0, 2592, 32, 2332, 32, 2848*3,  978*3,  864,  61, 2848*3, 978*3, 864,
+   setWindowCoarseCal_FI60F_600, setWindowFineCal_FI60F_600,
+   setWindowSendCal_FI60F_600, sendCal1Header_FI60F_600,
+   sendCal2Header_FI60F_600, setWindowScan_FI60F_400 },
+
+ { MODEL_FI60F | MODEL_FI65F, MODE_COLOR, 600, 600, 0, 2592, 32, 3498, 32, 2848*3,  978*3,  864,  61, 2848*3, 978*3, 864,
    setWindowCoarseCal_FI60F_600, setWindowFineCal_FI60F_600,
    setWindowSendCal_FI60F_600, sendCal1Header_FI60F_600,
    sendCal2Header_FI60F_600, setWindowScan_FI60F_600 },
 
  /*S1100 USB*/
-/* model        xres yres  u   mxx mnx    mxy mny  lin_s pln_s pln_w  bh   cls   cps   cpw */
- { MODEL_S1100,  300, 300, 1, 2592, 32,  5324, 32,  8912, 3160, 2592, 58, 8912, 3160, 2592,
+/* model        mode        xres yres  u   mxx mnx    mxy mny  lin_s pln_s pln_w  bh   cls   cps   cpw */
+ { MODEL_S1100, MODE_COLOR,  300, 300, 1, 2592, 32,  5324, 32,  8912, 3160, 2592, 58, 8912, 3160, 2592,
    setWindowCoarseCal_S1100_300_U, setWindowFineCal_S1100_300_U,
    setWindowSendCal_S1100_300_U, sendCal1Header_S1100_300_U,
    sendCal2Header_S1100_300_U, setWindowScan_S1100_300_U },
 
- { MODEL_S1100,  600, 600, 1, 5184, 32, 10648, 32, 15904, 5360, 5184, 32, 15904, 5360, 5184,
+ { MODEL_S1100, MODE_COLOR,  600, 600, 1, 5184, 32, 10648, 32, 15904, 5360, 5184, 32, 15904, 5360, 5184,
    setWindowCoarseCal_S1100_600_U, setWindowFineCal_S1100_600_U,
    setWindowSendCal_S1100_600_U, sendCal1Header_S1100_600_U,
    sendCal2Header_S1100_600_U, setWindowScan_S1100_600_U },
 
- { MODEL_NONE,     0,   0, 0,    0,  0,     0,  0,     0,    0,    0,  0,     0,    0,    0,
+ { MODEL_NONE,           0,    0,   0, 0,    0,  0,     0,  0,     0,    0,    0,  0,     0,    0,    0,
    NULL, NULL, NULL, NULL, NULL, NULL },
 
 };
@@ -1955,7 +1974,8 @@ change_params(struct scanner *s)
     DBG (10, "change_params: start\n");
 
     do {
-      if(settings[i].model == s->model
+      if(settings[i].model & s->model
+        && settings[i].mode <= s->mode
         && settings[i].x_res >= s->resolution
         && settings[i].y_res >= s->resolution
         && settings[i].usb_power == s->usb_power
@@ -2038,11 +2058,12 @@ change_params(struct scanner *s)
     s->br_x = (s->max_x + s->page_width)/2;
     
     /*=============================================================*/
-    /* set up the calibration structs */
+    /* set up the calibration scan structs */
     /* generally full width, short height, full resolution */
     s->cal_image.line_stride = settings[i].cal_line_stride;
     s->cal_image.plane_stride = settings[i].cal_plane_stride;
     s->cal_image.plane_width = settings[i].cal_plane_width;
+    s->cal_image.mode = MODE_COLOR;
     s->cal_image.x_res = settings[i].x_res;
     s->cal_image.y_res = settings[i].y_res;
     s->cal_image.raw_data = NULL;
@@ -2052,38 +2073,19 @@ change_params(struct scanner *s)
     s->cal_data.line_stride = settings[i].cal_line_stride * 2;
     s->cal_data.plane_stride = settings[i].cal_plane_stride * 2;
     s->cal_data.plane_width = settings[i].cal_plane_width;
+    s->cal_data.mode = MODE_COLOR;
     s->cal_data.x_res = settings[i].x_res;
     s->cal_data.y_res = settings[i].y_res;
     s->cal_data.raw_data = NULL;
     s->cal_data.image = &s->sendcal;
 
     /*=============================================================*/
-    /* set up the input scan structs */
-    s->block_xfr.line_stride = settings[i].line_stride;
-    s->block_xfr.plane_stride = settings[i].plane_stride;
-    s->block_xfr.plane_width = settings[i].plane_width;
-    s->block_xfr.x_res = settings[i].x_res;
-    s->block_xfr.y_res = settings[i].y_res;
-    s->block_xfr.raw_data = NULL;
-    s->block_xfr.image = &s->block_img;
-
-    /* set up the block image used during scanning operation */
-    /* note that this is the same width/x_res as the final output image */
-    /* but the height/y_res are the same as block_xfr */
-    width = (s->block_xfr.plane_width*s->resolution/settings[i].x_res) * img_heads;
-    s->block_img.width_pix = width;
-    s->block_img.width_bytes = width * 3;
-    s->block_img.height = settings[i].block_height;
-    s->block_img.x_res = s->resolution;
-    s->block_img.y_res = settings[i].y_res;
-    s->block_img.pages = img_pages;
-    s->block_img.buffer = NULL;
-
     /* set up the calibration image blocks */
     width = s->cal_image.plane_width * img_heads;
     s->coarsecal.width_pix = s->darkcal.width_pix = s->lightcal.width_pix = width;
     s->coarsecal.width_bytes = s->darkcal.width_bytes = s->lightcal.width_bytes = width * 3;
     s->coarsecal.height = 1;
+    s->coarsecal.mode = MODE_COLOR;
     s->coarsecal.x_res = s->darkcal.x_res = s->lightcal.x_res = settings[i].x_res;
     s->coarsecal.y_res = s->darkcal.y_res = s->lightcal.y_res = settings[i].y_res;
     s->darkcal.height = s->lightcal.height = 16;
@@ -2095,13 +2097,18 @@ change_params(struct scanner *s)
     s->sendcal.width_pix = width;
     s->sendcal.width_bytes = width * 6;  /* 2 bytes of cal data per pixel component */
     s->sendcal.height = 1;
+    s->sendcal.mode = MODE_COLOR;
     s->sendcal.x_res = settings[i].x_res;
     s->sendcal.y_res = settings[i].y_res;
     s->sendcal.pages = img_pages;
     s->sendcal.buffer = NULL;
     
+    /*=============================================================*/
     /* set up the fullscan parameters */
-    s->fullscan.width_bytes = s->block_xfr.line_stride;
+    /* this is bookkeeping for what we actually pull from the scanner */
+    /* note that this has no image, just dimensions and counters */
+    s->fullscan.width_bytes = settings[i].line_stride;
+    s->fullscan.mode = settings[i].mode;
     s->fullscan.x_res = settings[i].x_res;
     s->fullscan.y_res = settings[i].y_res;
     if(s->source == SOURCE_FLATBED || !s->page_height)
@@ -2116,8 +2123,34 @@ change_params(struct scanner *s)
     }
 
     /*=============================================================*/
+    /* set up the input block raw struct */
+    /* this holds up to 512k of raw scan data */
+    s->block_xfr.line_stride = settings[i].line_stride;
+    s->block_xfr.plane_stride = settings[i].plane_stride;
+    s->block_xfr.plane_width = settings[i].plane_width;
+    s->block_xfr.mode = settings[i].mode;
+    s->block_xfr.x_res = settings[i].x_res;
+    s->block_xfr.y_res = settings[i].y_res;
+    s->block_xfr.raw_data = NULL;
+    s->block_xfr.image = &s->block_img;
+
+    /* set up the input block image struct */
+    /* note that this is the same width/x_res as the final output image */
+    /* but the mode, height and y_res are the same as block_xfr */
+    width = (settings[i].max_x * s->resolution / settings[i].x_res);
+    s->block_img.width_pix = width;
+    s->block_img.width_bytes = width * (settings[i].mode == MODE_COLOR ? 3 : 1);
+    s->block_img.height = settings[i].block_height;
+    s->block_img.mode = settings[i].mode;
+    s->block_img.x_res = s->resolution;
+    s->block_img.y_res = settings[i].y_res;
+    s->block_img.pages = img_pages;
+    s->block_img.buffer = NULL;
+
+    /*=============================================================*/
     /* set up the output image structs */
     /* output image might be different from scan due to interpolation */
+    s->front.mode = s->mode;
     s->front.x_res = s->resolution;
     s->front.y_res = s->resolution;
     if(s->source == SOURCE_FLATBED)
@@ -2170,6 +2203,7 @@ change_params(struct scanner *s)
     /* back settings always same as front settings */
     s->back.width_pix = s->front.width_pix;
     s->back.width_bytes = s->front.width_bytes;
+    s->back.mode = s->front.mode;
     s->back.x_res = s->front.x_res;
     s->back.y_res = s->front.y_res;
     s->back.height = s->front.height;
@@ -2182,6 +2216,7 @@ change_params(struct scanner *s)
     /* dynamic threshold temp buffer, in gray */
     s->dt.width_pix = s->front.width_pix;
     s->dt.width_bytes = s->front.width_pix;
+    s->dt.mode = MODE_GRAYSCALE;
     s->dt.x_res = s->front.x_res;
     s->dt.y_res = s->front.y_res;
     s->dt.height = 1;
@@ -3955,7 +3990,7 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len, SANE_Int * len
         {
             DBG (15, "sane_read: block buffer full\n");
 
-            /* convert the raw data into normal packed pixel data */
+            /* convert the raw color data into normal packed pixel data */
             descramble_raw(s, &s->block_xfr);
 
             s->block_xfr.done = 0;
@@ -4095,6 +4130,8 @@ six5 (struct scanner *s)
 
 /* de-scrambles the raw data from the scanner into the image buffer */
 /* the output image might be lower dpi than input image, so we scale horizontally */
+/* if the input image is mirrored left to right, we do not correct it here */
+/* if the input image has padding (at the end or between heads), it is removed here */
 static SANE_Status
 descramble_raw(struct scanner *s, struct transfer * tp)
 {
@@ -4103,6 +4140,13 @@ descramble_raw(struct scanner *s, struct transfer * tp)
     int height = tp->total_bytes / tp->line_stride;
     int i, j, k;
 
+    /* raw gray data handled in another function */
+    if(tp->mode == MODE_GRAYSCALE){
+      return descramble_raw_gray(s, tp);
+    }
+
+    DBG(15, "descramble_raw: start\n");
+
     if (s->model == MODEL_S300 || s->model == MODEL_S1300i) {
       for (i = 0; i < 2; i++){                   /* page, front/back */
         for (j = 0; j < height; j++){             /* row (y)*/
@@ -4233,6 +4277,47 @@ descramble_raw(struct scanner *s, struct transfer * tp)
       }
     }
 
+    DBG(15, "descramble_raw: finish %d\n", ret);
+
+    return ret;
+}
+
+/* de-scrambles the raw gray data from the scanner into the image buffer */
+/* the output image might be lower dpi than input image, so we scale horizontally */
+/* if the input image is mirrored left to right, we do not correct it here */
+/* if the input image has padding (at the end or between heads), it is removed here */
+static SANE_Status
+descramble_raw_gray(struct scanner *s, struct transfer * tp)
+{
+    SANE_Status ret = SANE_STATUS_GOOD;
+    int height = tp->total_bytes / tp->line_stride;
+    int row, col_out;
+
+    DBG(15, "descramble_raw_gray: start\n");
+
+    if (s->model == MODEL_FI60F || s->model == MODEL_FI65F) {
+      for (row = 0; row < height; row++){
+  
+        unsigned char *p_in = tp->raw_data + row * tp->line_stride;
+        unsigned char *p_out = tp->image->buffer + row * tp->image->width_pix;
+  
+        for (col_out = 0; col_out < tp->image->width_pix; col_out++){
+          int col_in = col_out * tp->x_res/tp->image->x_res;
+          int offset = col_in%tp->plane_width;
+          int step   = col_in/tp->plane_width;
+  
+          *p_out = *(p_in + offset*3 + step);
+          p_out++;
+        }
+      }
+    }
+
+    else{
+        DBG(5, "internal error: descramble_raw_gray not supported\n");
+        ret = SANE_STATUS_INVAL;
+    }
+
+    DBG(15, "descramble_raw_gray: finish %d\n", ret);
     return ret;
 }
 
@@ -4313,8 +4398,10 @@ read_from_scanner(struct scanner *s, struct transfer * tp)
 }
 
 /* copies block buffer into front or back image buffer */
-/* converts pixel data from RGB Color to the output format */
+/* converts pixel data from input mode (color/gray) to output mode (color/gray/binary) */
 /* the output image might be lower dpi than input image, so we scale vertically */
+/* the input is already scaled horizontally and padding skipped if required */
+/* if the input is mirrored left to right, we fix it here */
 static SANE_Status
 copy_block_to_page(struct scanner *s,int side)
 {
@@ -4322,11 +4409,10 @@ copy_block_to_page(struct scanner *s,int side)
     struct transfer * block = &s->block_xfr;
     struct page * page = &s->pages[side];
     int image_height = block->total_bytes / block->line_stride;
-    int page_height = SCANNER_UNIT_TO_PIX(s->page_height, s->resolution);
     int page_width = page->image->width_pix;
     int block_page_stride = block->image->width_bytes * block->image->height;
     int line_reverse = (side == SIDE_BACK) || (s->model == MODEL_FI60F) || (s->model == MODEL_FI65F);
-    int i,j,k=0,l=0;
+    int i,j,k=0;
 
     int curr_in_row = s->fullscan.rx_bytes/s->fullscan.width_bytes;
     int last_out_row = (page->bytes_scanned / page->image->width_bytes) - 1;
@@ -4334,7 +4420,7 @@ copy_block_to_page(struct scanner *s,int side)
     DBG (10, "copy_block_to_page: start\n");
 
     /* skip padding and tl_y */
-    if (s->fullscan.rx_bytes + s->block_xfr.rx_bytes < block->line_stride * page->image->y_skip_offset)
+    if (s->fullscan.rx_bytes + s->block_xfr.rx_bytes <= block->line_stride * page->image->y_skip_offset)
     {
         DBG (10, "copy_block_to_page: before the start? %d\n", side);
         return ret;
@@ -4345,25 +4431,8 @@ copy_block_to_page(struct scanner *s,int side)
         DBG (10, "copy_block_to_page: k start? %d\n", k);
     }
 
-    /* skip trailer */
-    if (s->page_height)
-    {
-        DBG (10, "copy_block_to_page: ph %d\n", s->page_height);
-        if (s->fullscan.rx_bytes > block->line_stride * page->image->y_skip_offset + page_height * block->line_stride)
-        {
-            DBG (10, "copy_block_to_page: off the end? %d\n", side);
-            return ret;
-        }
-        else if (s->fullscan.rx_bytes + s->block_xfr.rx_bytes
-                 > block->line_stride * page->image->y_skip_offset + page_height * block->line_stride)
-        {
-             l = (s->fullscan.rx_bytes + s->block_xfr.rx_bytes) / block->line_stride
-                 - page_height - page->image->y_skip_offset;
-        }
-    }
-
     /* loop over all the lines in the block */
-    for (i = k; i < image_height-l; i++)
+    for (i = k; i < image_height; i++)
     {
       /* determine source and dest rows (dpi scaling) */
       int this_in_row = curr_in_row + i;
@@ -4389,13 +4458,15 @@ copy_block_to_page(struct scanner *s,int side)
 
         last_out_row = this_out_row;
 
-        /* reverse order for back side or FI-60F scanner */
-        if (line_reverse)
+        if (block->mode == MODE_COLOR){
+  
+          /* reverse order for back side or FI-60F scanner */
+          if (line_reverse)
             p_in += (page_width - 1) * 3;
-
-        /* convert all of the pixels in this row */
-        for (j = 0; j < page_width; j++)
-        {
+  
+          /* convert all of the pixels in this row */
+          for (j = 0; j < page_width; j++)
+          {
             unsigned char r, g, b;
             if (s->model == MODEL_S300 || s->model == MODEL_S1300i)
                 { r = p_in[1]; g = p_in[2]; b = p_in[0]; }
@@ -4413,12 +4484,41 @@ copy_block_to_page(struct scanner *s,int side)
             }
             else if (s->mode == MODE_LINEART)
             {
-                s->dt.buffer[j] = (r + g + b) / 3; /* stores dt temp image buffer and binarize afterword */
+                s->dt.buffer[j] = (r + g + b) / 3; /* stores dt temp image buffer and binarize afterward */
             }
             if (line_reverse)
                 p_in -= 3;
             else
                 p_in += 3;
+           }
+         }
+ 
+         /* grayscale input */
+         else{
+           unsigned char * p_in = block->image->buffer + (side * block_page_stride)
+               + (i * block->image->width_bytes) + page->image->x_start_offset;
+ 
+           /* reverse order for back side or FI-60F scanner */
+           if (line_reverse)
+             p_in += (page_width - 1);
+   
+           //memcpy(p_out,p_in,page->image->width_bytes);
+           
+           for (j = 0; j < page_width; j++)
+           {
+             if (s->mode == MODE_GRAYSCALE)
+             {
+                 *p_out++ = *p_in;
+             }
+             else if (s->mode == MODE_LINEART)
+             {
+                 s->dt.buffer[j] = *p_in; /* stores dt temp image buffer and binarize afterward */
+             }
+             if (line_reverse)
+                 p_in--;
+             else
+                 p_in++;
+           }
         }
 
 	/* skip non-transfer pixels in block image buffer */
@@ -4576,13 +4676,13 @@ destroy(struct scanner *s)
     teardown_buffers(s);
 
     if(s->sane.name){
-      free(s->sane.name);
+      free((void *) s->sane.name);
     }
     if(s->sane.vendor){
-      free(s->sane.vendor);
+      free((void *) s->sane.vendor);
     }
     if(s->sane.model){
-      free(s->sane.model);
+      free((void *) s->sane.model);
     }
   
     free(s);
diff --git a/backend/epjitsu.conf.in b/backend/epjitsu.conf.in
index 155befc..3ba1c15 100644
--- a/backend/epjitsu.conf.in
+++ b/backend/epjitsu.conf.in
@@ -61,14 +61,23 @@ usb 0x04c5 0x1156
 firmware @DATADIR@/sane/epjitsu/300M_0C00.nal
 usb 0x04c5 0x117f
 
-# Fujitsu S1100
-firmware @DATADIR@/sane/epjitsu/1100_0B00.nal
-usb 0x04c5 0x1200
+# Fujitsu fi-65F
+firmware @DATADIR@/sane/epjitsu/65f_0A01.nal
+usb 0x04c5 0x11bd
 
 # Fujitsu S1300
 firmware @DATADIR@/sane/epjitsu/1300_0C26.nal
 usb 0x04c5 0x11ed
 
+# Fujitsu S1100
+firmware @DATADIR@/sane/epjitsu/1100_0B00.nal
+usb 0x04c5 0x1200
+
 # Fujitsu S1300i
 firmware @DATADIR@/sane/epjitsu/1300i_0D12.nal
 usb 0x04c5 0x128d
+
+# Fujitsu S1100i
+firmware @DATADIR@/sane/epjitsu/1100i_0A00.nal
+usb 0x04c5 0x1447
+
diff --git a/backend/epjitsu.h b/backend/epjitsu.h
index 7bb1ccc..6dfaf67 100644
--- a/backend/epjitsu.h
+++ b/backend/epjitsu.h
@@ -55,6 +55,7 @@ struct image {
   int width_bytes;
   int height;
   int pages;
+  int mode;
   int x_res;
   int y_res;
   int x_start_offset;
@@ -71,6 +72,7 @@ struct transfer {
   int total_bytes;
   int rx_bytes;
   int done;
+  int mode;
   int x_res;
   int y_res;
 
@@ -216,6 +218,7 @@ struct scanner
   /* the scan struct holds these larger numbers, but image buffer is unused */
   struct {
       int done;
+      int mode;
       int x_res;
       int y_res;
       int height;
@@ -259,12 +262,12 @@ struct scanner
   int hw_sleep;
 };
 
-#define MODEL_NONE 0
-#define MODEL_S300 1
-#define MODEL_FI60F 2
-#define MODEL_S1100 3
-#define MODEL_S1300i 4
-#define MODEL_FI65F 5
+#define MODEL_NONE (1<<0)
+#define MODEL_S300 (1<<1)
+#define MODEL_FI60F (1<<2)
+#define MODEL_S1100 (1<<3)
+#define MODEL_S1300i (1<<4)
+#define MODEL_FI65F (1<<5)
 
 #define USB_COMMAND_TIME   10000
 #define USB_DATA_TIME      10000
@@ -378,6 +381,7 @@ static SANE_Status set_window(struct scanner *s, int window);
 static SANE_Status scan(struct scanner *s);
 
 static SANE_Status read_from_scanner(struct scanner *s, struct transfer *tp);
+static SANE_Status descramble_raw_gray(struct scanner *s, struct transfer * tp);
 static SANE_Status descramble_raw(struct scanner *s, struct transfer * tp);
 static SANE_Status copy_block_to_page(struct scanner *s, int side);
 static SANE_Status binarize_line(struct scanner *s, unsigned char *lineOut, int width);
diff --git a/backend/epson.c b/backend/epson.c
index 6b111f2..3fc264f 100644
--- a/backend/epson.c
+++ b/backend/epson.c
@@ -4232,7 +4232,7 @@ SANE_Status
 sane_get_parameters (SANE_Handle handle, SANE_Parameters * params)
 {
   Epson_Scanner *s = (Epson_Scanner *) handle;
-  int ndpi, max_x, max_y;
+  int ndpi;
   int bytes_per_pixel;
 
   DBG (5, "sane_get_parameters()\n");
@@ -4270,8 +4270,6 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params)
 
   ndpi = s->val[OPT_RESOLUTION].w;
 
-  max_x = max_y = 0;
-
   s->params.pixels_per_line =
     SANE_UNFIX (s->val[OPT_BR_X].w - s->val[OPT_TL_X].w) / 25.4 * ndpi + 0.5;
   s->params.lines =
@@ -5271,7 +5269,6 @@ sane_read (SANE_Handle handle, SANE_Byte * data, SANE_Int max_length,
   int index = 0;
   SANE_Bool reorder = SANE_FALSE;
   SANE_Bool needStrangeReorder = SANE_FALSE;
-  int bytes_to_process = 0;
 
 START_READ:
   DBG (5, "sane_read: begin\n");
@@ -5447,9 +5444,7 @@ START_READ:
         reorder = SANE_TRUE;
       }
 
-      bytes_to_process = receive (s, s->buf, buf_len, &status);
-
-      /* bytes_to_process = buf_len; */
+      receive (s, s->buf, buf_len, &status);
 
       if (SANE_STATUS_GOOD != status)
       {
diff --git a/backend/epson2-io.c b/backend/epson2-io.c
index 4477963..9d23e2a 100644
--- a/backend/epson2-io.c
+++ b/backend/epson2-io.c
@@ -113,32 +113,37 @@ ssize_t
 e2_recv(Epson_Scanner *s, void *buf, ssize_t buf_size,
 	    SANE_Status *status)
 {
-	ssize_t n = 0;
+	ssize_t n = buf_size; /* network interface needs to read header back even data is 0.*/
 
 	DBG(15, "%s: size = %ld, buf = %p\n", __func__, (long) buf_size, buf);
 
+	*status = SANE_STATUS_GOOD;
 	if (s->hw->connection == SANE_EPSON_NET) {
 		n = sanei_epson_net_read(s, buf, buf_size, status);
 	} else if (s->hw->connection == SANE_EPSON_SCSI) {
-		n = sanei_epson2_scsi_read(s->fd, buf, buf_size, status);
+		if (buf_size)
+			n = sanei_epson2_scsi_read(s->fd, buf, buf_size, status);
 	} else if (s->hw->connection == SANE_EPSON_PIO) {
-		if (buf_size ==
-		    (n = sanei_pio_read(s->fd, buf, (size_t) buf_size)))
-			*status = SANE_STATUS_GOOD;
-		else
-			*status = SANE_STATUS_INVAL;
+		if (buf_size) {
+			if (buf_size ==
+			    (n = sanei_pio_read(s->fd, buf, (size_t) buf_size)))
+				*status = SANE_STATUS_GOOD;
+			else
+				*status = SANE_STATUS_INVAL;
+		}
 	} else if (s->hw->connection == SANE_EPSON_USB) {
 		/* !!! only report an error if we don't read anything */
-		n = buf_size;	/* buf_size gets overwritten */
-		*status =
-			sanei_usb_read_bulk(s->fd, (SANE_Byte *) buf,
-					    (size_t *) & n);
-		r_cmd_count += (n + 63) / 64;	/* add # of packets, rounding up */
-		DBG(20, "%s: cmd count, r = %d, w = %d\n",
-		    __func__, r_cmd_count, w_cmd_count);
-
-		if (n > 0)
-			*status = SANE_STATUS_GOOD;
+		if (n) {
+			*status =
+				sanei_usb_read_bulk(s->fd, (SANE_Byte *) buf,
+						    (size_t *) & n);
+			r_cmd_count += (n + 63) / 64;	/* add # of packets, rounding up */
+			DBG(20, "%s: cmd count, r = %d, w = %d\n",
+			    __func__, r_cmd_count, w_cmd_count);
+
+			if (n > 0)
+				*status = SANE_STATUS_GOOD;
+		}
 	}
 
 	if (n < buf_size) {
@@ -170,18 +175,23 @@ e2_txrx(Epson_Scanner * s, unsigned char *txbuf, size_t txlen,
 	    unsigned char *rxbuf, size_t rxlen)
 {
 	SANE_Status status;
+	size_t done;
 
-	e2_send(s, txbuf, txlen, rxlen, &status);
+	done = e2_send(s, txbuf, txlen, rxlen, &status);
 	if (status != SANE_STATUS_GOOD) {
 		DBG(1, "%s: tx err, %s\n", __func__, sane_strstatus(status));
 		return status;
 	}
+	if (done != txlen) {
+		DBG(1, "%s: tx err, short write\n", __func__);
+		return SANE_STATUS_IO_ERROR;
+	}
 
 	e2_recv(s, rxbuf, rxlen, &status);
 	if (status != SANE_STATUS_GOOD) {
 		DBG(1, "%s: rx err, %s\n", __func__, sane_strstatus(status));
 	}
-
+		DBG(1, "%s: eds_recv status, %s\n", __func__, sane_strstatus(status));
 	return status;
 }
 
diff --git a/backend/epson2-ops.c b/backend/epson2-ops.c
index eac01b0..1ba2292 100644
--- a/backend/epson2-ops.c
+++ b/backend/epson2-ops.c
@@ -2087,7 +2087,6 @@ e2_block_read(struct Epson_Scanner *s)
 {
 	SANE_Status status;
 	SANE_Bool reorder = SANE_FALSE;
-	SANE_Bool needStrangeReorder = SANE_FALSE;
 
       START_READ:
 	DBG(18, "%s: begin\n", __func__);
@@ -2150,22 +2149,6 @@ e2_block_read(struct Epson_Scanner *s)
 		 */
 
 		/*
-		 * Some scanners (e.g. the Perfection 1640 and GT-2200) seem
-		 * to have the R and G channels swapped.
-		 * The GT-8700 is the Asian version of the Perfection 1640.
-		 * If the scanner name is one of these and the scan mode is
-		 * RGB then swap the colors.
-		 */
-
-		/* never used, beta testers required */
-		needStrangeReorder =
-			(strstr(s->hw->model, "GT-2200") ||
-			 ((strstr(s->hw->model, "1640")
-			   && strstr(s->hw->model, "Perfection"))
-			  || strstr(s->hw->model, "GT-8700")))
-			&& s->params.format == SANE_FRAME_RGB;
-
-		/*
 		 * Certain Perfection 1650 also need this re-ordering of the two
 		 * color channels. These scanners are identified by the problem
 		 * with the half vertical scanning area. When we corrected this,
diff --git a/backend/epson2.h b/backend/epson2.h
index 8650f01..773c7de 100644
--- a/backend/epson2.h
+++ b/backend/epson2.h
@@ -45,13 +45,6 @@
 #include "sane/sanei_backend.h"
 #include "sane/sanei_debug.h"
 
-#ifdef __GNUC__
-#define __func__ __FUNCTION__
-#else
-#define __func__ "(undef)"
-/* I cast my vote for C99... :) */
-#endif
-
 #define EPSON2_CONFIG_FILE "epson2.conf"
 
 #ifndef PATH_MAX
diff --git a/backend/epson2_net.c b/backend/epson2_net.c
index 911ce62..4b3e7e9 100644
--- a/backend/epson2_net.c
+++ b/backend/epson2_net.c
@@ -104,7 +104,7 @@ sanei_epson_net_read(Epson_Scanner *s, unsigned char *buf, ssize_t wanted,
 
 	size = be32atoh(&header[6]);
 
-	DBG(23, "%s: wanted = %lu, available = %lu\n", __FUNCTION__,
+	DBG(23, "%s: wanted = %lu, available = %lu\n", __func__,
 		(u_long) wanted, (u_long) size);
 
 	*status = SANE_STATUS_GOOD;
@@ -170,7 +170,7 @@ sanei_epson_net_write(Epson_Scanner *s, unsigned int cmd, const unsigned char *b
 	}
 
 	DBG(24, "%s: cmd = %04x, buf = %p, buf_size = %lu, reply_len = %lu\n",
-		__FUNCTION__, cmd, buf, (u_long) buf_size, (u_long) reply_len);
+		__func__, cmd, buf, (u_long) buf_size, (u_long) reply_len);
 
 	memset(h1, 0x00, 12);
 	memset(h2, 0x00, 8);
diff --git a/backend/epson2_scsi.c b/backend/epson2_scsi.c
index 89394cd..8e95c6f 100644
--- a/backend/epson2_scsi.c
+++ b/backend/epson2_scsi.c
@@ -32,7 +32,7 @@ sanei_epson2_scsi_sense_handler(int scsi_fd,
 
 	if (result[0] && result[0] != 0x70) {
 		DBG(2, "%s: sense code = 0x%02x\n",
-			__FUNCTION__, result[0]);
+			__func__, result[0]);
 		return SANE_STATUS_IO_ERROR;
 	} else {
 		return SANE_STATUS_GOOD;
diff --git a/backend/epsonds-cmd.c b/backend/epsonds-cmd.c
index b91f3f1..9a4db30 100644
--- a/backend/epsonds-cmd.c
+++ b/backend/epsonds-cmd.c
@@ -21,6 +21,7 @@
 #include "epsonds-io.h"
 #include "epsonds-cmd.h"
 #include "epsonds-ops.h"
+#include "epsonds-net.h"
 
 static SANE_Status
 esci2_parse_block(char *buf, int len, void *userdata, SANE_Status (*cb)(void *userdata, char *token, int len))
@@ -132,49 +133,39 @@ static SANE_Status esci2_cmd(epsonds_scanner* s,
 {
 	SANE_Status status;
 	unsigned int more;
-	char rbuf[64];
+	char header[13], rbuf[64]; /* add one more byte for header buffer to correct buffer overflow issue,*/
 
 	DBG(8, "%s: %4s len %lu, payload len: %lu\n", __func__, cmd, len, plen);
 
-	if (len < 12) {
-		DBG(1, "%s: command is too short (%lu)\n", __func__, len);
+	memset(header, 0x00, sizeof(header));
+	memset(rbuf, 0x00, sizeof(rbuf));
+
+	// extra safety check, will not happen
+	if (len != 12) {
+		DBG(1, "%s: command has wrong size (%lu != 12)\n", __func__, len);
 		return SANE_STATUS_INVAL;
 	}
 
-	/* merge the payload size and send the RequestBlock */
-	if (payload && plen) {
-
-		sprintf(rbuf, "%4.4sx%07x", cmd, (unsigned int)plen);
-
-		DBG(8, " %s (%lu)\n", rbuf, plen);
-
-		eds_send(s, rbuf, 12, &status);
-
-	} else {
-		eds_send(s, cmd, len, &status);
-	}
+	// merge ParameterBlock size
+	sprintf(header, "%4.4sx%07x", cmd, (unsigned int)plen);
 
+	// send RequestBlock, request immediate response if there's no payload
+	status = eds_txrx(s, header, len, rbuf, (plen > 0) ? 0 : 64);
 	if (status != SANE_STATUS_GOOD) {
 		return status;
 	}
 
-	/* send ParameterBlock */
-	if (payload && plen) {
+	/* send ParameterBlock, request response */
+	if (plen) {
+
+		DBG(8, " %12.12s (%lu)\n", header, plen);
 
-		eds_send(s, payload, plen, &status);
+		status = eds_txrx(s, payload, plen, rbuf, 64);
 		if (status != SANE_STATUS_GOOD) {
 			return status;
 		}
 	}
 
-	/* receive DataHeaderBlock */
-	memset(rbuf, 0x00, sizeof(rbuf));
-
-	eds_recv(s, rbuf, 64, &status);
-	if (status != SANE_STATUS_GOOD) {
-		return status;
-	}
-
 	/* rxbuf holds the DataHeaderBlock, which should be
 	 * parsed to know if we need to read more data
 	 */
@@ -196,6 +187,10 @@ static SANE_Status esci2_cmd(epsonds_scanner* s,
 		char *pbuf = malloc(more);
 		if (pbuf) {
 
+			if (s->hw->connection == SANE_EPSONDS_NET) {
+				epsonds_net_request_read(s, more);
+			}
+
 			ssize_t read = eds_recv(s, pbuf, more, &status);
 			if (read != more) {
 			}
@@ -853,7 +848,7 @@ esci2_img(struct epsonds_scanner *s, SANE_Int *length)
 		return SANE_STATUS_CANCELLED;
 
 	/* request image data */
-	eds_send(s, "IMG x0000000", 12, &status);
+	eds_send(s, "IMG x0000000", 12, &status, 64);
 	if (status != SANE_STATUS_GOOD) {
 		return status;
 	}
@@ -882,6 +877,10 @@ esci2_img(struct epsonds_scanner *s, SANE_Int *length)
 	}
 
 	/* ALWAYS read image data */
+	if (s->hw->connection == SANE_EPSONDS_NET) {
+		epsonds_net_request_read(s, more);
+	}
+
 	read = eds_recv(s, s->buf, more, &status);
 	if (status != SANE_STATUS_GOOD) {
 		return status;
diff --git a/backend/epsonds-io.c b/backend/epsonds-io.c
index 28bacfc..e153ad4 100644
--- a/backend/epsonds-io.c
+++ b/backend/epsonds-io.c
@@ -16,11 +16,19 @@
 #include "sane/config.h"
 #include <ctype.h>
 #include <unistd.h>     /* sleep */
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 
 #include "epsonds.h"
 #include "epsonds-io.h"
+#include "epsonds-net.h"
 
-size_t eds_send(epsonds_scanner *s, void *buf, size_t length, SANE_Status *status)
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+size_t eds_send(epsonds_scanner *s, void *buf, size_t length, SANE_Status *status, size_t reply_len)
 {
 	DBG(32, "%s: size = %lu\n", __func__, (u_long) length);
 
@@ -36,7 +44,9 @@ size_t eds_send(epsonds_scanner *s, void *buf, size_t length, SANE_Status *statu
 	}
 
 	if (s->hw->connection == SANE_EPSONDS_NET) {
-		/* XXX */
+
+		return epsonds_net_write(s, 0x2000, buf, length, reply_len, status);
+
 	} else if (s->hw->connection == SANE_EPSONDS_USB) {
 
 		size_t n = length;
@@ -55,21 +65,23 @@ size_t eds_send(epsonds_scanner *s, void *buf, size_t length, SANE_Status *statu
 
 size_t eds_recv(epsonds_scanner *s, void *buf, size_t length, SANE_Status *status)
 {
-	size_t n = 0;
+	size_t n = length; /* network interface needs to read header back even data is 0.*/
 
 	DBG(30, "%s: size = %ld, buf = %p\n", __func__, (long) length, buf);
 
+	*status = SANE_STATUS_GOOD;
+
 	if (s->hw->connection == SANE_EPSONDS_NET) {
-		/* XXX */
+		n = epsonds_net_read(s, buf, length, status);
 	} else if (s->hw->connection == SANE_EPSONDS_USB) {
 
 		/* !!! only report an error if we don't read anything */
-
-		n = length;
-		*status = sanei_usb_read_bulk(s->fd, (SANE_Byte *)buf,
-					    (size_t *) &n);
-		if (n > 0)
-			*status = SANE_STATUS_GOOD;
+		if (n) {
+			*status = sanei_usb_read_bulk(s->fd, (SANE_Byte *)buf,
+						    (size_t *) &n);
+			if (n > 0)
+				*status = SANE_STATUS_GOOD;
+		}
 	}
 
 	if (n < length) {
@@ -90,7 +102,7 @@ SANE_Status eds_txrx(epsonds_scanner* s, char *txbuf, size_t txlen,
 	SANE_Status status;
 	size_t done;
 
-	done = eds_send(s, txbuf, txlen, &status);
+	done = eds_send(s, txbuf, txlen, &status, rxlen);
 	if (status != SANE_STATUS_GOOD) {
 		DBG(1, "%s: tx err, %s\n", __func__, sane_strstatus(status));
 		return status;
@@ -147,6 +159,7 @@ SANE_Status eds_fsy(epsonds_scanner *s)
 
 SANE_Status eds_fsx(epsonds_scanner *s)
 {
+//	SANE_Status status = eds_control(s, "\x1CZ", 2);
 	SANE_Status status = eds_control(s, "\x1CX", 2);
 	if (status == SANE_STATUS_GOOD) {
 		s->locked = 1;
diff --git a/backend/epsonds-io.h b/backend/epsonds-io.h
index 1a1b2b7..1bb67c6 100644
--- a/backend/epsonds-io.h
+++ b/backend/epsonds-io.h
@@ -17,7 +17,7 @@
 #define USB_TIMEOUT (6 * 1000)
 #define USB_SHORT_TIMEOUT (1 * 800)
 
-size_t eds_send(epsonds_scanner *s, void *buf, size_t length, SANE_Status *status);
+size_t eds_send(epsonds_scanner *s, void *buf, size_t length, SANE_Status *status, size_t reply_len);
 size_t eds_recv(epsonds_scanner *s, void *buf, size_t length, SANE_Status *status);
 
 SANE_Status eds_txrx(epsonds_scanner *s, char *txbuf, size_t txlen,
diff --git a/backend/epsonds-jpeg.c b/backend/epsonds-jpeg.c
index 76a52cb..62e8bb5 100644
--- a/backend/epsonds-jpeg.c
+++ b/backend/epsonds-jpeg.c
@@ -13,6 +13,8 @@
 
 #define DEBUG_DECLARE_ONLY
 
+#include "sane/config.h"
+
 #include <math.h>
 
 #include "epsonds.h"
@@ -35,12 +37,12 @@ typedef struct
 epsonds_src_mgr;
 
 METHODDEF(void)
-jpeg_init_source(j_decompress_ptr UNUSEDARG cinfo)
+jpeg_init_source(j_decompress_ptr __sane_unused__ cinfo)
 {
 }
 
 METHODDEF(void)
-jpeg_term_source(j_decompress_ptr UNUSEDARG cinfo)
+jpeg_term_source(j_decompress_ptr __sane_unused__ cinfo)
 {
 }
 
diff --git a/backend/epsonds-jpeg.h b/backend/epsonds-jpeg.h
index c54208e..a804dec 100644
--- a/backend/epsonds-jpeg.h
+++ b/backend/epsonds-jpeg.h
@@ -11,8 +11,6 @@
  * published by the Free Software Foundation, version 2.
  */
 
-#define UNUSEDARG __attribute__ ((unused))
-
 SANE_Status eds_jpeg_start(epsonds_scanner *s);
 void eds_jpeg_finish(epsonds_scanner *s);
 SANE_Status eds_jpeg_read_header(epsonds_scanner *s);
diff --git a/backend/epsonds-net.c b/backend/epsonds-net.c
new file mode 100644
index 0000000..8ea236b
--- /dev/null
+++ b/backend/epsonds-net.c
@@ -0,0 +1,278 @@
+/*
+ * epsonds-net.c - SANE library for Epson scanners.
+ *
+ * Copyright (C) 2006-2016 Tower Technologies
+ * Author: Alessandro Zummo <a.zummo@towertech.it>
+ *
+ * This file is part of the SANE package.
+ *
+ * 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, version 2.
+ */
+
+#define DEBUG_DECLARE_ONLY
+
+#include "sane/config.h"
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#include "sane/sane.h"
+#include "sane/saneopts.h"
+#include "sane/sanei_tcp.h"
+#include "sane/sanei_config.h"
+#include "sane/sanei_backend.h"
+
+#include "epsonds.h"
+#include "epsonds-net.h"
+
+#include "byteorder.h"
+
+#include "sane/sanei_debug.h"
+
+static int
+epsonds_net_read_raw(epsonds_scanner *s, unsigned char *buf, ssize_t wanted,
+		       SANE_Status *status)
+{
+	int ready, read = -1;
+	fd_set readable;
+	struct timeval tv;
+
+	tv.tv_sec = 10;
+	tv.tv_usec = 0;
+
+	FD_ZERO(&readable);
+	FD_SET(s->fd, &readable);
+
+	ready = select(s->fd + 1, &readable, NULL, NULL, &tv);
+	if (ready > 0) {
+		read = sanei_tcp_read(s->fd, buf, wanted);
+	} else {
+		DBG(15, "%s: select failed: %d\n", __func__, ready);
+	}
+
+	*status = SANE_STATUS_GOOD;
+
+	if (read < wanted) {
+		*status = SANE_STATUS_IO_ERROR;
+	}
+
+	return read;
+}
+
+int
+epsonds_net_read(epsonds_scanner *s, unsigned char *buf, ssize_t wanted,
+		       SANE_Status * status)
+{
+	ssize_t size;
+	ssize_t read = 0;
+	unsigned char header[12];
+
+	/* read from buffer, if available */
+	if (wanted && s->netptr != s->netbuf) {
+		DBG(23, "reading %lu from buffer at %p, %lu available\n",
+			(u_long) wanted, s->netptr, (u_long) s->netlen);
+
+		memcpy(buf, s->netptr, wanted);
+		read = wanted;
+
+		s->netlen -= wanted;
+
+		if (s->netlen == 0) {
+			DBG(23, "%s: freeing %p\n", __func__, s->netbuf);
+			free(s->netbuf);
+			s->netbuf = s->netptr = NULL;
+			s->netlen = 0;
+		}
+
+		return read;
+	}
+
+	/* receive net header */
+	size = epsonds_net_read_raw(s, header, 12, status);
+	if (size != 12) {
+		return 0;
+	}
+
+	if (header[0] != 'I' || header[1] != 'S') {
+		DBG(1, "header mismatch: %02X %02x\n", header[0], header[1]);
+		*status = SANE_STATUS_IO_ERROR;
+		return 0;
+	}
+
+	// incoming payload size
+	size = be32atoh(&header[6]);
+
+	DBG(23, "%s: wanted = %lu, available = %lu\n", __func__,
+		(u_long) wanted, (u_long) size);
+
+	*status = SANE_STATUS_GOOD;
+
+	if (size == wanted) {
+
+		DBG(15, "%s: full read\n", __func__);
+
+		if (size) {
+			read = epsonds_net_read_raw(s, buf, size, status);
+		}
+
+		if (s->netbuf) {
+			free(s->netbuf);
+			s->netbuf = NULL;
+			s->netlen = 0;
+		}
+
+		if (read < 0) {
+			return 0;
+		}
+
+	} else if (wanted < size) {
+
+		DBG(23, "%s: long tail\n", __func__);
+
+		read = epsonds_net_read_raw(s, s->netbuf, size, status);
+		if (read != size) {
+			return 0;
+		}
+
+		memcpy(buf, s->netbuf, wanted);
+		read = wanted;
+
+		free(s->netbuf);
+		s->netbuf = NULL;
+		s->netlen = 0;
+
+	} else {
+
+		DBG(23, "%s: partial read\n", __func__);
+
+		read = epsonds_net_read_raw(s, s->netbuf, size, status);
+		if (read != size) {
+			return 0;
+		}
+
+		s->netlen = size - wanted;
+		s->netptr += wanted;
+		read = wanted;
+
+		DBG(23, "0,4 %02x %02x\n", s->netbuf[0], s->netbuf[4]);
+		DBG(23, "storing %lu to buffer at %p, next read at %p, %lu bytes left\n",
+			(u_long) size, s->netbuf, s->netptr, (u_long) s->netlen);
+
+		memcpy(buf, s->netbuf, wanted);
+	}
+
+	return read;
+}
+
+SANE_Status
+epsonds_net_request_read(epsonds_scanner *s, size_t len)
+{
+	SANE_Status status;
+	epsonds_net_write(s, 0x2000, NULL, 0, len, &status);
+	return status;
+}
+
+int
+epsonds_net_write(epsonds_scanner *s, unsigned int cmd, const unsigned char *buf,
+			size_t buf_size, size_t reply_len, SANE_Status *status)
+{
+	unsigned char *h1, *h2;
+	unsigned char *packet = malloc(12 + 8);
+
+	/* XXX check allocation failure */
+
+	h1 = packet;		// packet header
+	h2 = packet + 12;	// data header
+
+	if (reply_len) {
+		s->netbuf = s->netptr = malloc(reply_len);
+		s->netlen = reply_len;
+		DBG(24, "allocated %lu bytes at %p\n",
+			(u_long) reply_len, s->netbuf);
+	}
+
+	DBG(24, "%s: cmd = %04x, buf = %p, buf_size = %lu, reply_len = %lu\n",
+		__func__, cmd, buf, (u_long) buf_size, (u_long) reply_len);
+
+	memset(h1, 0x00, 12);
+	memset(h2, 0x00, 8);
+
+	h1[0] = 'I';
+	h1[1] = 'S';
+
+	h1[2] = cmd >> 8;	// packet type
+	h1[3] = cmd;		// data type
+
+	h1[4] = 0x00;
+	h1[5] = 0x0C; // data offset
+
+	DBG(24, "H1[0]: %02x %02x %02x %02x\n", h1[0], h1[1], h1[2], h1[3]);
+
+	// 0x20 passthru
+	// 0x21 job control
+
+	if (buf_size) {
+		htobe32a(&h1[6], buf_size);
+	}
+
+	if((cmd >> 8) == 0x20) {
+
+		htobe32a(&h1[6], buf_size + 8);	// data size (data header + payload)
+
+		htobe32a(&h2[0], buf_size);	// payload size
+		htobe32a(&h2[4], reply_len);	// expected answer size
+
+		DBG(24, "H1[6]: %02x %02x %02x %02x (%lu)\n", h1[6], h1[7], h1[8], h1[9], (u_long) (buf_size + 8));
+		DBG(24, "H2[0]: %02x %02x %02x %02x (%lu)\n", h2[0], h2[1], h2[2], h2[3], (u_long) buf_size);
+		DBG(24, "H2[4]: %02x %02x %02x %02x (%lu)\n", h2[4], h2[5], h2[6], h2[7], (u_long) reply_len);
+	}
+
+	if ((cmd >> 8) == 0x20 && (buf_size || reply_len)) {
+
+		// send header + data header
+		sanei_tcp_write(s->fd, packet, 12 + 8);
+
+	} else {
+		sanei_tcp_write(s->fd, packet, 12);
+	}
+
+	// send payload
+	if (buf_size)
+		sanei_tcp_write(s->fd, buf, buf_size);
+
+	free(packet);
+
+	*status = SANE_STATUS_GOOD;
+	return buf_size;
+}
+
+SANE_Status
+epsonds_net_lock(struct epsonds_scanner *s)
+{
+	SANE_Status status;
+	unsigned char buf[7] = "\x01\xa0\x04\x00\x00\x01\x2c";
+
+	DBG(1, "%s\n", __func__);
+
+	epsonds_net_write(s, 0x2100, buf, 7, 0, &status);
+	epsonds_net_read(s, buf, 1, &status);
+
+	// buf[0] should be ACK, 0x06
+
+	return status;
+}
+
+SANE_Status
+epsonds_net_unlock(struct epsonds_scanner *s)
+{
+	SANE_Status status;
+
+	DBG(1, "%s\n", __func__);
+
+	epsonds_net_write(s, 0x2101, NULL, 0, 0, &status);
+/*	epsonds_net_read(s, buf, 1, &status); */
+	return status;
+}
diff --git a/backend/epsonds-net.h b/backend/epsonds-net.h
new file mode 100644
index 0000000..f7b173e
--- /dev/null
+++ b/backend/epsonds-net.h
@@ -0,0 +1,16 @@
+#ifndef _EPSONDS_NET_H_
+#define _EPSONDS_NET_H_
+
+#include <sys/types.h>
+#include "../include/sane/sane.h"
+
+extern int epsonds_net_read(struct epsonds_scanner *s, unsigned char *buf, ssize_t buf_size,
+				SANE_Status *status);
+extern int epsonds_net_write(struct epsonds_scanner *s, unsigned int cmd, const unsigned char *buf,
+				size_t buf_size, size_t reply_len,
+				SANE_Status *status);
+extern SANE_Status epsonds_net_lock(struct epsonds_scanner *s);
+extern SANE_Status epsonds_net_unlock(struct epsonds_scanner *s);
+extern SANE_Status epsonds_net_request_read(epsonds_scanner *s, size_t len);
+
+#endif
diff --git a/backend/epsonds-ops.c b/backend/epsonds-ops.c
index 403cd58..f7a07fb 100644
--- a/backend/epsonds-ops.c
+++ b/backend/epsonds-ops.c
@@ -72,6 +72,18 @@ eds_dev_post_init(struct epsonds_device *dev)
 	return SANE_STATUS_GOOD;
 }
 
+SANE_Bool
+eds_is_model(epsonds_device *dev, const char *model)
+{
+        if (dev->model == NULL)
+                return SANE_FALSE;
+
+        if (strncmp(dev->model, model, strlen(model)) == 0)
+                return SANE_TRUE;
+
+        return SANE_FALSE;
+}
+
 SANE_Status
 eds_add_resolution(epsonds_device *dev, int r)
 {
@@ -199,6 +211,12 @@ eds_init_parameters(epsonds_scanner *s)
 
 	s->dummy = 0;
 
+	/* setup depth according to our mode table */
+	if (mode_params[s->val[OPT_MODE].w].depth == 1)
+		s->params.depth = 1;
+	else
+		s->params.depth = s->val[OPT_DEPTH].w;
+
 	dpi = s->val[OPT_RESOLUTION].w;
 
 	if (SANE_UNFIX(s->val[OPT_BR_Y].w) == 0 ||
@@ -246,11 +264,6 @@ eds_init_parameters(epsonds_scanner *s)
 	 * The default color depth is stored in mode_params.depth:
 	 */
 
-	if (mode_params[s->val[OPT_MODE].w].depth == 1)
-		s->params.depth = 1;
-	else
-		s->params.depth = s->val[OPT_DEPTH].w;
-
 	/* this works because it can only be set to 1, 8 or 16 */
 	bytes_per_pixel = s->params.depth / 8;
 	if (s->params.depth % 8) {	/* just in case ... */
diff --git a/backend/epsonds-ops.h b/backend/epsonds-ops.h
index 3f45393..ac5e71b 100644
--- a/backend/epsonds-ops.h
+++ b/backend/epsonds-ops.h
@@ -11,11 +11,11 @@
  * published by the Free Software Foundation, version 2.
  */
 
-#define e2_model(s,m) e2_dev_model((s)->hw,(m))
-
 extern void eds_dev_init(epsonds_device *dev);
 extern SANE_Status eds_dev_post_init(struct epsonds_device *dev);
 
+extern SANE_Bool eds_is_model(epsonds_device *dev, const char *model);
+
 extern SANE_Status eds_add_resolution(epsonds_device *dev, int r);
 extern SANE_Status eds_set_resolution_range(epsonds_device *dev, int min, int max);
 extern void eds_set_fbf_area(epsonds_device *dev, int x, int y, int unit);
diff --git a/backend/epsonds.c b/backend/epsonds.c
index 2f85312..218e08c 100644
--- a/backend/epsonds.c
+++ b/backend/epsonds.c
@@ -12,8 +12,8 @@
  */
 
 #define EPSONDS_VERSION		1
-#define EPSONDS_REVISION	0
-#define EPSONDS_BUILD		35
+#define EPSONDS_REVISION	1
+#define EPSONDS_BUILD		0
 
 /* debugging levels:
  *
@@ -41,9 +41,12 @@
 #include "sane/config.h"
 
 #include <ctype.h>
+#include <unistd.h>
 
 #include "sane/saneopts.h"
 #include "sane/sanei_config.h"
+#include "sane/sanei_tcp.h"
+#include "sane/sanei_udp.h"
 
 #include "epsonds.h"
 #include "epsonds-usb.h"
@@ -51,6 +54,8 @@
 #include "epsonds-cmd.h"
 #include "epsonds-ops.h"
 #include "epsonds-jpeg.h"
+#include "epsonds-net.h"
+
 
 /*
  * Definition of the mode_param struct, that is used to
@@ -115,6 +120,7 @@ max_string_size(const SANE_String_Const strings[])
 }
 
 static SANE_Status attach_one_usb(SANE_String_Const devname);
+static SANE_Status attach_one_net(SANE_String_Const devname);
 
 static void
 print_params(const SANE_Parameters params)
@@ -140,7 +146,10 @@ close_scanner(epsonds_scanner *s)
 		esci2_fin(s);
 	}
 
-	if (s->hw->connection == SANE_EPSONDS_USB) {
+	if (s->hw->connection == SANE_EPSONDS_NET) {
+		epsonds_net_unlock(s);
+		sanei_tcp_close(s->fd);
+	} else if (s->hw->connection == SANE_EPSONDS_USB) {
 		sanei_usb_close(s->fd);
 	}
 
@@ -154,6 +163,49 @@ free:
 	DBG(7, "%s: ZZZ\n", __func__);
 }
 
+static void
+e2_network_discovery(void)
+{
+	fd_set rfds;
+	int fd, len;
+	SANE_Status status;
+
+	char *ip, *query = "EPSONP\x00\xff\x00\x00\x00\x00\x00\x00\x00";
+	unsigned char buf[76];
+
+	struct timeval to;
+
+	status = sanei_udp_open_broadcast(&fd);
+	if (status != SANE_STATUS_GOOD)
+		return;
+
+	sanei_udp_write_broadcast(fd, 3289, (unsigned char *) query, 15);
+
+	DBG(5, "%s, sent discovery packet\n", __func__);
+
+	to.tv_sec = 1;
+	to.tv_usec = 0;
+
+	FD_ZERO(&rfds);
+	FD_SET(fd, &rfds);
+
+	sanei_udp_set_nonblock(fd, SANE_TRUE);
+	while (select(fd + 1, &rfds, NULL, NULL, &to) > 0) {
+		if ((len = sanei_udp_recvfrom(fd, buf, 76, &ip)) == 76) {
+			DBG(5, " response from %s\n", ip);
+
+			/* minimal check, protocol unknown */
+			if (strncmp((char *) buf, "EPSON", 5) == 0)
+				attach_one_net(ip);
+		}
+	}
+
+	DBG(5, "%s, end\n", __func__);
+
+	sanei_udp_close(fd);
+}
+
+
 static SANE_Status
 open_scanner(epsonds_scanner *s)
 {
@@ -166,10 +218,59 @@ open_scanner(epsonds_scanner *s)
 		return SANE_STATUS_GOOD;	/* no need to open the scanner */
 	}
 
-	if (s->hw->connection == SANE_EPSONDS_USB) {
+	if (s->hw->connection == SANE_EPSONDS_NET) {
+		unsigned char buf[5];
+
+		/* device name has the form net:ipaddr */
+		status = sanei_tcp_open(&s->hw->sane.name[4], 1865, &s->fd);
+		if (status == SANE_STATUS_GOOD) {
+
+			ssize_t read;
+			struct timeval tv;
+
+			tv.tv_sec = 5;
+			tv.tv_usec = 0;
+
+			setsockopt(s->fd, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv,  sizeof(tv));
+
+			s->netlen = 0;
+
+			DBG(32, "awaiting welcome message\n");
+
+			/* the scanner sends a kind of welcome msg */
+			// XXX check command type, answer to connect is 0x80
+			read = eds_recv(s, buf, 3, &status);
+			if (read != 3) {
+				sanei_tcp_close(s->fd);
+				s->fd = -1;
+				return SANE_STATUS_IO_ERROR;
+			}
+
+			DBG(32, "welcome message received, locking the scanner...\n");
+
+			/* lock the scanner for use by sane */
+			status = epsonds_net_lock(s);
+			if (status != SANE_STATUS_GOOD) {
+				DBG(1, "%s cannot lock scanner: %s\n", s->hw->sane.name,
+					sane_strstatus(status));
+
+				sanei_tcp_close(s->fd);
+				s->fd = -1;
+
+				return status;
+			}
+
+			DBG(32, "scanner locked\n");
+		}
+
+	} else if (s->hw->connection == SANE_EPSONDS_USB) {
 
 		status = sanei_usb_open(s->hw->sane.name, &s->fd);
-		sanei_usb_set_timeout(USB_TIMEOUT);
+
+		if (status == SANE_STATUS_GOOD) {
+			sanei_usb_set_timeout(USB_TIMEOUT);
+			sanei_usb_clear_halt(s->fd);
+		}
 
 	} else {
 		DBG(1, "unknown connection type: %d\n", s->hw->connection);
@@ -220,12 +321,20 @@ device_detect(const char *name, int type, SANE_Status *status)
 	struct epsonds_scanner *s;
 	struct epsonds_device *dev;
 
-	DBG(1, "%s\n", __func__);
+	DBG(1, "%s, %s, type: %d\n", __func__, name, type);
 
 	/* try to find the device in our list */
 	for (dev = first_dev; dev; dev = dev->next) {
+
 		if (strcmp(dev->sane.name, name) == 0) {
+
 			DBG(1, " found cached device\n");
+
+			// the device might have been just probed, sleep a bit.
+			if (dev->connection == SANE_EPSONDS_NET) {
+				sleep(1);
+			}
+
 			return scanner_create(dev, status);
 		}
 	}
@@ -250,8 +359,9 @@ device_detect(const char *name, int type, SANE_Status *status)
 
 	dev->connection = type;
 	dev->model = strdup("(undetermined)");
+	dev->name = strdup(name);
 
-	dev->sane.name = name;
+	dev->sane.name = dev->name;
 	dev->sane.vendor = "Epson";
 	dev->sane.model = dev->model;
 	dev->sane.type = "ESC/I-2";
@@ -283,11 +393,11 @@ device_detect(const char *name, int type, SANE_Status *status)
 	if (*status != SANE_STATUS_GOOD)
 		goto close;
 
-	/* assume 1 and 8 bit are always supported */
+	// assume 1 and 8 bit are always supported
 	eds_add_depth(s->hw, 1);
 	eds_add_depth(s->hw, 8);
 
-	/* setup area according to available options */
+	// setup area according to available options
 	if (s->hw->has_fb) {
 
 		dev->x_range = &dev->fbf_x_range;
@@ -350,6 +460,19 @@ attach_one_usb(const char *dev)
 }
 
 static SANE_Status
+attach_one_net(const char *dev)
+{
+	char name[39 + 4];
+
+	DBG(7, "%s: dev = %s\n", __func__, dev);
+
+	strcpy(name, "net:");
+	strcat(name, dev);
+	return attach(name, SANE_EPSONDS_NET);
+}
+
+
+static SANE_Status
 attach_one_config(SANEI_Config __sane_unused__ *config, const char *line)
 {
 	int vendor, product;
@@ -380,6 +503,16 @@ attach_one_config(SANEI_Config __sane_unused__ *config, const char *line)
 					epsonds_usb_product_ids[i], attach_one_usb);
 		}
 
+	} else if (strncmp(line, "net", 3) == 0) {
+
+		/* remove the "net" sub string */
+		const char *name = sanei_config_skip_whitespace(line + 3);
+
+		if (strncmp(name, "autodiscovery", 13) == 0)
+			e2_network_discovery();
+		else
+			attach_one_net(name);
+
 	} else {
 		DBG(0, "unable to parse config line: %s\n", line);
 	}
@@ -669,7 +802,11 @@ sane_open(SANE_String_Const name, SANE_Handle *handle)
 
 	} else {
 
-		if (strncmp(name, "libusb:", 7) == 0) {
+		if (strncmp(name, "net:", 4) == 0) {
+			s = device_detect(name, SANE_EPSONDS_NET, &status);
+			if (s == NULL)
+				return status;
+		} else if (strncmp(name, "libusb:", 7) == 0) {
 			s = device_detect(name, SANE_EPSONDS_USB, &status);
 			if (s == NULL)
 				return status;
@@ -1041,7 +1178,7 @@ SANE_Status
 sane_start(SANE_Handle handle)
 {
 	epsonds_scanner *s = (epsonds_scanner *)handle;
-	char buf[64];
+	char buf[65]; /* add one more byte to correct buffer overflow issue */
 	char cmd[100]; /* take care not to overflow */
 	SANE_Status status = 0;
 
@@ -1112,10 +1249,17 @@ sane_start(SANE_Handle handle)
 			s->val[OPT_ADF_MODE].w ? "DPLX" : "",
 			s->val[OPT_ADF_SKEW].w ? "SKEW" : "");
 
-		if (s->hw->adf_has_dfd == 2) {
-			strcat(buf, "DFL2");
-		} else if (s->hw->adf_has_dfd == 1) {
-			strcat(buf, "DFL1");
+		/* it seems that DFL only works in duplex mode, but it's
+		 * also required to be enabled or duplex will be rejected.
+		 */
+
+		if (s->val[OPT_ADF_MODE].w) {
+
+			if (s->hw->adf_has_dfd == 2) {
+				strcat(buf, "DFL2");
+			} else if (s->hw->adf_has_dfd == 1) {
+				strcat(buf, "DFL1");
+			}
 		}
 
 	} else if (strcmp(source_list[s->val[OPT_SOURCE].w], FBF_STR) == 0) {
@@ -1148,9 +1292,9 @@ sane_start(SANE_Handle handle)
 	/* resolution (RSMi not always supported) */
 
 	if (s->val[OPT_RESOLUTION].w > 999) {
-		sprintf(buf, "#RSMi%07d", s->val[OPT_RESOLUTION].w);
+		sprintf(buf, "#RSMi%07d#RSSi%07d", s->val[OPT_RESOLUTION].w, s->val[OPT_RESOLUTION].w);
 	} else {
-		sprintf(buf, "#RSMd%03d", s->val[OPT_RESOLUTION].w);
+		sprintf(buf, "#RSMd%03d#RSSd%03d", s->val[OPT_RESOLUTION].w, s->val[OPT_RESOLUTION].w);
 	}
 
 	strcat(cmd, buf);
diff --git a/backend/epsonds.conf.in b/backend/epsonds.conf.in
index 23dc461..b8b3623 100644
--- a/backend/epsonds.conf.in
+++ b/backend/epsonds.conf.in
@@ -10,3 +10,7 @@ usb
 # e.g.:
 # usb 0x4b8 0x14c
 
+# Network
+#
+# net 192.168.1.123
+net autodiscovery
diff --git a/backend/epsonds.h b/backend/epsonds.h
index 024773b..0427ef3 100644
--- a/backend/epsonds.h
+++ b/backend/epsonds.h
@@ -43,13 +43,6 @@
 #include "sane/sanei_usb.h"
 #include "sane/sanei_jpeg.h"
 
-#ifdef __GNUC__
-#define __func__ __FUNCTION__
-#else
-#define __func__ "(undef)"
-/* I cast my vote for C99... :) */
-#endif
-
 #define EPSONDS_CONFIG_FILE "epsonds.conf"
 
 #ifndef PATH_MAX
@@ -94,7 +87,7 @@ typedef enum
 {	/* hardware connection to the scanner */
 	SANE_EPSONDS_NODEV,	/* default, no HW specified yet */
 	SANE_EPSONDS_USB,	/* USB interface */
-	SANE_EPSONDS_NET	/* network interface (unsupported)*/
+	SANE_EPSONDS_NET	/* network interface */
 } epsonds_conn_type;
 
 /* hardware description */
@@ -180,6 +173,10 @@ struct epsonds_scanner
 	struct jpeg_decompress_struct jpeg_cinfo;
 	struct jpeg_error_mgr jpeg_err;
 	SANE_Bool jpeg_header_seen;
+
+	/* network buffers */
+	unsigned char *netbuf, *netptr;
+	size_t netlen;
 };
 
 typedef struct epsonds_scanner epsonds_scanner;
diff --git a/backend/fujitsu-scsi.h b/backend/fujitsu-scsi.h
index de6652c..42598cb 100644
--- a/backend/fujitsu-scsi.h
+++ b/backend/fujitsu-scsi.h
@@ -377,6 +377,10 @@ putnbyte (unsigned char *pnt, unsigned int value, unsigned int nbytes)
 #define get_IN_read_size(in)          getbitfield(in+0x78, 1, 6)
 #define get_IN_start_end_ms(in)       getbitfield(in+0x78, 1, 5)
 
+#define get_IN_battery(in)            getbitfield(in+0x79, 1, 7)
+#define get_IN_battery_save(in)       getbitfield(in+0x79, 1, 6)
+#define get_IN_op_reverse(in)         getbitfield(in+0x79, 1, 1)
+
 #define get_IN_op_halt(in)            getbitfield(in+0x7a, 1, 7)
 
 /* some scanners need evpd inquiry data manipulated */
@@ -616,12 +620,13 @@ putnbyte (unsigned char *pnt, unsigned int value, unsigned int nbytes)
 #define SEND_len                10
 
 #define set_S_xfer_datatype(sb, val) sb[0x02] = (unsigned char)val
-/*#define S_datatype_imagedatai		0x00
 #define S_datatype_halftone_mask        0x02
-#define S_datatype_gamma_function       0x03*/
+#define S_datatype_gamma_function       0x03
 #define S_datatype_lut_data             0x83
+#define S_datatype_lut_dropout          0x84
 #define S_datatype_jpg_q_table          0x88
 #define S_datatype_endorser_data        0x90
+#define S_datatype_sendto_name          0xa0
 /*#define S_EX_datatype_lut		0x01
 #define S_EX_datatype_shading_data	0xa0
 #define S_user_reg_gamma		0xc0
@@ -747,6 +752,8 @@ putnbyte (unsigned char *pnt, unsigned int value, unsigned int nbytes)
 #define GHS_data_len            12
 
 #define get_GHS_top(in)             getbitfield(in+0x02, 1, 7)
+#define get_GHS_fedalm(in)          getbitfield(in+0x02, 1, 5)
+#define get_GHS_adjalm(in)          getbitfield(in+0x02, 1, 4)
 #define get_GHS_A3(in)              getbitfield(in+0x02, 1, 3)
 #define get_GHS_B4(in)              getbitfield(in+0x02, 1, 2)
 #define get_GHS_A4(in)              getbitfield(in+0x02, 1, 1)
@@ -762,12 +769,14 @@ putnbyte (unsigned char *pnt, unsigned int value, unsigned int nbytes)
 
 #define get_GHS_sleep(in)           getbitfield(in+0x04, 1, 7)
 #define get_GHS_clean(in)           getbitfield(in+0x04, 1, 6)
+#define get_GHS_scan_sw_long(in)    getbitfield(in+0x04, 1, 5)
+#define get_GHS_hpos(in)            getbitfield(in+0x04, 1, 4)
 #define get_GHS_send_sw(in)         getbitfield(in+0x04, 1, 2)
 #define get_GHS_manual_feed(in)     getbitfield(in+0x04, 1, 1)
 #define get_GHS_scan_sw(in)         getbitfield(in+0x04, 1, 0)
 
 #define get_GHS_picalm(in)          getbitfield(in+0x05, 1, 7)
-#define get_GHS_fadalm(in)          getbitfield(in+0x05, 1, 6)
+#define get_GHS_padalm(in)          getbitfield(in+0x05, 1, 6)
 #define get_GHS_brkalm(in)          getbitfield(in+0x05, 1, 5)
 #define get_GHS_sepalm(in)          getbitfield(in+0x05, 1, 4)
 #define get_GHS_function(in)        getbitfield(in+0x05, 0x0f, 0)
@@ -783,10 +792,34 @@ putnbyte (unsigned char *pnt, unsigned int value, unsigned int nbytes)
 
 #define get_GHS_error_code(in)      in[0x07]
 
-#define get_GHS_skew_angle(in)      getnbyte(in+0x08, 2)
+#define get_GHS_skew_angle(in)      in[0x09]
 
 #define get_GHS_ink_remain(in)      in[0x0a]
 
+#define get_GHS_lang_code(in)      getnbyte(in+0x0c, 2)
+
+#define get_GHS_adjalm_fed(in)     getbitfield(in+0x0e, 1, 7)
+#define get_GHS_non_sep(in)        getbitfield(in+0x0e, 1, 4)
+#define get_GHS_ext_sendto(in)     getbitfield(in+0x0e, 1, 2)
+#define get_GHS_rq_hldimg(in)      getbitfield(in+0x0e, 1, 1)
+#define get_GHS_pacnt(in)          getbitfield(in+0x0e, 1, 0)
+
+#define get_GHS_wifi_sw(in)      getbitfield(in+0x10, 1, 7)
+#define get_GHS_w_use(in)        getbitfield(in+0x10, 1, 6)
+#define get_GHS_w_use2(in)       getbitfield(in+0x10, 1, 5)
+#define get_GHS_w_use3(in)       getbitfield(in+0x10, 1, 4)
+#define get_GHS_w_use4(in)       getbitfield(in+0x10, 1, 3)
+
+#define get_GHS_battery(in)         getbitfield(in+0x11, 1, 7)
+#define get_GHS_btr_charge(in)      getbitfield(in+0x11, 1, 6)
+#define get_GHS_btr_chg_tmp_stp(in) getbitfield(in+0x11, 1, 5)
+#define get_GHS_ibtr_ene_sav(in)    getbitfield(in+0x11, 1, 4)
+#define get_GHS_fngr_caut(in)       getbitfield(in+0x11, 1, 2)
+#define get_GHS_trnpg_l(in)         getbitfield(in+0x11, 1, 1)
+#define get_GHS_trnpg_r(in)         getbitfield(in+0x11, 1, 0)
+
+#define get_GHS_btr_power(in)       in[0x12]
+
 /* ==================================================================== */
 /* SCANNER_CONTROL */
 #define SCANNER_CONTROL_code    0xf1
@@ -807,6 +840,12 @@ putnbyte (unsigned char *pnt, unsigned int value, unsigned int nbytes)
 #define SC_function_eject_complete             0x0a
 #define SC_function_manual_feed                0x0c
 
+/* used with SC_function_panel */
+#define set_SC_led_eb(icb, val)                setbitfield(icb + 5, 1, 7, val)
+#define set_SC_led(icb, val)                   setbitfield(icb + 5, 1, 6, val)
+#define set_SC_fcno_eb(icb, val)               setbitfield(icb + 5, 1, 4, val)
+#define set_SC_fcno(icb, val)                  setbitfield(icb + 5, 0xf, 0, val)
+
 #define set_SC_ric_dtq(sb, val) sb[2] = val
 #define set_SC_ric_len(sb, val) putnbyte(sb + 0x06, val, 3)
 
@@ -1024,12 +1063,12 @@ putnbyte (unsigned char *pnt, unsigned int value, unsigned int nbytes)
 
 /* DTC also called Auto-I mode?*/
 /*warning: filtering uses inverse logic*/
-#define set_WD_filtering(sb, val) setbitfield(sb + 0x2f, 1, 7, val)
-#define get_WD_filtering(sb) getbitfield(sb + 0x2f, 1, 7)
+#define set_WD_filtering(sb, val) setbitfield(sb + 0x2f, 1, 7, !val)
+#define get_WD_filtering(sb) !getbitfield(sb + 0x2f, 1, 7)
 
 /*warning: smoothing uses inverse logic*/
-#define set_WD_smoothing(sb, val) setbitfield(sb + 0x2f, 3, 5, val)
-#define get_WD_smoothing(sb) getbitfield(sb + 0x2f, 3, 5)
+#define set_WD_smoothing(sb, val) setbitfield(sb + 0x2f, 3, 5, !val)
+#define get_WD_smoothing(sb) !getbitfield(sb + 0x2f, 3, 5)
 
 #define set_WD_gamma_curve(sb, val) setbitfield(sb + 0x2f, 3, 3, val)
 #define get_WD_gamma_curve(sb) getbitfield(sb + 0x2f, 3, 3)
diff --git a/backend/fujitsu.c b/backend/fujitsu.c
index 9fddb1c..433f75a 100644
--- a/backend/fujitsu.c
+++ b/backend/fujitsu.c
@@ -6,7 +6,7 @@
    Copyright (C) 2000 Randolph Bentson
    Copyright (C) 2001 Frederik Ramm
    Copyright (C) 2001-2004 Oliver Schirrmeister
-   Copyright (C) 2003-2014 m. allan noah
+   Copyright (C) 2003-2016 m. allan noah
 
    JPEG output and low memory usage support funded by:
      Archivista GmbH, www.archivista.ch
@@ -574,9 +574,32 @@
       v126 2015-08-23, MAN
          - initial support for iX100
          - add late_lut support for iX500/iX100
-      v127 2015-08-25, MAN
+      v127 2015-08-25, MAN (SANE 1.0.25)
          - separate iX100 from iX500 settings
          - iX100 has gray and lineart
+      v128 2015-11-08, MAN
+         - do not ask fi-4340 for serial number
+      v129 2015-11-21, MAN
+         - br_x and br_y locked to page_width/height until changed
+      v130 2016-02-23, MAN
+         - run init_model before init_ms so some scanners can override
+         - set all M309x and M409x scanners s->broken_diag_serial = 1
+      v131 2016-06-06, MAN
+         - hide compression-arg option when jpeg disabled
+         - add Send/SC/GHS macros for recent scanners
+         - add initial support for fi-74x0
+         - add initial support for fi-7030
+         - set has_MS_lamp=0 for fi-71x0
+         - add I18N macros to all option titles and descriptions
+      v132 2016-10-07, MAN
+         - remove ipc_mode option and variables
+         - set ipc mode based on other options
+         - cleanup inverted logic DTC options
+         - fixes threshold option reported in #315069
+      v133 2017-04-08, MAN
+         - initial support for fi-7600/7700
+         - autodetect various double feed capabilities using VPD
+         - call send_lut if we are using a downloaded gamma table
 
    SANE FLOW DIAGRAM
 
@@ -626,7 +649,7 @@
 #include "fujitsu.h"
 
 #define DEBUG 1
-#define BUILD 127
+#define BUILD 133
 
 /* values for SANE_DEBUG_FUJITSU env var:
  - errors           5
@@ -990,22 +1013,22 @@ attach_one (const char *device_name, int connType)
     return ret;
   }
 
-  /* see what mode pages device supports */
-  ret = init_ms (s);
+  /* clean up the scanner struct based on model */
+  /* this is the only piece of model specific code */
+  ret = init_model (s);
   if (ret != SANE_STATUS_GOOD) {
     disconnect_fd(s);
     free (s);
-    DBG (5, "attach_one: ms failed\n");
+    DBG (5, "attach_one: model failed\n");
     return ret;
   }
 
-  /* clean up the scanner struct based on model */
-  /* this is the only piece of model specific code */
-  ret = init_model (s);
+  /* see what mode pages device supports */
+  ret = init_ms (s);
   if (ret != SANE_STATUS_GOOD) {
     disconnect_fd(s);
     free (s);
-    DBG (5, "attach_one: model failed\n");
+    DBG (5, "attach_one: ms failed\n");
     return ret;
   }
 
@@ -1682,6 +1705,9 @@ init_vpd (struct fujitsu *s)
 
               DBG (15, "  skew check: %d\n", get_IN_skew_check(in));
               DBG (15, "  new feed roller: %d\n", get_IN_new_fd_roll(in));
+
+              s->has_adv_paper_prot = get_IN_paper_prot_2(in);
+              DBG (15, "  paper protection: %d\n", s->has_adv_paper_prot);
           }
 
           if (get_IN_page_length (in) > 0x70-5) {
@@ -1689,7 +1715,10 @@ init_vpd (struct fujitsu *s)
               DBG (15, "  paper count: %d\n", get_IN_paper_count(in));
               DBG (15, "  paper number: %d\n", get_IN_paper_number(in));
               DBG (15, "  ext send to: %d\n", get_IN_ext_send_to(in));
-              DBG (15, "  staple det: %d\n", get_IN_staple_det(in));
+
+              s->has_staple_detect = get_IN_staple_det(in);
+              DBG (15, "  staple det: %d\n", s->has_staple_detect);
+
               DBG (15, "  pause host: %d\n", get_IN_pause_host(in));
               DBG (15, "  pause panel: %d\n", get_IN_pause_panel(in));
               DBG (15, "  pause conf: %d\n", get_IN_pause_conf(in));
@@ -1701,7 +1730,9 @@ init_vpd (struct fujitsu *s)
               DBG (15, "  imprint chk b: %d\n", get_IN_imprint_chk_b(in));
               DBG (15, "  imprint chk f: %d\n", get_IN_imprint_chk_f(in));
               DBG (15, "  force w bg: %d\n", get_IN_force_w_bg(in));
-              DBG (15, "  mf recover lvl: %d\n", get_IN_mf_recover_lvl(in));
+
+              s->has_df_recovery = get_IN_mf_recover_lvl(in);
+              DBG (15, "  mf recover lvl: %d\n", s->has_df_recovery);
 
               DBG (15, "  first read time: %d\n", get_IN_first_read_time(in));
               DBG (15, "  div scanning: %d\n", get_IN_div_scanning(in));
@@ -1720,7 +1751,7 @@ init_vpd (struct fujitsu *s)
               DBG (15, "  sync next feed: %d\n", get_IN_sync_next_feed(in));
 
               s->has_op_halt = get_IN_op_halt(in);
-              DBG (15, "  object postion halt: %d\n", s->has_op_halt);
+              DBG (15, "  object position halt: %d\n", s->has_op_halt);
           }
 
           ret = SANE_STATUS_GOOD;
@@ -2014,19 +2045,12 @@ init_model (struct fujitsu *s)
 
   /* if scanner has built-in gamma tables, we use the first one (0) */
   /* otherwise, we use the first downloaded one (0x80) */
-  /* note that you may NOT need to send the table to use it? */
+  /* note that you may NOT need to send the table to use it, */
+  /* the scanner will fall back to the brightness/contrast LUT */
   if (!s->num_internal_gamma && s->num_download_gamma){
     s->window_gamma = 0x80;
   }
 
-  /* older scanners would enable their highest  */
-  /* IPC mode by default. Newer scanners don't, */
-  /* so we go ahead and turn it on. */
-  if (s->has_sdtc)
-    s->ipc_mode = WD_ipc_SDTC;
-  else if (s->has_dtc)
-    s->ipc_mode = WD_ipc_DTC;
-
   /* endorser type tells string length (among other things) */
   if(s->has_endorser_b){
     /*old-style is 40 bytes*/
@@ -2141,6 +2165,9 @@ init_model (struct fujitsu *s)
   else if ( strstr (s->model_name, "M309")
    || strstr (s->model_name, "M409")){
 
+    /* weirdness */
+    s->broken_diag_serial = 1;
+
     /* lies */
     s->adbits = 8;
   }
@@ -2160,7 +2187,8 @@ init_model (struct fujitsu *s)
     s->max_y_fb = 14032;
   }
 
-  else if (strstr (s->model_name, "fi-4750") ) {
+  else if (strstr (s->model_name,"fi-4340")
+   || strstr (s->model_name, "fi-4750") ) {
     /* weirdness */
     s->broken_diag_serial = 1;
   }
@@ -2265,10 +2293,8 @@ init_model (struct fujitsu *s)
   }
 
   else if (strstr (s->model_name,"fi-6800")
-   || strstr (s->model_name,"fi-5900")){ /* guessing this scanner too */
-    /* missing from vpd */
-    s->has_staple_detect=1; /* may not actually work? */
-    s->has_df_recovery=1;
+   || strstr (s->model_name,"fi-5900")){
+    /* do not need overrides */
   }
 
   else if (strstr (s->model_name,"iX500")){
@@ -2316,6 +2342,8 @@ init_model (struct fujitsu *s)
 
   else if (strstr (s->model_name,"fi-7180")
    || strstr (s->model_name,"fi-7160")){
+    /* locks up scanner if we try to auto detect */
+    s->has_MS_lamp = 0;
 
     /* weirdness */
     /* these machines have longer max paper at lower res */
@@ -2325,10 +2353,6 @@ init_model (struct fujitsu *s)
     s->max_y_by_res[2].len = 260268;
     s->max_y_by_res[3].res = 200;
     s->max_y_by_res[3].len = 266268;
-
-    /* missing from vpd */
-    s->has_df_recovery=1;
-    s->has_adv_paper_prot=1;
   }
 
   else if (strstr (s->model_name,"fi-7280")
@@ -2344,12 +2368,48 @@ init_model (struct fujitsu *s)
     s->max_y_by_res[3].len = 266268;
 
     /* missing from vpd */
-    s->has_df_recovery=1;
-    s->has_adv_paper_prot=1;
     s->max_x_fb = 10764;
     s->max_y_fb = 14032; /* some scanners can be slightly more? */
   }
 
+  else if (strstr (s->model_name,"fi-7480")
+   || strstr (s->model_name,"fi-7460")){
+
+    /* weirdness */
+    /* these machines have longer max paper at lower res */
+    s->max_y_by_res[1].res = 400;
+    s->max_y_by_res[1].len = 194268;
+    s->max_y_by_res[2].res = 300;
+    s->max_y_by_res[2].len = 260268;
+    s->max_y_by_res[3].res = 200;
+    s->max_y_by_res[3].len = 266268;
+  }
+
+  else if (strstr (s->model_name,"fi-7030")){
+
+    /* weirdness */
+    /* these machines have longer max paper at lower res */
+    s->max_y_by_res[1].res = 400;
+    s->max_y_by_res[1].len = 192000;
+    s->max_y_by_res[2].res = 300;
+    s->max_y_by_res[2].len = 258000;
+    s->max_y_by_res[3].res = 200;
+    s->max_y_by_res[3].len = 264000;
+  }
+
+  else if (strstr (s->model_name,"fi-7700")
+   || strstr (s->model_name,"fi-7600")){
+
+    /* weirdness */
+    /* these machines have longer max paper at lower res */
+    s->max_y_by_res[1].res = 400;
+    s->max_y_by_res[1].len = 192000;
+    s->max_y_by_res[2].res = 300;
+    s->max_y_by_res[2].len = 258000;
+    s->max_y_by_res[3].res = 200;
+    s->max_y_by_res[3].len = 264000;
+  }
+
   DBG (10, "init_model: finish\n");
 
   return SANE_STATUS_GOOD;
@@ -2439,11 +2499,6 @@ init_user (struct fujitsu *s)
   s->u_endorser_dir=DIR_TTB;
   strcpy((char *)s->u_endorser_string,"%05ud");
 
-  /* inverted logic ipc settings */
-  s->noise_removal = 1;
-  s->bp_filter = 1;
-  s->smoothing = 1;
-
   /* more recent machines default to this being 'on',  *
    * which causes the scanner to ingest multiple pages *
    * even when the user only wants one */
@@ -3039,8 +3094,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
   /* gamma */
   if(option==OPT_GAMMA){
     opt->name = "gamma";
-    opt->title = "Gamma function exponent";
-    opt->desc = "Changes intensity of midtones";
+    opt->title = SANE_I18N ("Gamma function exponent");
+    opt->desc = SANE_I18N ("Changes intensity of midtones");
     opt->type = SANE_TYPE_FIXED;
     opt->unit = SANE_UNIT_NONE;
     opt->constraint_type = SANE_CONSTRAINT_RANGE;
@@ -3089,8 +3144,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
   /* =============== common ipc params ================================ */
   if(option==OPT_RIF){
     opt->name = "rif";
-    opt->title = "RIF";
-    opt->desc = "Reverse image format";
+    opt->title = SANE_I18N ("RIF");
+    opt->desc = SANE_I18N ("Reverse image format");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     if (s->has_rif)
@@ -3107,8 +3162,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     s->ht_type_list[i]=NULL;
   
     opt->name = "ht-type";
-    opt->title = "Halftone type";
-    opt->desc = "Control type of halftone filter";
+    opt->title = SANE_I18N ("Halftone type");
+    opt->desc = SANE_I18N ("Control type of halftone filter");
     opt->type = SANE_TYPE_STRING;
     opt->unit = SANE_UNIT_NONE;
 
@@ -3128,8 +3183,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_HT_PATTERN){
     opt->name = "ht-pattern";
-    opt->title = "Halftone pattern";
-    opt->desc = "Control pattern of halftone filter";
+    opt->title = SANE_I18N ("Halftone pattern");
+    opt->desc = SANE_I18N ("Control pattern of halftone filter");
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
 
@@ -3151,8 +3206,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_OUTLINE){
     opt->name = "outline";
-    opt->title = "Outline";
-    opt->desc = "Perform outline extraction";
+    opt->title = SANE_I18N ("Outline");
+    opt->desc = SANE_I18N ("Perform outline extraction");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     if (s->has_outline)
@@ -3163,8 +3218,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_EMPHASIS){
     opt->name = "emphasis";
-    opt->title = "Emphasis";
-    opt->desc = "Negative to smooth or positive to sharpen image";
+    opt->title = SANE_I18N ("Emphasis");
+    opt->desc = SANE_I18N ("Negative to smooth or positive to sharpen image");
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
 
@@ -3182,8 +3237,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_SEPARATION){
     opt->name = "separation";
-    opt->title = "Separation";
-    opt->desc = "Enable automatic separation of image and text";
+    opt->title = SANE_I18N ("Separation");
+    opt->desc = SANE_I18N ("Enable automatic separation of image and text");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     if (s->has_autosep)
@@ -3194,8 +3249,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_MIRRORING){
     opt->name = "mirroring";
-    opt->title = "Mirroring";
-    opt->desc = "Reflect output image horizontally";
+    opt->title = SANE_I18N ("Mirroring");
+    opt->desc = SANE_I18N ("Reflect output image horizontally");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     if (s->has_mirroring)
@@ -3212,8 +3267,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     s->wl_follow_list[i]=NULL;
   
     opt->name = "wl-follow";
-    opt->title = "White level follower";
-    opt->desc = "Control white level follower";
+    opt->title = SANE_I18N ("White level follower");
+    opt->desc = SANE_I18N ("Control white level follower");
     opt->type = SANE_TYPE_STRING;
     opt->unit = SANE_UNIT_NONE;
 
@@ -3227,50 +3282,18 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
       opt->cap = SANE_CAP_INACTIVE;
   }
 
-  if(option==OPT_IPC_MODE){
-    i=0;
-    s->ipc_mode_list[i++]=STRING_DEFAULT;
-    if(s->has_dtc){
-      s->ipc_mode_list[i++]=STRING_DTC;
-    }
-    if(s->has_sdtc){
-      s->ipc_mode_list[i++]=STRING_SDTC;
-    }
-    s->ipc_mode_list[i]=NULL;
-  
-    opt->name = "ipc-mode";
-    opt->title = "IPC mode";
-    opt->desc = "Image processing mode, enables additional options";
-    opt->type = SANE_TYPE_STRING;
-    opt->unit = SANE_UNIT_NONE;
-
-    opt->constraint_type = SANE_CONSTRAINT_STRING_LIST;
-    opt->constraint.string_list = s->ipc_mode_list;
-    opt->size = maxStringSize (opt->constraint.string_list);
-
-    if ( i > 2 ){
-      opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
-      if(s->s_mode != MODE_HALFTONE && s->s_mode != MODE_LINEART){
-        opt->cap |= SANE_CAP_INACTIVE;
-      }
-    }
-    else
-      opt->cap = SANE_CAP_INACTIVE;
-  }
-
   /* =============== DTC params ================================ */
   /* enabled when in dtc mode (manually or by default) */
   if(option==OPT_BP_FILTER){
     opt->name = "bp-filter";
-    opt->title = "BP filter";
-    opt->desc = "Improves quality of high resolution ball-point pen text";
+    opt->title = SANE_I18N ("BP filter");
+    opt->desc = SANE_I18N ("Improves quality of high resolution ball-point pen text");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
 
     if ( s->has_dtc ){
       opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
-      if(s->ipc_mode == WD_ipc_SDTC 
-       || (s->has_sdtc && s->ipc_mode == WD_ipc_DEFAULT)){
+      if(get_ipc_mode(s) == WD_ipc_SDTC){
         opt->cap |= SANE_CAP_INACTIVE;
       }
     }
@@ -3280,15 +3303,14 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_SMOOTHING){
     opt->name = "smoothing";
-    opt->title = "Smoothing";
-    opt->desc = "Enable smoothing for improved OCR";
+    opt->title = SANE_I18N ("Smoothing");
+    opt->desc = SANE_I18N ("Enable smoothing for improved OCR");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
 
     if ( s->has_dtc ){
       opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
-      if(s->ipc_mode == WD_ipc_SDTC 
-       || (s->has_sdtc && s->ipc_mode == WD_ipc_DEFAULT)){
+      if(get_ipc_mode(s) == WD_ipc_SDTC){
         opt->cap |= SANE_CAP_INACTIVE;
       }
     }
@@ -3298,9 +3320,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_GAMMA_CURVE){
     opt->name = "gamma-curve";
-    opt->title = "Gamma curve";
-    opt->desc = "Gamma curve";
-    opt->desc = "Gamma curve, from light to dark, but upper two may not work";
+    opt->title = SANE_I18N ("Gamma curve");
+    opt->desc = SANE_I18N ("Gamma curve, from light to dark, but upper two may not work");
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
 
@@ -3312,8 +3333,7 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
     if ( s->has_dtc ){
       opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
-      if(s->ipc_mode == WD_ipc_SDTC 
-       || (s->has_sdtc && s->ipc_mode == WD_ipc_DEFAULT)){
+      if(get_ipc_mode(s) == WD_ipc_SDTC){
         opt->cap |= SANE_CAP_INACTIVE;
       }
     }
@@ -3323,8 +3343,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_THRESHOLD_CURVE){
     opt->name = "threshold-curve";
-    opt->title = "Threshold curve";
-    opt->desc = "Threshold curve, from light to dark, but upper two may not be linear";
+    opt->title = SANE_I18N ("Threshold curve");
+    opt->desc = SANE_I18N ("Threshold curve, from light to dark, but upper two may not be linear");
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
 
@@ -3336,8 +3356,7 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
     if ( s->has_dtc ){
       opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
-      if(s->ipc_mode == WD_ipc_SDTC 
-       || (s->has_sdtc && s->ipc_mode == WD_ipc_DEFAULT)){
+      if(get_ipc_mode(s) == WD_ipc_SDTC){
         opt->cap |= SANE_CAP_INACTIVE;
       }
     }
@@ -3347,15 +3366,14 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_THRESHOLD_WHITE){
     opt->name = "threshold-white";
-    opt->title = "Threshold white";
-    opt->desc = "Set pixels equal to threshold to white instead of black";
+    opt->title = SANE_I18N ("Threshold white");
+    opt->desc = SANE_I18N ("Set pixels equal to threshold to white instead of black");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
 
     if ( s->has_dtc ){
       opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
-      if(s->ipc_mode == WD_ipc_SDTC 
-       || (s->has_sdtc && s->ipc_mode == WD_ipc_DEFAULT)){
+      if(get_ipc_mode(s) == WD_ipc_SDTC){
         opt->cap |= SANE_CAP_INACTIVE;
       }
     }
@@ -3365,15 +3383,14 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_NOISE_REMOVAL){
     opt->name = "noise-removal";
-    opt->title = "Noise removal";
-    opt->desc = "Noise removal";
+    opt->title = SANE_I18N ("Noise removal");
+    opt->desc = SANE_I18N ("Noise removal");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
 
     if ( s->has_dtc ){
       opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
-      if(s->ipc_mode == WD_ipc_SDTC 
-       || (s->has_sdtc && s->ipc_mode == WD_ipc_DEFAULT)){
+      if(get_ipc_mode(s) == WD_ipc_SDTC){
         opt->cap |= SANE_CAP_INACTIVE;
       }
     }
@@ -3383,16 +3400,14 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_MATRIX_5){
     opt->name = "matrix-5x5";
-    opt->title = "Matrix 5x5";
-    opt->desc = "Remove 5 pixel square noise";
+    opt->title = SANE_I18N ("Matrix 5x5");
+    opt->desc = SANE_I18N ("Remove 5 pixel square noise");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
 
     if ( s->has_dtc ){
       opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
-      if( !s->noise_removal
-       || s->ipc_mode == WD_ipc_SDTC 
-       || (s->has_sdtc && s->ipc_mode == WD_ipc_DEFAULT)){
+      if(!s->noise_removal){
         opt->cap |= SANE_CAP_INACTIVE;
       }
     }
@@ -3402,16 +3417,14 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_MATRIX_4){
     opt->name = "matrix-4x4";
-    opt->title = "Matrix 4x4";
-    opt->desc = "Remove 4 pixel square noise";
+    opt->title = SANE_I18N ("Matrix 4x4");
+    opt->desc = SANE_I18N ("Remove 4 pixel square noise");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
 
     if ( s->has_dtc ){
       opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
-      if( !s->noise_removal
-       || s->ipc_mode == WD_ipc_SDTC 
-       || (s->has_sdtc && s->ipc_mode == WD_ipc_DEFAULT)){
+      if(!s->noise_removal){
         opt->cap |= SANE_CAP_INACTIVE;
       }
     }
@@ -3421,16 +3434,14 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_MATRIX_3){
     opt->name = "matrix-3x3";
-    opt->title = "Matrix 3x3";
-    opt->desc = "Remove 3 pixel square noise";
+    opt->title = SANE_I18N ("Matrix 3x3");
+    opt->desc = SANE_I18N ("Remove 3 pixel square noise");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
 
     if ( s->has_dtc ){
       opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
-      if( !s->noise_removal
-       || s->ipc_mode == WD_ipc_SDTC 
-       || (s->has_sdtc && s->ipc_mode == WD_ipc_DEFAULT)){
+      if(!s->noise_removal){
         opt->cap |= SANE_CAP_INACTIVE;
       }
     }
@@ -3440,16 +3451,14 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_MATRIX_2){
     opt->name = "matrix-2x2";
-    opt->title = "Matrix 2x2";
-    opt->desc = "Remove 2 pixel square noise";
+    opt->title = SANE_I18N ("Matrix 2x2");
+    opt->desc = SANE_I18N ("Remove 2 pixel square noise");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
 
     if ( s->has_dtc ){
       opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
-      if( !s->noise_removal
-       || s->ipc_mode == WD_ipc_SDTC 
-       || (s->has_sdtc && s->ipc_mode == WD_ipc_DEFAULT)){
+      if(!s->noise_removal){
         opt->cap |= SANE_CAP_INACTIVE;
       }
     }
@@ -3462,8 +3471,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
   /* called variance with ipc2, sensitivity with ipc3 */
   if(option==OPT_VARIANCE){
     opt->name = "variance";
-    opt->title = "Variance";
-    opt->desc = "Set SDTC variance rate (sensitivity), 0 equals 127";
+    opt->title = SANE_I18N ("Variance");
+    opt->desc = SANE_I18N ("Set SDTC variance rate (sensitivity), 0 equals 127");
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
 
@@ -3475,7 +3484,7 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
     if ( s->has_sdtc ){
       opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
-      if (s->ipc_mode == WD_ipc_DTC){
+      if(get_ipc_mode(s) == WD_ipc_DTC){
         opt->cap |= SANE_CAP_INACTIVE;
       }
     }
@@ -3496,8 +3505,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
   if(option==OPT_AWD){
   
     opt->name = "awd";
-    opt->title = "Auto width detection";
-    opt->desc = "Scanner detects paper sides. May reduce scanning speed.";
+    opt->title = SANE_I18N ("Auto width detection");
+    opt->desc = SANE_I18N ("Scanner detects paper sides. May reduce scanning speed.");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     opt->constraint_type = SANE_CONSTRAINT_NONE;
@@ -3514,8 +3523,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
   if(option==OPT_ALD){
   
     opt->name = "ald";
-    opt->title = "Auto length detection";
-    opt->desc = "Scanner detects paper lower edge. May confuse some frontends.";
+    opt->title = SANE_I18N ("Auto length detection");
+    opt->desc = SANE_I18N ("Scanner detects paper lower edge. May confuse some frontends.");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     opt->constraint_type = SANE_CONSTRAINT_NONE;
@@ -3541,8 +3550,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     s->compress_list[i]=NULL;
 
     opt->name = "compression";
-    opt->title = "Compression";
-    opt->desc = "Enable compressed data. May crash your front-end program";
+    opt->title = SANE_I18N ("Compression");
+    opt->desc = SANE_I18N ("Enable compressed data. May crash your front-end program");
     opt->type = SANE_TYPE_STRING;
     opt->constraint_type = SANE_CONSTRAINT_STRING_LIST;
     opt->constraint.string_list = s->compress_list;
@@ -3562,8 +3571,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
   if(option==OPT_COMPRESS_ARG){
 
     opt->name = "compression-arg";
-    opt->title = "Compression argument";
-    opt->desc = "Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) is same as 4";
+    opt->title = SANE_I18N ("Compression argument");
+    opt->desc = SANE_I18N ("Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) is same as 4");
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
     opt->constraint_type = SANE_CONSTRAINT_RANGE;
@@ -3573,7 +3582,9 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     if(s->has_comp_JPG1){
       s->compress_arg_range.min=0;
       s->compress_arg_range.max=7;
+#ifndef SANE_JPEG_DISABLED
       opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
+#endif
 
       if(s->compress != COMP_JPEG){
         opt->cap |= SANE_CAP_INACTIVE;
@@ -3591,8 +3602,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     s->df_action_list[3] = NULL;
   
     opt->name = "df-action";
-    opt->title = "DF action";
-    opt->desc = "Action following double feed error";
+    opt->title = SANE_I18N ("DF action");
+    opt->desc = SANE_I18N ("Action following double feed error");
     opt->type = SANE_TYPE_STRING;
     opt->constraint_type = SANE_CONSTRAINT_STRING_LIST;
     opt->constraint.string_list = s->df_action_list;
@@ -3608,8 +3619,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
   if(option==OPT_DF_SKEW){
   
     opt->name = "df-skew";
-    opt->title = "DF skew";
-    opt->desc = "Enable double feed error due to skew";
+    opt->title = SANE_I18N ("DF skew");
+    opt->desc = SANE_I18N ("Enable double feed error due to skew");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     opt->constraint_type = SANE_CONSTRAINT_NONE;
@@ -3627,8 +3638,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
   if(option==OPT_DF_THICKNESS){
   
     opt->name = "df-thickness";
-    opt->title = "DF thickness";
-    opt->desc = "Enable double feed error due to paper thickness";
+    opt->title = SANE_I18N ("DF thickness");
+    opt->desc = SANE_I18N ("Enable double feed error due to paper thickness");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     opt->constraint_type = SANE_CONSTRAINT_NONE;
@@ -3646,8 +3657,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
   if(option==OPT_DF_LENGTH){
   
     opt->name = "df-length";
-    opt->title = "DF length";
-    opt->desc = "Enable double feed error due to paper length";
+    opt->title = SANE_I18N ("DF length");
+    opt->desc = SANE_I18N ("Enable double feed error due to paper length");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     opt->constraint_type = SANE_CONSTRAINT_NONE;
@@ -3670,8 +3681,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     s->df_diff_list[4] = NULL;
   
     opt->name = "df-diff";
-    opt->title = "DF length difference";
-    opt->desc = "Difference in page length to trigger double feed error";
+    opt->title = SANE_I18N ("DF length difference");
+    opt->desc = SANE_I18N ("Difference in page length to trigger double feed error");
     opt->type = SANE_TYPE_STRING;
     opt->constraint_type = SANE_CONSTRAINT_STRING_LIST;
     opt->constraint.string_list = s->df_diff_list;
@@ -3694,8 +3705,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     s->df_recovery_list[3] = NULL;
   
     opt->name = "df-recovery";
-    opt->title = "DF recovery mode";
-    opt->desc = "Request scanner to reverse feed on paper jam";
+    opt->title = SANE_I18N ("DF recovery mode");
+    opt->desc = SANE_I18N ("Request scanner to reverse feed on paper jam");
     opt->type = SANE_TYPE_STRING;
     opt->constraint_type = SANE_CONSTRAINT_STRING_LIST;
     opt->constraint.string_list = s->df_recovery_list;
@@ -3714,8 +3725,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     s->paper_protect_list[3] = NULL;
   
     opt->name = "paper-protect";
-    opt->title = "Paper protection";
-    opt->desc = "Request scanner to predict jams in the ADF";
+    opt->title = SANE_I18N ("Paper protection");
+    opt->desc = SANE_I18N ("Request scanner to predict jams in the ADF");
     opt->type = SANE_TYPE_STRING;
     opt->constraint_type = SANE_CONSTRAINT_STRING_LIST;
     opt->constraint.string_list = s->paper_protect_list;
@@ -3734,8 +3745,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     s->adv_paper_prot_list[3] = NULL;
   
     opt->name = "adv-paper-protect";
-    opt->title = "Advanced paper protection";
-    opt->desc = "Request scanner to predict jams in the ADF using improved sensors";
+    opt->title = SANE_I18N ("Advanced paper protection");
+    opt->desc = SANE_I18N ("Request scanner to predict jams in the ADF using improved sensors");
     opt->type = SANE_TYPE_STRING;
     opt->constraint_type = SANE_CONSTRAINT_STRING_LIST;
     opt->constraint.string_list = s->adv_paper_prot_list;
@@ -3754,8 +3765,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     s->staple_detect_list[3] = NULL;
   
     opt->name = "staple-detect";
-    opt->title = "Staple detection";
-    opt->desc = "Request scanner to detect jams in the ADF caused by staples";
+    opt->title = SANE_I18N ("Staple detection");
+    opt->desc = SANE_I18N ("Request scanner to detect jams in the ADF caused by staples");
     opt->type = SANE_TYPE_STRING;
     opt->constraint_type = SANE_CONSTRAINT_STRING_LIST;
     opt->constraint.string_list = s->staple_detect_list;
@@ -3774,8 +3785,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     s->bg_color_list[3] = NULL;
   
     opt->name = "bgcolor";
-    opt->title = "Background color";
-    opt->desc = "Set color of background for scans. May conflict with overscan option";
+    opt->title = SANE_I18N ("Background color");
+    opt->desc = SANE_I18N ("Set color of background for scans. May conflict with overscan option");
     opt->type = SANE_TYPE_STRING;
     opt->constraint_type = SANE_CONSTRAINT_STRING_LIST;
     opt->constraint.string_list = s->bg_color_list;
@@ -3795,8 +3806,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     s->do_color_list[4] = NULL;
   
     opt->name = "dropoutcolor";
-    opt->title = "Dropout color";
-    opt->desc = "One-pass scanners use only one color during gray or binary scanning, useful for colored paper or ink";
+    opt->title = SANE_I18N ("Dropout color");
+    opt->desc = SANE_I18N ("One-pass scanners use only one color during gray or binary scanning, useful for colored paper or ink");
     opt->type = SANE_TYPE_STRING;
     opt->constraint_type = SANE_CONSTRAINT_STRING_LIST;
     opt->constraint.string_list = s->do_color_list;
@@ -3819,8 +3830,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     s->buff_mode_list[3] = NULL;
   
     opt->name = "buffermode";
-    opt->title = "Buffer mode";
-    opt->desc = "Request scanner to read pages quickly from ADF into internal memory";
+    opt->title = SANE_I18N ("Buffer mode");
+    opt->desc = SANE_I18N ("Request scanner to read pages quickly from ADF into internal memory");
     opt->type = SANE_TYPE_STRING;
     opt->constraint_type = SANE_CONSTRAINT_STRING_LIST;
     opt->constraint.string_list = s->buff_mode_list;
@@ -3839,8 +3850,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     s->prepick_list[3] = NULL;
   
     opt->name = "prepick";
-    opt->title = "Prepick";
-    opt->desc = "Request scanner to grab next page from ADF";
+    opt->title = SANE_I18N ("Prepick");
+    opt->desc = SANE_I18N ("Request scanner to grab next page from ADF");
     opt->type = SANE_TYPE_STRING;
     opt->constraint_type = SANE_CONSTRAINT_STRING_LIST;
     opt->constraint.string_list = s->prepick_list;
@@ -3859,8 +3870,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     s->overscan_list[3] = NULL;
   
     opt->name = "overscan";
-    opt->title = "Overscan";
-    opt->desc = "Collect a few mm of background on top side of scan, before paper enters ADF, and increase maximum scan area beyond paper size, to allow collection on remaining sides. May conflict with bgcolor option";
+    opt->title = SANE_I18N ("Overscan");
+    opt->desc = SANE_I18N ("Collect a few mm of background on top side of scan, before paper enters ADF, and increase maximum scan area beyond paper size, to allow collection on remaining sides. May conflict with bgcolor option");
     opt->type = SANE_TYPE_STRING;
     opt->constraint_type = SANE_CONSTRAINT_STRING_LIST;
     opt->constraint.string_list = s->overscan_list;
@@ -3878,8 +3889,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     s->sleep_time_range.quant = 1;
   
     opt->name = "sleeptimer";
-    opt->title = "Sleep timer";
-    opt->desc = "Time in minutes until the internal power supply switches to sleep mode"; 
+    opt->title = SANE_I18N ("Sleep timer");
+    opt->desc = SANE_I18N ("Time in minutes until the internal power supply switches to sleep mode"); 
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
     opt->constraint_type = SANE_CONSTRAINT_RANGE;
@@ -3897,8 +3908,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     s->off_time_range.quant = 1;
   
     opt->name = "offtimer";
-    opt->title = "Off timer";
-    opt->desc = "Time in minutes until the internal power supply switches the scanner off. Will be rounded to nearest 15 minutes. Zero means never power off."; 
+    opt->title = SANE_I18N ("Off timer");
+    opt->desc = SANE_I18N ("Time in minutes until the internal power supply switches the scanner off. Will be rounded to nearest 15 minutes. Zero means never power off."); 
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
     opt->constraint_type = SANE_CONSTRAINT_RANGE;
@@ -3916,8 +3927,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     s->duplex_offset_range.quant = 1;
   
     opt->name = "duplexoffset";
-    opt->title = "Duplex offset";
-    opt->desc = "Adjust front/back offset";
+    opt->title = SANE_I18N ("Duplex offset");
+    opt->desc = SANE_I18N ("Adjust front/back offset");
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
     opt->constraint_type = SANE_CONSTRAINT_RANGE;
@@ -3934,8 +3945,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     s->green_offset_range.quant = 1;
   
     opt->name = "greenoffset";
-    opt->title = "Green offset";
-    opt->desc = "Adjust green/red offset";
+    opt->title = SANE_I18N ("Green offset");
+    opt->desc = SANE_I18N ("Adjust green/red offset");
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
     opt->constraint_type = SANE_CONSTRAINT_RANGE;
@@ -3952,8 +3963,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
     s->blue_offset_range.quant = 1;
   
     opt->name = "blueoffset";
-    opt->title = "Blue offset";
-    opt->desc = "Adjust blue/red offset";
+    opt->title = SANE_I18N ("Blue offset");
+    opt->desc = SANE_I18N ("Adjust blue/red offset");
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
     opt->constraint_type = SANE_CONSTRAINT_RANGE;
@@ -3966,8 +3977,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
   
   if(option==OPT_LOW_MEM){
     opt->name = "lowmemory";
-    opt->title = "Low Memory";
-    opt->desc = "Limit driver memory usage for use in embedded systems. Causes some duplex transfers to alternate sides on each call to sane_read. Value of option 'side' can be used to determine correct image. This option should only be used with custom front-end software.";
+    opt->title = SANE_I18N ("Low Memory");
+    opt->desc = SANE_I18N ("Limit driver memory usage for use in embedded systems. Causes some duplex transfers to alternate sides on each call to sane_read. Value of option 'side' can be used to determine correct image. This option should only be used with custom front-end software.");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     opt->size = sizeof(SANE_Word);
@@ -3982,8 +3993,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_SIDE){
     opt->name = "side";
-    opt->title = "Duplex side";
-    opt->desc = "Tells which side (0=front, 1=back) of a duplex scan the next call to sane_read will return.";
+    opt->title = SANE_I18N ("Duplex side");
+    opt->desc = SANE_I18N ("Tells which side (0=front, 1=back) of a duplex scan the next call to sane_read will return.");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     opt->size = sizeof(SANE_Word);
@@ -3994,8 +4005,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
   /*deskew and crop by hardware*/
   if(option==OPT_HWDESKEWCROP){
     opt->name = "hwdeskewcrop";
-    opt->title = "Hardware deskew and crop";
-    opt->desc = "Request scanner to rotate and crop pages digitally.";
+    opt->title = SANE_I18N ("Hardware deskew and crop");
+    opt->desc = SANE_I18N ("Request scanner to rotate and crop pages digitally.");
     opt->type = SANE_TYPE_BOOL;
     if (s->has_hybrid_crop_deskew)
      opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT | SANE_CAP_ADVANCED;
@@ -4006,8 +4017,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
   /*deskew by software*/
   if(option==OPT_SWDESKEW){
     opt->name = "swdeskew";
-    opt->title = "Software deskew";
-    opt->desc = "Request driver to rotate skewed pages digitally.";
+    opt->title = SANE_I18N ("Software deskew");
+    opt->desc = SANE_I18N ("Request driver to rotate skewed pages digitally.");
     opt->type = SANE_TYPE_BOOL;
     if (1)
      opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT | SANE_CAP_ADVANCED;
@@ -4019,8 +4030,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
   if(option==OPT_SWDESPECK){
 
     opt->name = "swdespeck";
-    opt->title = "Software despeckle diameter";
-    opt->desc = "Maximum diameter of lone dots to remove from scan.";
+    opt->title = SANE_I18N ("Software despeckle diameter");
+    opt->desc = SANE_I18N ("Maximum diameter of lone dots to remove from scan.");
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
     opt->constraint_type = SANE_CONSTRAINT_RANGE;
@@ -4039,8 +4050,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
   /*crop by software*/
   if(option==OPT_SWCROP){
     opt->name = "swcrop";
-    opt->title = "Software crop";
-    opt->desc = "Request driver to remove border from pages digitally.";
+    opt->title = SANE_I18N ("Software crop");
+    opt->desc = SANE_I18N ("Request driver to remove border from pages digitally.");
     opt->type = SANE_TYPE_BOOL;
     if (1)
      opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT | SANE_CAP_ADVANCED;
@@ -4069,8 +4080,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
   /*halt scanner feeder when cancelling*/
   if(option==OPT_HALT_ON_CANCEL){
     opt->name = "halt-on-cancel";
-    opt->title = "Halt on Cancel";
-    opt->desc = "Request driver to halt the paper feed instead of eject during a cancel.";
+    opt->title = SANE_I18N ("Halt on Cancel");
+    opt->desc = SANE_I18N ("Request driver to halt the paper feed instead of eject during a cancel.");
     opt->type = SANE_TYPE_BOOL;
     if (s->has_op_halt)
      opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT | SANE_CAP_ADVANCED;
@@ -4081,8 +4092,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
   /* "Endorser" group ------------------------------------------------------ */
   if(option==OPT_ENDORSER_GROUP){
     opt->name = "endorser-options";
-    opt->title = "Endorser Options";
-    opt->desc = "Controls for endorser unit";
+    opt->title = SANE_I18N ("Endorser Options");
+    opt->desc = SANE_I18N ("Controls for endorser unit");
     opt->type = SANE_TYPE_GROUP;
     opt->constraint_type = SANE_CONSTRAINT_NONE;
 
@@ -4093,8 +4104,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_ENDORSER){
     opt->name = "endorser";
-    opt->title = "Endorser";
-    opt->desc = "Enable endorser unit";
+    opt->title = SANE_I18N ("Endorser");
+    opt->desc = SANE_I18N ("Enable endorser unit");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     opt->size = sizeof(SANE_Word);
@@ -4109,8 +4120,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_ENDORSER_BITS){
     opt->name = "endorser-bits";
-    opt->title = "Endorser bits";
-    opt->desc = "Determines maximum endorser counter value.";
+    opt->title = SANE_I18N ("Endorser bits");
+    opt->desc = SANE_I18N ("Determines maximum endorser counter value.");
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
     opt->size = sizeof(SANE_Word);
@@ -4135,8 +4146,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_ENDORSER_VAL){
     opt->name = "endorser-val";
-    opt->title = "Endorser value";
-    opt->desc = "Initial endorser counter value.";
+    opt->title = SANE_I18N ("Endorser value");
+    opt->desc = SANE_I18N ("Initial endorser counter value.");
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
     opt->size = sizeof(SANE_Word);
@@ -4159,8 +4170,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_ENDORSER_STEP){
     opt->name = "endorser-step";
-    opt->title = "Endorser step";
-    opt->desc = "Change endorser counter value by this much for each page.";
+    opt->title = SANE_I18N ("Endorser step");
+    opt->desc = SANE_I18N ("Change endorser counter value by this much for each page.");
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
     opt->size = sizeof(SANE_Word);
@@ -4183,8 +4194,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_ENDORSER_Y){
     opt->name = "endorser-y";
-    opt->title = "Endorser Y";
-    opt->desc = "Endorser print offset from top of paper.";
+    opt->title = SANE_I18N ("Endorser Y");
+    opt->desc = SANE_I18N ("Endorser print offset from top of paper.");
     opt->type = SANE_TYPE_FIXED;
     opt->unit = SANE_UNIT_MM;
     opt->size = sizeof(SANE_Word);
@@ -4209,8 +4220,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_ENDORSER_FONT){
     opt->name = "endorser-font";
-    opt->title = "Endorser font";
-    opt->desc = "Endorser printing font.";
+    opt->title = SANE_I18N ("Endorser font");
+    opt->desc = SANE_I18N ("Endorser printing font.");
     opt->type = SANE_TYPE_STRING;
     opt->unit = SANE_UNIT_NONE;
 
@@ -4239,8 +4250,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_ENDORSER_DIR){
     opt->name = "endorser-dir";
-    opt->title = "Endorser direction";
-    opt->desc = "Endorser printing direction.";
+    opt->title = SANE_I18N ("Endorser direction");
+    opt->desc = SANE_I18N ("Endorser printing direction.");
     opt->type = SANE_TYPE_STRING;
     opt->unit = SANE_UNIT_NONE;
 
@@ -4264,8 +4275,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_ENDORSER_SIDE){
     opt->name = "endorser-side";
-    opt->title = "Endorser side";
-    opt->desc = "Endorser printing side, requires hardware support to change";
+    opt->title = SANE_I18N ("Endorser side");
+    opt->desc = SANE_I18N ("Endorser printing side, requires hardware support to change");
     opt->type = SANE_TYPE_STRING;
     opt->unit = SANE_UNIT_NONE;
 
@@ -4290,8 +4301,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_ENDORSER_STRING){
     opt->name = "endorser-string";
-    opt->title = "Endorser string";
-    opt->desc = "Endorser alphanumeric print format. %05ud or %08ud at the end will be replaced by counter value.";
+    opt->title = SANE_I18N ("Endorser string");
+    opt->desc = SANE_I18N ("Endorser alphanumeric print format. %05ud or %08ud at the end will be replaced by counter value.");
     opt->type = SANE_TYPE_STRING;
     opt->unit = SANE_UNIT_NONE;
     opt->size = s->endorser_string_len + 1;
@@ -4318,8 +4329,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_TOP){
     opt->name = "top-edge";
-    opt->title = "Top edge";
-    opt->desc = "Paper is pulled partly into adf";
+    opt->title = SANE_I18N ("Top edge");
+    opt->desc = SANE_I18N ("Paper is pulled partly into adf");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     if (s->has_cmd_hw_status || s->ghs_in_rs)
@@ -4330,8 +4341,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_A3){
     opt->name = "a3-paper";
-    opt->title = "A3 paper";
-    opt->desc = "A3 paper detected";
+    opt->title = SANE_I18N ("A3 paper");
+    opt->desc = SANE_I18N ("A3 paper detected");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     if (s->has_cmd_hw_status)
@@ -4342,8 +4353,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_B4){
     opt->name = "b4-paper";
-    opt->title = "B4 paper";
-    opt->desc = "B4 paper detected";
+    opt->title = SANE_I18N ("B4 paper");
+    opt->desc = SANE_I18N ("B4 paper detected");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     if (s->has_cmd_hw_status)
@@ -4354,8 +4365,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_A4){
     opt->name = "a4-paper";
-    opt->title = "A4 paper";
-    opt->desc = "A4 paper detected";
+    opt->title = SANE_I18N ("A4 paper");
+    opt->desc = SANE_I18N ("A4 paper detected");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     if (s->has_cmd_hw_status)
@@ -4366,8 +4377,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_B5){
     opt->name = "b5-paper";
-    opt->title = "B5 paper";
-    opt->desc = "B5 paper detected";
+    opt->title = SANE_I18N ("B5 paper");
+    opt->desc = SANE_I18N ("B5 paper detected");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     if (s->has_cmd_hw_status)
@@ -4390,8 +4401,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_OMR){
     opt->name = "omr-df";
-    opt->title = "OMR or DF";
-    opt->desc = "OMR or double feed detected";
+    opt->title = SANE_I18N ("OMR or DF");
+    opt->desc = SANE_I18N ("OMR or double feed detected");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     if (s->has_cmd_hw_status)
@@ -4414,8 +4425,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_SLEEP){
     opt->name = "power-save";
-    opt->title = "Power saving";
-    opt->desc = "Scanner in power saving mode";
+    opt->title = SANE_I18N ("Power saving");
+    opt->desc = SANE_I18N ("Scanner in power saving mode");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     if (s->has_cmd_hw_status)
@@ -4438,8 +4449,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_MANUAL_FEED){
     opt->name = "manual-feed";
-    opt->title = "Manual feed";
-    opt->desc = "Manual feed selected";
+    opt->title = SANE_I18N ("Manual feed");
+    opt->desc = SANE_I18N ("Manual feed selected");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     if (s->has_cmd_hw_status)
@@ -4462,8 +4473,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_FUNCTION){
     opt->name = "function";
-    opt->title = "Function";
-    opt->desc = "Function character on screen";
+    opt->title = SANE_I18N ("Function");
+    opt->desc = SANE_I18N ("Function character on screen");
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
     if (s->has_cmd_hw_status || s->ghs_in_rs)
@@ -4474,8 +4485,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_INK_EMPTY){
     opt->name = "ink-low";
-    opt->title = "Ink low";
-    opt->desc = "Imprinter ink running low";
+    opt->title = SANE_I18N ("Ink low");
+    opt->desc = SANE_I18N ("Imprinter ink running low");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     if (s->has_cmd_hw_status && (s->has_endorser_f || s->has_endorser_b))
@@ -4486,8 +4497,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_DOUBLE_FEED){
     opt->name = "double-feed";
-    opt->title = "Double feed";
-    opt->desc = "Double feed detected";
+    opt->title = SANE_I18N ("Double feed");
+    opt->desc = SANE_I18N ("Double feed detected");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     if (s->has_cmd_hw_status || s->ghs_in_rs)
@@ -4498,8 +4509,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_ERROR_CODE){
     opt->name = "error-code";
-    opt->title = "Error code";
-    opt->desc = "Hardware error code";
+    opt->title = SANE_I18N ("Error code");
+    opt->desc = SANE_I18N ("Hardware error code");
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
     if (s->has_cmd_hw_status)
@@ -4510,8 +4521,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_SKEW_ANGLE){
     opt->name = "skew-angle";
-    opt->title = "Skew angle";
-    opt->desc = "Requires black background for scanning";
+    opt->title = SANE_I18N ("Skew angle");
+    opt->desc = SANE_I18N ("Requires black background for scanning");
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
     if (s->has_cmd_hw_status)
@@ -4522,8 +4533,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_INK_REMAIN){
     opt->name = "ink-remain";
-    opt->title = "Ink remaining";
-    opt->desc = "Imprinter ink level";
+    opt->title = SANE_I18N ("Ink remaining");
+    opt->desc = SANE_I18N ("Imprinter ink level");
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
     if (s->has_cmd_hw_status && (s->has_endorser_f || s->has_endorser_b))
@@ -4534,8 +4545,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_DENSITY_SW){
     opt->name = "density";
-    opt->title = "Density";
-    opt->desc = "Density dial";
+    opt->title = SANE_I18N ("Density");
+    opt->desc = SANE_I18N ("Density dial");
     opt->type = SANE_TYPE_INT;
     opt->unit = SANE_UNIT_NONE;
     if (s->ghs_in_rs)
@@ -4546,8 +4557,8 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 
   if(option==OPT_DUPLEX_SW){
     opt->name = "duplex";
-    opt->title = "Duplex switch";
-    opt->desc = "Duplex switch";
+    opt->title = SANE_I18N ("Duplex switch");
+    opt->desc = SANE_I18N ("Duplex switch");
     opt->type = SANE_TYPE_BOOL;
     opt->unit = SANE_UNIT_NONE;
     if (s->ghs_in_rs)
@@ -4749,18 +4760,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
           }
           return SANE_STATUS_GOOD;
 
-        case OPT_IPC_MODE:
-          if(s->ipc_mode == WD_ipc_DEFAULT){
-            strcpy (val, STRING_DEFAULT);
-          }
-          else if(s->ipc_mode == WD_ipc_DTC){
-            strcpy (val, STRING_DTC);
-          }
-          else if(s->ipc_mode == WD_ipc_SDTC){
-            strcpy (val, STRING_SDTC);
-          }
-          return SANE_STATUS_GOOD;
-
+        /* DTC params*/
         case OPT_BP_FILTER:
           *val_p = s->bp_filter;
           return SANE_STATUS_GOOD;
@@ -4801,6 +4801,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
           *val_p = s->matrix_2;
           return SANE_STATUS_GOOD;
 
+        /* SDTC params*/
         case OPT_VARIANCE:
           *val_p = s->variance;
           return SANE_STATUS_GOOD;
@@ -5357,6 +5358,14 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
           if (s->page_width == FIXED_MM_TO_SCANNER_UNIT(val_c))
               return SANE_STATUS_GOOD;
 
+          /* if full width image, and paper size is changed,
+             change the image size to match new paper */
+          if (s->tl_x == 0 && s->br_x == s->page_width){
+              DBG (20, "sane_control_option: br_x tracking page_width\n");
+              s->br_x = FIXED_MM_TO_SCANNER_UNIT(val_c);
+              *info |= SANE_INFO_RELOAD_PARAMS;
+          }
+
           s->page_width = FIXED_MM_TO_SCANNER_UNIT(val_c);
           *info |= SANE_INFO_RELOAD_OPTIONS;
           return SANE_STATUS_GOOD;
@@ -5365,6 +5374,14 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
           if (s->page_height == FIXED_MM_TO_SCANNER_UNIT(val_c))
               return SANE_STATUS_GOOD;
 
+          /* if full height image, and paper size is changed,
+             change the image size to match new paper */
+          if (s->tl_y == 0 && s->br_y == s->page_height){
+              DBG (20, "sane_control_option: br_y tracking page_height\n");
+              s->br_y = FIXED_MM_TO_SCANNER_UNIT(val_c);
+              *info |= SANE_INFO_RELOAD_PARAMS;
+          }
+
           s->page_height = FIXED_MM_TO_SCANNER_UNIT(val_c);
           *info |= SANE_INFO_RELOAD_OPTIONS;
           return SANE_STATUS_GOOD;
@@ -5429,48 +5446,35 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
             s->wl_follow = WD_wl_follow_OFF;
           return SANE_STATUS_GOOD;
 
-        case OPT_IPC_MODE:
-          if (!strcmp (val, STRING_DEFAULT)) {
-            tmp = WD_ipc_DEFAULT;
-          }
-          else if (!strcmp (val, STRING_DTC)) {
-            tmp = WD_ipc_DTC;
-          }
-          else {
-            tmp = WD_ipc_SDTC;
-          }
-
-          if (tmp != s->ipc_mode)
-            *info |= SANE_INFO_RELOAD_OPTIONS;
-
-          s->ipc_mode = tmp;
-          return SANE_STATUS_GOOD;
-
+        /* DTC params*/
         case OPT_BP_FILTER:
           s->bp_filter = val_c;
+          *info |= SANE_INFO_RELOAD_OPTIONS;
           return SANE_STATUS_GOOD;
 
         case OPT_SMOOTHING:
           s->smoothing = val_c;
+          *info |= SANE_INFO_RELOAD_OPTIONS;
           return SANE_STATUS_GOOD;
 
         case OPT_GAMMA_CURVE:
           s->gamma_curve = val_c;
+          *info |= SANE_INFO_RELOAD_OPTIONS;
           return SANE_STATUS_GOOD;
 
         case OPT_THRESHOLD_CURVE:
           s->threshold_curve = val_c;
+          *info |= SANE_INFO_RELOAD_OPTIONS;
           return SANE_STATUS_GOOD;
 
         case OPT_THRESHOLD_WHITE:
           s->threshold_white = val_c;
+          *info |= SANE_INFO_RELOAD_OPTIONS;
           return SANE_STATUS_GOOD;
 
         case OPT_NOISE_REMOVAL:
-          if (val_c != s->noise_removal)
-            *info |= SANE_INFO_RELOAD_OPTIONS;
-
           s->noise_removal = val_c;
+          *info |= SANE_INFO_RELOAD_OPTIONS;
           return SANE_STATUS_GOOD;
 
         case OPT_MATRIX_5:
@@ -5489,8 +5493,10 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
           s->matrix_2 = val_c;
           return SANE_STATUS_GOOD;
 
+        /* SDTC params*/
         case OPT_VARIANCE:
           s->variance = val_c;
+          *info |= SANE_INFO_RELOAD_OPTIONS;
           return SANE_STATUS_GOOD;
 
         /* Advanced Group */
@@ -6681,7 +6687,7 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params)
   return ret;
 }
 
-/* set s_param and u_param data based on user settings
+/* set s_params and u_params data based on user settings
  * and scanner capabilities. */
 SANE_Status
 update_params (struct fujitsu * s)
@@ -6926,8 +6932,9 @@ sane_start (SANE_Handle handle)
       if (ret != SANE_STATUS_GOOD)
         DBG (5, "sane_start: WARNING: cannot send_endorser %d\n", ret);
 
-      /* send lut if scanner has no hardware brightness/contrast */
-      if (!s->late_lut && (!s->brightness_steps || !s->contrast_steps)){
+      /* send lut if scanner has no hardware brightness/contrast,
+       * or we are going to ask it to use a downloaded gamma table */
+      if (!s->late_lut && (!s->brightness_steps || !s->contrast_steps || s->window_gamma & 0x80)){
         ret = send_lut(s);
         if (ret != SANE_STATUS_GOOD)
           DBG (5, "sane_start: WARNING: cannot early send_lut %d\n", ret);
@@ -6940,8 +6947,9 @@ sane_start (SANE_Handle handle)
         goto errors;
       }
     
-      /* send lut if scanner has no hardware brightness/contrast */
-      if (s->late_lut && (!s->brightness_steps || !s->contrast_steps)){
+      /* send lut if scanner has no hardware brightness/contrast,
+       * or we are going to ask it to use a downloaded gamma table */
+      if (s->late_lut && (!s->brightness_steps || !s->contrast_steps || s->window_gamma & 0x80)){
         ret = send_lut(s);
         if (ret != SANE_STATUS_GOOD)
           DBG (5, "sane_start: WARNING: cannot late send_lut %d\n", ret);
@@ -7573,15 +7581,15 @@ set_window (struct fujitsu *s)
     set_WD_separation(desc1,s->separation);
     set_WD_mirroring(desc1,s->mirroring);
 
-    if (s->has_sdtc && s->ipc_mode != WD_ipc_DTC)
+    if (get_ipc_mode(s) == WD_ipc_SDTC)
       set_WD_variance(desc1,s->variance);
 
-    if ((s->has_dtc && !s->has_sdtc) || s->ipc_mode == WD_ipc_DTC){
-      set_WD_filtering(desc1,!s->bp_filter);
-      set_WD_smoothing(desc1,!s->smoothing);
+    else if (get_ipc_mode(s) == WD_ipc_DTC){
+      set_WD_filtering(desc1,s->bp_filter);
+      set_WD_smoothing(desc1,s->smoothing);
       set_WD_gamma_curve(desc1,s->gamma_curve);
       set_WD_threshold_curve(desc1,s->threshold_curve);
-      set_WD_noise_removal(desc1,!s->noise_removal);
+      set_WD_noise_removal(desc1,s->noise_removal);
       if(s->noise_removal){
         set_WD_matrix5x5(desc1,s->matrix_5);
         set_WD_matrix4x4(desc1,s->matrix_4);
@@ -7593,7 +7601,7 @@ set_window (struct fujitsu *s)
 
     set_WD_wl_follow(desc1,s->wl_follow);
     set_WD_subwindow_list(desc1,0);
-    set_WD_ipc_mode(desc1,s->ipc_mode);
+    set_WD_ipc_mode(desc1,get_ipc_mode(s));
   }
 
   else{
@@ -7691,8 +7699,8 @@ get_pixelsize(struct fujitsu *s, int actual)
       /* when we are called post-scan, the scanner may give
        * more accurate data in other fields */
       if(actual && !s->has_short_pixelsize && get_PSIZE_paper_w(in)){
+        DBG(5,"get_pixelsize: Actual width %d -> %d\n", s->s_params.pixels_per_line, get_PSIZE_paper_w(in));
         s->s_params.pixels_per_line = get_PSIZE_paper_w(in);
-        DBG(5,"get_pixelsize: Actual width\n");
       }
       else{
         s->s_params.pixels_per_line = get_PSIZE_num_x(in);
@@ -7707,8 +7715,8 @@ get_pixelsize(struct fujitsu *s, int actual)
       /* when we are called post-scan, the scanner may give
        * more accurate data in other fields */
       else if(actual && !s->has_short_pixelsize && get_PSIZE_paper_l(in)){
+        DBG(5,"get_pixelsize: Actual length %d -> %d\n", s->s_params.lines, get_PSIZE_paper_l(in));
         s->s_params.lines = get_PSIZE_paper_l(in);
-        DBG(5,"get_pixelsize: Actual length\n");
       }
       else{
         s->s_params.lines = get_PSIZE_num_y(in);
@@ -9867,6 +9875,43 @@ get_page_height(struct fujitsu *s)
   return height;
 }
 
+/* scanners have two different possible IPC
+ * modes, which enable a different series of
+ * subordinate options. Rather than provide
+ * the user with an option to pick the IPC
+ * mode, we show them the subordinate ones,
+ * and pick the right mode to match.
+ */
+static int
+get_ipc_mode(struct fujitsu *s) 
+{
+  if ( s->bp_filter
+    || s->smoothing
+    || s->gamma_curve
+    || s->threshold_curve
+    || s->threshold_white
+    || s->noise_removal
+    || s->matrix_5
+    || s->matrix_4
+    || s->matrix_3
+    || s->matrix_2
+  )
+    return WD_ipc_DTC;
+
+  if(s->variance)
+    return WD_ipc_SDTC;
+
+  /* special case: 0 threshold should activate IPC */
+  if(!s->threshold){
+    if(s->has_sdtc)
+      return WD_ipc_SDTC;
+    if(s->has_dtc)
+      return WD_ipc_DTC;
+  }
+
+  return WD_ipc_DEFAULT;
+}
+
 /* s->max_y gives the maximum height of paper which can be scanned 
  * this actually varies by resolution, so a helper to change it */
 static int
diff --git a/backend/fujitsu.conf.in b/backend/fujitsu.conf.in
index b3895ea..5fa0003 100644
--- a/backend/fujitsu.conf.in
+++ b/backend/fujitsu.conf.in
@@ -121,7 +121,13 @@ usb 0x04c5 0x119e
 #S1500 & S1500M
 usb 0x04c5 0x11a2
 
-#fi-6140Z
+#fi-6125
+usb 0x04c5 0x11ee
+
+#fi-6225
+usb 0x04c5 0x11ef
+
+#fi-6140Z/fi-6160ZLA
 usb 0x04c5 0x11f1
 
 #fi-6240Z
@@ -157,6 +163,108 @@ usb 0x04c5 0x132e
 #fi-7260
 usb 0x04c5 0x132f
 
+#ScanSnap iX500EE
+usb 0x04c5 0x13f3
+
 #ScanSnap iX100
 usb 0x04c5 0x13f4
 
+#ScanPartner SP25
+usb 0x04c5 0x1409
+
+#ScanPartner SP30
+usb 0x04c5 0x140a
+
+#ScanPartner SP30F
+usb 0x04c5 0x140c
+
+#fi-6140ZLA
+usb 0x04c5 0x145f
+
+#fi-6240ZLA
+usb 0x04c5 0x1460
+
+#fi-6130ZLA
+usb 0x04c5 0x1461
+
+#fi-6230ZLA
+usb 0x04c5 0x1462
+
+#fi-6125ZLA
+usb 0x04c5 0x1463
+
+#fi-6225ZLA
+usb 0x04c5 0x1464
+
+#fi-6135ZLA
+usb 0x04c5 0x146b
+
+#fi-6235ZLA
+usb 0x04c5 0x146c
+
+#fi-6120ZLA
+usb 0x04c5 0x146d
+
+#fi-6220ZLA
+usb 0x04c5 0x146e
+
+#N7100
+usb 0x04c5 0x146f
+
+#fi-6400
+usb 0x04c5 0x14ac
+
+#fi-7480
+usb 0x04c5 0x14b8
+
+#fi-6420
+usb 0x04c5 0x14bd
+
+#fi-7460
+usb 0x04c5 0x14be
+
+#fi-7140
+usb 0x04c5 0x14df
+
+#fi-7240
+usb 0x04c5 0x14e0
+
+#fi-7135
+usb 0x04c5 0x14e1
+
+#fi-7235
+usb 0x04c5 0x14e2
+
+#fi-7130
+usb 0x04c5 0x14e3
+
+#fi-7230
+usb 0x04c5 0x14e4
+
+#fi-7125
+usb 0x04c5 0x14e5
+
+#fi-7225
+usb 0x04c5 0x14e6
+
+#fi-7120
+usb 0x04c5 0x14e7
+
+#fi-7220
+usb 0x04c5 0x14e8
+
+#fi-400F
+usb 0x04c5 0x151e
+
+#fi-7030
+usb 0x04c5 0x151f
+
+#fi-7700
+usb 0x04c5 0x1520
+
+#fi-7600
+usb 0x04c5 0x1521
+
+#fi-7700S
+usb 0x04c5 0x1522
+
diff --git a/backend/fujitsu.h b/backend/fujitsu.h
index 6ce1a56..916f069 100644
--- a/backend/fujitsu.h
+++ b/backend/fujitsu.h
@@ -43,7 +43,6 @@ enum fujitsu_Option
   OPT_SEPARATION,
   OPT_MIRRORING,
   OPT_WL_FOLLOW,
-  OPT_IPC_MODE,
 
   /*IPC/DTC*/
   OPT_BP_FILTER,
@@ -386,7 +385,6 @@ struct fujitsu
   SANE_Range ht_pattern_range;
   SANE_Range emphasis_range;
   SANE_String_Const wl_follow_list[4];
-  SANE_String_Const ipc_mode_list[4];
   SANE_Range gamma_curve_range;
   SANE_Range threshold_curve_range;
   SANE_Range variance_range;
@@ -456,7 +454,6 @@ struct fujitsu
   int separation;
   int mirroring;
   int wl_follow;
-  int ipc_mode;
 
   /* ipc_mode=DTC */
   int bp_filter;
@@ -534,12 +531,6 @@ struct fujitsu
   SANE_Parameters u_params;
   SANE_Parameters s_params;
 
-  /* also keep a backup copy, in case the software enhancement code overwrites*/
-  /*
-  SANE_Parameters u_params_bk;
-  SANE_Parameters s_params_bk;
-  */
-
   /* --------------------------------------------------------------------- */
   /* values which are set by scanning functions to keep track of pages, etc */
   int started;
@@ -821,6 +812,7 @@ static int must_downsample (struct fujitsu *s);
 static int must_fully_buffer (struct fujitsu *s);
 static int get_page_width (struct fujitsu *s);
 static int get_page_height (struct fujitsu *s);
+static int get_ipc_mode (struct fujitsu *s);
 static int set_max_y (struct fujitsu *s);
 
 static SANE_Status send_lut (struct fujitsu *s);
diff --git a/backend/genesys.c b/backend/genesys.c
index 984cead..db0a2b2 100644
--- a/backend/genesys.c
+++ b/backend/genesys.c
@@ -2,7 +2,7 @@
 
    Copyright (C) 2003, 2004 Henning Meier-Geinitz <henning@meier-geinitz.de>
    Copyright (C) 2004, 2005 Gerhard Jaeger <gerhard@gjaeger.de>
-   Copyright (C) 2004-2015 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2004-2016 Stéphane Voltz <stef.dev@free.fr>
    Copyright (C) 2005-2009 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
    Copyright (C) 2006 Laurent Charpentier <laurent_pubs@yahoo.com>
    Copyright (C) 2007 Luke <iceyfor@gmail.com>
@@ -58,7 +58,7 @@
  * SANE backend for Genesys Logic GL646/GL841/GL842/GL843/GL846/GL847/GL124 based scanners
  */
 
-#define BUILD 2508
+#define BUILD 2511
 #define BACKEND_NAME genesys
 
 #include "genesys.h"
@@ -387,7 +387,7 @@ sanei_genesys_create_slope_table3 (Genesys_Device * dev,
 
   DBG (DBG_proc,
        "%s: step_type = %d, "
-       "exposure_time = %d, yres = %g, power_mode = %d\n", __FUNCTION__, step_type,
+       "exposure_time = %d, yres = %g, power_mode = %d\n", __func__, step_type,
        exposure_time, yres, power_mode);
 
   /* final speed */
@@ -792,7 +792,7 @@ sanei_genesys_exposure_time2 (Genesys_Device * dev, float ydpi,
     exposure = exposure_by_led;
 
   DBG (DBG_info, "%s: ydpi=%d, step=%d, endpixel=%d led=%d, power=%d => exposure=%d\n",
-       __FUNCTION__, (int)ydpi, step_type, endpixel, exposure_by_led, power_mode, exposure);
+       __func__, (int)ydpi, step_type, endpixel, exposure_by_led, power_mode, exposure);
   return exposure;
 }
 
@@ -928,7 +928,7 @@ genesys_send_offset_and_shading (Genesys_Device * dev, uint8_t * data,
   int start_address;
   SANE_Status status;
 
-  DBG (DBG_proc, "%s: (size = %d)\n", __FUNCTION__, size);
+  DBG (DBG_proc, "%s: (size = %d)\n", __func__, size);
 
   /* ASIC higher than gl843 doesn't have register 2A/2B, so we route to
    * a per ASIC shading data loading function if available.
@@ -978,7 +978,7 @@ genesys_send_offset_and_shading (Genesys_Device * dev, uint8_t * data,
   status = sanei_genesys_set_buffer_address (dev, start_address);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to set buffer address: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to set buffer address: %s\n", __func__,
            sane_strstatus (status));
       return status;
     }
@@ -986,7 +986,7 @@ genesys_send_offset_and_shading (Genesys_Device * dev, uint8_t * data,
   status = dev->model->cmd_set->bulk_write_data (dev, 0x3c, data, size);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to send shading table: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to send shading table: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -1046,7 +1046,7 @@ sanei_genesys_init_shading_data (Genesys_Device * dev, int pixels_per_line)
   free (shading_data);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to send shading data: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to send shading data: %s\n", __func__,
 	  sane_strstatus (status));
     }
 
@@ -1489,7 +1489,7 @@ genesys_coarse_calibration (Genesys_Device * dev)
   status = dev->model->cmd_set->set_fe (dev, AFE_INIT);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to set frontend: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to set frontend: %s\n", __func__,
 	   sane_strstatus (status));
       free(all_data);
       free(calibration_data);
@@ -2069,9 +2069,12 @@ genesys_white_shading_calibration (Genesys_Device * dev)
   /* turn on motor and lamp power */
   dev->model->cmd_set->set_lamp_power (dev, dev->calib_reg, SANE_TRUE);
   dev->model->cmd_set->set_motor_power (dev->calib_reg, motor);
-  if (dev->model->flags & GENESYS_FLAG_SHADING_REPARK)
+
+  /* if needed, go back before doin next scan, by using rewind, registers and
+   * slopes table are kept intact from previous scan */
+  if (dev->model->flags & GENESYS_FLAG_SHADING_REPARK && dev->model->cmd_set->rewind)
     {
-	  status = dev->model->cmd_set->slow_back_home (dev, SANE_TRUE);
+      status = dev->model->cmd_set->rewind (dev);
     }
 
   status =
@@ -2180,7 +2183,7 @@ genesys_dark_white_shading_calibration (Genesys_Device * dev)
   SANE_Bool motor;
 
 
-  DBG (DBG_proc, "%s: (lines = %d)\n", __FUNCTION__, (unsigned int)dev->calib_lines);
+  DBG (DBG_proc, "%s: (lines = %d)\n", __func__, (unsigned int)dev->calib_lines);
 
   pixels_per_line = dev->calib_pixels;
   channels = dev->calib_channels;
@@ -2193,7 +2196,7 @@ genesys_dark_white_shading_calibration (Genesys_Device * dev)
   dev->white_average_data = malloc (dev->average_size);
   if (!dev->white_average_data)
     {
-      DBG (DBG_error, "%s: failed to allocate white average memory\n", __FUNCTION__);
+      DBG (DBG_error, "%s: failed to allocate white average memory\n", __func__);
       return SANE_STATUS_NO_MEM;
     }
 
@@ -2203,7 +2206,7 @@ genesys_dark_white_shading_calibration (Genesys_Device * dev)
   dev->dark_average_data = malloc (channels * 2 * pixels_per_line);
   if (!dev->dark_average_data)
     {
-      DBG (DBG_error, "%s: failed to allocate dark average memory\n", __FUNCTION__);
+      DBG (DBG_error, "%s: failed to allocate dark average memory\n", __func__);
       return SANE_STATUS_NO_MEM;
     }
 
@@ -2212,7 +2215,7 @@ genesys_dark_white_shading_calibration (Genesys_Device * dev)
   calibration_data = malloc (size);
   if (!calibration_data)
     {
-      DBG (DBG_error, "%s: failed to allocate calibration memory\n", __FUNCTION__);
+      DBG (DBG_error, "%s: failed to allocate calibration memory\n", __func__);
       return SANE_STATUS_NO_MEM;
     }
 
@@ -2233,7 +2236,7 @@ genesys_dark_white_shading_calibration (Genesys_Device * dev)
   if (status != SANE_STATUS_GOOD)
     {
       free (calibration_data);
-      DBG (DBG_error, "%s: failed to bulk write registers: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to bulk write registers: %s\n", __func__,
            sane_strstatus (status));
       return status;
     }
@@ -2243,7 +2246,7 @@ genesys_dark_white_shading_calibration (Genesys_Device * dev)
   if (status != SANE_STATUS_GOOD)
     {
       free (calibration_data);
-      DBG (DBG_error, "%s: failed to begin scan: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to begin scan: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -2252,7 +2255,7 @@ genesys_dark_white_shading_calibration (Genesys_Device * dev)
   if (status != SANE_STATUS_GOOD)
     {
       free (calibration_data);
-      DBG (DBG_error, "%s: failed to read data: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to read data: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -2261,7 +2264,7 @@ genesys_dark_white_shading_calibration (Genesys_Device * dev)
   if (status != SANE_STATUS_GOOD)
     {
       free (calibration_data);
-      DBG (DBG_error, "%s: Failed to end scan: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: Failed to end scan: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -2434,7 +2437,7 @@ compute_averaged_planar (Genesys_Device * dev,
   unsigned int x, i, j, br, dk, res, avgpixels, basepixels, val;
   unsigned int fill,factor;
 
-  DBG (DBG_info, "%s: pixels=%d, offset=%d\n", __FUNCTION__, pixels_per_line, o);
+  DBG (DBG_info, "%s: pixels=%d, offset=%d\n", __func__, pixels_per_line, o);
 
   /* initialize result */
   memset (shading_data, 0xff, words_per_color * 3 * 2);
@@ -2504,9 +2507,9 @@ compute_averaged_planar (Genesys_Device * dev,
       fill=1;
     }
 
-  DBG (DBG_info, "%s: averaging over %d pixels\n", __FUNCTION__, avgpixels);
-  DBG (DBG_info, "%s: packing factor is %d\n", __FUNCTION__, factor);
-  DBG (DBG_info, "%s: fill length is %d\n", __FUNCTION__, fill);
+  DBG (DBG_info, "%s: averaging over %d pixels\n", __func__, avgpixels);
+  DBG (DBG_info, "%s: packing factor is %d\n", __func__, factor);
+  DBG (DBG_info, "%s: fill length is %d\n", __func__, fill);
 
   for (x = 0; x <= pixels_per_line - avgpixels; x += avgpixels)
     {
@@ -2903,7 +2906,7 @@ genesys_send_shading_coefficient (Genesys_Device * dev)
   shading_data = malloc (length);
   if (!shading_data)
     {
-      DBG (DBG_error, "%s: failed to allocate memory\n", __FUNCTION__);
+      DBG (DBG_error, "%s: failed to allocate memory\n", __func__);
       return SANE_STATUS_NO_MEM;
     }
   memset (shading_data, 0, length);
@@ -3071,7 +3074,7 @@ genesys_send_shading_coefficient (Genesys_Device * dev)
         shading_data = malloc (length);
         if (!shading_data)
           {
-            DBG (DBG_error, "%s: failed to allocate memory\n", __FUNCTION__);
+            DBG (DBG_error, "%s: failed to allocate memory\n", __func__);
             return SANE_STATUS_NO_MEM;
           }
         memset (shading_data, 0, length);
@@ -3121,7 +3124,7 @@ genesys_send_shading_coefficient (Genesys_Device * dev)
 			            256);        /* patch_size: contigous extent */
       break;
     default:
-      DBG (DBG_error, "%s: sensor %d not supported\n", __FUNCTION__, dev->model->ccd_type);
+      DBG (DBG_error, "%s: sensor %d not supported\n", __func__, dev->model->ccd_type);
       return SANE_STATUS_UNSUPPORTED;
       break;
     }
@@ -3131,7 +3134,7 @@ genesys_send_shading_coefficient (Genesys_Device * dev)
   free (shading_data);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to send shading data: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to send shading data: %s\n", __func__,
 	  sane_strstatus (status));
     }
 
@@ -3689,7 +3692,7 @@ genesys_sheetfed_calibration (Genesys_Device * dev)
   if (status != SANE_STATUS_GOOD)
     {
       dev->model->cmd_set->eject_document (dev);
-      DBG (DBG_error, "%s: failed eject target: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed eject target: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -3821,7 +3824,7 @@ genesys_warmup_lamp (Genesys_Device * dev)
   /* check if the current chipset implements warmup */
   if(dev->model->cmd_set->init_regs_for_warmup==NULL)
     {
-      DBG (DBG_error, "%s: init_regs_for_warmup not implemented\n", __FUNCTION__);
+      DBG (DBG_error, "%s: init_regs_for_warmup not implemented\n", __func__);
       return status;
     }
 
@@ -4346,7 +4349,7 @@ genesys_fill_line_interp_buffer (Genesys_Device * dev, uint8_t *work_buffer_dst,
 	  if (status != SANE_STATUS_GOOD)
 	    {
 	      DBG (DBG_error,
-		   "%s: failed to read %lu bytes (%s)\n", __FUNCTION__,
+		   "%s: failed to read %lu bytes (%s)\n", __func__,
 		   (u_long) dev->oe_buffer.size, sane_strstatus (status));
 	      return SANE_STATUS_IO_ERROR;
 	    }
@@ -4383,7 +4386,7 @@ genesys_fill_line_interp_buffer (Genesys_Device * dev, uint8_t *work_buffer_dst,
               if (status != SANE_STATUS_GOOD)
                 {
                   DBG (DBG_error,
-                       "%s: failed to read %lu bytes (%s)\n", __FUNCTION__,
+                       "%s: failed to read %lu bytes (%s)\n", __func__,
                        (u_long) dev->oe_buffer.size, sane_strstatus (status));
                   return SANE_STATUS_IO_ERROR;
                 }
@@ -4417,7 +4420,7 @@ genesys_fill_segmented_buffer (Genesys_Device * dev, uint8_t *work_buffer_dst, s
 	  if (status != SANE_STATUS_GOOD)
 	    {
 	      DBG (DBG_error,
-		   "%s: failed to read %lu bytes (%s)\n", __FUNCTION__,
+		   "%s: failed to read %lu bytes (%s)\n", __func__,
 		   (u_long) dev->oe_buffer.size, sane_strstatus (status));
 	      return SANE_STATUS_IO_ERROR;
 	    }
@@ -4508,7 +4511,7 @@ genesys_fill_segmented_buffer (Genesys_Device * dev, uint8_t *work_buffer_dst, s
               if (status != SANE_STATUS_GOOD)
                 {
                   DBG (DBG_error,
-                       "%s: failed to read %lu bytes (%s)\n", __FUNCTION__,
+                       "%s: failed to read %lu bytes (%s)\n", __func__,
                        (u_long) dev->oe_buffer.size, sane_strstatus (status));
                   return SANE_STATUS_IO_ERROR;
                 }
@@ -5496,7 +5499,7 @@ GENESYS_STATIC char *calibration_filename(Genesys_Device *currdev)
       snprintf (tmpstr, PATH_MAX, "%s%c.sane%c%s", ptr, PATH_SEP, PATH_SEP, filename);
     }
 
-  DBG (DBG_info, "%s: calibration filename >%s<\n", __FUNCTION__, tmpstr);
+  DBG (DBG_info, "%s: calibration filename >%s<\n", __func__, tmpstr);
 
   return tmpstr;
 }
@@ -5893,7 +5896,7 @@ init_options (Genesys_Scanner * s)
       DISABLE (OPT_COLOR_FILTER);
     }
 
-  /* calibration stor file name */
+  /* calibration store file name */
   s->opt[OPT_CALIBRATION_FILE].name = "calibration-file";
   s->opt[OPT_CALIBRATION_FILE].title = SANE_I18N ("Calibration file");
   s->opt[OPT_CALIBRATION_FILE].desc = SANE_I18N ("Specify the calibration file to use");
@@ -6330,7 +6333,7 @@ probe_genesys_devices (void)
       free (new_dev);
     }
 
-  DBG(DBG_info, "%s: %d devices currently attached\n", __FUNCTION__, num_devices);
+  DBG(DBG_info, "%s: %d devices currently attached\n", __func__, num_devices);
 
   DBGCOMPLETED;
 
@@ -6545,7 +6548,7 @@ genesys_buffer_image(Genesys_Scanner *s)
       lines =
 	(SANE_UNFIX (dev->model->y_size) * dev->settings.yres) / MM_PER_INCH;
     }
-  DBG (DBG_info, "%s: buffering %d lines of %d bytes\n", __FUNCTION__, lines,
+  DBG (DBG_info, "%s: buffering %d lines of %d bytes\n", __func__, lines,
        s->params.bytes_per_line);
 
   /* maximum bytes to read */
@@ -6568,7 +6571,7 @@ genesys_buffer_image(Genesys_Scanner *s)
     {
       DBG (DBG_error,
 	   "%s: digital processing requires too much memory.\nConsider disabling it\n",
-	   __FUNCTION__);
+	   __func__);
       return SANE_STATUS_NO_MEM;
     }
 
@@ -6585,7 +6588,7 @@ genesys_buffer_image(Genesys_Scanner *s)
       if (status != SANE_STATUS_EOF && status != SANE_STATUS_GOOD)
 	{
 	  free (s->dev->img_buffer);
-	  DBG (DBG_error, "%s: %s buffering failed\n", __FUNCTION__,
+	  DBG (DBG_error, "%s: %s buffering failed\n", __func__,
 	       sane_strstatus (status));
 	  return status;
 	}
@@ -6600,7 +6603,7 @@ genesys_buffer_image(Genesys_Scanner *s)
 	    {
 	      DBG (DBG_error0,
 		   "%s: digital processing requires too much memory.\nConsider disabling it\n",
-		   __FUNCTION__);
+		   __func__);
 	      return SANE_STATUS_NO_MEM;
 	    }
 	}
@@ -6627,7 +6630,7 @@ genesys_buffer_image(Genesys_Scanner *s)
         {
           DBG (DBG_error0,
                "%s: digital processing requires too much memory.\nConsider disabling it\n",
-               __FUNCTION__);
+               __func__);
           return SANE_STATUS_NO_MEM;
         }
       genesys_gray_lineart (dev,
@@ -6669,10 +6672,10 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
   DBG_INIT ();
   DBG (DBG_init, "SANE Genesys backend version %d.%d build %d from %s\n",
        SANE_CURRENT_MAJOR, V_MINOR, BUILD, PACKAGE_STRING);
-#ifdef HAVE_LIBUSB_1_0
+#ifdef HAVE_LIBUSB
   DBG (DBG_init, "SANE Genesys backend built with libusb-1.0\n");
 #endif
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
   DBG (DBG_init, "SANE Genesys backend built with libusb\n");
 #endif
 
@@ -6942,8 +6945,8 @@ sane_open (SANE_String_Const devicename, SANE_Handle * handle)
   tmpstr=calibration_filename(s->dev);
   s->val[OPT_CALIBRATION_FILE].s = strdup (tmpstr);
   s->dev->calib_file = strdup (tmpstr);
-  DBG (DBG_info, "%s: Calibration filename set to:\n", __FUNCTION__);
-  DBG (DBG_info, "%s: >%s<\n", __FUNCTION__, s->dev->calib_file);
+  DBG (DBG_info, "%s: Calibration filename set to:\n", __func__);
+  DBG (DBG_info, "%s: >%s<\n", __func__, s->dev->calib_file);
   free(tmpstr);
 
   /* now open file, fetch calibration records */
@@ -7033,7 +7036,9 @@ sane_close (SANE_Handle handle)
   FREE_IFNOT_NULL (s->dev->sensor.gamma_table[1]);
   FREE_IFNOT_NULL (s->dev->sensor.gamma_table[2]);
 
-  /* for an handful of bytes .. */
+  s->dev->already_initialized = SANE_FALSE;
+
+   /* for an handful of bytes .. */
   free ((void *)(size_t)s->opt[OPT_RESOLUTION].constraint.word_list);
   free (s->val[OPT_SOURCE].s);
   free (s->val[OPT_MODE].s);
@@ -7125,6 +7130,7 @@ get_option_value (Genesys_Scanner * s, int option, void *val)
     case OPT_DESPECK:
     case OPT_CONTRAST:
     case OPT_BRIGHTNESS:
+    case OPT_EXPIRATION_TIME:
       *(SANE_Word *) val = s->val[option].w;
       break;
     case OPT_CUSTOM_GAMMA:
@@ -7245,8 +7251,8 @@ static SANE_Status set_calibration_value (Genesys_Scanner * s, int option, void
   if (tmp)
     free (tmp);
   dev->calib_file = strdup (val);
-  DBG (DBG_info, "%s: Calibration filename set to:\n", __FUNCTION__);
-  DBG (DBG_info, "%s: >%s<\n", __FUNCTION__, s->dev->calib_file);
+  DBG (DBG_info, "%s: Calibration filename set to:\n", __func__);
+  DBG (DBG_info, "%s: >%s<\n", __func__, s->dev->calib_file);
 
   DBGCOMPLETED;
   return SANE_STATUS_GOOD;
@@ -7536,7 +7542,7 @@ set_option_value (Genesys_Scanner * s, int option, void *val,
 	{
 	  DBG (DBG_error,
 	       "%s: failed to disable power saving mode: %s\n",
-	       __FUNCTION__, sane_strstatus (status));
+	       __func__, sane_strstatus (status));
 	}
       else
 	status = genesys_scanner_calibration (s->dev);
diff --git a/backend/genesys.conf.in b/backend/genesys.conf.in
index 7899455..5273d51 100644
--- a/backend/genesys.conf.in
+++ b/backend/genesys.conf.in
@@ -2,7 +2,7 @@
 
 #
 # scanners that are not yet supported
-# uncomment them only for developpment purpose
+# uncomment them only for development purpose
 #
 
 # UMAX Astra 4500 and Avision iVina 1600
diff --git a/backend/genesys_conv.c b/backend/genesys_conv.c
index 0346ad6..61f466e 100644
--- a/backend/genesys_conv.c
+++ b/backend/genesys_conv.c
@@ -1,7 +1,7 @@
 /* sane - Scanner Access Now Easy.
 
    Copyright (C) 2005, 2006 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-   Copyright (C) 2010-2013 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2010-2013 Stéphane Voltz <stef.dev@free.fr>
 
    This file is part of the SANE package.
 
@@ -295,7 +295,7 @@ genesys_shrink_lines_1 (
 	  else
 	    {
 	      /* TODO: since depth is 1, we must interpolate bit within bytes */
-	      DBG (DBG_warn, "%s: inaccurate bit expansion!\n", __FUNCTION__);
+	      DBG (DBG_warn, "%s: inaccurate bit expansion!\n", __func__);
 	      cnt = dst_pixels / 2;
 	      dst_x = 0;
 	      for (src_x = 0; src_x < src_pixels; src_x++)
@@ -332,7 +332,7 @@ genesys_crop(Genesys_Scanner *s)
   int left = 0;
   int right = 0;
 
-  DBG (DBG_proc, "%s: start\n", __FUNCTION__);
+  DBG (DBG_proc, "%s: start\n", __func__);
 
   /* first find edges if any */
   status = sanei_magic_findEdges (&s->params,
@@ -345,10 +345,10 @@ genesys_crop(Genesys_Scanner *s)
                                   &right);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_info, "%s: bad or no edges, bailing\n", __FUNCTION__);
+      DBG (DBG_info, "%s: bad or no edges, bailing\n", __func__);
       goto cleanup;
     }
-  DBG (DBG_io, "%s: t:%d b:%d l:%d r:%d\n", __FUNCTION__, top, bottom, left,
+  DBG (DBG_io, "%s: t:%d b:%d l:%d r:%d\n", __func__, top, bottom, left,
        right);
 
   /* now crop the image */
@@ -356,7 +356,7 @@ genesys_crop(Genesys_Scanner *s)
     sanei_magic_crop (&(s->params), dev->img_buffer, top, bottom, left, right);
   if (status)
     {
-      DBG (DBG_warn, "%s: failed to crop\n", __FUNCTION__);
+      DBG (DBG_warn, "%s: failed to crop\n", __func__);
       goto cleanup;
     }
 
@@ -364,7 +364,7 @@ genesys_crop(Genesys_Scanner *s)
   dev->total_bytes_to_read = s->params.bytes_per_line * s->params.lines;
 
 cleanup:
-  DBG (DBG_proc, "%s: completed\n", __FUNCTION__);
+  DBG (DBG_proc, "%s: completed\n", __func__);
   return SANE_STATUS_GOOD;
 }
 
@@ -382,7 +382,7 @@ genesys_deskew(Genesys_Scanner *s)
   int x = 0, y = 0, bg;
   double slope = 0;
 
-  DBG (DBG_proc, "%s: start\n", __FUNCTION__);
+  DBG (DBG_proc, "%s: start\n", __func__);
 
   bg=0;
   if(s->params.format==SANE_FRAME_GRAY && s->params.depth == 1)
@@ -398,10 +398,10 @@ genesys_deskew(Genesys_Scanner *s)
                                  &slope);
   if (status!=SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: bad findSkew, bailing\n", __FUNCTION__);
+      DBG (DBG_error, "%s: bad findSkew, bailing\n", __func__);
       return SANE_STATUS_GOOD;
     }
-  DBG(DBG_info, "%s: slope=%f => %f\n",__FUNCTION__,slope, (slope/M_PI_2)*90);
+  DBG(DBG_info, "%s: slope=%f => %f\n",__func__,slope, (slope/M_PI_2)*90);
   /* rotate image slope is in [-PI/2,PI/2]
    * positive values rotate trigonometric direction wise */
   status = sanei_magic_rotate (&s->params,
@@ -412,10 +412,10 @@ genesys_deskew(Genesys_Scanner *s)
                                bg);
   if (status!=SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: rotate error: %s", __FUNCTION__, sane_strstatus(status));
+      DBG (DBG_error, "%s: rotate error: %s", __func__, sane_strstatus(status));
     }
 
-  DBG (DBG_proc, "%s: completed\n", __FUNCTION__);
+  DBG (DBG_proc, "%s: completed\n", __func__);
   return SANE_STATUS_GOOD;
 }
 
@@ -430,7 +430,7 @@ genesys_despeck(Genesys_Scanner *s)
                          s->dev->img_buffer,
                          s->val[OPT_DESPECK].w)!=SANE_STATUS_GOOD)
   {
-    DBG (DBG_error, "%s: bad despeck, bailing\n",__FUNCTION__);
+    DBG (DBG_error, "%s: bad despeck, bailing\n",__func__);
   }
 
   return SANE_STATUS_GOOD;
@@ -454,7 +454,7 @@ genesys_derotate (Genesys_Scanner * s)
 
   if (status)
     {
-      DBG (DBG_warn, "%s: failed : %d\n", __FUNCTION__, status);
+      DBG (DBG_warn, "%s: failed : %d\n", __func__, status);
       DBGCOMPLETED;
       return SANE_STATUS_GOOD;
     }
@@ -463,7 +463,7 @@ genesys_derotate (Genesys_Scanner * s)
   status = sanei_magic_turn (&s->params, s->dev->img_buffer, angle);
   if (status)
     {
-      DBG (DBG_warn, "%s: failed : %d\n", __FUNCTION__, status);
+      DBG (DBG_warn, "%s: failed : %d\n", __func__, status);
       DBGCOMPLETED;
       return SANE_STATUS_GOOD;
     }
diff --git a/backend/genesys_devices.c b/backend/genesys_devices.c
index 775ffb6..11f2579 100644
--- a/backend/genesys_devices.c
+++ b/backend/genesys_devices.c
@@ -3,12 +3,12 @@
    Copyright (C) 2003 Oliver Rauch
    Copyright (C) 2003-2005 Henning Meier-Geinitz <henning@meier-geinitz.de>
    Copyright (C) 2004, 2005 Gerhard Jaeger <gerhard@gjaeger.de>
-   Copyright (C) 2004-2013 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2004-2013 Stéphane Voltz <stef.dev@free.fr>
    Copyright (C) 2005-2009 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
    Copyright (C) 2007 Luke <iceyfor@gmail.com>
    Copyright (C) 2010 Jack McGill <jmcgill85258@yahoo.com>
    Copyright (C) 2010 Andrey Loginov <avloginov@gmail.com>,
-   		xerox travelscan device entry
+		   xerox travelscan device entry
    Copyright (C) 2010 Chris Berry <s0457957@sms.ed.ac.uk> and Michael Rickmann <mrickma@gwdg.de>
                  for Plustek Opticbook 3600 support
 
@@ -64,28 +64,28 @@ static Genesys_Frontend Wolfson[] = {
    , {0x02, 0x02, 0x02}
    , {0x00, 0x00, 0x00}
    }
-  ,				/* 0: UMAX */
+  ,                                /* 0: UMAX */
   {DAC_WOLFSON_ST12, {0x00, 0x03, 0x05, 0x03}
    , {0x00, 0x00, 0x00}
    , {0xc8, 0xc8, 0xc8}
    , {0x04, 0x04, 0x04}
    , {0x00, 0x00, 0x00}
    }
-  ,				/* 1: ST12 */
+  ,                                /* 1: ST12 */
   {DAC_WOLFSON_ST24,{0x00, 0x03, 0x05, 0x21}
    , {0x00, 0x00, 0x00}
    , {0xc8, 0xc8, 0xc8}
    , {0x06, 0x06, 0x06}
    , {0x00, 0x00, 0x00}
    }
-  ,				/* 2: ST24 */
+  ,                                /* 2: ST24 */
   {DAC_WOLFSON_5345,{0x00, 0x03, 0x05, 0x12}
    , {0x00, 0x00, 0x00}
    , {0xb8, 0xb8, 0xb8}
    , {0x04, 0x04, 0x04}
    , {0x00, 0x00, 0x00}
    }
-  ,				/* 3: MD6228/MD6471 */
+  ,                                /* 3: MD6228/MD6471 */
   {DAC_WOLFSON_HP2400,
    /* reg0  reg1  reg2  reg3 */
      {0x00, 0x03, 0x05, 0x02} /* reg3=0x02 for 50-600 dpi, 0x32 (0x12 also works well) at 1200 */
@@ -94,7 +94,7 @@ static Genesys_Frontend Wolfson[] = {
    , {0x06, 0x09, 0x08}
    , {0x00, 0x00, 0x00}
    }
-  ,				/* 4: HP2400c */
+  ,                                /* 4: HP2400c */
   {DAC_WOLFSON_HP2300,
      {0x00, 0x03, 0x04, 0x02}
    , {0x00, 0x00, 0x00}
@@ -102,16 +102,16 @@ static Genesys_Frontend Wolfson[] = {
    , {0x04, 0x04, 0x04}
    , {0x00, 0x00, 0x00}
    }
-  ,				/* 5: HP2300c */
+  ,                                /* 5: HP2300c */
   {DAC_CANONLIDE35,{0x00, 0x3d, 0x08, 0x00}
    , {0x00, 0x00, 0x00}
    , {0xe1, 0xe1, 0xe1}
    , {0x93, 0x93, 0x93}
    , {0x00, 0x19, 0x06}
    }
-  ,				/* 6: CANONLIDE35 */
+  ,                                /* 6: CANONLIDE35 */
   {DAC_AD_XP200,
-     {0x58, 0x80, 0x00, 0x00}	/* reg1=0x80 ? */
+     {0x58, 0x80, 0x00, 0x00}        /* reg1=0x80 ? */
    , {0x00, 0x00, 0x00}
    , {0x09, 0x09, 0x09}
    , {0x09, 0x09, 0x09}
@@ -124,7 +124,7 @@ static Genesys_Frontend Wolfson[] = {
    , {0x93, 0x93, 0x93}
    , {0x07, 0x00, 0x00}
    }
-  ,				/* 8: HP3670 */
+  ,                                /* 8: HP3670 */
   {DAC_WOLFSON_HP3670,
    /* reg0  reg1  reg2  reg3 */
      {0x00, 0x03, 0x05, 0x32} /* reg3=0x32 for 100-300 dpi, 0x12 at 1200 */
@@ -156,7 +156,7 @@ static Genesys_Frontend Wolfson[] = {
    , {0x2f, 0x04, 0x00}
    , {0x00, 0x00, 0x00}
    }
-  ,				/* KV-SS080 */
+  ,                                /* KV-SS080 */
   {DAC_KVSS080,
      {0x00, 0x23, 0x24, 0x0f}
    , {0x00, 0x00, 0x00}
@@ -168,7 +168,7 @@ static Genesys_Frontend Wolfson[] = {
   {DAC_G4050,
      {0x00, 0x23, 0x24, 0x1f}
    , {0x00, 0x00, 0x00}
-   , {0x45, 0x45, 0x45}	/* 0x20, 0x21, 0x22 */
+   , {0x45, 0x45, 0x45} /* 0x20, 0x21, 0x22 */
    , {0x4b, 0x4b, 0x4b} /* 0x28, 0x29, 0x2a */
    , {0x00,0x00,0x00}
    }
@@ -181,6 +181,22 @@ static Genesys_Frontend Wolfson[] = {
    , {0x00, 0x00, 0x00}
    }
   ,
+  /** @brief GL124 special case
+   * for GL124 based scanners, this struct is "abused"
+   * in fact the fields are map like below to AFE registers
+   * (from Texas Instrument or alike ?)
+   */
+  {DAC_CANONLIDE120,
+     {0x80,
+   /* 0001  0002  0003 */
+      0xa3, 0x2b, 0x4c}
+   /* 0005  0006  0007 */
+   , {0x00, 0xca, 0x95}
+   , {0x00, 0x00, 0x00}
+   , {0x00, 0x00, 0x00}
+   , {0x00, 0x00, 0x00}
+   }
+  ,
   {DAC_PLUSTEK_3600,
      {0x70, 0x80, 0x00, 0x00}
    , {0x00, 0x00, 0x00}
@@ -192,7 +208,7 @@ static Genesys_Frontend Wolfson[] = {
   {DAC_CS8400F,
      {0x00, 0x23, 0x24, 0x0f}
    , {0x00, 0x00, 0x00}
-   , {0x60, 0x5c, 0x6c}	/* 0x20, 0x21, 0x22 */
+   , {0x60, 0x5c, 0x6c}        /* 0x20, 0x21, 0x22 */
    , {0x8a, 0x9f, 0xc2} /* 0x28, 0x29, 0x2a */
    , {0x00, 0x00, 0x00}
    }
@@ -200,7 +216,7 @@ static Genesys_Frontend Wolfson[] = {
   {DAC_IMG101,
      {0x78, 0xf0, 0x00, 0x00}
    , {0x00, 0x00, 0x00}
-   , {0x00, 0x00, 0x00}	/* 0x20, 0x21, 0x22 */
+   , {0x00, 0x00, 0x00}        /* 0x20, 0x21, 0x22 */
    , {0x00, 0x00, 0x00} /* 0x28, 0x29, 0x2a */
    , {0x00, 0x00, 0x00}
    }
@@ -208,7 +224,7 @@ static Genesys_Frontend Wolfson[] = {
   {DAC_PLUSTEK3800,
      {0x78, 0xf0, 0x00, 0x00}
    , {0x00, 0x00, 0x00}
-   , {0x00, 0x00, 0x00}	/* 0x20, 0x21, 0x22 */
+   , {0x00, 0x00, 0x00}        /* 0x20, 0x21, 0x22 */
    , {0x00, 0x00, 0x00} /* 0x28, 0x29, 0x2a */
    , {0x00, 0x00, 0x00}
    },
@@ -296,7 +312,7 @@ static Genesys_Sensor Sensor[] = {
   {CCD_HP2300,
    600,
    48,
-   20, 0, 5368, 180, 180,	/* 5376 */
+   20, 0, 5368, 180, 180,        /* 5376 */
    {0x16, 0x00, 0x01, 0x03} ,
    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb7, 0x0a, 0x20, 0x2a, 0x6a, 0x8a, 0x00, 0x05} ,
    {0x0f, 0x13, 0x17, 0x03, 0x07, 0x0b, 0x83, 0x00, 0xc1, 0x06, 0x0b, 0x10, 0x16} ,
@@ -307,21 +323,21 @@ static Genesys_Sensor Sensor[] = {
   /* CANOLIDE35 */
   {CCD_CANONLIDE35,
    1200,
-   87,				/* (black) */
-   87,				/* (dummy) */
-   0,				/* (startxoffset) */
-   10400,			/* sensor_pixels */
+   87,                                /* (black) */
+   87,                                /* (dummy) */
+   0,                                /* (startxoffset) */
+   10400,                        /* sensor_pixels */
    0,
    0,
    {0x00, 0x00, 0x00, 0x00},
    {0x04, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x02, 0x00, 0x50,
-    0x00, 0x00, 0x00, 0x02	/* TODO(these do no harm, but may be neccessery for CCD) */
+    0x00, 0x00, 0x00, 0x02        /* TODO(these do no harm, but may be neccessery for CCD) */
     },
    {0x05, 0x07,
-    0x00, 0x00, 0x00, 0x00,	/*[GB](HI|LOW) not needed for cis */
+    0x00, 0x00, 0x00, 0x00,        /*[GB](HI|LOW) not needed for cis */
     0x3a, 0x03,
-    0x40,			/*TODO: bit7 */
-    0x00, 0x00, 0x00, 0x00	/*TODO (these do no harm, but may be neccessery for CCD) */
+    0x40,                        /*TODO: bit7 */
+    0x00, 0x00, 0x00, 0x00        /*TODO (these do no harm, but may be neccessery for CCD) */
     }
    ,
    {1.0, 1.0, 1.0},
@@ -353,10 +369,10 @@ static Genesys_Sensor Sensor[] = {
   ,
   /* Syscan DP 665 */
   {CCD_DP665, 600,
-   27,				/*(black) */
-   27,				/* (dummy) */
-   0,				/* (startxoffset) */
-   2496,			/*sensor_pixels */
+   27,                                /*(black) */
+   27,                                /* (dummy) */
+   0,                                /* (startxoffset) */
+   2496,                        /*sensor_pixels */
    210,
    200,
    {0x00, 0x00, 0x00, 0x00},
@@ -364,10 +380,10 @@ static Genesys_Sensor Sensor[] = {
     0x10, 0x00, 0x20, 0x02
     },
    {0x04, 0x05,
-    0x00, 0x00, 0x00, 0x00,	/*[GB](HI|LOW) not needed for cis */
+    0x00, 0x00, 0x00, 0x00,        /*[GB](HI|LOW) not needed for cis */
     0x54, 0x03,
-    0x00,			/*TODO: bit7 */
-    0x00, 0x00, 0x00, 0x01	/*TODO (these do no harm, but may be neccessery for CCD) */
+    0x00,                        /*TODO: bit7 */
+    0x00, 0x00, 0x00, 0x01        /*TODO (these do no harm, but may be neccessery for CCD) */
     }
    ,
    {1.0, 1.0, 1.0},
@@ -376,10 +392,10 @@ static Genesys_Sensor Sensor[] = {
   ,
   /* Visioneer Roadwarrior */
   {CCD_ROADWARRIOR, 600,
-   27,				/*(black) */
-   27,				/* (dummy) */
-   0,				/* (startxoffset) */
-   5200,			/*sensor_pixels */
+   27,                                /*(black) */
+   27,                                /* (dummy) */
+   0,                                /* (startxoffset) */
+   5200,                        /*sensor_pixels */
    210,
    200,
    {0x00, 0x00, 0x00, 0x00},
@@ -387,10 +403,10 @@ static Genesys_Sensor Sensor[] = {
     0x10, 0x00, 0x20, 0x02
     },
    {0x04, 0x05,
-    0x00, 0x00, 0x00, 0x00,	/*[GB](HI|LOW) not needed for cis */
+    0x00, 0x00, 0x00, 0x00,        /*[GB](HI|LOW) not needed for cis */
     0x54, 0x03,
-    0x00,			/*TODO: bit7 */
-    0x00, 0x00, 0x00, 0x01	/*TODO (these do no harm, but may be neccessery for CCD) */
+    0x00,                        /*TODO: bit7 */
+    0x00, 0x00, 0x00, 0x01        /*TODO (these do no harm, but may be neccessery for CCD) */
     }
    ,
   {1.0, 1.0, 1.0},
@@ -399,10 +415,10 @@ static Genesys_Sensor Sensor[] = {
 ,
   /* Pentax DS Mobile 600 */
   {CCD_DSMOBILE600, 600,
-   28,				/*(black) */
-   28,				/* (dummy) */
-   0,				/* (startxoffset) */
-   5200,			/*sensor_pixels */
+   28,                                /*(black) */
+   28,                                /* (dummy) */
+   0,                                /* (startxoffset) */
+   5200,                        /*sensor_pixels */
    210,
    200,
    {0x00, 0x00, 0x00, 0x00},
@@ -410,10 +426,10 @@ static Genesys_Sensor Sensor[] = {
     0x10, 0x00, 0x20, 0x02
     },
    {0x04, 0x05,
-    0x00, 0x00, 0x00, 0x00,	/*[GB](HI|LOW) not needed for cis */
+    0x00, 0x00, 0x00, 0x00,        /*[GB](HI|LOW) not needed for cis */
     0x54, 0x03,
-    0x00,			/*TODO: bit7 */
-    0x00, 0x00, 0x00, 0x01	/*TODO (these do no harm, but may be neccessery for CCD) */
+    0x00,                        /*TODO: bit7 */
+    0x00, 0x00, 0x00, 0x01        /*TODO (these do no harm, but may be neccessery for CCD) */
     }
    ,
    {1.0, 1.0, 1.0},
@@ -422,10 +438,10 @@ static Genesys_Sensor Sensor[] = {
   ,
   /* 13: Strobe XP300 */
   {CCD_XP300, 600,
-   27,				/*(black) */
-   27,				/* (dummy) */
-   0,				/* (startxoffset) */
-   10240,			/*sensor_pixels */
+   27,                                /*(black) */
+   27,                                /* (dummy) */
+   0,                                /* (startxoffset) */
+   10240,                        /*sensor_pixels */
    210,
    200,
    {0x00, 0x00, 0x00, 0x00},
@@ -433,10 +449,10 @@ static Genesys_Sensor Sensor[] = {
     0x10, 0x00, 0x20, 0x02
     },
    {0x04, 0x05,
-    0x00, 0x00, 0x00, 0x00,	/*[GB](HI|LOW) not needed for cis */
+    0x00, 0x00, 0x00, 0x00,        /*[GB](HI|LOW) not needed for cis */
     0x54, 0x03,
-    0x00,			/*TODO: bit7 */
-    0x00, 0x00, 0x00, 0x01	/*TODO (these do no harm, but may be neccessery for CCD) */
+    0x00,                        /*TODO: bit7 */
+    0x00, 0x00, 0x00, 0x01        /*TODO (these do no harm, but may be neccessery for CCD) */
     }
    ,
    {1.0, 1.0, 1.0},
@@ -445,10 +461,10 @@ static Genesys_Sensor Sensor[] = {
   ,
   /* 13: Strobe XP300 */
   {CCD_DP685, 600,
-   27,				/*(black) */
-   27,				/* (dummy) */
-   0,				/* (startxoffset) */
-   5020,			/*sensor_pixels */
+   27,                                /*(black) */
+   27,                                /* (dummy) */
+   0,                                /* (startxoffset) */
+   5020,                        /*sensor_pixels */
    210,
    200,
    {0x00, 0x00, 0x00, 0x00},
@@ -456,10 +472,10 @@ static Genesys_Sensor Sensor[] = {
     0x10, 0x00, 0x20, 0x02
     },
    {0x04, 0x05,
-    0x00, 0x00, 0x00, 0x00,	/*[GB](HI|LOW) not needed for cis */
+    0x00, 0x00, 0x00, 0x00,        /*[GB](HI|LOW) not needed for cis */
     0x54, 0x03,
-    0x00,			/*TODO: bit7 */
-    0x00, 0x00, 0x00, 0x01	/*TODO (these do no harm, but may be neccessery for CCD) */
+    0x00,                        /*TODO: bit7 */
+    0x00, 0x00, 0x00, 0x01        /*TODO (these do no harm, but may be neccessery for CCD) */
     }
    ,
    {1.0, 1.0, 1.0},
@@ -468,10 +484,10 @@ static Genesys_Sensor Sensor[] = {
   ,
   /* CANONLIDE200 */
   {CIS_CANONLIDE200,
-   4800,	/* optical resolution */
-   87*4,	/* black pixels */
-   16*4,	/* dummy pixels */
-   320*8,	/* CCD_startx_offset 323 */
+   4800,        /* optical resolution */
+   87*4,        /* black pixels */
+   16*4,        /* dummy pixels */
+   320*8,        /* CCD_startx_offset 323 */
    5136*8,
    210,
    200,
@@ -494,11 +510,11 @@ static Genesys_Sensor Sensor[] = {
   ,
   /* CANONLIDE700 */
   {CIS_CANONLIDE700,
-   4800,	/* optical resolution */
-   73*8,	/* black pixels 73 at 600 dpi */
-   16*8,	/* dummy pixels */
-   384*8,	/* CCD_startx_offset 384 at 600 dpi */
-   5188*8,	/* 8x5570 segments , 5187+1 for rounding */
+   4800,        /* optical resolution */
+   73*8,        /* black pixels 73 at 600 dpi */
+   16*8,        /* dummy pixels */
+   384*8,        /* CCD_startx_offset 384 at 600 dpi */
+   5188*8,        /* 8x5570 segments , 5187+1 for rounding */
    210,
    200,
    {0x00, 0x00, 0x00, 0x00},
@@ -520,10 +536,10 @@ static Genesys_Sensor Sensor[] = {
   ,
   /* CANONLIDE100 */
   {CIS_CANONLIDE100,
-   2400,	/* optical resolution */
-   87*4,	/* black pixels */
-   16*4,	/* dummy pixels 16 */
-   320*4,	/* 323 */
+   2400,        /* optical resolution */
+   87*4,        /* black pixels */
+   16*4,        /* dummy pixels 16 */
+   320*4,        /* 323 */
    5136*4,      /* 10272 */
    210,
    200,
@@ -565,8 +581,8 @@ static Genesys_Sensor Sensor[] = {
   ,
   {CCD_G4050,
    4800,
-   50*8,	/* black_pixels */
-   58,	        /* 31 at 600 dpi dummy_pixels 58 at 1200 */
+   50*8,        /* black_pixels */
+   58,                /* 31 at 600 dpi dummy_pixels 58 at 1200 */
    152,
    5360*8,      /* 5360 max at 600 dpi */
    160,
@@ -583,8 +599,8 @@ static Genesys_Sensor Sensor[] = {
   ,
   {CCD_CS4400F,
    4800,
-   50*8,	/* black_pixels */
-   20,	        /* 31 at 600 dpi dummy_pixels 58 at 1200 */
+   50*8,        /* black_pixels */
+   20,                /* 31 at 600 dpi dummy_pixels 58 at 1200 */
    152,
    5360*8,      /* 5360 max at 600 dpi */
    160,
@@ -601,8 +617,8 @@ static Genesys_Sensor Sensor[] = {
   ,
   {CCD_CS8400F,
    4800,
-   50*8,	/* black_pixels */
-   20,	        /* 31 at 600 dpi dummy_pixels 58 at 1200 */
+   50*8,        /* black_pixels */
+   20,                /* 31 at 600 dpi dummy_pixels 58 at 1200 */
    152,
    5360*8,      /* 5360 max at 600 dpi */
    160,
@@ -639,11 +655,11 @@ static Genesys_Sensor Sensor[] = {
 
   /* CANONLIDE110 */
   {CIS_CANONLIDE110,
-   2400,	/* optical resolution */
-   87,		/* black pixels */
-   16,		/* dummy pixels 16 */
-   303,		/* 303 */
-   5168*4,	/* total pixels */
+   2400,        /* optical resolution */
+   87,                /* black pixels */
+   16,                /* dummy pixels 16 */
+   303,                /* 303 */
+   5168*4,        /* total pixels */
    210,
    200,
    {0x00, 0x00, 0x00, 0x00},
@@ -663,22 +679,25 @@ static Genesys_Sensor Sensor[] = {
 
   /* CANONLIDE120 */
   {CIS_CANONLIDE120,
-   2400,	/* optical resolution */
-   87,		/* black pixels */
-   16,		/* dummy pixels 16 */
-   303,		/* 303 */
-   5168*4,	/* total pixels */
+   2400,        /* optical resolution */
+   87,          /* black pixels */
+   16,          /* dummy pixels 16 */
+   303,
+   /* SEGCNT at 600 DPI by number of segments */
+   5104*4,      /* total pixels */
    210,
    200,
    {0x00, 0x00, 0x00, 0x00},
    /* reg 0x10 - 0x15 : EXPR, EXPG and EXPB */
    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    /* reg 0x16 - 0x1d */
-    0x10, 0x04, 0x00, 0x01, 0x30, 0x00, 0x02, 0x01 },
+    0x15, 0x04, 0x00, 0x01, 0x30, 0x00, 0x02, 0x01 },
    /* reg 0x52 - 0x5e */
    {
-    0x00, 0x02, 0x04, 0x06, 0x04, 0x04, 0x04, 0x04,
-    0x1a, 0x00, 0xc0, 0x00, 0x00
+   /* 52    53    54    55    56    57    58    59 */
+    0x04, 0x06, 0x00, 0x02, 0x04, 0x04, 0x04, 0x04,
+   /* 5a    5b    5c    5d    5e */
+    0x3a, 0x00, 0x00, 0x00, 0x1f
     }
    ,
    {2.1, 2.1, 2.1},
@@ -686,11 +705,11 @@ static Genesys_Sensor Sensor[] = {
   ,
   /* CANON LIDE 210 sensor */
   {CIS_CANONLIDE210,
-   2400,	/* optical resolution */
-   87,		/* black pixels */
-   16,		/* dummy pixels 16 */
-   303,		/* 303 */
-   5168*4,	/* total pixels */
+   2400,        /* optical resolution */
+   87,                /* black pixels */
+   16,                /* dummy pixels 16 */
+   303,                /* 303 */
+   5168*4,        /* total pixels */
    210,
    200,
    {0x00, 0x00, 0x00, 0x00},
@@ -709,11 +728,11 @@ static Genesys_Sensor Sensor[] = {
   ,
   /* CANON LIDE 220 sensor */
   {CIS_CANONLIDE220,
-   2400,	/* optical resolution */
-   87,		/* black pixels */
-   16,		/* dummy pixels 16 */
-   303,		/* 303 */
-   5168*4,	/* total pixels */
+   2400,        /* optical resolution */
+   87,                /* black pixels */
+   16,                /* dummy pixels 16 */
+   303,                /* 303 */
+   5168*4,        /* total pixels */
    210,
    200,
    {0x00, 0x00, 0x00, 0x00},
@@ -732,21 +751,21 @@ static Genesys_Sensor Sensor[] = {
   ,
   {CCD_PLUSTEK_3600,
    1200,
-   87,				/*(black) */
-   87,				/* (dummy) */
-   0,				/* (startxoffset) */
-   10100,			/*sensor_pixels */
+   87,                                /*(black) */
+   87,                                /* (dummy) */
+   0,                                /* (startxoffset) */
+   10100,                        /*sensor_pixels */
    210,
    230,
    {0x00, 0x00, 0x00, 0x00},
    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x0b, 0x11, 0x2a,
-    0x00, 0x00, 0x00, 0xc4	/* TODO(these do no harm, but may be neccessery for CCD) */
+    0x00, 0x00, 0x00, 0xc4        /* TODO(these do no harm, but may be neccessery for CCD) */
    },
    {0x07, 0x0a,
-    0x0c, 0x00, 0x02, 0x06,	/*[GB](HI|LOW) not needed for cis */
+    0x0c, 0x00, 0x02, 0x06,        /*[GB](HI|LOW) not needed for cis */
     0x22, 0x69,
-    0x40,			/*TODO: bit7 */
-    0x00, 0x00, 0x00, 0x02	/*TODO (these do no harm, but may be neccessery for CCD) */
+    0x40,                        /*TODO: bit7 */
+    0x00, 0x00, 0x00, 0x02        /*TODO (these do no harm, but may be neccessery for CCD) */
    }
    ,
    {1.0, 1.0, 1.0},
@@ -754,7 +773,7 @@ static Genesys_Sensor Sensor[] = {
   ,
   /* Canon Image formula 101 */
   {CCD_IMG101,
-   1200,	/* optical resolution */
+   1200,        /* optical resolution */
    31,
    31,
    0,
@@ -781,7 +800,7 @@ static Genesys_Sensor Sensor[] = {
   ,
   /* Plustek OpticBook 3800 */
   {CCD_PLUSTEK3800,
-   1200,	/* optical resolution */
+   1200,        /* optical resolution */
    31,
    31,
    0,
@@ -857,7 +876,7 @@ static Genesys_Gpo Gpo[] = {
   /* MD5345/MD6471 */
   {GPO_5345,
    {0x30, 0x18}
-   ,				/* bits 11-12 are for bipolar V-ref input voltage */
+   ,                                /* bits 11-12 are for bipolar V-ref input voltage */
    {0xa0, 0x18}
    ,
    }
@@ -921,7 +940,7 @@ static Genesys_Gpo Gpo[] = {
   },
   /* CANONLIDE200 */
   {GPO_CANONLIDE200,
-   {0xfb, 0x20},	/* 0xfb when idle , 0xf9/0xe9 (1200) when scanning */
+   {0xfb, 0x20},        /* 0xfb when idle , 0xf9/0xe9 (1200) when scanning */
    {0xff, 0x00},
   },
   /* CANONLIDE700 */
@@ -951,6 +970,12 @@ static Genesys_Gpo Gpo[] = {
    {0xff, 0x00},
   }
   ,
+  /* CANONLIDE120 */
+  {GPO_CANONLIDE120,
+   {0xfb, 0x20},
+   {0xff, 0x00},
+  }
+  ,
   /* CANONLIDE210 */
   {GPO_CANONLIDE210,
    {0xfb, 0x20},
@@ -997,15 +1022,15 @@ static Genesys_Gpo Gpo[] = {
 static Genesys_Motor Motor[] = {
   /* UMAX */
   {MOTOR_UMAX,
-   1200,			/* motor base steps */
-   2400,			/* maximum motor resolution */
-   1,				/* maximum step mode */
+   1200,                        /* motor base steps */
+   2400,                        /* maximum motor resolution */
+   1,                                /* maximum step mode */
    1,                           /* number of power modes*/
    {{{
-     11000,			/* maximum start speed */
-     3000,			/* maximum end speed */
-     128,			/* step count */
-     1.0,			/* nonlinearity */
+     11000,                        /* maximum start speed */
+     3000,                        /* maximum end speed */
+     128,                        /* step count */
+     1.0,                        /* nonlinearity */
      },
     {
      11000,
@@ -1014,7 +1039,7 @@ static Genesys_Motor Motor[] = {
      1.0,
    },},},
   },
-  {MOTOR_5345,				/* MD5345/6228/6471 */
+  {MOTOR_5345,                                /* MD5345/6228/6471 */
    1200,
    2400,
    1,
@@ -1032,7 +1057,7 @@ static Genesys_Motor Motor[] = {
      0.5,
     },},},
   },
-  {MOTOR_ST24,			/* ST24 */
+  {MOTOR_ST24,                        /* ST24 */
    2400,
    2400,
    1,
@@ -1050,15 +1075,15 @@ static Genesys_Motor Motor[] = {
      0.3,
     },},},
   },
-  {MOTOR_HP3670,	/* HP 3670 */
+  {MOTOR_HP3670,        /* HP 3670 */
    1200,
    2400,
    1,
    1,
    {{{
-     11000,	/* start speed */
-     3000,	/* max speed */
-     128,	/* min steps */
+     11000,        /* start speed */
+     3000,        /* max speed */
+     128,        /* min steps */
      0.25,
      },
     {
@@ -1068,15 +1093,15 @@ static Genesys_Motor Motor[] = {
      0.5,
     },},},
   },
-  {MOTOR_HP2400,		/* HP 2400c */
+  {MOTOR_HP2400,                /* HP 2400c */
    1200,
    1200,
    1,
    1,
    {{{
-     11000,	/* start speed */
-     3000,	/* max speed */
-     128,	/* min steps */
+     11000,        /* start speed */
+     3000,        /* max speed */
+     128,        /* min steps */
      0.25,
      },
     {
@@ -1086,7 +1111,7 @@ static Genesys_Motor Motor[] = {
      0.5,
     },},},
   },
-  {MOTOR_HP2300,		/* HP 2300c */
+  {MOTOR_HP2300,                /* HP 2300c */
    600, /* 600/1200 */
    1200,
    1,
@@ -1104,7 +1129,7 @@ static Genesys_Motor Motor[] = {
      0.5,
    },},},
   },
-  {MOTOR_CANONLIDE35,		/* Canon LiDE 35 */
+  {MOTOR_CANONLIDE35,                /* Canon LiDE 35 */
    1200,
    2400,
    1,
@@ -1112,7 +1137,7 @@ static Genesys_Motor Motor[] = {
    {{{ 3500, 1300, 60, 0.8, },
     { 3500, 1400, 60, 0.8, },},},
   },
-  {MOTOR_XP200,			/* Strobe XP200 */
+  {MOTOR_XP200,                        /* Strobe XP200 */
    600,
    600,
    1,
@@ -1130,7 +1155,7 @@ static Genesys_Motor Motor[] = {
      0.5,
     },},},
   },
-  {MOTOR_XP300,				/* 7: Visioneer Strobe XP300 */
+  {MOTOR_XP300,                                /* 7: Visioneer Strobe XP300 */
    300,
    600,
    1,
@@ -1148,7 +1173,7 @@ static Genesys_Motor Motor[] = {
      0.8,
      },},},
   },
-  {MOTOR_DP665,				/* Syscan DP 665 */
+  {MOTOR_DP665,                                /* Syscan DP 665 */
    750,
    1500,
    1,
@@ -1166,7 +1191,7 @@ static Genesys_Motor Motor[] = {
      0.8,
      },},},
   },
-  {MOTOR_ROADWARRIOR,			/* Visioneer Roadwarrior */
+  {MOTOR_ROADWARRIOR,                        /* Visioneer Roadwarrior */
    750,
    1500,
    1,
@@ -1184,7 +1209,7 @@ static Genesys_Motor Motor[] = {
      0.8,
      },},},
   },
-  {MOTOR_DSMOBILE_600,			/* Pentax DSmobile 600 */
+  {MOTOR_DSMOBILE_600,                        /* Pentax DSmobile 600 */
    750,
    1500,
    2,
@@ -1202,7 +1227,7 @@ static Genesys_Motor Motor[] = {
      0.8,
      },},},
   },
-  {MOTOR_CANONLIDE100,		/* Canon LiDE 100 */
+  {MOTOR_CANONLIDE100,                /* Canon LiDE 100 */
    1200,
    6400,
    2,   /* maximum step type count */
@@ -1210,12 +1235,12 @@ static Genesys_Motor Motor[] = {
    { /* motor slopes */
 	   { /* power mode 0 */
 		   {   3000,   1000, 127, 0.50}, /* full step */
-    		   {   3000,   1500, 127, 0.50}, /* half step */
-    		   { 3*2712, 3*2712, 16, 0.80}, /* quarter step 0.75*2712 */
+		       {   3000,   1500, 127, 0.50}, /* half step */
+		       { 3*2712, 3*2712, 16, 0.80}, /* quarter step 0.75*2712 */
 	   },
     },
   },
-  {MOTOR_CANONLIDE200,		/* Canon LiDE 200 */
+  {MOTOR_CANONLIDE200,                /* Canon LiDE 200 */
    1200,
    6400,
    2,
@@ -1223,12 +1248,12 @@ static Genesys_Motor Motor[] = {
    { /* motor slopes */
 	   { /* power mode 0 */
 		   {   3000,   1000, 127, 0.50}, /* full step */
-    		   {   3000,   1500, 127, 0.50}, /* half step */
-    		   { 3*2712, 3*2712, 16, 0.80}, /* quarter step 0.75*2712 */
+		       {   3000,   1500, 127, 0.50}, /* half step */
+		       { 3*2712, 3*2712, 16, 0.80}, /* quarter step 0.75*2712 */
 	   },
     },
   },
-  {MOTOR_CANONLIDE700,		/* Canon LiDE 700 */
+  {MOTOR_CANONLIDE700,                /* Canon LiDE 700 */
    1200,
    6400,
    2,
@@ -1236,8 +1261,8 @@ static Genesys_Motor Motor[] = {
    { /* motor slopes */
 	   { /* power mode 0 */
 		   {   3000,   1000, 127, 0.50}, /* full step */
-    		   {   3000,   1500, 127, 0.50}, /* half step */
-    		   { 3*2712, 3*2712, 16, 0.80}, /* quarter step 0.75*2712 */
+		       {   3000,   1500, 127, 0.50}, /* half step */
+		       { 3*2712, 3*2712, 16, 0.80}, /* quarter step 0.75*2712 */
 	   },
     },
   },
@@ -1248,10 +1273,10 @@ static Genesys_Motor Motor[] = {
    1,
    { /* motor slopes */
 	   { /* power mode 0 */
-     		{ 22222, 500, 246, 0.5 }, /* max speed / dpi * base dpi => exposure */
-     		{ 22222, 500, 246, 0.5 },
-     		{ 22222, 500, 246, 0.5 },
-    	   },
+		     { 22222, 500, 246, 0.5 }, /* max speed / dpi * base dpi => exposure */
+		     { 22222, 500, 246, 0.5 },
+		     { 22222, 500, 246, 0.5 },
+	       },
    },
   },
   {MOTOR_G4050,
@@ -1261,10 +1286,10 @@ static Genesys_Motor Motor[] = {
    1,
    { /* motor slopes */
 	   { /* power mode 0 */
-     		{ 3961, 240, 246, 0.8 }, /* full step   */
-     		{ 3961, 240, 246, 0.8 }, /* half step   */
-     		{ 3961, 240, 246, 0.8 }, /* quarter step */
-    	   },
+		     { 3961, 240, 246, 0.8 }, /* full step   */
+		     { 3961, 240, 246, 0.8 }, /* half step   */
+		     { 3961, 240, 246, 0.8 }, /* quarter step */
+	       },
    },
   },
   {MOTOR_CS8400F,
@@ -1274,13 +1299,13 @@ static Genesys_Motor Motor[] = {
    1,
    { /* motor slopes */
 	   { /* power mode 0 */
-     		{ 3961, 240, 246, 0.8 }, /* full step   */
-     		{ 3961, 240, 246, 0.8 }, /* half step   */
-     		{ 3961, 240, 246, 0.8 }, /* quarter step */
-    	   },
+		     { 3961, 240, 246, 0.8 }, /* full step   */
+		     { 3961, 240, 246, 0.8 }, /* half step   */
+		     { 3961, 240, 246, 0.8 }, /* quarter step */
+	       },
    },
   },
-  {MOTOR_CANONLIDE110,		/* Canon LiDE 110 */
+  {MOTOR_CANONLIDE110,                /* Canon LiDE 110 */
    4800,
    9600,
    1,   /* maximum step type count */
@@ -1291,7 +1316,7 @@ static Genesys_Motor Motor[] = {
 	   },
     },
   },
-  {MOTOR_CANONLIDE210,		/* Canon LiDE 210 */
+  {MOTOR_CANONLIDE120,                /* Canon LiDE 120 */
    4800,
    9600,
    1,   /* maximum step type count */
@@ -1302,7 +1327,18 @@ static Genesys_Motor Motor[] = {
 	   },
     },
   },
-  {MOTOR_PLUSTEK_3600,		/* PLUSTEK 3600 */
+  {MOTOR_CANONLIDE210,                /* Canon LiDE 210 */
+   4800,
+   9600,
+   1,   /* maximum step type count */
+   1,   /* maximum power modes count */
+   { /* motor slopes */
+	   { /* power mode 0 */
+		   {   3000,   1000, 256, 0.50}, /* full step */
+	   },
+    },
+  },
+  {MOTOR_PLUSTEK_3600,                /* PLUSTEK 3600 */
    1200,
    2400,
    1,
@@ -1313,7 +1349,7 @@ static Genesys_Motor Motor[] = {
        { 3500, 3250, 60, 0.8 },
      },
    },},
-  {MOTOR_IMG101,		/* Canon Image Formula 101 */
+  {MOTOR_IMG101,                /* Canon Image Formula 101 */
    600,
    1200,
    1,
@@ -1324,7 +1360,7 @@ static Genesys_Motor Motor[] = {
        { 3500, 3250, 60, 0.8 },
      },
    },},
-  {MOTOR_PLUSTEK3800,		/* Plustek OpticBook 3800 */
+  {MOTOR_PLUSTEK3800,                /* Plustek OpticBook 3800 */
    600,
    1200,
    1,
@@ -1338,8 +1374,8 @@ static Genesys_Motor Motor[] = {
   {MOTOR_CANONLIDE80,
    2400, /* 2400 ???? */
    4800, /* 9600 ???? */
-   1,	/* max step type */
-   1,	/* power mode count */
+   1,        /* max step type */
+   1,        /* power mode count */
    {
      { /* start speed, max end speed, step number */
        /* maximum speed (second field) is used to compute exposure as seen by motor */
@@ -1355,48 +1391,48 @@ static Genesys_Motor Motor[] = {
 /* here we have the various device settings...
  */
 static Genesys_Model umax_astra_4500_model = {
-  "umax-astra-4500",		/* Name */
-  "UMAX",			/* Device vendor string */
-  "Astra 4500",			/* Device model name */
+  "umax-astra-4500",                /* Name */
+  "UMAX",                        /* Device vendor string */
+  "Astra 4500",                        /* Device model name */
   GENESYS_GL646,
   NULL,
 
-  {1200, 600, 300, 150, 75, 0},	/* possible x-resolutions */
-  {2400, 1200, 600, 300, 150, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {1200, 600, 300, 150, 75, 0},        /* possible x-resolutions */
+  {2400, 1200, 600, 300, 150, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (3.5),		/* Start of scan area in mm  (x) */
-  SANE_FIX (7.5),		/* Start of scan area in mm (y) */
-  SANE_FIX (218.0),		/* Size of scan area in mm (x) */
-  SANE_FIX (299.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (3.5),                /* Start of scan area in mm  (x) */
+  SANE_FIX (7.5),                /* Start of scan area in mm (y) */
+  SANE_FIX (218.0),                /* Size of scan area in mm (x) */
+  SANE_FIX (299.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (1.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (1.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 8, 16,			/* RGB CCD Line-distance correction in pixel */
+  0, 8, 16,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_BGR,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_BGR,                /* Order of the CCD/CIS colors */
 
-  SANE_FALSE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_FALSE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_UMAX,
   DAC_WOLFSON_UMAX,
   GPO_UMAX,
   MOTOR_UMAX,
-  GENESYS_FLAG_UNTESTED,	/* Which flags are needed for this scanner? */
+  GENESYS_FLAG_UNTESTED,        /* Which flags are needed for this scanner? */
   /* untested, values set by hmg */
   GENESYS_HAS_NO_BUTTONS, /* no buttons supported */
   20,
@@ -1404,48 +1440,48 @@ static Genesys_Model umax_astra_4500_model = {
 };
 
 static Genesys_Model canon_lide_50_model = {
-  "canon-lide-50",		/* Name */
-  "Canon",			/* Device vendor string */
-  "LiDE 35/40/50",		/* Device model name */
+  "canon-lide-50",                /* Name */
+  "Canon",                        /* Device vendor string */
+  "LiDE 35/40/50",                /* Device model name */
   GENESYS_GL841,
   NULL,
 
-  {      1200, 600, 400, 300, 240, 200, 150, 75, 0},	/* possible x-resolutions */
-  {2400, 1200, 600, 400, 300, 240, 200, 150, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {      1200, 600, 400, 300, 240, 200, 150, 75, 0},        /* possible x-resolutions */
+  {2400, 1200, 600, 400, 300, 240, 200, 150, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (0.42),		/* Start of scan area in mm  (x) */
-  SANE_FIX (7.9),		/* Start of scan area in mm (y) */
-  SANE_FIX (218.0),		/* Size of scan area in mm (x) */
-  SANE_FIX (299.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (0.42),                /* Start of scan area in mm  (x) */
+  SANE_FIX (7.9),                /* Start of scan area in mm (y) */
+  SANE_FIX (218.0),                /* Size of scan area in mm (x) */
+  SANE_FIX (299.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (6.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (6.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_CANONLIDE35,
   DAC_CANONLIDE35,
   GPO_CANONLIDE35,
   MOTOR_CANONLIDE35,
-  GENESYS_FLAG_LAZY_INIT | 	/* Which flags are needed for this scanner? */
+  GENESYS_FLAG_LAZY_INIT |         /* Which flags are needed for this scanner? */
   GENESYS_FLAG_SKIP_WARMUP |
   GENESYS_FLAG_OFFSET_CALIBRATION |
   GENESYS_FLAG_DARK_WHITE_CALIBRATION |
@@ -1460,43 +1496,43 @@ static Genesys_Model canon_lide_50_model = {
 };
 
 static Genesys_Model panasonic_kvss080_model = {
-  "panasonic-kv-ss080",		/* Name */
-  "Panasonic",			/* Device vendor string */
-  "KV-SS080",			/* Device model name */
+  "panasonic-kv-ss080",                /* Name */
+  "Panasonic",                        /* Device vendor string */
+  "KV-SS080",                        /* Device model name */
   GENESYS_GL843,
   NULL,
 
-  { 600, /* 500, 400,*/ 300, 200, 150, 100, 75, 0},	/* possible x-resolutions */
-  { 1200, 600, /* 500, 400, */ 300, 200, 150, 100, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  { 600, /* 500, 400,*/ 300, 200, 150, 100, 75, 0},        /* possible x-resolutions */
+  { 1200, 600, /* 500, 400, */ 300, 200, 150, 100, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (7.2),		/* Start of scan area in mm  (x) */
-  SANE_FIX (14.7),		/* Start of scan area in mm (y) */
-  SANE_FIX (217.7),		/* Size of scan area in mm (x) */
-  SANE_FIX (300.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (7.2),                /* Start of scan area in mm  (x) */
+  SANE_FIX (14.7),                /* Start of scan area in mm (y) */
+  SANE_FIX (217.7),                /* Size of scan area in mm (x) */
+  SANE_FIX (300.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (9.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (9.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (0.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 8, 16,			/* RGB CCD Line-distance correction in pixel */
+  0, 8, 16,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_FALSE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_FALSE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_KVSS080,
   DAC_KVSS080,
   GPO_KVSS080,
@@ -1511,45 +1547,45 @@ static Genesys_Model panasonic_kvss080_model = {
 };
 
 static Genesys_Model hp4850c_model = {
-  "hewlett-packard-scanjet-4850c",	/* Name */
-  "Hewlett Packard",			/* Device vendor string */
-  "ScanJet 4850C",			/* Device model name */
+  "hewlett-packard-scanjet-4850c",        /* Name */
+  "Hewlett Packard",                        /* Device vendor string */
+  "ScanJet 4850C",                        /* Device model name */
   GENESYS_GL843,
   NULL,
 
   {2400, 1200, 600, 400, 300, 200, 150, 100, 0},
   {2400, 1200, 600, 400, 300, 200, 150, 100, 0},
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
   SANE_FIX (7.9),        /* Start of scan area in mm  (x) */
   SANE_FIX (5.9),        /* Start of scan area in mm (y) */
   SANE_FIX (219.6),      /* Size of scan area in mm (x) */
   SANE_FIX (314.5),      /* Size of scan area in mm (y) */
 
-  SANE_FIX (3.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (3.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 24, 48,		        /* RGB CCD Line-distance correction in line number */
-  				/* 0 38 76 OK 1200/2400 */
-  				/* 0 24 48 OK [100,600] dpi */
+  0, 24, 48,                        /* RGB CCD Line-distance correction in line number */
+				  /* 0 38 76 OK 1200/2400 */
+				  /* 0 24 48 OK [100,600] dpi */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_FALSE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_FALSE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_G4050,
   DAC_G4050,
   GPO_G4050,
@@ -1566,45 +1602,45 @@ static Genesys_Model hp4850c_model = {
 };
 
 static Genesys_Model hpg4010_model = {
-  "hewlett-packard-scanjet-g4010",	/* Name */
-  "Hewlett Packard",			/* Device vendor string */
-  "ScanJet G4010",			/* Device model name */
+  "hewlett-packard-scanjet-g4010",        /* Name */
+  "Hewlett Packard",                        /* Device vendor string */
+  "ScanJet G4010",                        /* Device model name */
   GENESYS_GL843,
   NULL,
 
   { 2400, 1200, 600, 400, 300, 200, 150, 100, 0},
   { 2400, 1200, 600, 400, 300, 200, 150, 100, 0},
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (8.0),		/* Start of scan area in mm  (x) */
-  SANE_FIX (13.00),		/* Start of scan area in mm (y) */
-  SANE_FIX (217.9),		/* Size of scan area in mm (x) 5148 pixels at 600 dpi*/
-  SANE_FIX (315.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (8.0),                /* Start of scan area in mm  (x) */
+  SANE_FIX (13.00),                /* Start of scan area in mm (y) */
+  SANE_FIX (217.9),                /* Size of scan area in mm (x) 5148 pixels at 600 dpi*/
+  SANE_FIX (315.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (3.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (3.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 24, 48,		        /* RGB CCD Line-distance correction in line number */
-  				/* 0 38 76 OK 1200/2400 */
-  				/* 0 24 48 OK [100,600] dpi */
+  0, 24, 48,                        /* RGB CCD Line-distance correction in line number */
+				  /* 0 38 76 OK 1200/2400 */
+				  /* 0 24 48 OK [100,600] dpi */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_FALSE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_FALSE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_G4050,
   DAC_G4050,
   GPO_G4050,
@@ -1621,45 +1657,45 @@ static Genesys_Model hpg4010_model = {
 };
 
 static Genesys_Model hpg4050_model = {
-  "hewlett-packard-scanjet-g4050",	/* Name */
-  "Hewlett Packard",			/* Device vendor string */
-  "ScanJet G4050",			/* Device model name */
+  "hewlett-packard-scanjet-g4050",        /* Name */
+  "Hewlett Packard",                        /* Device vendor string */
+  "ScanJet G4050",                        /* Device model name */
   GENESYS_GL843,
   NULL,
 
   { 2400, 1200, 600, 400, 300, 200, 150, 100, 0},
   { 2400, 1200, 600, 400, 300, 200, 150, 100, 0},
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (8.0),		/* Start of scan area in mm  (x) */
-  SANE_FIX (13.00),		/* Start of scan area in mm (y) */
-  SANE_FIX (217.9),		/* Size of scan area in mm (x) 5148 pixels at 600 dpi*/
-  SANE_FIX (315.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (8.0),                /* Start of scan area in mm  (x) */
+  SANE_FIX (13.00),                /* Start of scan area in mm (y) */
+  SANE_FIX (217.9),                /* Size of scan area in mm (x) 5148 pixels at 600 dpi*/
+  SANE_FIX (315.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (3.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (3.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (8.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (13.00),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (217.9),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (250.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (8.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (13.00),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (217.9),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (250.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (40.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (40.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 24, 48,		        /* RGB CCD Line-distance correction in line number */
-  				/* 0 38 76 OK 1200/2400 */
-  				/* 0 24 48 OK [100,600] dpi */
+  0, 24, 48,                        /* RGB CCD Line-distance correction in line number */
+				  /* 0 38 76 OK 1200/2400 */
+				  /* 0 24 48 OK [100,600] dpi */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_FALSE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_FALSE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_G4050,
   DAC_G4050,
   GPO_G4050,
@@ -1677,45 +1713,45 @@ static Genesys_Model hpg4050_model = {
 
 
 static Genesys_Model canon_4400f_model = {
-  "canon-canoscan-4400f",	/* Name */
-  "Canon",			/* Device vendor string */
-  "Canoscan 4400f",		/* Device model name */
+  "canon-canoscan-4400f",        /* Name */
+  "Canon",                        /* Device vendor string */
+  "Canoscan 4400f",                /* Device model name */
   GENESYS_GL843,
   NULL,
 
   { 4800, 2400, 1200, 600, 400, 300, 200, 150, 100, 0},
   { 4800, 2400, 1200, 600, 400, 300, 200, 150, 100, 0},
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (6.0),		/* Start of scan area in mm  (x) */
-  SANE_FIX (13.00),		/* Start of scan area in mm (y) */
-  SANE_FIX (217.9),		/* Size of scan area in mm (x) 5148 pixels at 600 dpi*/
-  SANE_FIX (315.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (6.0),                /* Start of scan area in mm  (x) */
+  SANE_FIX (13.00),                /* Start of scan area in mm (y) */
+  SANE_FIX (217.9),                /* Size of scan area in mm (x) 5148 pixels at 600 dpi*/
+  SANE_FIX (315.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (3.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (3.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (8.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (13.00),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (217.9),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (250.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (8.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (13.00),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (217.9),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (250.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (40.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (40.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 24, 48,		        /* RGB CCD Line-distance correction in line number */
-  				/* 0 38 76 OK 1200/2400 */
-  				/* 0 24 48 OK [100,600] dpi */
+  0, 24, 48,                        /* RGB CCD Line-distance correction in line number */
+				  /* 0 38 76 OK 1200/2400 */
+				  /* 0 24 48 OK [100,600] dpi */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_FALSE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_FALSE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_CS4400F,
   DAC_G4050,
   GPO_CS4400F,
@@ -1727,7 +1763,7 @@ static Genesys_Model canon_4400f_model = {
   GENESYS_FLAG_SKIP_WARMUP |
   GENESYS_FLAG_DARK_CALIBRATION |
   GENESYS_FLAG_FULL_HWDPI_MODE |
-  GENESYS_FLAG_HALF_CCD_MODE |		/* actually quarter CCD mode ... */
+  GENESYS_FLAG_HALF_CCD_MODE |                /* actually quarter CCD mode ... */
   GENESYS_FLAG_CUSTOM_GAMMA,
   GENESYS_HAS_SCAN_SW | GENESYS_HAS_FILE_SW | GENESYS_HAS_COPY_SW,
   100,
@@ -1736,45 +1772,45 @@ static Genesys_Model canon_4400f_model = {
 
 
 static Genesys_Model canon_8400f_model = {
-  "canon-canoscan-8400f",	/* Name */
-  "Canon",			/* Device vendor string */
-  "Canoscan 8400f",		/* Device model name */
+  "canon-canoscan-8400f",        /* Name */
+  "Canon",                        /* Device vendor string */
+  "Canoscan 8400f",                /* Device model name */
   GENESYS_GL843,
   NULL,
 
   { 4800, 2400, 1200, 600, 400, 300, 200, 150, 100, 0},
   { 4800, 2400, 1200, 600, 400, 300, 200, 150, 100, 0},
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (4.0),		/* Start of scan area in mm  (x) */
-  SANE_FIX (13.00),		/* Start of scan area in mm (y) */
-  SANE_FIX (217.9),		/* Size of scan area in mm (x) 5148 pixels at 600 dpi*/
-  SANE_FIX (315.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (4.0),                /* Start of scan area in mm  (x) */
+  SANE_FIX (13.00),                /* Start of scan area in mm (y) */
+  SANE_FIX (217.9),                /* Size of scan area in mm (x) 5148 pixels at 600 dpi*/
+  SANE_FIX (315.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (3.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (3.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (8.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (13.00),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (217.9),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (250.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (8.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (13.00),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (217.9),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (250.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (40.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (40.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 24, 48,		        /* RGB CCD Line-distance correction in line number */
-  				/* 0 38 76 OK 1200/2400 */
-  				/* 0 24 48 OK [100,600] dpi */
+  0, 24, 48,                        /* RGB CCD Line-distance correction in line number */
+				  /* 0 38 76 OK 1200/2400 */
+				  /* 0 24 48 OK [100,600] dpi */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_FALSE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_FALSE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_CS8400F,
   DAC_CS8400F,
   GPO_CS8400F,
@@ -1795,43 +1831,43 @@ static Genesys_Model canon_8400f_model = {
 
 
 static Genesys_Model canon_lide_100_model = {
-  "canon-lide-100",		/* Name */
-  "Canon",			/* Device vendor string */
-  "LiDE 100",			/* Device model name */
+  "canon-lide-100",                /* Name */
+  "Canon",                        /* Device vendor string */
+  "LiDE 100",                        /* Device model name */
   GENESYS_GL847,
   NULL,
 
-  {4800, 2400, 1200, 600, 300, 200, 150, 100, 75, 0},	/* possible x-resolutions */
-  {4800, 2400, 1200, 600, 300, 200, 150, 100, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {4800, 2400, 1200, 600, 300, 200, 150, 100, 75, 0},        /* possible x-resolutions */
+  {4800, 2400, 1200, 600, 300, 200, 150, 100, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (1.1),		/* Start of scan area in mm (x) */
-  SANE_FIX (8.3),		/* Start of scan area in mm (y) */
-  SANE_FIX (216.07),		/* Size of scan area in mm (x) */
-  SANE_FIX (299.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (1.1),                /* Start of scan area in mm (x) */
+  SANE_FIX (8.3),                /* Start of scan area in mm (y) */
+  SANE_FIX (216.07),                /* Size of scan area in mm (x) */
+  SANE_FIX (299.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (1.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (1.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CIS_CANONLIDE100,
   DAC_CANONLIDE200,
   GPO_CANONLIDE200,
@@ -1849,43 +1885,43 @@ static Genesys_Model canon_lide_100_model = {
 };
 
 static Genesys_Model canon_lide_110_model = {
-  "canon-lide-110",		/* Name */
-  "Canon",			/* Device vendor string */
-  "LiDE 110",			/* Device model name */
+  "canon-lide-110",                /* Name */
+  "Canon",                        /* Device vendor string */
+  "LiDE 110",                        /* Device model name */
   GENESYS_GL124,
   NULL,
 
-  {4800, 2400, 1200, 600, /* 400,*/ 300, 150, 100, 75, 0},	/* possible x-resolutions */
-  {4800, 2400, 1200, 600, /* 400,*/ 300, 150, 100, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {4800, 2400, 1200, 600, /* 400,*/ 300, 150, 100, 75, 0},        /* possible x-resolutions */
+  {4800, 2400, 1200, 600, /* 400,*/ 300, 150, 100, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (2.2),		/* Start of scan area in mm (x) */
-  SANE_FIX (9.0),		/* Start of scan area in mm (y) */
-  SANE_FIX (216.70),		/* Size of scan area in mm (x) */
-  SANE_FIX (300.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (2.2),                /* Start of scan area in mm (x) */
+  SANE_FIX (9.0),                /* Start of scan area in mm (y) */
+  SANE_FIX (216.70),                /* Size of scan area in mm (x) */
+  SANE_FIX (300.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (1.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (1.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CIS_CANONLIDE110,
   DAC_CANONLIDE110,
   GPO_CANONLIDE110,
@@ -1902,47 +1938,47 @@ static Genesys_Model canon_lide_110_model = {
 };
 
 static Genesys_Model canon_lide_120_model = {
-  "canon-lide-120",		/* Name */
-  "Canon",			/* Device vendor string */
-  "LiDE 120",			/* Device model name */
+  "canon-lide-120",              /* Name */
+  "Canon",                       /* Device vendor string */
+  "LiDE 120",                    /* Device model name */
   GENESYS_GL124,
   NULL,
 
-  {4800, 2400, 1200, 600, 300, 150, 100, 75, 0},	/* possible x-resolutions */
-  {4800, 2400, 1200, 600, 300, 150, 100, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {4800, 2400, 1200, 600, 300, 150, 100, 75, 0},        /* possible x-resolutions */
+  {4800, 2400, 1200, 600, 300, 150, 100, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                    /* possible depths in gray mode */
+  {16, 8, 0},                    /* possible depths in color mode */
 
-  SANE_FIX (2.2),		/* Start of scan area in mm (x) */
-  SANE_FIX (9.0),		/* Start of scan area in mm (y) */
-  SANE_FIX (216.70),		/* Size of scan area in mm (x) */
-  SANE_FIX (300.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (0.0),               /* Start of scan area in mm (x) */
+  SANE_FIX (8.0),                /* Start of scan area in mm (y) */
+  SANE_FIX (216.0),             /* Size of scan area in mm (x) */
+  SANE_FIX (300.0),              /* Size of scan area in mm (y) */
 
-  SANE_FIX (1.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (1.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),              /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),              /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                       /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,               /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                     /* Is this a CIS scanner? */
+  SANE_FALSE,                    /* Is this a sheetfed scanner? */
   CIS_CANONLIDE120,
-  DAC_CANONLIDE110,
-  GPO_CANONLIDE110,
-  MOTOR_CANONLIDE110,
+  DAC_CANONLIDE120,
+  GPO_CANONLIDE120,
+  MOTOR_CANONLIDE120,
       GENESYS_FLAG_SKIP_WARMUP
     | GENESYS_FLAG_OFFSET_CALIBRATION
     | GENESYS_FLAG_DARK_CALIBRATION
@@ -1956,43 +1992,43 @@ static Genesys_Model canon_lide_120_model = {
 
 
 static Genesys_Model canon_lide_210_model = {
-  "canon-lide-210",		/* Name */
-  "Canon",			/* Device vendor string */
-  "LiDE 210",			/* Device model name */
+  "canon-lide-210",                /* Name */
+  "Canon",                        /* Device vendor string */
+  "LiDE 210",                        /* Device model name */
   GENESYS_GL124,
   NULL,
 
-  {4800, 2400, 1200, 600, /* 400,*/ 300, 150, 100, 75, 0},	/* possible x-resolutions */
-  {4800, 2400, 1200, 600, /* 400,*/ 300, 150, 100, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {4800, 2400, 1200, 600, /* 400,*/ 300, 150, 100, 75, 0},        /* possible x-resolutions */
+  {4800, 2400, 1200, 600, /* 400,*/ 300, 150, 100, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (2.2),		/* Start of scan area in mm (x) */
-  SANE_FIX (8.7),		/* Start of scan area in mm (y) */
-  SANE_FIX (216.70),		/* Size of scan area in mm (x) */
-  SANE_FIX (297.5),		/* Size of scan area in mm (y) */
+  SANE_FIX (2.2),                /* Start of scan area in mm (x) */
+  SANE_FIX (8.7),                /* Start of scan area in mm (y) */
+  SANE_FIX (216.70),                /* Size of scan area in mm (x) */
+  SANE_FIX (297.5),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CIS_CANONLIDE210,
   DAC_CANONLIDE110,
   GPO_CANONLIDE210,
@@ -2009,43 +2045,43 @@ static Genesys_Model canon_lide_210_model = {
 };
 
 static Genesys_Model canon_lide_220_model = {
-  "canon-lide-220",		/* Name */
-  "Canon",			/* Device vendor string */
-  "LiDE 220",			/* Device model name */
+  "canon-lide-220",                /* Name */
+  "Canon",                        /* Device vendor string */
+  "LiDE 220",                        /* Device model name */
   GENESYS_GL124, /* or a compatible one */
   NULL,
 
-  {4800, 2400, 1200, 600, 300, 150, 100, 75, 0},	/* possible x-resolutions */
-  {4800, 2400, 1200, 600, 300, 150, 100, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {4800, 2400, 1200, 600, 300, 150, 100, 75, 0},        /* possible x-resolutions */
+  {4800, 2400, 1200, 600, 300, 150, 100, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (2.2),		/* Start of scan area in mm (x) */
-  SANE_FIX (8.7),		/* Start of scan area in mm (y) */
-  SANE_FIX (216.70),		/* Size of scan area in mm (x) */
-  SANE_FIX (297.5),		/* Size of scan area in mm (y) */
+  SANE_FIX (2.2),                /* Start of scan area in mm (x) */
+  SANE_FIX (8.7),                /* Start of scan area in mm (y) */
+  SANE_FIX (216.70),                /* Size of scan area in mm (x) */
+  SANE_FIX (297.5),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CIS_CANONLIDE220,
   DAC_CANONLIDE110,
   GPO_CANONLIDE210,
@@ -2062,48 +2098,48 @@ static Genesys_Model canon_lide_220_model = {
 };
 
 static Genesys_Model canon_5600f_model = {
-  "canon-5600f",		/* Name */
-  "Canon",			/* Device vendor string */
-  "5600F",			/* Device model name */
+  "canon-5600f",                /* Name */
+  "Canon",                        /* Device vendor string */
+  "5600F",                        /* Device model name */
   GENESYS_GL847,
   NULL,
 
-  {1200, 600, 400, 300, 200, 150, 100, 75, 0},	/* possible x-resolutions */
-  {1200, 600, 400, 300, 200, 150, 100, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {1200, 600, 400, 300, 200, 150, 100, 75, 0},        /* possible x-resolutions */
+  {1200, 600, 400, 300, 200, 150, 100, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (1.1),		/* Start of scan area in mm  (x) */
-  SANE_FIX (8.3),		/* Start of scan area in mm (y) */
-  SANE_FIX (216.07),		/* Size of scan area in mm (x) */
-  SANE_FIX (299.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (1.1),                /* Start of scan area in mm  (x) */
+  SANE_FIX (8.3),                /* Start of scan area in mm (y) */
+  SANE_FIX (216.07),                /* Size of scan area in mm (x) */
+  SANE_FIX (299.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (3.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (3.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CIS_CANONLIDE200,
   DAC_CANONLIDE200,
   GPO_CANONLIDE200,
   MOTOR_CANONLIDE200,
-  GENESYS_FLAG_UNTESTED		/* not working yet */
+  GENESYS_FLAG_UNTESTED                /* not working yet */
     | GENESYS_FLAG_SKIP_WARMUP
     | GENESYS_FLAG_SIS_SENSOR
     | GENESYS_FLAG_DARK_CALIBRATION
@@ -2115,43 +2151,43 @@ static Genesys_Model canon_5600f_model = {
 };
 
 static Genesys_Model canon_lide_700f_model = {
-  "canon-lide-700f",		/* Name */
-  "Canon",			/* Device vendor string */
-  "LiDE 700F",			/* Device model name */
+  "canon-lide-700f",                /* Name */
+  "Canon",                        /* Device vendor string */
+  "LiDE 700F",                        /* Device model name */
   GENESYS_GL847,
   NULL,
 
-  {4800, 2400, 1200, 600, 300, 200, 150, 100, 75, 0},	/* possible x-resolutions */
-  {4800, 2400, 1200, 600, 300, 200, 150, 100, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {4800, 2400, 1200, 600, 300, 200, 150, 100, 75, 0},        /* possible x-resolutions */
+  {4800, 2400, 1200, 600, 300, 200, 150, 100, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (3.1),		/* Start of scan area in mm  (x) */
-  SANE_FIX (8.1),		/* Start of scan area in mm (y) */
-  SANE_FIX (216.07),		/* Size of scan area in mm (x) */
-  SANE_FIX (297.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (3.1),                /* Start of scan area in mm  (x) */
+  SANE_FIX (8.1),                /* Start of scan area in mm (y) */
+  SANE_FIX (216.07),                /* Size of scan area in mm (x) */
+  SANE_FIX (297.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (1.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (1.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CIS_CANONLIDE700,
   DAC_CANONLIDE700,
   GPO_CANONLIDE700,
@@ -2170,43 +2206,43 @@ static Genesys_Model canon_lide_700f_model = {
 
 
 static Genesys_Model canon_lide_200_model = {
-  "canon-lide-200",		/* Name */
-  "Canon",			/* Device vendor string */
-  "LiDE 200",			/* Device model name */
+  "canon-lide-200",                /* Name */
+  "Canon",                        /* Device vendor string */
+  "LiDE 200",                        /* Device model name */
   GENESYS_GL847,
   NULL,
 
-  {4800, 2400, 1200, 600, 300, 200, 150, 100, 75, 0},	/* possible x-resolutions */
-  {4800, 2400, 1200, 600, 300, 200, 150, 100, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {4800, 2400, 1200, 600, 300, 200, 150, 100, 75, 0},        /* possible x-resolutions */
+  {4800, 2400, 1200, 600, 300, 200, 150, 100, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (1.1),		/* Start of scan area in mm  (x) */
-  SANE_FIX (8.3),		/* Start of scan area in mm (y) */
-  SANE_FIX (216.07),		/* Size of scan area in mm (x) */
-  SANE_FIX (299.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (1.1),                /* Start of scan area in mm  (x) */
+  SANE_FIX (8.3),                /* Start of scan area in mm (y) */
+  SANE_FIX (216.07),                /* Size of scan area in mm (x) */
+  SANE_FIX (299.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CIS_CANONLIDE200,
   DAC_CANONLIDE200,
   GPO_CANONLIDE200,
@@ -2224,48 +2260,48 @@ static Genesys_Model canon_lide_200_model = {
 
 
 static Genesys_Model canon_lide_60_model = {
-  "canon-lide-60",		/* Name */
-  "Canon",			/* Device vendor string */
-  "LiDE 60",			/* Device model name */
+  "canon-lide-60",                /* Name */
+  "Canon",                        /* Device vendor string */
+  "LiDE 60",                        /* Device model name */
   GENESYS_GL841,
   NULL,
 
-  {1200, 600, 300, 150, 75, 0},	/* possible x-resolutions */
-  {2400, 1200, 600, 300, 150, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {1200, 600, 300, 150, 75, 0},        /* possible x-resolutions */
+  {2400, 1200, 600, 300, 150, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (0.42),		/* Start of scan area in mm  (x) */
-  SANE_FIX (7.9),		/* Start of scan area in mm (y) */
-  SANE_FIX (218.0),		/* Size of scan area in mm (x) */
-  SANE_FIX (299.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (0.42),                /* Start of scan area in mm  (x) */
+  SANE_FIX (7.9),                /* Start of scan area in mm (y) */
+  SANE_FIX (218.0),                /* Size of scan area in mm (x) */
+  SANE_FIX (299.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (6.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (6.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_CANONLIDE35,
   DAC_CANONLIDE35,
   GPO_CANONLIDE35,
   MOTOR_CANONLIDE35,
-  GENESYS_FLAG_LAZY_INIT 	/* Which flags are needed for this scanner? */
+  GENESYS_FLAG_LAZY_INIT         /* Which flags are needed for this scanner? */
     | GENESYS_FLAG_SKIP_WARMUP
     | GENESYS_FLAG_OFFSET_CALIBRATION
     | GENESYS_FLAG_DARK_WHITE_CALIBRATION
@@ -2275,50 +2311,50 @@ static Genesys_Model canon_lide_60_model = {
   GENESYS_HAS_NO_BUTTONS, /* no buttons supported */
   300,
   400
-};				/* this is completely untested -- hmg */
+};                                /* this is completely untested -- hmg */
 
 static Genesys_Model canon_lide_80_model = {
-  "canon-lide-80",		/* Name */
-  "Canon",			/* Device vendor string */
-  "LiDE 80",			/* Device model name */
+  "canon-lide-80",                /* Name */
+  "Canon",                        /* Device vendor string */
+  "LiDE 80",                        /* Device model name */
   GENESYS_GL841,
   NULL,
 
-  {      1200, 600, 400, 300, 240, 150, 100, 75, 0},	/* possible x-resolutions */
-  {2400, 1200, 600, 400, 300, 240, 150, 100, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
-  SANE_FIX (0.42),		/* Start of scan area in mm  (x)   0.42 */
-  SANE_FIX (7.90),		/* Start of scan area in mm (y)    7.90 */
-  SANE_FIX (216.07),		/* Size of scan area in mm (x)   218.00 */
-  SANE_FIX (299.0),		/* Size of scan area in mm (y) */
+  {      1200, 600, 400, 300, 240, 150, 100, 75, 0},        /* possible x-resolutions */
+  {2400, 1200, 600, 400, 300, 240, 150, 100, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
+  SANE_FIX (0.42),                /* Start of scan area in mm  (x)   0.42 */
+  SANE_FIX (7.90),                /* Start of scan area in mm (y)    7.90 */
+  SANE_FIX (216.07),                /* Size of scan area in mm (x)   218.00 */
+  SANE_FIX (299.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (4.5),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (4.5),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CIS_CANONLIDE80,
   DAC_CANONLIDE80,
   GPO_CANONLIDE80,
   MOTOR_CANONLIDE80,
-  GENESYS_FLAG_LAZY_INIT | 	/* Which flags are needed for this scanner? */
+  GENESYS_FLAG_LAZY_INIT |         /* Which flags are needed for this scanner? */
   GENESYS_FLAG_SKIP_WARMUP |
   GENESYS_FLAG_OFFSET_CALIBRATION |
   GENESYS_FLAG_DARK_WHITE_CALIBRATION |
@@ -2334,43 +2370,43 @@ static Genesys_Model canon_lide_80_model = {
 
 
 static Genesys_Model hp2300c_model = {
-  "hewlett-packard-scanjet-2300c",	/* Name */
-  "Hewlett Packard",		/* Device vendor string */
-  "ScanJet 2300c",		/* Device model name */
+  "hewlett-packard-scanjet-2300c",        /* Name */
+  "Hewlett Packard",                /* Device vendor string */
+  "ScanJet 2300c",                /* Device model name */
   GENESYS_GL646,
   NULL,
 
-  {600, 300, 150, 75, 0},	/* possible x-resolutions */
-  {1200, 600, 300, 150, 75, 0},	/* possible y-resolutions, motor can go up to 1200 dpi */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {600, 300, 150, 75, 0},        /* possible x-resolutions */
+  {1200, 600, 300, 150, 75, 0},        /* possible y-resolutions, motor can go up to 1200 dpi */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (2.0),		/* Start of scan area in mm (x_offset) */
-  SANE_FIX (7.5),		/* Start of scan area in mm (y_offset) */
-  SANE_FIX (215.9),		/* Size of scan area in mm (x) */
-  SANE_FIX (295.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (2.0),                /* Start of scan area in mm (x_offset) */
+  SANE_FIX (7.5),                /* Start of scan area in mm (y_offset) */
+  SANE_FIX (215.9),                /* Size of scan area in mm (x) */
+  SANE_FIX (295.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (1.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (1.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  16, 8, 0,			/* RGB CCD Line-distance correction in pixel */
+  16, 8, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_FALSE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_FALSE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_HP2300,
   DAC_WOLFSON_HP2300,
   GPO_HP2300,
@@ -2390,43 +2426,43 @@ static Genesys_Model hp2300c_model = {
 
 static
 Genesys_Model hp2400c_model = {
-  "hewlett-packard-scanjet-2400c",	/* Name */
-  "Hewlett Packard",		/* Device vendor string */
-  "ScanJet 2400c",		/* Device model name */
+  "hewlett-packard-scanjet-2400c",        /* Name */
+  "Hewlett Packard",                /* Device vendor string */
+  "ScanJet 2400c",                /* Device model name */
   GENESYS_GL646,
   NULL,
 
-  {1200, 600, 300, 150, 100, 50, 0},	/* possible x-resolutions */
-  {1200, 600, 300, 150, 100, 50, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {1200, 600, 300, 150, 100, 50, 0},        /* possible x-resolutions */
+  {1200, 600, 300, 150, 100, 50, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (6.5),		/* Start of scan area in mm  (x) */
-  SANE_FIX (2.5),		/* Start of scan area in mm (y) */
-  SANE_FIX (220.0),		/* Size of scan area in mm (x) */
-  SANE_FIX (297.2),		/* Size of scan area in mm (y) */
+  SANE_FIX (6.5),                /* Start of scan area in mm  (x) */
+  SANE_FIX (2.5),                /* Start of scan area in mm (y) */
+  SANE_FIX (220.0),                /* Size of scan area in mm (x) */
+  SANE_FIX (297.2),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (1.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (1.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 24, 48,			/* RGB CCD Line-distance correction in pixel */
+  0, 24, 48,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_FALSE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_FALSE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_HP2400,
   DAC_WOLFSON_HP2400,
   GPO_HP2400,
@@ -2445,45 +2481,45 @@ Genesys_Model hp2400c_model = {
 
 static
 Genesys_Model visioneer_xp200_model = {
-  "visioneer-strobe-xp200",	/* Name */
-  "Visioneer",			/* Device vendor string */
-  "Strobe XP200",		/* Device model name */
+  "visioneer-strobe-xp200",        /* Name */
+  "Visioneer",                        /* Device vendor string */
+  "Strobe XP200",                /* Device model name */
   GENESYS_GL646,
   NULL,
 
-  {600, 300, 200, 100, 75, 0},	/* possible x-resolutions */
-  {600, 300, 200, 100, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {600, 300, 200, 100, 75, 0},        /* possible x-resolutions */
+  {600, 300, 200, 100, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (0.5),		/* Start of scan area in mm  (x) */
-  SANE_FIX (16.0),		/* Start of scan area in mm (y) */
-  SANE_FIX (215.9),		/* Size of scan area in mm (x) */
-  SANE_FIX (297.2),		/* Size of scan area in mm (y) */
+  SANE_FIX (0.5),                /* Start of scan area in mm  (x) */
+  SANE_FIX (16.0),                /* Start of scan area in mm (y) */
+  SANE_FIX (215.9),                /* Size of scan area in mm (x) */
+  SANE_FIX (297.2),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_TRUE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_TRUE,                        /* Is this a sheetfed scanner? */
   CIS_XP200,
-  DAC_AD_XP200,			/* Analog Device frontend */
+  DAC_AD_XP200,                        /* Analog Device frontend */
   GPO_XP200,
   MOTOR_XP200,
       GENESYS_FLAG_14BIT_GAMMA
@@ -2498,43 +2534,43 @@ Genesys_Model visioneer_xp200_model = {
 };
 
 static Genesys_Model hp3670c_model = {
-  "hewlett-packard-scanjet-3670c",	/* Name */
-  "Hewlett Packard",		/* Device vendor string */
-  "ScanJet 3670c",		/* Device model name */
+  "hewlett-packard-scanjet-3670c",        /* Name */
+  "Hewlett Packard",                /* Device vendor string */
+  "ScanJet 3670c",                /* Device model name */
   GENESYS_GL646,
   NULL,
 
-  {1200, 600, 300, 150, 100, 75, 0},	/* possible x-resolutions */
-  {1200, 600, 300, 150, 100, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {1200, 600, 300, 150, 100, 75, 0},        /* possible x-resolutions */
+  {1200, 600, 300, 150, 100, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (8.5),		/* Start of scan area in mm  (x) */
-  SANE_FIX (11.0),		/* Start of scan area in mm (y) */
-  SANE_FIX (215.9),		/* Size of scan area in mm (x) */
-  SANE_FIX (300.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (8.5),                /* Start of scan area in mm  (x) */
+  SANE_FIX (11.0),                /* Start of scan area in mm (y) */
+  SANE_FIX (215.9),                /* Size of scan area in mm (x) */
+  SANE_FIX (300.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (1.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (1.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (104.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (55.6),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (25.6),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (78.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (104.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (55.6),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (25.6),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (78.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (76.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (76.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 24, 48,			/* RGB CCD Line-distance correction in pixel */
+  0, 24, 48,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_FALSE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_FALSE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_HP3670,
   DAC_WOLFSON_HP3670,
   GPO_HP3670,
@@ -2552,91 +2588,91 @@ static Genesys_Model hp3670c_model = {
 };
 
 static Genesys_Model plustek_st12_model = {
-  "plustek-opticpro-st12",	/* Name */
-  "Plustek",			/* Device vendor string */
-  "OpticPro ST12",		/* Device model name */
+  "plustek-opticpro-st12",        /* Name */
+  "Plustek",                        /* Device vendor string */
+  "OpticPro ST12",                /* Device model name */
   GENESYS_GL646,
   NULL,
 
-  {600, 300, 150, 75, 0},	/* possible x-resolutions */
-  {1200, 600, 300, 150, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {600, 300, 150, 75, 0},        /* possible x-resolutions */
+  {1200, 600, 300, 150, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (3.5),		/* Start of scan area in mm  (x) */
-  SANE_FIX (7.5),		/* Start of scan area in mm (y) */
-  SANE_FIX (218.0),		/* Size of scan area in mm (x) */
-  SANE_FIX (299.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (3.5),                /* Start of scan area in mm  (x) */
+  SANE_FIX (7.5),                /* Start of scan area in mm (y) */
+  SANE_FIX (218.0),                /* Size of scan area in mm (x) */
+  SANE_FIX (299.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (1.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (1.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 8, 16,			/* RGB CCD Line-distance correction in pixel */
+  0, 8, 16,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_BGR,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_BGR,                /* Order of the CCD/CIS colors */
 
-  SANE_FALSE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_FALSE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_ST12,
   DAC_WOLFSON_ST12,
   GPO_ST12,
   MOTOR_UMAX,
-  GENESYS_FLAG_UNTESTED | GENESYS_FLAG_14BIT_GAMMA,	/* Which flags are needed for this scanner? */
+  GENESYS_FLAG_UNTESTED | GENESYS_FLAG_14BIT_GAMMA,        /* Which flags are needed for this scanner? */
   GENESYS_HAS_NO_BUTTONS, /* no buttons supported */
   20,
   200
 };
 
 static Genesys_Model plustek_st24_model = {
-  "plustek-opticpro-st24",	/* Name */
-  "Plustek",			/* Device vendor string */
-  "OpticPro ST24",		/* Device model name */
+  "plustek-opticpro-st24",        /* Name */
+  "Plustek",                        /* Device vendor string */
+  "OpticPro ST24",                /* Device model name */
   GENESYS_GL646,
   NULL,
 
-  {1200, 600, 300, 150, 75, 0},	/* possible x-resolutions */
-  {2400, 1200, 600, 300, 150, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {1200, 600, 300, 150, 75, 0},        /* possible x-resolutions */
+  {2400, 1200, 600, 300, 150, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (3.5),		/* Start of scan area in mm  (x) */
-  SANE_FIX (7.5),		/* Start of scan area in mm (y) */
-  SANE_FIX (218.0),		/* Size of scan area in mm (x) */
-  SANE_FIX (299.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (3.5),                /* Start of scan area in mm  (x) */
+  SANE_FIX (7.5),                /* Start of scan area in mm (y) */
+  SANE_FIX (218.0),                /* Size of scan area in mm (x) */
+  SANE_FIX (299.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (1.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (1.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 8, 16,			/* RGB CCD Line-distance correction in pixel */
+  0, 8, 16,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_BGR,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_BGR,                /* Order of the CCD/CIS colors */
 
-  SANE_FALSE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_FALSE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_ST24,
   DAC_WOLFSON_ST24,
   GPO_ST24,
@@ -2653,42 +2689,42 @@ static Genesys_Model plustek_st24_model = {
 };
 
 static Genesys_Model medion_md5345_model = {
-  "medion-md5345-model",	/* Name */
-  "Medion",			/* Device vendor string */
-  "MD5345/MD6228/MD6471",	/* Device model name */
+  "medion-md5345-model",        /* Name */
+  "Medion",                        /* Device vendor string */
+  "MD5345/MD6228/MD6471",        /* Device model name */
   GENESYS_GL646,
   NULL,
 
-  {1200, 600, 400, 300, 200, 150, 100, 75, 50, 0},	/* possible x-resolutions */
-  {2400, 1200, 600, 400, 300, 200, 150, 100, 75, 50, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {1200, 600, 400, 300, 200, 150, 100, 75, 50, 0},        /* possible x-resolutions */
+  {2400, 1200, 600, 400, 300, 200, 150, 100, 75, 50, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX ( 0.30),		/* Start of scan area in mm  (x) */
-  SANE_FIX ( 0.80),		/* 2.79 < Start of scan area in mm (y) */
-  SANE_FIX (220.0),		/* Size of scan area in mm (x) */
-  SANE_FIX (296.4),		/* Size of scan area in mm (y) */
+  SANE_FIX ( 0.30),                /* Start of scan area in mm  (x) */
+  SANE_FIX ( 0.80),                /* 2.79 < Start of scan area in mm (y) */
+  SANE_FIX (220.0),                /* Size of scan area in mm (x) */
+  SANE_FIX (296.4),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.00),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.00),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.00),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.00),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.00),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.00),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (0.00),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (0.00),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.00),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.00),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (0.00),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (0.00),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.00),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.00),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  48, 24, 0,			/* RGB CCD Line-distance correction in pixel */
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  48, 24, 0,                        /* RGB CCD Line-distance correction in pixel */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_FALSE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_FALSE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_5345,
   DAC_WOLFSON_5345,
   GPO_5345,
@@ -2708,49 +2744,49 @@ static Genesys_Model medion_md5345_model = {
 };
 
 static Genesys_Model visioneer_xp300_model = {
-  "visioneer-strobe-xp300",		/* Name */
-  "Visioneer",			/* Device vendor string */
-  "Strobe XP300",			/* Device model name */
+  "visioneer-strobe-xp300",                /* Name */
+  "Visioneer",                        /* Device vendor string */
+  "Strobe XP300",                        /* Device model name */
   GENESYS_GL841,
   NULL,
 
-  {600, 300, 150, 75, 0},	/* possible x-resolutions */
-  {600, 300, 150, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {600, 300, 150, 75, 0},        /* possible x-resolutions */
+  {600, 300, 150, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (0.0),		/* Start of scan area in mm  (x) */
-  SANE_FIX (1.0),		/* Start of scan area in mm (y) */
-  SANE_FIX (435.0),		/* Size of scan area in mm (x) */
-  SANE_FIX (511),		/* Size of scan area in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in mm  (x) */
+  SANE_FIX (1.0),                /* Start of scan area in mm (y) */
+  SANE_FIX (435.0),                /* Size of scan area in mm (x) */
+  SANE_FIX (511),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (26.5),		/* Size of scan area after paper sensor stops
+  SANE_FIX (26.5),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
   /* this is larger than needed -- accounts for second sensor head, which is a
      calibration item */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_TRUE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_TRUE,                        /* Is this a sheetfed scanner? */
   CCD_XP300,
   DAC_WOLFSON_XP300,
   GPO_XP300,
   MOTOR_XP300,
-  GENESYS_FLAG_LAZY_INIT 	/* Which flags are needed for this scanner? */
+  GENESYS_FLAG_LAZY_INIT         /* Which flags are needed for this scanner? */
     | GENESYS_FLAG_SKIP_WARMUP
     | GENESYS_FLAG_OFFSET_CALIBRATION
     | GENESYS_FLAG_DARK_CALIBRATION
@@ -2761,48 +2797,48 @@ static Genesys_Model visioneer_xp300_model = {
 };
 
 static Genesys_Model syscan_docketport_665_model = {
-  "syscan-docketport-665",		/* Name */
-  "Syscan/Ambir",			/* Device vendor string */
-  "DocketPORT 665",			/* Device model name */
+  "syscan-docketport-665",                /* Name */
+  "Syscan/Ambir",                        /* Device vendor string */
+  "DocketPORT 665",                        /* Device model name */
   GENESYS_GL841,
   NULL,
 
-  {600, 300, 150, 75, 0},	/* possible x-resolutions */
-  {1200, 600, 300, 150, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {600, 300, 150, 75, 0},        /* possible x-resolutions */
+  {1200, 600, 300, 150, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (0.0),		/* Start of scan area in mm  (x) */
-  SANE_FIX (0.0),		/* Start of scan area in mm (y) */
-  SANE_FIX (108.0),		/* Size of scan area in mm (x) */
-  SANE_FIX (511),		/* Size of scan area in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in mm  (x) */
+  SANE_FIX (0.0),                /* Start of scan area in mm (y) */
+  SANE_FIX (108.0),                /* Size of scan area in mm (x) */
+  SANE_FIX (511),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (17.5),		/* Size of scan area after paper sensor stops
+  SANE_FIX (17.5),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_TRUE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_TRUE,                        /* Is this a sheetfed scanner? */
   CCD_DP665,
   DAC_WOLFSON_XP300,
   GPO_DP665,
   MOTOR_DP665,
-  GENESYS_FLAG_LAZY_INIT 	/* Which flags are needed for this scanner? */
+  GENESYS_FLAG_LAZY_INIT         /* Which flags are needed for this scanner? */
     | GENESYS_FLAG_SKIP_WARMUP
     | GENESYS_FLAG_OFFSET_CALIBRATION
     | GENESYS_FLAG_DARK_CALIBRATION
@@ -2813,48 +2849,48 @@ static Genesys_Model syscan_docketport_665_model = {
 };
 
 static Genesys_Model visioneer_roadwarrior_model = {
-  "visioneer-roadwarrior",		/* Name */
-  "Visioneer",				/* Device vendor string */
-  "Readwarrior",			/* Device model name */
+  "visioneer-roadwarrior",                /* Name */
+  "Visioneer",                                /* Device vendor string */
+  "Readwarrior",                        /* Device model name */
   GENESYS_GL841,
   NULL,
 
-  {600, 300, 150, 75, 0},	/* possible x-resolutions */
-  {1200, 600, 300, 150, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {600, 300, 150, 75, 0},        /* possible x-resolutions */
+  {1200, 600, 300, 150, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (0.0),		/* Start of scan area in mm  (x) */
-  SANE_FIX (0.0),		/* Start of scan area in mm (y) */
-  SANE_FIX (220.0),		/* Size of scan area in mm (x) */
-  SANE_FIX (511),		/* Size of scan area in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in mm  (x) */
+  SANE_FIX (0.0),                /* Start of scan area in mm (y) */
+  SANE_FIX (220.0),                /* Size of scan area in mm (x) */
+  SANE_FIX (511),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (16.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (16.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_TRUE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_TRUE,                        /* Is this a sheetfed scanner? */
   CCD_ROADWARRIOR,
   DAC_WOLFSON_XP300,
   GPO_DP665,
   MOTOR_ROADWARRIOR,
-  GENESYS_FLAG_LAZY_INIT 	/* Which flags are needed for this scanner? */
+  GENESYS_FLAG_LAZY_INIT         /* Which flags are needed for this scanner? */
     | GENESYS_FLAG_SKIP_WARMUP
     | GENESYS_FLAG_OFFSET_CALIBRATION
     | GENESYS_FLAG_CUSTOM_GAMMA
@@ -2865,48 +2901,48 @@ static Genesys_Model visioneer_roadwarrior_model = {
 };
 
 static Genesys_Model syscan_docketport_465_model = {
-  "syscan-docketport-465",		/* Name */
-  "Syscan",				/* Device vendor string */
-  "DocketPORT 465",			/* Device model name */
+  "syscan-docketport-465",                /* Name */
+  "Syscan",                                /* Device vendor string */
+  "DocketPORT 465",                        /* Device model name */
   GENESYS_GL841,
   NULL,
 
-  {600, 300, 150, 75, 0},	/* possible x-resolutions */
-  {1200, 600, 300, 150, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {600, 300, 150, 75, 0},        /* possible x-resolutions */
+  {1200, 600, 300, 150, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (0.0),		/* Start of scan area in mm  (x) */
-  SANE_FIX (0.0),		/* Start of scan area in mm (y) */
-  SANE_FIX (220.0),		/* Size of scan area in mm (x) */
-  SANE_FIX (511),		/* Size of scan area in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in mm  (x) */
+  SANE_FIX (0.0),                /* Start of scan area in mm (y) */
+  SANE_FIX (220.0),                /* Size of scan area in mm (x) */
+  SANE_FIX (511),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (16.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (16.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_TRUE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_TRUE,                        /* Is this a sheetfed scanner? */
   CCD_ROADWARRIOR,
   DAC_WOLFSON_XP300,
   GPO_DP665,
   MOTOR_ROADWARRIOR,
-  GENESYS_FLAG_LAZY_INIT 	/* Which flags are needed for this scanner? */
+  GENESYS_FLAG_LAZY_INIT         /* Which flags are needed for this scanner? */
     | GENESYS_FLAG_SKIP_WARMUP
     | GENESYS_FLAG_NO_CALIBRATION
     | GENESYS_FLAG_CUSTOM_GAMMA
@@ -2917,48 +2953,48 @@ static Genesys_Model syscan_docketport_465_model = {
 };
 
 static Genesys_Model visioneer_xp100_r3_model = {
-  "visioneer-xp100-revision3",		/* Name */
-  "Visioneer",				/* Device vendor string */
-  "XP100 Revision 3",			/* Device model name */
+  "visioneer-xp100-revision3",                /* Name */
+  "Visioneer",                                /* Device vendor string */
+  "XP100 Revision 3",                        /* Device model name */
   GENESYS_GL841,
   NULL,
 
-  {600, 300, 150, 75, 0},	/* possible x-resolutions */
-  {1200, 600, 300, 150, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {600, 300, 150, 75, 0},        /* possible x-resolutions */
+  {1200, 600, 300, 150, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (0.0),		/* Start of scan area in mm  (x) */
-  SANE_FIX (0.0),		/* Start of scan area in mm (y) */
-  SANE_FIX (220.0),		/* Size of scan area in mm (x) */
-  SANE_FIX (511),		/* Size of scan area in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in mm  (x) */
+  SANE_FIX (0.0),                /* Start of scan area in mm (y) */
+  SANE_FIX (220.0),                /* Size of scan area in mm (x) */
+  SANE_FIX (511),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (16.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (16.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_TRUE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_TRUE,                        /* Is this a sheetfed scanner? */
   CCD_ROADWARRIOR,
   DAC_WOLFSON_XP300,
   GPO_DP665,
   MOTOR_ROADWARRIOR,
-  GENESYS_FLAG_LAZY_INIT 	/* Which flags are needed for this scanner? */
+  GENESYS_FLAG_LAZY_INIT         /* Which flags are needed for this scanner? */
     | GENESYS_FLAG_SKIP_WARMUP
     | GENESYS_FLAG_OFFSET_CALIBRATION
     | GENESYS_FLAG_CUSTOM_GAMMA
@@ -2969,48 +3005,48 @@ static Genesys_Model visioneer_xp100_r3_model = {
 };
 
 static Genesys_Model pentax_dsmobile_600_model = {
-  "pentax-dsmobile-600",		/* Name */
-  "Pentax",				/* Device vendor string */
-  "DSmobile 600",			/* Device model name */
+  "pentax-dsmobile-600",                /* Name */
+  "Pentax",                                /* Device vendor string */
+  "DSmobile 600",                        /* Device model name */
   GENESYS_GL841,
   NULL,
 
-  {600, 300, 150, 75, 0},	/* possible x-resolutions */
-  {1200, 600, 300, 150, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {600, 300, 150, 75, 0},        /* possible x-resolutions */
+  {1200, 600, 300, 150, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (0.0),		/* Start of scan area in mm  (x) */
-  SANE_FIX (0.0),		/* Start of scan area in mm (y) */
-  SANE_FIX (220.0),		/* Size of scan area in mm (x) */
-  SANE_FIX (511),		/* Size of scan area in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in mm  (x) */
+  SANE_FIX (0.0),                /* Start of scan area in mm (y) */
+  SANE_FIX (220.0),                /* Size of scan area in mm (x) */
+  SANE_FIX (511),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (16.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (16.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_TRUE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_TRUE,                        /* Is this a sheetfed scanner? */
   CCD_DSMOBILE600,
   DAC_WOLFSON_DSM600,
   GPO_DP665,
   MOTOR_DSMOBILE_600,
-  GENESYS_FLAG_LAZY_INIT 	/* Which flags are needed for this scanner? */
+  GENESYS_FLAG_LAZY_INIT         /* Which flags are needed for this scanner? */
     | GENESYS_FLAG_SKIP_WARMUP
     | GENESYS_FLAG_OFFSET_CALIBRATION
     | GENESYS_FLAG_CUSTOM_GAMMA
@@ -3021,48 +3057,48 @@ static Genesys_Model pentax_dsmobile_600_model = {
 };
 
 static Genesys_Model syscan_docketport_467_model = {
-  "syscan-docketport-467",		/* Name */
-  "Syscan",				/* Device vendor string */
-  "DocketPORT 467",			/* Device model name */
+  "syscan-docketport-467",                /* Name */
+  "Syscan",                                /* Device vendor string */
+  "DocketPORT 467",                        /* Device model name */
   GENESYS_GL841,
   NULL,
 
-  {600, 300, 150, 75, 0},	/* possible x-resolutions */
-  {1200, 600, 300, 150, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {600, 300, 150, 75, 0},        /* possible x-resolutions */
+  {1200, 600, 300, 150, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (0.0),		/* Start of scan area in mm  (x) */
-  SANE_FIX (0.0),		/* Start of scan area in mm (y) */
-  SANE_FIX (220.0),		/* Size of scan area in mm (x) */
-  SANE_FIX (511),		/* Size of scan area in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in mm  (x) */
+  SANE_FIX (0.0),                /* Start of scan area in mm (y) */
+  SANE_FIX (220.0),                /* Size of scan area in mm (x) */
+  SANE_FIX (511),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (16.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (16.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_TRUE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_TRUE,                        /* Is this a sheetfed scanner? */
   CCD_DSMOBILE600,
   DAC_WOLFSON_DSM600,
   GPO_DP665,
   MOTOR_DSMOBILE_600,
-  GENESYS_FLAG_LAZY_INIT 	/* Which flags are needed for this scanner? */
+  GENESYS_FLAG_LAZY_INIT         /* Which flags are needed for this scanner? */
     | GENESYS_FLAG_SKIP_WARMUP
     | GENESYS_FLAG_OFFSET_CALIBRATION
     | GENESYS_FLAG_CUSTOM_GAMMA
@@ -3073,49 +3109,49 @@ static Genesys_Model syscan_docketport_467_model = {
 };
 
 static Genesys_Model syscan_docketport_685_model = {
-  "syscan-docketport-685",		/* Name */
-  "Syscan/Ambir",			/* Device vendor string */
-  "DocketPORT 685",			/* Device model name */
+  "syscan-docketport-685",                /* Name */
+  "Syscan/Ambir",                        /* Device vendor string */
+  "DocketPORT 685",                        /* Device model name */
   GENESYS_GL841,
   NULL,
 
-  {600, 300, 150, 75, 0},	/* possible x-resolutions */
-  {600, 300, 150, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {600, 300, 150, 75, 0},        /* possible x-resolutions */
+  {600, 300, 150, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (0.0),		/* Start of scan area in mm  (x) */
-  SANE_FIX (1.0),		/* Start of scan area in mm (y) */
-  SANE_FIX (212.0),		/* Size of scan area in mm (x) */
-  SANE_FIX (500),		/* Size of scan area in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in mm  (x) */
+  SANE_FIX (1.0),                /* Start of scan area in mm (y) */
+  SANE_FIX (212.0),                /* Size of scan area in mm (x) */
+  SANE_FIX (500),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (26.5),		/* Size of scan area after paper sensor stops
+  SANE_FIX (26.5),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
   /* this is larger than needed -- accounts for second sensor head, which is a
      calibration item */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_TRUE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_TRUE,                        /* Is this a sheetfed scanner? */
   CCD_DP685,
   DAC_WOLFSON_DSM600,
   GPO_DP685,
   MOTOR_XP300,
-  GENESYS_FLAG_LAZY_INIT 	/* Which flags are needed for this scanner? */
+  GENESYS_FLAG_LAZY_INIT         /* Which flags are needed for this scanner? */
     | GENESYS_FLAG_SKIP_WARMUP
     | GENESYS_FLAG_OFFSET_CALIBRATION
     | GENESYS_FLAG_CUSTOM_GAMMA
@@ -3126,49 +3162,49 @@ static Genesys_Model syscan_docketport_685_model = {
 };
 
 static Genesys_Model syscan_docketport_485_model = {
-  "syscan-docketport-485",		/* Name */
-  "Syscan/Ambir",			/* Device vendor string */
-  "DocketPORT 485",			/* Device model name */
+  "syscan-docketport-485",                /* Name */
+  "Syscan/Ambir",                        /* Device vendor string */
+  "DocketPORT 485",                        /* Device model name */
   GENESYS_GL841,
   NULL,
 
-  {600, 300, 150, 75, 0},	/* possible x-resolutions */
-  {600, 300, 150, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {600, 300, 150, 75, 0},        /* possible x-resolutions */
+  {600, 300, 150, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (0.0),		/* Start of scan area in mm  (x) */
-  SANE_FIX (1.0),		/* Start of scan area in mm (y) */
-  SANE_FIX (435.0),		/* Size of scan area in mm (x) */
-  SANE_FIX (511),		/* Size of scan area in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in mm  (x) */
+  SANE_FIX (1.0),                /* Start of scan area in mm (y) */
+  SANE_FIX (435.0),                /* Size of scan area in mm (x) */
+  SANE_FIX (511),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (26.5),		/* Size of scan area after paper sensor stops
+  SANE_FIX (26.5),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
   /* this is larger than needed -- accounts for second sensor head, which is a
      calibration item */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_TRUE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_TRUE,                        /* Is this a sheetfed scanner? */
   CCD_XP300,
   DAC_WOLFSON_XP300,
   GPO_XP300,
   MOTOR_XP300,
-  GENESYS_FLAG_LAZY_INIT 	/* Which flags are needed for this scanner? */
+  GENESYS_FLAG_LAZY_INIT         /* Which flags are needed for this scanner? */
     | GENESYS_FLAG_SKIP_WARMUP
     | GENESYS_FLAG_OFFSET_CALIBRATION
     | GENESYS_FLAG_CUSTOM_GAMMA
@@ -3179,49 +3215,49 @@ static Genesys_Model syscan_docketport_485_model = {
 };
 
 static Genesys_Model dct_docketport_487_model = {
-  "dct-docketport-487",		/* Name */
-  "DCT",			/* Device vendor string */
-  "DocketPORT 487",			/* Device model name */
+  "dct-docketport-487",                /* Name */
+  "DCT",                        /* Device vendor string */
+  "DocketPORT 487",                        /* Device model name */
   GENESYS_GL841,
   NULL,
 
-  {600, 300, 150, 75, 0},	/* possible x-resolutions */
-  {600, 300, 150, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {600, 300, 150, 75, 0},        /* possible x-resolutions */
+  {600, 300, 150, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (0.0),		/* Start of scan area in mm  (x) */
-  SANE_FIX (1.0),		/* Start of scan area in mm (y) */
-  SANE_FIX (435.0),		/* Size of scan area in mm (x) */
-  SANE_FIX (511),		/* Size of scan area in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in mm  (x) */
+  SANE_FIX (1.0),                /* Start of scan area in mm (y) */
+  SANE_FIX (435.0),                /* Size of scan area in mm (x) */
+  SANE_FIX (511),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (26.5),		/* Size of scan area after paper sensor stops
+  SANE_FIX (26.5),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
   /* this is larger than needed -- accounts for second sensor head, which is a
      calibration item */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_TRUE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_TRUE,                        /* Is this a sheetfed scanner? */
   CCD_XP300,
   DAC_WOLFSON_XP300,
   GPO_XP300,
   MOTOR_XP300,
-  GENESYS_FLAG_LAZY_INIT 	/* Which flags are needed for this scanner? */
+  GENESYS_FLAG_LAZY_INIT         /* Which flags are needed for this scanner? */
     | GENESYS_FLAG_SKIP_WARMUP
     | GENESYS_FLAG_OFFSET_CALIBRATION
     | GENESYS_FLAG_DARK_CALIBRATION
@@ -3233,43 +3269,43 @@ static Genesys_Model dct_docketport_487_model = {
 };
 
 static Genesys_Model visioneer_7100_model = {
-  "visioneer-7100-model",	/* Name */
-  "Visioneer",			/* Device vendor string */
-  "OneTouch 7100",	/* Device model name */
+  "visioneer-7100-model",        /* Name */
+  "Visioneer",                        /* Device vendor string */
+  "OneTouch 7100",        /* Device model name */
   GENESYS_GL646,
   NULL,
 
-  {1200, 600, 400, 300, 200, 150, 100, 75, 50, 0},	/* possible x-resolutions */
-  {2400, 1200, 600, 400, 300, 200, 150, 100, 75, 50, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {1200, 600, 400, 300, 200, 150, 100, 75, 50, 0},        /* possible x-resolutions */
+  {2400, 1200, 600, 400, 300, 200, 150, 100, 75, 50, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX ( 4.00),		/* Start of scan area in mm  (x) */
-  SANE_FIX ( 0.80),		/* 2.79 < Start of scan area in mm (y) */
-  SANE_FIX (215.9),		/* Size of scan area in mm (x) */
-  SANE_FIX (296.4),		/* Size of scan area in mm (y) */
+  SANE_FIX ( 4.00),                /* Start of scan area in mm  (x) */
+  SANE_FIX ( 0.80),                /* 2.79 < Start of scan area in mm (y) */
+  SANE_FIX (215.9),                /* Size of scan area in mm (x) */
+  SANE_FIX (296.4),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.00),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.00),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.00),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.00),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.00),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.00),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (0.00),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (0.00),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.00),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.00),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (0.00),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (0.00),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.00),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.00),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  48, 24, 0,			/* RGB CCD Line-distance correction in pixel */
+  48, 24, 0,                        /* RGB CCD Line-distance correction in pixel */
 /* 48, 24, 0, */
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_FALSE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_FALSE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_5345,
   DAC_WOLFSON_5345,
   GPO_5345,
@@ -3288,43 +3324,43 @@ static Genesys_Model visioneer_7100_model = {
 };
 
 static Genesys_Model xerox_2400_model = {
-  "xerox-2400-model",	/* Name */
-  "Xerox",		/* Device vendor string */
-  "OneTouch 2400",	/* Device model name */
+  "xerox-2400-model",        /* Name */
+  "Xerox",                /* Device vendor string */
+  "OneTouch 2400",        /* Device model name */
   GENESYS_GL646,
   NULL,
 
-  {1200, 600, 400, 300, 200, 150, 100, 75, 50, 0},	/* possible x-resolutions */
-  {2400, 1200, 600, 400, 300, 200, 150, 100, 75, 50, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {1200, 600, 400, 300, 200, 150, 100, 75, 50, 0},        /* possible x-resolutions */
+  {2400, 1200, 600, 400, 300, 200, 150, 100, 75, 50, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX ( 4.00),		/* Start of scan area in mm  (x) */
-  SANE_FIX ( 0.80),		/* 2.79 < Start of scan area in mm (y) */
-  SANE_FIX (215.9),		/* Size of scan area in mm (x) */
-  SANE_FIX (296.4),		/* Size of scan area in mm (y) */
+  SANE_FIX ( 4.00),                /* Start of scan area in mm  (x) */
+  SANE_FIX ( 0.80),                /* 2.79 < Start of scan area in mm (y) */
+  SANE_FIX (215.9),                /* Size of scan area in mm (x) */
+  SANE_FIX (296.4),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.00),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.00),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.00),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.00),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.00),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.00),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (0.00),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (0.00),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.00),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.00),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (0.00),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (0.00),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.00),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.00),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  48, 24, 0,			/* RGB CCD Line-distance correction in pixel */
+  48, 24, 0,                        /* RGB CCD Line-distance correction in pixel */
 /* 48, 24, 0, */
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_FALSE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_FALSE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_5345,
   DAC_WOLFSON_5345,
   GPO_5345,
@@ -3344,48 +3380,48 @@ static Genesys_Model xerox_2400_model = {
 
 
 static Genesys_Model xerox_travelscanner_model = {
-  "xerox-travelscanner",		/* Name */
-  "Xerox",				/* Device vendor string */
-  "Travelscanner 100",			/* Device model name */
+  "xerox-travelscanner",                /* Name */
+  "Xerox",                                /* Device vendor string */
+  "Travelscanner 100",                        /* Device model name */
   GENESYS_GL841,
   NULL,
 
-  {600, 300, 150, 75, 0},	/* possible x-resolutions */
-  {1200, 600, 300, 150, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {600, 300, 150, 75, 0},        /* possible x-resolutions */
+  {1200, 600, 300, 150, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (4.0),		/* Start of scan area in mm  (x) */
-  SANE_FIX (0.0),		/* Start of scan area in mm (y) */
-  SANE_FIX (220.0),		/* Size of scan area in mm (x) */
-  SANE_FIX (511),		/* Size of scan area in mm (y) */
+  SANE_FIX (4.0),                /* Start of scan area in mm  (x) */
+  SANE_FIX (0.0),                /* Start of scan area in mm (y) */
+  SANE_FIX (220.0),                /* Size of scan area in mm (x) */
+  SANE_FIX (511),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (16.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (16.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,			/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_TRUE,			/* Is this a CIS scanner? */
-  SANE_TRUE,			/* Is this a sheetfed scanner? */
+  SANE_TRUE,                        /* Is this a CIS scanner? */
+  SANE_TRUE,                        /* Is this a sheetfed scanner? */
   CCD_ROADWARRIOR,
   DAC_WOLFSON_XP300,
   GPO_DP665,
   MOTOR_ROADWARRIOR,
-  GENESYS_FLAG_LAZY_INIT 	/* Which flags are needed for this scanner? */
+  GENESYS_FLAG_LAZY_INIT         /* Which flags are needed for this scanner? */
     | GENESYS_FLAG_SKIP_WARMUP
     | GENESYS_FLAG_OFFSET_CALIBRATION
     | GENESYS_FLAG_CUSTOM_GAMMA
@@ -3396,53 +3432,53 @@ static Genesys_Model xerox_travelscanner_model = {
 };
 
 static Genesys_Model plustek_3600_model = {
-  "plustek-opticbook-3600",	/* Name */
-  "PLUSTEK",			/* Device vendor string */
-  "OpticBook 3600",		/* Device model name */
+  "plustek-opticbook-3600",        /* Name */
+  "PLUSTEK",                        /* Device vendor string */
+  "OpticBook 3600",                /* Device model name */
   GENESYS_GL841,
   NULL,
-  {/*1200,*/ 600, 400, 300, 200, 150, 100, 75, 0},		/* possible x-resolutions */
-  {/*2400,*/ 1200, 600, 400, 300, 200, 150, 100, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {/*1200,*/ 600, 400, 300, 200, 150, 100, 75, 0},                /* possible x-resolutions */
+  {/*2400,*/ 1200, 600, 400, 300, 200, 150, 100, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (0.42),/*SANE_FIX (0.42),		 Start of scan area in mm  (x) */
-  SANE_FIX (6.75),/*SANE_FIX (7.9),		 Start of scan area in mm (y) */
-  SANE_FIX (216.0),/*SANE_FIX (216.0),		 Size of scan area in mm (x) */
-  SANE_FIX (297.0),/*SANE_FIX (297.0),		 Size of scan area in mm (y) */
+  SANE_FIX (0.42),/*SANE_FIX (0.42),                 Start of scan area in mm  (x) */
+  SANE_FIX (6.75),/*SANE_FIX (7.9),                 Start of scan area in mm (y) */
+  SANE_FIX (216.0),/*SANE_FIX (216.0),                 Size of scan area in mm (x) */
+  SANE_FIX (297.0),/*SANE_FIX (297.0),                 Size of scan area in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (0.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (0.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 24, 48,			/* RGB CCD Line-distance correction in pixel */
+  0, 24, 48,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_FALSE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_FALSE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_PLUSTEK_3600,
   DAC_PLUSTEK_3600,
   GPO_PLUSTEK_3600,
   MOTOR_PLUSTEK_3600,
-  GENESYS_FLAG_UNTESTED		/* not fully working yet */
+  GENESYS_FLAG_UNTESTED                /* not fully working yet */
 	  | GENESYS_FLAG_CUSTOM_GAMMA
 	  | GENESYS_FLAG_SKIP_WARMUP
 	  | GENESYS_FLAG_DARK_CALIBRATION
 	  | GENESYS_FLAG_OFFSET_CALIBRATION
-  	  | GENESYS_FLAG_LAZY_INIT
-  	  | GENESYS_FLAG_HALF_CCD_MODE,/*
+	    | GENESYS_FLAG_LAZY_INIT
+	    | GENESYS_FLAG_HALF_CCD_MODE,/*
       | GENESYS_FLAG_NO_CALIBRATION,*/
   GENESYS_HAS_NO_BUTTONS,
   7,
@@ -3450,49 +3486,49 @@ static Genesys_Model plustek_3600_model = {
 };
 
 static Genesys_Model hpn6310_model = {
-  "hewlett-packard-scanjet-N6310",	/* Name */
-  "Hewlett Packard",			/* Device vendor string */
-  "ScanJet N6310",			/* Device model name */
+  "hewlett-packard-scanjet-N6310",        /* Name */
+  "Hewlett Packard",                        /* Device vendor string */
+  "ScanJet N6310",                        /* Device model name */
   GENESYS_GL847,
   NULL,
 
   { 2400, 1200, 600, 400, 300, 200, 150, 100, 75, 0},
   { 2400, 1200, 600, 400, 300, 200, 150, 100, 75, 0},
 
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (6), 		/* Start of scan area in mm  (x) */
-  SANE_FIX (2), 		/* Start of scan area in mm (y) */
-  SANE_FIX (216),		/* Size of scan area in mm (x) 5148 pixels at 600 dpi*/
-  SANE_FIX (511),		/* Size of scan area in mm (y) */
+  SANE_FIX (6),                 /* Start of scan area in mm  (x) */
+  SANE_FIX (2),                 /* Start of scan area in mm (y) */
+  SANE_FIX (216),                /* Size of scan area in mm (x) 5148 pixels at 600 dpi*/
+  SANE_FIX (511),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (3.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (3.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (100.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (100.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 0, 0,				/* RGB CCD Line-distance correction in pixel */
+  0, 0, 0,                                /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_FALSE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_FALSE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_HP_N6310,
   DAC_CANONLIDE200,     /*Not defined yet for N6310 */
   GPO_HP_N6310,
   MOTOR_CANONLIDE200,   /*Not defined yet for N6310 */
-  GENESYS_FLAG_UNTESTED		/* not fully working yet */
+  GENESYS_FLAG_UNTESTED                /* not fully working yet */
   | GENESYS_FLAG_LAZY_INIT
     | GENESYS_FLAG_14BIT_GAMMA
     | GENESYS_FLAG_DARK_CALIBRATION
@@ -3509,43 +3545,43 @@ static Genesys_Model hpn6310_model = {
 
 
 static Genesys_Model plustek_3800_model = {
-  "plustek-opticbook-3800",	/* Name */
-  "PLUSTEK",			/* Device vendor string */
-  "OpticBook 3800",		/* Device model name */
+  "plustek-opticbook-3800",        /* Name */
+  "PLUSTEK",                        /* Device vendor string */
+  "OpticBook 3800",                /* Device model name */
   GENESYS_GL845,
   NULL,
 
-  {1200, 600, 300, 150, 100, 75, 0},	/* possible x-resolutions */
-  {1200, 600, 300, 150, 100, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {1200, 600, 300, 150, 100, 75, 0},        /* possible x-resolutions */
+  {1200, 600, 300, 150, 100, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (7.2),		/* Start of scan area in mm  (x) */
-  SANE_FIX (14.7),		/* Start of scan area in mm (y) */
-  SANE_FIX (217.7),		/* Size of scan area in mm (x) */
-  SANE_FIX (300.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (7.2),                /* Start of scan area in mm  (x) */
+  SANE_FIX (14.7),                /* Start of scan area in mm (y) */
+  SANE_FIX (217.7),                /* Size of scan area in mm (x) */
+  SANE_FIX (300.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (9.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (9.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (0.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 24, 48,			/* RGB CCD Line-distance correction in pixel */
+  0, 24, 48,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_FALSE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_FALSE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_PLUSTEK3800,
   DAC_PLUSTEK3800,
   GPO_PLUSTEK3800,
@@ -3554,50 +3590,50 @@ static Genesys_Model plustek_3800_model = {
   GENESYS_FLAG_SKIP_WARMUP |
   GENESYS_FLAG_OFFSET_CALIBRATION |
   GENESYS_FLAG_CUSTOM_GAMMA,
-  GENESYS_HAS_NO_BUTTONS,	/* TODO there are 4 buttons to support */
+  GENESYS_HAS_NO_BUTTONS,        /* TODO there are 4 buttons to support */
   100,
   100
 };
 
 
 static Genesys_Model canon_formula101_model = {
-  "canon-image-formula-101",		/* Name */
-  "Canon",			/* Device vendor string */
-  "Image Formula 101",			/* Device model name */
+  "canon-image-formula-101",                /* Name */
+  "Canon",                        /* Device vendor string */
+  "Image Formula 101",                        /* Device model name */
   GENESYS_GL846,
   NULL,
 
-  {1200, 600, 300, 150, 100, 75, 0},	/* possible x-resolutions */
-  {1200, 600, 300, 150, 100, 75, 0},	/* possible y-resolutions */
-  {16, 8, 0},			/* possible depths in gray mode */
-  {16, 8, 0},			/* possible depths in color mode */
+  {1200, 600, 300, 150, 100, 75, 0},        /* possible x-resolutions */
+  {1200, 600, 300, 150, 100, 75, 0},        /* possible y-resolutions */
+  {16, 8, 0},                        /* possible depths in gray mode */
+  {16, 8, 0},                        /* possible depths in color mode */
 
-  SANE_FIX (7.2),		/* Start of scan area in mm  (x) */
-  SANE_FIX (14.7),		/* Start of scan area in mm (y) */
-  SANE_FIX (217.7),		/* Size of scan area in mm (x) */
-  SANE_FIX (300.0),		/* Size of scan area in mm (y) */
+  SANE_FIX (7.2),                /* Start of scan area in mm  (x) */
+  SANE_FIX (14.7),                /* Start of scan area in mm (y) */
+  SANE_FIX (217.7),                /* Size of scan area in mm (x) */
+  SANE_FIX (300.0),                /* Size of scan area in mm (y) */
 
-  SANE_FIX (9.0),		/* Start of white strip in mm (y) */
-  SANE_FIX (0.0),		/* Start of black mark in mm (x) */
+  SANE_FIX (9.0),                /* Start of white strip in mm (y) */
+  SANE_FIX (0.0),                /* Start of black mark in mm (x) */
 
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Start of scan area in TA mode in mm (y) */
-  SANE_FIX (0.0),		/* Size of scan area in TA mode in mm (x) */
-  SANE_FIX (0.0),		/* Size of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Start of scan area in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Size of scan area in TA mode in mm (x) */
+  SANE_FIX (0.0),                /* Size of scan area in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Start of white strip in TA mode in mm (y) */
+  SANE_FIX (0.0),                /* Start of white strip in TA mode in mm (y) */
 
-  SANE_FIX (0.0),		/* Size of scan area after paper sensor stops
+  SANE_FIX (0.0),                /* Size of scan area after paper sensor stops
 				   sensing document in mm */
-  SANE_FIX (0.0),		/* Amount of feeding needed to eject document
+  SANE_FIX (0.0),                /* Amount of feeding needed to eject document
 				   after finishing scanning in mm */
 
-  0, 24, 48,			/* RGB CCD Line-distance correction in pixel */
+  0, 24, 48,                        /* RGB CCD Line-distance correction in pixel */
 
-  COLOR_ORDER_RGB,		/* Order of the CCD/CIS colors */
+  COLOR_ORDER_RGB,                /* Order of the CCD/CIS colors */
 
-  SANE_FALSE,			/* Is this a CIS scanner? */
-  SANE_FALSE,			/* Is this a sheetfed scanner? */
+  SANE_FALSE,                        /* Is this a CIS scanner? */
+  SANE_FALSE,                        /* Is this a sheetfed scanner? */
   CCD_IMG101,
   DAC_IMG101,
   GPO_IMG101,
diff --git a/backend/genesys_gl124.c b/backend/genesys_gl124.c
index eaac873..a98d3d4 100644
--- a/backend/genesys_gl124.c
+++ b/backend/genesys_gl124.c
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2010-2013 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2010-2016 Stéphane Voltz <stef.dev@free.fr>
 
 
    This file is part of the SANE package.
@@ -112,7 +112,7 @@ gl124_bulk_read_data (Genesys_Device * dev, uint8_t addr,
       if (status != SANE_STATUS_GOOD)
 	{
 	  DBG (DBG_error, "%s failed while writing command: %s\n",
-	       __FUNCTION__, sane_strstatus (status));
+	       __func__, sane_strstatus (status));
 	  return status;
 	}
 
@@ -154,7 +154,7 @@ gl124_bulk_read_data (Genesys_Device * dev, uint8_t addr,
 	    }
 	}
 
-      DBG (DBG_io2, "%s: read %lu bytes, %lu remaining\n", __FUNCTION__,
+      DBG (DBG_io2, "%s: read %lu bytes, %lu remaining\n", __func__,
 	   (u_long) size, (u_long) (target - size));
 
       target -= size;
@@ -294,7 +294,7 @@ static Sensor_Profile *get_sensor_profile(int sensor_type, int dpi, int half_ccd
   /* default fallback */
   if(idx<0)
     {
-      DBG (DBG_warn,"%s: using default sensor profile\n",__FUNCTION__);
+      DBG (DBG_warn,"%s: using default sensor profile\n",__func__);
       idx=0;
     }
 
@@ -356,10 +356,18 @@ gl124_init_registers (Genesys_Device * dev)
   SETREG (0x01,0xa2); /* + REG01_SHDAREA */
   SETREG (0x02,0x90);
   SETREG (0x03,0x50);
-  SETREG (0x03,0x50 & ~REG03_AVEENB);
   SETREG (0x04,0x03);
   SETREG (0x05,0x00);
-  SETREG (0x06,0x50 | REG06_GAIN4);
+  if(dev->model->ccd_type==CIS_CANONLIDE120)
+    {
+      SETREG (0x06,0x50);
+      SETREG (0x07,0x00);
+    }
+  else
+    {
+      SETREG (0x03,0x50 & ~REG03_AVEENB);
+      SETREG (0x06,0x50 | REG06_GAIN4);
+    }
   SETREG (0x09,0x00);
   SETREG (0x0a,0xc0);
   SETREG (0x0b,0x2a);
@@ -381,7 +389,14 @@ gl124_init_registers (Genesys_Device * dev)
   SETREG (0x1f,0x00);
   SETREG (0x20,0x15);
   SETREG (0x21,0x00);
-  SETREG (0x22,0x02);
+  if(dev->model->ccd_type!=CIS_CANONLIDE120)
+    {
+      SETREG (0x22,0x02);
+    }
+  else
+    {
+      SETREG (0x22,0x14);
+    }
   SETREG (0x23,0x00);
   SETREG (0x24,0x00);
   SETREG (0x25,0x00);
@@ -434,11 +449,19 @@ gl124_init_registers (Genesys_Device * dev)
   SETREG (0x6a,0x00);
   SETREG (0x6b,0x00);
   SETREG (0x6c,0x00);
-  SETREG (0x6d,0xd0);
   SETREG (0x6e,0x00);
   SETREG (0x6f,0x00);
-  SETREG (0x70,0x06);
-  SETREG (0x71,0x08);
+  if(dev->model->ccd_type!=CIS_CANONLIDE120)
+    {
+      SETREG (0x6d,0xd0);
+      SETREG (0x71,0x08);
+    }
+  else
+    {
+      SETREG (0x6d,0x00);
+      SETREG (0x71,0x1f);
+    }
+  SETREG (0x70,0x00);
   SETREG (0x72,0x08);
   SETREG (0x73,0x0a);
 
@@ -456,8 +479,16 @@ gl124_init_registers (Genesys_Device * dev)
   SETREG (0x7d,0x00);
   SETREG (0x7e,0x08);
   SETREG (0x7f,0x58);
-  SETREG (0x80,0x00);
-  SETREG (0x81,0x14);
+  if(dev->model->ccd_type!=CIS_CANONLIDE120)
+    {
+      SETREG (0x80,0x00);
+      SETREG (0x81,0x14);
+    }
+  else
+    {
+      SETREG (0x80,0x00);
+      SETREG (0x81,0x10);
+    }
 
   /* STRPIXEL */
   SETREG (0x82,0x00);
@@ -536,6 +567,15 @@ gl124_init_registers (Genesys_Device * dev)
   SETREG (0xcd,0x00);
   SETREG (0xce,0x00);
   */
+  if(dev->model->ccd_type==CIS_CANONLIDE120)
+    {
+      SETREG (0xc5,0x20);
+      SETREG (0xc6,0xeb);
+      SETREG (0xc7,0x20);
+      SETREG (0xc8,0xeb);
+      SETREG (0xc9,0x20);
+      SETREG (0xca,0xeb);
+    }
 
   /* memory layout
   SETREG (0xd0,0x0a);
@@ -624,13 +664,13 @@ gl124_send_slope_table (Genesys_Device * dev, int table_nr,
   int i;
   char msg[10000];
 
-  DBG (DBG_proc, "%s (table_nr = %d, steps = %d)\n", __FUNCTION__,
+  DBG (DBG_proc, "%s (table_nr = %d, steps = %d)\n", __func__,
        table_nr, steps);
 
   /* sanity check */
   if(table_nr<0 || table_nr>4)
     {
-      DBG (DBG_error, "%s: invalid table number %d!\n", __FUNCTION__, table_nr);
+      DBG (DBG_error, "%s: invalid table number %d!\n", __func__, table_nr);
       return SANE_STATUS_INVAL;
     }
 
@@ -648,7 +688,7 @@ gl124_send_slope_table (Genesys_Device * dev, int table_nr,
 	{
 	  sprintf (msg+strlen(msg), ",%d", slope_table[i]);
 	}
-      DBG (DBG_io, "%s: %s\n", __FUNCTION__, msg);
+      DBG (DBG_io, "%s: %s\n", __func__, msg);
     }
 
   /* slope table addresses are fixed */
@@ -658,7 +698,7 @@ gl124_send_slope_table (Genesys_Device * dev, int table_nr,
     {
       DBG (DBG_error,
 	   "%s: write to AHB failed writing slope table %d (%s)\n",
-	   __FUNCTION__, table_nr, sane_strstatus (status));
+	   __func__, table_nr, sane_strstatus (status));
     }
 
   free (table);
@@ -666,8 +706,11 @@ gl124_send_slope_table (Genesys_Device * dev, int table_nr,
   return status;
 }
 
-/**
- * Set register values of 'special' type frontend
+/** @brief * Set register values of 'special' ti type frontend
+ * Registers value are taken from the frontend register data
+ * set.
+ * @param dev device owning the AFE
+ * @param set flag AFE_INIT to specify the AFE must be reset before writing data
  * */
 static SANE_Status
 gl124_set_ti_fe (Genesys_Device * dev, uint8_t set)
@@ -679,8 +722,7 @@ gl124_set_ti_fe (Genesys_Device * dev, uint8_t set)
   DBGSTART;
   if (set == AFE_INIT)
     {
-      DBG (DBG_proc, "%s: setting DAC %u\n", __FUNCTION__,
-	   dev->model->dac_type);
+      DBG (DBG_proc, "%s: setting DAC %u\n", __func__, dev->model->dac_type);
 
       /* sets to default values */
       sanei_genesys_init_fe (dev);
@@ -690,7 +732,7 @@ gl124_set_ti_fe (Genesys_Device * dev, uint8_t set)
   status = sanei_genesys_fe_write_data (dev, 0x00, 0x80);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to write reg0: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to write reg0: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -703,7 +745,7 @@ gl124_set_ti_fe (Genesys_Device * dev, uint8_t set)
       if (status != SANE_STATUS_GOOD)
 	{
 	  DBG (DBG_error,
-	       "%s: failed to write reg %d: %s\n", __FUNCTION__, i,
+	       "%s: failed to write reg %d: %s\n", __func__, i,
 	       sane_strstatus (status));
 	  return status;
 	}
@@ -712,12 +754,12 @@ gl124_set_ti_fe (Genesys_Device * dev, uint8_t set)
   status = sanei_genesys_fe_write_data (dev, 0x04, 0x00);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to write reg4: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to write reg4: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
 
-  /* these are not really sign */
+  /* these are not really sign for this AFE */
   for (i = 0; i < 3; i++)
     {
       val = dev->frontend.sign[i];
@@ -725,17 +767,24 @@ gl124_set_ti_fe (Genesys_Device * dev, uint8_t set)
       if (status != SANE_STATUS_GOOD)
 	{
 	  DBG (DBG_error,
-	       "%s: failed to write reg %d: %s\n", __FUNCTION__, i+5,
+	       "%s: failed to write reg %d: %s\n", __func__, i+5,
 	       sane_strstatus (status));
 	  return status;
 	}
     }
 
   /* close writing to DAC */
-  status = sanei_genesys_fe_write_data (dev, 0x00, 0x11);
+  if(dev->model->dac_type == DAC_CANONLIDE120)
+    {
+      status = sanei_genesys_fe_write_data (dev, 0x00, 0x01);
+    }
+  else
+    {
+      status = sanei_genesys_fe_write_data (dev, 0x00, 0x11);
+    }
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to write reg0: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to write reg0: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -781,7 +830,7 @@ gl124_set_fe (Genesys_Device * dev, uint8_t set)
     case 1:
     case 2:
     default:
-      DBG (DBG_error, "%s: unsupported analog FE 0x%02x\n",__FUNCTION__,val);
+      DBG (DBG_error, "%s: unsupported analog FE 0x%02x\n",__func__,val);
       status=SANE_STATUS_INVAL;
       break;
     }
@@ -852,10 +901,17 @@ gl124_init_motor_regs_scan (Genesys_Device * dev,
     }
   else
     {
-      min_speed = 900;
-      if(dev->model->ccd_type==MOTOR_CANONLIDE110)
+      switch(dev->model->motor_type)
         {
-          min_speed = 300;
+          case MOTOR_CANONLIDE110:
+	    min_speed = 600;
+            break;
+          case MOTOR_CANONLIDE120:
+            min_speed = 900;
+            break;
+          default:
+            min_speed = 900;
+            break;
         }
     }
 
@@ -864,6 +920,12 @@ gl124_init_motor_regs_scan (Genesys_Device * dev,
     {
       yres=min_speed;
       linesel=yres/scan_yres-1;
+      /* limit case, we need a linesel > 0 */
+      if(linesel==0)
+        {
+          linesel=1;
+          yres=scan_yres*2;
+        }
     }
   else
     {
@@ -871,11 +933,11 @@ gl124_init_motor_regs_scan (Genesys_Device * dev,
       linesel=0;
     }
 
-  DBG (DBG_io2, "%s: linesel=%d\n", __FUNCTION__, linesel);
+  DBG (DBG_io2, "%s: final yres=%f, linesel=%d\n", __func__, yres, linesel);
 
   lincnt=scan_lines*(linesel+1);
   sanei_genesys_set_triple(reg,REG_LINCNT,lincnt);
-  DBG (DBG_io, "%s: lincnt=%d\n", __FUNCTION__, lincnt);
+  DBG (DBG_io, "%s: lincnt=%d\n", __func__, lincnt);
 
   /* compute register 02 value */
   r = sanei_genesys_get_address (reg, REG02);
@@ -954,7 +1016,7 @@ gl124_init_motor_regs_scan (Genesys_Device * dev,
     {
         dist += fast_steps*2;
     }
-  DBG (DBG_io2, "%s: acceleration distance=%d\n", __FUNCTION__, dist);
+  DBG (DBG_io2, "%s: acceleration distance=%d\n", __func__, dist);
 
   /* get sure we don't use insane value */
   if(dist<feedl)
@@ -963,7 +1025,7 @@ gl124_init_motor_regs_scan (Genesys_Device * dev,
     feedl = 0;
 
   sanei_genesys_set_triple(reg,REG_FEEDL,feedl);
-  DBG (DBG_io, "%s: feedl=%d\n", __FUNCTION__, feedl);
+  DBG (DBG_io, "%s: feedl=%d\n", __func__, feedl);
 
   /* doesn't seem to matter that much */
   sanei_genesys_calculate_zmode2 (use_fast_fed,
@@ -997,7 +1059,12 @@ gl124_init_motor_regs_scan (Genesys_Device * dev,
 
 
 /** @brief copy sensor specific settings
- * Set up register set for the given sensor resolution.
+ * Set up register set for the given sensor resolution. Values are from the device table
+ * in genesys_devices.c for registers:
+ *       [0x16 ... 0x1d]
+ *       [0x52 ... 0x5e]
+ * Other come from the specific device sensor table in genesys_gl124.h:
+ *      0x18, 0x20, 0x61, 0x98 and
  * @param dev device to set up
  * @param regs register set to modify
  * @param dpi resolution of the sensor during scan
@@ -1019,14 +1086,20 @@ gl124_setup_sensor (Genesys_Device * dev, Genesys_Register_Set * regs, int dpi,
     {
       r = sanei_genesys_get_address (regs, 0x10 + i);
       if (r)
-	r->value = dev->sensor.regs_0x10_0x1d[i];
+	{
+	  r->value = dev->sensor.regs_0x10_0x1d[i];
+	}
     }
 
+  /* skip writing 5d,5e which is AFE address because
+   * they are not deifned in register set */
   for (i = 0; i < 11; i++)
     {
       r = sanei_genesys_get_address (regs, 0x52 + i);
       if (r)
-	r->value = dev->sensor.regs_0x52_0x5e[i];
+	{
+	  r->value = dev->sensor.regs_0x52_0x5e[i];
+	}
     }
 
   /* set EXPDUMMY and CKxMAP */
@@ -1054,6 +1127,23 @@ gl124_setup_sensor (Genesys_Device * dev, Genesys_Register_Set * regs, int dpi,
       r->value = sensor->reg98;
     }
 
+  if(sensor->reg16!=0)
+    {
+      r = sanei_genesys_get_address (regs, 0x16);
+      if (r)
+	{
+	  r->value = sensor->reg16;
+	}
+    }
+  if(sensor->reg70!=0)
+    {
+      r = sanei_genesys_get_address (regs, 0x70);
+      if (r)
+	{
+	  r->value = sensor->reg70;
+	}
+    }
+
   sanei_genesys_set_triple(regs,REG_SEGCNT,sensor->segcnt);
   sanei_genesys_set_double(regs,REG_TG0CNT,sensor->tg0cnt);
   sanei_genesys_set_double(regs,REG_EXPDMY,sensor->expdummy);
@@ -1131,19 +1221,19 @@ gl124_init_optical_regs_scan (Genesys_Device * dev,
 
   DBG (DBG_proc, "%s :  exposure_time=%d, "
        "used_res=%d, start=%d, pixels=%d, channels=%d, depth=%d, "
-       "half_ccd=%d, flags=%x\n", __FUNCTION__, exposure_time,
+       "half_ccd=%d, flags=%x\n", __func__, exposure_time,
        used_res, start, pixels, channels, depth, half_ccd, flags);
 
   /* resolution is divided according to CKSEL */
   r = sanei_genesys_get_address (reg, REG18);
   cksel= (r->value & REG18_CKSEL)+1;
-  DBG (DBG_io2, "%s: cksel=%d\n", __FUNCTION__, cksel);
+  DBG (DBG_io2, "%s: cksel=%d\n", __func__, cksel);
 
   /* to manage high resolution device while keeping good
    * low resolution scanning speed, we make hardware dpi vary */
   dpihw=sanei_genesys_compute_dpihw(dev, used_res * cksel);
   factor=dev->sensor.optical_res/dpihw;
-  DBG (DBG_io2, "%s: dpihw=%d (factor=%d)\n", __FUNCTION__, dpihw, factor);
+  DBG (DBG_io2, "%s: dpihw=%d (factor=%d)\n", __func__, dpihw, factor);
 
   /* sensor parameters */
   gl124_setup_sensor (dev, reg, dpihw, half_ccd);
@@ -1163,7 +1253,7 @@ gl124_init_optical_regs_scan (Genesys_Device * dev,
   status = gl124_set_fe (dev, AFE_SET);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to set frontend: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to set frontend: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -1183,7 +1273,16 @@ gl124_init_optical_regs_scan (Genesys_Device * dev,
   r->value &= ~REG01_SCAN;
 
   r = sanei_genesys_get_address (reg, REG03);
-  r->value &= ~REG03_AVEENB;
+  if((dev->model->ccd_type!=CIS_CANONLIDE120)&&(used_res>=600))
+    {
+      r->value &= ~REG03_AVEENB;
+      DBG (DBG_io, "%s: disabling AVEENB\n", __func__);
+    }
+  else
+    {
+      r->value |= ~REG03_AVEENB;
+      DBG (DBG_io, "%s: enabling AVEENB\n", __func__);
+    }
 
   if (flags & OPTICAL_FLAG_DISABLE_LAMP)
     r->value &= ~REG03_LAMPPWR;
@@ -1217,13 +1316,13 @@ gl124_init_optical_regs_scan (Genesys_Device * dev,
       switch (color_filter)
 	{
 	case 0:
-	  r->value |= 0x10;	/* red filter */
+	  r->value |= 0x10;        /* red filter */
 	  break;
 	case 2:
-	  r->value |= 0x30;	/* blue filter */
+	  r->value |= 0x30;        /* blue filter */
 	  break;
 	default:
-	  r->value |= 0x20;	/* green filter */
+	  r->value |= 0x20;        /* green filter */
 	  break;
 	}
     }
@@ -1258,12 +1357,12 @@ gl124_init_optical_regs_scan (Genesys_Device * dev,
   if(half_ccd)
     {
       sanei_genesys_set_double(reg,REG_DPISET,dpiset*2);
-      DBG (DBG_io2, "%s: dpiset used=%d\n", __FUNCTION__, dpiset*2);
+      DBG (DBG_io2, "%s: dpiset used=%d\n", __func__, dpiset*2);
     }
   else
     {
       sanei_genesys_set_double(reg,REG_DPISET,dpiset);
-      DBG (DBG_io2, "%s: dpiset used=%d\n", __FUNCTION__, dpiset);
+      DBG (DBG_io2, "%s: dpiset used=%d\n", __func__, dpiset);
     }
 
   r = sanei_genesys_get_address (reg, REG06);
@@ -1310,14 +1409,14 @@ gl124_init_optical_regs_scan (Genesys_Device * dev,
   segnb = r->value & 0x0f;
 
   sanei_genesys_set_triple(reg,REG_STRPIXEL,startx/segnb);
-  DBG (DBG_io2, "%s: strpixel used=%d\n", __FUNCTION__, startx/segnb);
+  DBG (DBG_io2, "%s: strpixel used=%d\n", __func__, startx/segnb);
   sanei_genesys_get_triple(reg,REG_SEGCNT,&segcnt);
   if(endx/segnb==segcnt)
     {
       endx=0;
     }
   sanei_genesys_set_triple(reg,REG_ENDPIXEL,endx/segnb);
-  DBG (DBG_io2, "%s: endpixel used=%d\n", __FUNCTION__, endx/segnb);
+  DBG (DBG_io2, "%s: endpixel used=%d\n", __func__, endx/segnb);
 
   /* words(16bit) before gamma, conversion to 8 bit or lineart */
   words_per_line = (used_pixels * dpiset) / dpihw;
@@ -1340,13 +1439,13 @@ gl124_init_optical_regs_scan (Genesys_Device * dev,
   dev->line_count = 0;
   dev->line_interp = 0;
 
-  DBG (DBG_io2, "%s: used_pixels     =%d\n", __FUNCTION__, used_pixels);
-  DBG (DBG_io2, "%s: pixels          =%d\n", __FUNCTION__, pixels);
-  DBG (DBG_io2, "%s: depth           =%d\n", __FUNCTION__, depth);
-  DBG (DBG_io2, "%s: dev->bpl        =%lu\n", __FUNCTION__, (unsigned long)dev->bpl);
-  DBG (DBG_io2, "%s: dev->len        =%lu\n", __FUNCTION__, (unsigned long)dev->len);
-  DBG (DBG_io2, "%s: dev->dist       =%lu\n", __FUNCTION__, (unsigned long)dev->dist);
-  DBG (DBG_io2, "%s: dev->line_interp=%lu\n", __FUNCTION__, (unsigned long)dev->line_interp);
+  DBG (DBG_io2, "%s: used_pixels     =%d\n", __func__, used_pixels);
+  DBG (DBG_io2, "%s: pixels          =%d\n", __func__, pixels);
+  DBG (DBG_io2, "%s: depth           =%d\n", __func__, depth);
+  DBG (DBG_io2, "%s: dev->bpl        =%lu\n", __func__, (unsigned long)dev->bpl);
+  DBG (DBG_io2, "%s: dev->len        =%lu\n", __func__, (unsigned long)dev->len);
+  DBG (DBG_io2, "%s: dev->dist       =%lu\n", __func__, (unsigned long)dev->dist);
+  DBG (DBG_io2, "%s: dev->line_interp=%lu\n", __func__, (unsigned long)dev->line_interp);
 
   words_per_line *= channels;
   dev->wpl = words_per_line;
@@ -1360,10 +1459,10 @@ gl124_init_optical_regs_scan (Genesys_Device * dev,
 
   /* MAXWD is expressed in 2 words unit */
   sanei_genesys_set_triple(reg,REG_MAXWD,(words_per_line));
-  DBG (DBG_io2, "%s: words_per_line used=%d\n", __FUNCTION__, words_per_line);
+  DBG (DBG_io2, "%s: words_per_line used=%d\n", __func__, words_per_line);
 
   sanei_genesys_set_triple(reg,REG_LPERIOD,exposure_time);
-  DBG (DBG_io2, "%s: exposure_time used=%d\n", __FUNCTION__, exposure_time);
+  DBG (DBG_io2, "%s: exposure_time used=%d\n", __func__, exposure_time);
 
   sanei_genesys_set_double(reg,REG_DUMMY,dev->sensor.dummy_pixel);
 
@@ -1371,7 +1470,7 @@ gl124_init_optical_regs_scan (Genesys_Device * dev,
   return SANE_STATUS_GOOD;
 }
 
-/* set up registers for an actual scan
+/** set up registers for an actual scan
  *
  * this function sets up the scanner to scan in normal or single line mode
  */
@@ -1379,10 +1478,10 @@ GENESYS_STATIC
 SANE_Status
 gl124_init_scan_regs (Genesys_Device * dev,
                       Genesys_Register_Set * reg,
-                      float xres,	/*dpi */
-		      float yres,	/*dpi */
-		      float startx,	/*optical_res, from dummy_pixel+1 */
-		      float starty,	/*base_ydpi, from home! */
+		      float xres,        /*dpi */
+		      float yres,        /*dpi */
+		      float startx,        /*optical_res, from dummy_pixel+1 */
+		      float starty,        /*base_ydpi, from home! */
 		      float pixels,
 		      float lines,
 		      unsigned int depth,
@@ -1407,7 +1506,7 @@ gl124_init_scan_regs (Genesys_Device * dev,
   int max_shift;
   size_t requested_buffer_size, read_buffer_size;
 
-  SANE_Bool half_ccd;		/* false: full CCD res is used, true, half max CCD res is used */
+  SANE_Bool half_ccd;                /* false: full CCD res is used, true, half max CCD res is used */
   int optical_res;
   SANE_Status status;
 
@@ -1427,7 +1526,7 @@ gl124_init_scan_regs (Genesys_Device * dev,
   optical_res = dev->sensor.optical_res;
   if (half_ccd)
     optical_res /= 2;
-  DBG (DBG_info, "%s: optical_res=%d\n", __FUNCTION__, optical_res);
+  DBG (DBG_info, "%s: optical_res=%d\n", __func__, optical_res);
 
   /* stagger */
   if ((!half_ccd) && (dev->model->flags & GENESYS_FLAG_STAGGERED_LINE))
@@ -1463,7 +1562,7 @@ gl124_init_scan_regs (Genesys_Device * dev,
 
   /* compute correct pixels number */
   used_pixels = (pixels * optical_res) / xres;
-  DBG (DBG_info, "%s: used_pixels=%d\n", __FUNCTION__, used_pixels);
+  DBG (DBG_info, "%s: used_pixels=%d\n", __func__, used_pixels);
 
   /* round up pixels number if needed */
   if (used_pixels * xres < pixels * optical_res)
@@ -1607,7 +1706,7 @@ gl124_init_scan_regs (Genesys_Device * dev,
 
 
   dev->current_setup.pixels = (used_pixels * used_res) / optical_res;
-  DBG (DBG_info, "%s: current_setup.pixels=%d\n", __FUNCTION__, dev->current_setup.pixels);
+  DBG (DBG_info, "%s: current_setup.pixels=%d\n", __func__, dev->current_setup.pixels);
   dev->current_setup.lines = lincnt;
   dev->current_setup.depth = depth;
   dev->current_setup.channels = channels;
@@ -1642,9 +1741,9 @@ gl124_calculate_current_setup (Genesys_Device * dev)
   int depth;
   int start;
 
-  float xres;			/*dpi */
-  float yres;			/*dpi */
-  float startx;			/*optical_res, from dummy_pixel+1 */
+  float xres;                        /*dpi */
+  float yres;                        /*dpi */
+  float startx;                        /*optical_res, from dummy_pixel+1 */
   float pixels;
   float lines;
 
@@ -1672,7 +1771,7 @@ gl124_calculate_current_setup (Genesys_Device * dev)
        dev->settings.tl_x, dev->settings.tl_y, dev->settings.scan_mode);
 
   /* channels */
-  if (dev->settings.scan_mode == 4)	/* single pass color */
+  if (dev->settings.scan_mode == 4)        /* single pass color */
     channels = 3;
   else
     channels = 1;
@@ -1720,11 +1819,11 @@ gl124_calculate_current_setup (Genesys_Device * dev)
 
   /* compute correct pixels number */
   used_pixels = (pixels * optical_res) / xres;
-  DBG (DBG_info, "%s: used_pixels=%d\n", __FUNCTION__, used_pixels);
+  DBG (DBG_info, "%s: used_pixels=%d\n", __func__, used_pixels);
 
   /* exposure */
   exposure_time = gl124_compute_exposure (dev, xres, half_ccd);
-  DBG (DBG_info, "%s : exposure_time=%d pixels\n", __FUNCTION__, exposure_time);
+  DBG (DBG_info, "%s : exposure_time=%d pixels\n", __func__, exposure_time);
 
   /* max_shift */
   max_shift=sanei_genesys_compute_max_shift(dev,channels,yres,0);
@@ -1740,13 +1839,13 @@ gl124_calculate_current_setup (Genesys_Device * dev)
     stagger = (4 * yres) / dev->motor.base_ydpi;
   else
     stagger = 0;
-  DBG (DBG_info, "%s: stagger=%d lines\n", __FUNCTION__, stagger);
+  DBG (DBG_info, "%s: stagger=%d lines\n", __func__, stagger);
 
   /* lincnt */
   lincnt = lines + max_shift + stagger;
 
   dev->current_setup.pixels = (used_pixels * used_res) / optical_res;
-  DBG (DBG_info, "%s: current_setup.pixels=%d\n", __FUNCTION__, dev->current_setup.pixels);
+  DBG (DBG_info, "%s: current_setup.pixels=%d\n", __func__, dev->current_setup.pixels);
   dev->current_setup.lines = lincnt;
   dev->current_setup.depth = depth;
   dev->current_setup.channels = channels;
@@ -1878,7 +1977,7 @@ gl124_stop_action (Genesys_Device * dev)
   if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_error,
-	   "%s: failed to read reg100: %s\n", __FUNCTION__,
+	   "%s: failed to read reg100: %s\n", __func__,
 	   sane_strstatus (status));
       DBGCOMPLETED;
       return status;
@@ -1887,7 +1986,7 @@ gl124_stop_action (Genesys_Device * dev)
   /* only stop action if needed */
   if (!(val40 & REG100_DATAENB) && !(val40 & REG100_MOTMFLG))
     {
-      DBG (DBG_info, "%s: already stopped\n", __FUNCTION__);
+      DBG (DBG_info, "%s: already stopped\n", __func__);
       DBGCOMPLETED;
       return SANE_STATUS_GOOD;
     }
@@ -1900,7 +1999,7 @@ gl124_stop_action (Genesys_Device * dev)
   if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_error,
-	   "%s: failed to write register 01: %s\n", __FUNCTION__,
+	   "%s: failed to write register 01: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -1918,7 +2017,7 @@ gl124_stop_action (Genesys_Device * dev)
       if (status != SANE_STATUS_GOOD)
 	{
 	  DBG (DBG_error,
-	       "%s: failed to read home sensor: %s\n", __FUNCTION__,
+	       "%s: failed to read home sensor: %s\n", __func__,
 	       sane_strstatus (status));
 	  DBGCOMPLETED;
 	  return status;
@@ -1941,6 +2040,13 @@ gl124_stop_action (Genesys_Device * dev)
 }
 
 
+/** @brief setup GPIOs for scan
+ * Setup GPIO values to drive motor (or light) needed for the
+ * target resolution
+ * @param *dev device to set up
+ * @param resolution dpi of the target scan
+ * @return SANE_STATUS_GOOD unless REG32 cannot be read
+ */
 static SANE_Status
 gl124_setup_scan_gpio(Genesys_Device *dev, int resolution)
 {
@@ -1949,17 +2055,43 @@ uint8_t val;
 
   DBGSTART;
   RIE (sanei_genesys_read_register (dev, REG32, &val));
-  if(resolution>=dev->motor.base_ydpi/2)
-    {
-      val &= 0xf7;
-    }
-  else if(resolution>=dev->motor.base_ydpi/4)
+
+  /* LiDE 110, 210 and 220 cases */
+  if(dev->model->gpo_type != GPO_CANONLIDE120)
     {
-      val &= 0xef;
+      if(resolution>=dev->motor.base_ydpi/2)
+	{
+	  val &= 0xf7;
+	}
+      else if(resolution>=dev->motor.base_ydpi/4)
+	{
+	  val &= 0xef;
+	}
+      else
+	{
+	  val |= 0x10;
+	}
     }
+  /* 120 : <=300 => 0x53 */
   else
-    {
-      val |= 0x10;
+    { /* base_ydpi is 4800 */
+      if(resolution<=300)
+	{
+	  val &= 0xf7;
+	}
+      else if(resolution<=600)
+	{
+	  val |= 0x08;
+	}
+      else if(resolution<=1200)
+	{
+	  val &= 0xef;
+	  val |= 0x08;
+	}
+      else
+	{
+	  val &= 0xf7;
+	}
     }
   val |= 0x02;
   RIE (sanei_genesys_write_register (dev, REG32, val));
@@ -2026,7 +2158,7 @@ gl124_end_scan (Genesys_Device * dev, Genesys_Register_Set * reg,
     {
       status = SANE_STATUS_GOOD;
     }
-  else				/* flat bed scanners */
+  else                                /* flat bed scanners */
     {
       status = gl124_stop_action (dev);
       if (status != SANE_STATUS_GOOD)
@@ -2043,12 +2175,51 @@ gl124_end_scan (Genesys_Device * dev, Genesys_Register_Set * reg,
 }
 
 
-/** @brief Moves the slider to the home (top) position slowly
- * */
-#ifndef UNIT_TESTING
-static
-#endif
-  SANE_Status
+/** rewind scan
+ * Move back by the same amount of distance than previous scan.
+ * @param dev device to rewind
+ * @returns SANE_STATUS_GOOD on success
+ */
+GENESYS_STATIC
+SANE_Status gl124_rewind(Genesys_Device * dev)
+{
+  SANE_Status status;
+  uint8_t byte;
+
+  DBGSTART;
+
+  /* set motor reverse */
+  RIE (sanei_genesys_read_register (dev, 0x02, &byte));
+  byte |= 0x04;
+  RIE (sanei_genesys_write_register(dev, 0x02, byte));
+
+  /* and start scan, then wait completion */
+  RIE (gl124_begin_scan (dev, dev->reg, SANE_TRUE));
+  do
+    {
+      usleep(100*1000);
+      RIE (sanei_genesys_read_register (dev, REG100, &byte));
+    }
+  while(byte & REG100_MOTMFLG);
+  RIE (gl124_end_scan (dev, dev->reg, SANE_TRUE));
+
+  /* restore direction */
+  RIE (sanei_genesys_read_register (dev, 0x02, &byte));
+  byte &= 0xfb;
+  RIE (sanei_genesys_write_register(dev, 0x02, byte));
+  DBGCOMPLETED;
+  return SANE_STATUS_GOOD;
+}
+
+
+/** Park head
+ * Moves the slider to the home (top) position slowly
+ * @param dev device to park
+ * @param wait_until_home true to make the function waiting for head
+ * to be home before returning, if fals returne immediately
+ * @returns SANE_STATUS_GOO on success */
+GENESYS_STATIC
+SANE_Status
 gl124_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
 {
   Genesys_Register_Set local_reg[GENESYS_GL124_MAX_REGS];
@@ -2083,7 +2254,7 @@ gl124_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
     {
       sanei_genesys_print_status (val);
     }
-  usleep (100000);		/* sleep 100 ms */
+  usleep (100000);                /* sleep 100 ms */
 
   /* second is reliable */
   status = sanei_genesys_get_status (dev, &val);
@@ -2102,7 +2273,7 @@ gl124_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
   /* is sensor at home? */
   if (val & HOMESNR)
     {
-      DBG (DBG_info, "%s: already at home, completed\n", __FUNCTION__);
+      DBG (DBG_info, "%s: already at home, completed\n", __func__);
       dev->scanhead_position_in_steps = 0;
       DBGCOMPLETED;
       return SANE_STATUS_GOOD;
@@ -2114,7 +2285,7 @@ gl124_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
       status = gl124_feed (dev, 20, SANE_TRUE);
       if (status != SANE_STATUS_GOOD)
         {
-          DBG (DBG_error, "%s: failed to do initial feed: %s\n", __FUNCTION__, sane_strstatus (status));
+          DBG (DBG_error, "%s: failed to do initial feed: %s\n", __func__, sane_strstatus (status));
           return status;
         }
     }
@@ -2176,7 +2347,7 @@ gl124_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
   if (wait_until_home)
     {
 
-      while (loop < 300)	/* do not wait longer then 30 seconds */
+      while (loop < 300)        /* do not wait longer then 30 seconds */
 	{
 	  status = sanei_genesys_get_status (dev, &val);
 	  if (status != SANE_STATUS_GOOD)
@@ -2187,14 +2358,14 @@ gl124_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
 	      return status;
 	    }
 
-	  if (val & HOMESNR)	/* home sensor */
+	  if (val & HOMESNR)        /* home sensor */
 	    {
 	      DBG (DBG_info, "gl124_slow_back_home: reached home position\n");
 	      DBGCOMPLETED;
               dev->scanhead_position_in_steps = 0;
 	      return SANE_STATUS_GOOD;
 	    }
-	  usleep (100000);	/* sleep 100 ms */
+	  usleep (100000);        /* sleep 100 ms */
 	  ++loop;
 	}
 
@@ -2228,7 +2399,7 @@ gl124_feed (Genesys_Device * dev, unsigned int steps, int reverse)
   uint8_t val;
 
   DBGSTART;
-  DBG (DBG_io, "%s: steps=%d\n", __FUNCTION__, steps);
+  DBG (DBG_io, "%s: steps=%d\n", __func__, steps);
 
   /* prepare local registers */
   memcpy (local_reg, dev->reg, GENESYS_GL124_MAX_REGS * sizeof (Genesys_Register_Set));
@@ -2254,7 +2425,7 @@ gl124_feed (Genesys_Device * dev, unsigned int steps, int reverse)
                                  SCAN_FLAG_IGNORE_LINE_DISTANCE);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to set up registers: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to set up registers: %s\n", __func__, sane_strstatus (status));
       DBGCOMPLETED;
       return status;
     }
@@ -2273,7 +2444,7 @@ gl124_feed (Genesys_Device * dev, unsigned int steps, int reverse)
   r->value &= ~REG01_SCAN;
 
   /* set up for reverse if needed */
-  if(reverse) 
+  if(reverse)
     {
       r = sanei_genesys_get_address (local_reg, REG02);
       r->value |= REG02_MTRREV;
@@ -2285,7 +2456,7 @@ gl124_feed (Genesys_Device * dev, unsigned int steps, int reverse)
   status = gl124_start_action (dev);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to start motor: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to start motor: %s\n", __func__, sane_strstatus (status));
       gl124_stop_action (dev);
 
       /* restore original registers */
@@ -2336,14 +2507,14 @@ gl124_search_start_position (Genesys_Device * dev)
                                  dpi,
                                  dpi,
                                  0,
-                                 0,	/*we should give a small offset here~60 steps */
+				 0,        /*we should give a small offset here~60 steps */
 				 600,
                                  dev->model->search_lines,
                                  8,
                                  1,
                                  dev->settings.scan_method,
                                  SCAN_MODE_GRAY,
-                                 1,	/*green */
+				 1,        /*green */
 				 SCAN_FLAG_DISABLE_SHADING |
 				 SCAN_FLAG_DISABLE_GAMMA |
 				 SCAN_FLAG_IGNORE_LINE_DISTANCE |
@@ -2351,7 +2522,7 @@ gl124_search_start_position (Genesys_Device * dev)
   if (status!=SANE_STATUS_GOOD)
     {
       DBG (DBG_error,
-	   "%s: failed to init scan registers: %s\n", __FUNCTION__,
+	   "%s: failed to init scan registers: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -2448,10 +2619,10 @@ gl124_init_regs_for_coarse_calibration (Genesys_Device * dev)
   uint8_t cksel;
 
   DBGSTART;
-  cksel = (dev->calib_reg[reg_0x18].value & REG18_CKSEL) + 1;	/* clock speed = 1..4 clocks */
+  cksel = (dev->calib_reg[reg_0x18].value & REG18_CKSEL) + 1;        /* clock speed = 1..4 clocks */
 
   /* set line size */
-  if (dev->settings.scan_mode == SCAN_MODE_COLOR)	/* single pass color */
+  if (dev->settings.scan_mode == SCAN_MODE_COLOR)        /* single pass color */
     channels = 3;
   else
     channels = 1;
@@ -2540,7 +2711,7 @@ gl124_init_regs_for_shading (Genesys_Device * dev)
       move = SANE_UNFIX (dev->model->y_offset_calib);
       move = (move * (dev->motor.base_ydpi/4)) / MM_PER_INCH;
     }
-  DBG (DBG_io, "%s: move=%d steps\n", __FUNCTION__, move);
+  DBG (DBG_io, "%s: move=%d steps\n", __func__, move);
 
   status = gl124_init_scan_regs (dev,
 				 dev->calib_reg,
@@ -2563,7 +2734,7 @@ gl124_init_regs_for_shading (Genesys_Device * dev)
 
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to setup scan: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to setup scan: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -2574,7 +2745,7 @@ gl124_init_regs_for_shading (Genesys_Device * dev)
   if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_error,
-	   "%s: failed to bulk write registers: %s\n", __FUNCTION__,
+	   "%s: failed to bulk write registers: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -2613,14 +2784,14 @@ gl124_init_regs_for_scan (Genesys_Device * dev)
   status = sanei_genesys_get_status (dev, &val);
   if (status != SANE_STATUS_GOOD)
    {
-     DBG (DBG_error, "%s: failed to read status: %s\n", __FUNCTION__, sane_strstatus (status));
+     DBG (DBG_error, "%s: failed to read status: %s\n", __func__, sane_strstatus (status));
      DBGCOMPLETED;
      return status;
    }
   status = sanei_genesys_read_register (dev, REG100, &val40);
   if (status != SANE_STATUS_GOOD)
    {
-     DBG (DBG_error, "%s: failed to read reg100: %s\n", __FUNCTION__, sane_strstatus (status));
+     DBG (DBG_error, "%s: failed to read reg100: %s\n", __func__, sane_strstatus (status));
      DBGCOMPLETED;
      return status;
    }
@@ -2632,14 +2803,14 @@ gl124_init_regs_for_scan (Genesys_Device * dev)
           status = sanei_genesys_get_status (dev, &val);
           if (status != SANE_STATUS_GOOD)
            {
-             DBG (DBG_error, "%s: failed to read status: %s\n", __FUNCTION__, sane_strstatus (status));
+             DBG (DBG_error, "%s: failed to read status: %s\n", __func__, sane_strstatus (status));
              DBGCOMPLETED;
              return status;
            }
           status = sanei_genesys_read_register (dev, REG100, &val40);
           if (status != SANE_STATUS_GOOD)
            {
-             DBG (DBG_error, "%s: failed to read reg100: %s\n", __FUNCTION__, sane_strstatus (status));
+             DBG (DBG_error, "%s: failed to read reg100: %s\n", __func__, sane_strstatus (status));
              DBGCOMPLETED;
              return status;
            }
@@ -2666,14 +2837,14 @@ gl124_init_regs_for_scan (Genesys_Device * dev)
   move = SANE_UNFIX (dev->model->y_offset);
   move += dev->settings.tl_y;
   move = (move * move_dpi) / MM_PER_INCH;
-  DBG (DBG_info, "%s: move=%f steps\n", __FUNCTION__, move);
+  DBG (DBG_info, "%s: move=%f steps\n", __func__, move);
 
   if(channels*dev->settings.yres>=600 && move>700)
     {
       status = gl124_feed (dev, move-500, SANE_FALSE);
       if (status != SANE_STATUS_GOOD)
         {
-          DBG (DBG_error, "%s: failed to move to scan area\n",__FUNCTION__);
+          DBG (DBG_error, "%s: failed to move to scan area\n",__func__);
           return status;
         }
       move=500;
@@ -2737,7 +2908,7 @@ gl124_send_shading_data (Genesys_Device * dev, uint8_t * data, int size)
   uint8_t val,*buffer,*ptr,*src;
 
   DBGSTART;
-  DBG( DBG_io2, "%s: writing %d bytes of shading data\n",__FUNCTION__,size);
+  DBG( DBG_io2, "%s: writing %d bytes of shading data\n",__func__,size);
 
   /* logical size of a color as seen by generic code of the frontend */
   length = (uint32_t) (size / 3);
@@ -2748,13 +2919,13 @@ gl124_send_shading_data (Genesys_Device * dev, uint8_t * data, int size)
     {
       endpixel=segcnt;
     }
-  DBG( DBG_io2, "%s: STRPIXEL=%d, ENDPIXEL=%d, PIXELS=%d, SEGCNT=%d\n",__FUNCTION__,strpixel,endpixel,endpixel-strpixel,segcnt);
+  DBG( DBG_io2, "%s: STRPIXEL=%d, ENDPIXEL=%d, PIXELS=%d, SEGCNT=%d\n",__func__,strpixel,endpixel,endpixel-strpixel,segcnt);
 
   /* compute deletion factor */
   sanei_genesys_get_double(dev->reg,REG_DPISET,&dpiset);
   dpihw=sanei_genesys_compute_dpihw(dev,dpiset);
   factor=dpihw/dpiset;
-  DBG( DBG_io2, "%s: factor=%d\n",__FUNCTION__,factor);
+  DBG( DBG_io2, "%s: factor=%d\n",__func__,factor);
 
   /* binary data logging */
   if(DBG_LEVEL>=DBG_data)
@@ -2774,7 +2945,7 @@ gl124_send_shading_data (Genesys_Device * dev, uint8_t * data, int size)
   segcnt*=2*2;
   pixels=endpixel-strpixel;
 
-  DBG( DBG_io2, "%s: using chunks of %d bytes (%d shading data pixels)\n",__FUNCTION__,length, length/4);
+  DBG( DBG_io2, "%s: using chunks of %d bytes (%d shading data pixels)\n",__func__,length, length/4);
   buffer=(uint8_t *)malloc(pixels*dev->segnb);
   memset(buffer,0,pixels*dev->segnb);
 
@@ -2892,7 +3063,7 @@ move_to_calibration_area (Genesys_Device * dev)
 				 SCAN_FLAG_IGNORE_LINE_DISTANCE);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to setup scan: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to setup scan: %s\n", __func__, sane_strstatus (status));
       return status;
     }
 
@@ -2904,7 +3075,7 @@ move_to_calibration_area (Genesys_Device * dev)
   /* write registers and scan data */
   RIEF (dev->model->cmd_set->bulk_write_register (dev, dev->calib_reg, GENESYS_GL124_MAX_REGS), line);
 
-  DBG (DBG_info, "%s: starting line reading\n", __FUNCTION__);
+  DBG (DBG_info, "%s: starting line reading\n", __func__);
   RIEF (gl124_begin_scan (dev, dev->calib_reg, SANE_TRUE), line);
   RIEF (sanei_genesys_read_data_from_scanner (dev, line, size), line);
 
@@ -2992,11 +3163,11 @@ gl124_led_calibration (Genesys_Device * dev)
 				 SCAN_FLAG_IGNORE_LINE_DISTANCE);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to setup scan: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to setup scan: %s\n", __func__, sane_strstatus (status));
       return status;
     }
 
-  total_size = num_pixels * channels * (depth/8) * 1;	/* colors * bytes_per_color * scan lines */
+  total_size = num_pixels * channels * (depth/8) * 1;        /* colors * bytes_per_color * scan lines */
   line = malloc (total_size);
   if (!line)
     return SANE_STATUS_NO_MEM;
@@ -3190,7 +3361,7 @@ gl124_offset_calibration (Genesys_Device * dev)
   gl124_set_motor_power (dev->calib_reg, SANE_FALSE);
 
   /* allocate memory for scans */
-  total_size = pixels * channels * lines * (bpp/8);	/* colors * bytes_per_color * scan lines */
+  total_size = pixels * channels * lines * (bpp/8);        /* colors * bytes_per_color * scan lines */
 
   first_line = malloc (total_size);
   if (!first_line)
@@ -3503,7 +3674,7 @@ gl124_init_regs_for_warmup (Genesys_Device * dev,
 
   num_pixels = dev->current_setup.pixels;
 
-  *total_size = num_pixels * 3 * 1;	/* colors * bytes_per_color * scan lines */
+  *total_size = num_pixels * 3 * 1;        /* colors * bytes_per_color * scan lines */
 
   gl124_set_motor_power (reg, SANE_FALSE);
   RIE (dev->model->cmd_set->bulk_write_register (dev, reg, GENESYS_GL124_MAX_REGS));
@@ -3512,12 +3683,10 @@ gl124_init_regs_for_warmup (Genesys_Device * dev,
   return SANE_STATUS_GOOD;
 }
 
-/**
+/** @brief default GPIO values
  * set up GPIO/GPOE for idle state
-WRITE GPIO[17-21]= GPIO19
-WRITE GPOE[17-21]= GPOE21 GPOE20 GPOE19 GPOE18
-genesys_write_register(0xa8,0x3e)
-GPIO(0xa8)=0x3e
+ * @param dev device to set up
+ * @return SANE_STATUS_GOOD unless a GPIO register cannot be written
  */
 static SANE_Status
 gl124_init_gpio (Genesys_Device * dev)
@@ -3528,13 +3697,16 @@ gl124_init_gpio (Genesys_Device * dev)
   DBGSTART;
 
   /* per model GPIO layout */
-  if ((strcmp (dev->model->name, "canon-lide-110") == 0)
-    ||(strcmp (dev->model->name, "canon-lide-120") == 0))
+  if (strcmp (dev->model->name, "canon-lide-110") == 0)
     {
       idx = 0;
     }
+  else if (strcmp (dev->model->name, "canon-lide-110") == 0)
+    {
+      idx = 2;
+    }
   else
-    {				/* canon LiDE 210 and 220 case */
+    {                                /* canon LiDE 210 and 220 case */
       idx = 1;
     }
 
@@ -3568,7 +3740,7 @@ gl124_init_memory_layout (Genesys_Device * dev)
       idx = 0;
     }
   else
-    {				/* canon LiDE 210 and 220 case */
+    {                                /* canon LiDE 210 and 220 case */
       idx = 1;
     }
 
@@ -3587,18 +3759,18 @@ gl124_init_memory_layout (Genesys_Device * dev)
   /* size for each buffer is 0x16d*1k word */
   sanei_genesys_write_register (dev, 0xe0, layouts[idx].re0);
   sanei_genesys_write_register (dev, 0xe1, layouts[idx].re1);
-/* R-Channel ODD image buffer end-address 0x0291->0x148800 => size=0xB6800*/
+  /* R-Channel ODD image buffer end-address 0x0291->0x148800 => size=0xB6800*/
   sanei_genesys_write_register (dev, 0xe2, layouts[idx].re2);
   sanei_genesys_write_register (dev, 0xe3, layouts[idx].re3);
 
   /* R-Channel EVEN image buffer 0x0292 */
   sanei_genesys_write_register (dev, 0xe4, layouts[idx].re4);
   sanei_genesys_write_register (dev, 0xe5, layouts[idx].re5);
-/* R-Channel EVEN image buffer end-address 0x03ff*/
+  /* R-Channel EVEN image buffer end-address 0x03ff*/
   sanei_genesys_write_register (dev, 0xe6, layouts[idx].re6);
   sanei_genesys_write_register (dev, 0xe7, layouts[idx].re7);
 
-/* same for green, since CIS, same addresses */
+  /* same for green, since CIS, same addresses */
   sanei_genesys_write_register (dev, 0xe8, layouts[idx].re0);
   sanei_genesys_write_register (dev, 0xe9, layouts[idx].re1);
   sanei_genesys_write_register (dev, 0xea, layouts[idx].re2);
@@ -3725,7 +3897,8 @@ gl124_update_hardware_sensors (Genesys_Scanner * s)
    * add another per scanner button profile struct to avoid growing
    * hard-coded button mapping here.
    */
-  if(s->dev->model->gpo_type == GPO_CANONLIDE110)
+  if((s->dev->model->gpo_type == GPO_CANONLIDE110)
+    ||(s->dev->model->gpo_type == GPO_CANONLIDE120))
     {
       if (s->val[OPT_SCAN_SW].b == s->last_val[OPT_SCAN_SW].b)
         s->val[OPT_SCAN_SW].b = (val & 0x01) == 0;
@@ -3755,7 +3928,7 @@ gl124_update_hardware_sensors (Genesys_Scanner * s)
 
 /** the gl124 command set */
 static Genesys_Command_Set gl124_cmd_set = {
-  "gl124-generic",		/* the name of this set */
+  "gl124-generic",                /* the name of this set */
 
   gl124_init,
   gl124_init_regs_for_warmup,
@@ -3792,6 +3965,7 @@ static Genesys_Command_Set gl124_cmd_set = {
   gl124_led_calibration,
 
   gl124_slow_back_home,
+  gl124_rewind,
 
   sanei_genesys_bulk_write_register,
   NULL,
diff --git a/backend/genesys_gl124.h b/backend/genesys_gl124.h
index 25f99c3..9ca6afd 100644
--- a/backend/genesys_gl124.h
+++ b/backend/genesys_gl124.h
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2010-2013 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2010-2016 Stéphane Voltz <stef.dev@free.fr>
 
    This file is part of the SANE package.
 
@@ -44,71 +44,71 @@
 #include "genesys.h"
 
 #define REG01           0x01
-#define REG01_CISSET	0x80
-#define REG01_DOGENB	0x40
-#define REG01_DVDSET	0x20
+#define REG01_CISSET    0x80
+#define REG01_DOGENB    0x40
+#define REG01_DVDSET    0x20
 #define REG01_STAGGER   0x10
-#define REG01_COMPENB	0x08
+#define REG01_COMPENB   0x08
 #define REG01_TRUEGRAY  0x04
-#define REG01_SHDAREA	0x02
-#define REG01_SCAN	0x01
-
-#define REG02        	0x02
-#define REG02_NOTHOME	0x80
-#define REG02_ACDCDIS	0x40
-#define REG02_AGOHOME	0x20
-#define REG02_MTRPWR	0x10
-#define REG02_FASTFED	0x08
-#define REG02_MTRREV	0x04
-#define REG02_HOMENEG	0x02
-#define REG02_LONGCURV	0x01
+#define REG01_SHDAREA   0x02
+#define REG01_SCAN      0x01
+
+#define REG02           0x02
+#define REG02_NOTHOME   0x80
+#define REG02_ACDCDIS   0x40
+#define REG02_AGOHOME   0x20
+#define REG02_MTRPWR    0x10
+#define REG02_FASTFED   0x08
+#define REG02_MTRREV    0x04
+#define REG02_HOMENEG   0x02
+#define REG02_LONGCURV  0x01
 
 #define REG03           0x03
-#define REG03_LAMPDOG	0x80
-#define REG03_AVEENB	0x40
-#define REG03_XPASEL	0x20
-#define REG03_LAMPPWR	0x10
-#define REG03_LAMPTIM	0x0f
-
-#define REG04        	0x04
-#define REG04_LINEART	0x80
-#define REG04_BITSET	0x40
-#define REG04_FILTER	0x30
+#define REG03_LAMPDOG   0x80
+#define REG03_AVEENB    0x40
+#define REG03_XPASEL    0x20
+#define REG03_LAMPPWR   0x10
+#define REG03_LAMPTIM   0x0f
+
+#define REG04           0x04
+#define REG04_LINEART   0x80
+#define REG04_BITSET    0x40
+#define REG04_FILTER    0x30
 #define REG04_AFEMOD    0x07
 
-#define REG05 		0x05
-#define REG05_DPIHW	0xc0
-#define REG05_DPIHW_600	0x00
-#define REG05_DPIHW_1200	0x40
-#define REG05_DPIHW_2400	0x80
-#define REG05_DPIHW_4800	0xc0
-#define REG05_MTLLAMP	0x30
-#define REG05_GMMENB	0x08
-#define REG05_ENB20M	0x04
-#define REG05_MTLBASE	0x03
-
-#define REG06 		0x06
-#define REG06_SCANMOD	0xe0
-#define REG06S_SCANMOD	5
-#define REG06_PWRBIT	0x10
-#define REG06_GAIN4	0x08
-#define REG06_OPTEST	0x07
-
-#define	REG07_LAMPSIM	0x80
-
-#define REG08_DRAM2X 	0x80
+#define REG05           0x05
+#define REG05_DPIHW     0xc0
+#define REG05_DPIHW_600  0x00
+#define REG05_DPIHW_1200 0x40
+#define REG05_DPIHW_2400 0x80
+#define REG05_DPIHW_4800 0xc0
+#define REG05_MTLLAMP   0x30
+#define REG05_GMMENB    0x08
+#define REG05_ENB20M    0x04
+#define REG05_MTLBASE   0x03
+
+#define REG06           0x06
+#define REG06_SCANMOD   0xe0
+#define REG06S_SCANMOD     5
+#define REG06_PWRBIT    0x10
+#define REG06_GAIN4     0x08
+#define REG06_OPTEST    0x07
+
+#define REG07_LAMPSIM   0x80
+
+#define REG08_DRAM2X    0x80
 #define REG08_MPENB     0x20
 #define REG08_CIS_LINE  0x10
 #define REG08_IR2_ENB   0x08
 #define REG08_IR1_ENB   0x04
 #define REG08_ENB24M    0x01
 
-#define REG09_MCNTSET	0xc0
+#define REG09_MCNTSET   0xc0
 #define REG09_EVEN1ST   0x20
 #define REG09_BLINE1ST  0x10
-#define REG09_BACKSCAN	0x08
-#define REG09_OUTINV 	0x04
-#define REG09_SHORTTG	0x02
+#define REG09_BACKSCAN  0x08
+#define REG09_OUTINV    0x04
+#define REG09_SHORTTG   0x02
 
 #define REG09S_MCNTSET  6
 #define REG09S_CLKSET   4
@@ -136,55 +136,55 @@
 #define REG0B_48MHZ     0x60
 #define REG0B_60MHZ     0x80
 
-#define REG0D 		0x0d
+#define REG0D           0x0d
 #define REG0D_MTRP_RDY  0x80
 #define REG0D_FULLSTP   0x10
 #define REG0D_CLRMCNT   0x04
 #define REG0D_CLRDOCJM  0x02
-#define REG0D_CLRLNCNT	0x01
-
-#define REG0F 		0x0f
-
-#define REG16_CTRLHI	0x80
-#define REG16_TOSHIBA	0x40
-#define REG16_TGINV	0x20
-#define REG16_CK1INV	0x10
-#define REG16_CK2INV	0x08
-#define REG16_CTRLINV	0x04
-#define REG16_CKDIS	0x02
-#define REG16_CTRLDIS	0x01
-
-#define REG17_TGMODE	0xc0
-#define REG17_SNRSYN	0x0f
-
-#define REG18 		0x18
-#define REG18_CNSET	0x80
-#define REG18_DCKSEL	0x60
-#define REG18_CKTOGGLE	0x10
-#define REG18_CKDELAY	0x0c
-#define REG18_CKSEL	0x03
-
-#define REG1A_SW2SET 	0x80
-#define REG1A_SW1SET 	0x40
-#define REG1A_MANUAL3	0x02
-#define REG1A_MANUAL1	0x01
-#define REG1A_CK4INV	0x08
-#define REG1A_CK3INV	0x04
-#define REG1A_LINECLP	0x02
+#define REG0D_CLRLNCNT  0x01
+
+#define REG0F           0x0f
+
+#define REG16_CTRLHI    0x80
+#define REG16_TOSHIBA   0x40
+#define REG16_TGINV     0x20
+#define REG16_CK1INV    0x10
+#define REG16_CK2INV    0x08
+#define REG16_CTRLINV   0x04
+#define REG16_CKDIS     0x02
+#define REG16_CTRLDIS   0x01
+
+#define REG17_TGMODE    0xc0
+#define REG17_SNRSYN    0x0f
+
+#define REG18           0x18
+#define REG18_CNSET     0x80
+#define REG18_DCKSEL    0x60
+#define REG18_CKTOGGLE  0x10
+#define REG18_CKDELAY   0x0c
+#define REG18_CKSEL     0x03
+
+#define REG1A_SW2SET    0x80
+#define REG1A_SW1SET    0x40
+#define REG1A_MANUAL3   0x02
+#define REG1A_MANUAL1   0x01
+#define REG1A_CK4INV    0x08
+#define REG1A_CK3INV    0x04
+#define REG1A_LINECLP   0x02
 
 #define REG1C_TBTIME    0x07
 
-#define REG1D       	0x1d
-#define REG1D_CK4LOW	0x80
-#define REG1D_CK3LOW	0x40
-#define REG1D_CK1LOW	0x20
-#define REG1D_LINESEL	0x1f
+#define REG1D           0x1d
+#define REG1D_CK4LOW    0x80
+#define REG1D_CK3LOW    0x40
+#define REG1D_CK1LOW    0x20
+#define REG1D_LINESEL   0x1f
 #define REG1DS_LINESEL  0
 
 #define REG1E           0x1e
-#define REG1E_WDTIME	0xf0
+#define REG1E_WDTIME    0xf0
 #define REG1ES_WDTIME   4
-#define REG1E_WDTIME	0xf0
+#define REG1E_WDTIME    0xf0
 
 #define REG30           0x30
 #define REG31           0x31
@@ -243,18 +243,18 @@
 #define REGB1           0xb1
 
 #define REGB2           0xb2
-#define REGB2_Z1MOD	0x1f
+#define REGB2_Z1MOD     0x1f
 #define REGB3           0xb3
-#define REGB3_Z1MOD	0xff
+#define REGB3_Z1MOD     0xff
 #define REGB4           0xb4
-#define REGB4_Z1MOD	0xff
+#define REGB4_Z1MOD     0xff
 
 #define REGB5           0xb5
-#define REGB5_Z2MOD	0x1f
+#define REGB5_Z2MOD     0x1f
 #define REGB6           0xb6
-#define REGB6_Z2MOD	0xff
+#define REGB6_Z2MOD     0xff
 #define REGB7           0xb7
-#define REGB7_Z2MOD	0xff
+#define REGB7_Z2MOD     0xff
 
 #define REG100          0x100
 #define REG100_DOCSNR   0x80
@@ -537,6 +537,7 @@ typedef struct
 
 /** @brief gpio layout
  * describes initial gpio settings for a given model
+ * registers 0x31 to 0x38
  */
 static Gpio_layout gpios[]={
 	/* LiDE 110 */
@@ -547,6 +548,10 @@ static Gpio_layout gpios[]={
 	{
 		0x9f, 0x59, 0x01, 0x80, 0x5f, 0x01, 0x00
 	},
+	/* LiDE 120 */
+	{
+		0x9f, 0x53, 0x01, 0x80, 0x5f, 0x01, 0x00
+	},
 };
 
 typedef struct
@@ -565,12 +570,13 @@ typedef struct
 } Memory_layout;
 
 static Memory_layout layouts[]={
-	/* LIDE 110 */
-	{
+	/* LIDE 110, 120 */
+	{    /* 0xd0 0xd1 0xd2 */
 		0x0a, 0x15, 0x20,
+	     /* 0xe0  0xe1  0xe2  0xe3  0xe4  0xe5  0xe6  0xe7 */
 		0x00, 0xac, 0x08, 0x55, 0x08, 0x56, 0x0f, 0xff
 	},
-	/* LIDE 210 */
+	/* LIDE 210, 220 */
 	{
 		0x0a, 0x1f, 0x34,
 		0x01, 0x24, 0x08, 0x91, 0x08, 0x92, 0x0f, 0xff
@@ -590,8 +596,8 @@ typedef struct {
   int half_ccd;         /**> half ccd mode  */
   int exposure;         /**> exposure */
   int ck1map;           /**> CK1MAP */
-  int ck3map;           /**> CK2MAP */
-  int ck4map;           /**> CK3MAP */
+  int ck3map;           /**> CK3MAP */
+  int ck4map;           /**> CK4MAP */
   int segcnt;           /**> SEGCNT */
   int tg0cnt;           /**> TG0CNT */
   int expdummy;         /**> exposure dummy */
@@ -603,6 +609,8 @@ typedef struct {
   uint8_t reg20;        /**> register 0x20 value */
   uint8_t reg61;        /**> register 0x61 value */
   uint8_t reg98;        /**> register 0x98 value */
+  uint8_t reg16;        /**> register 0x16 value */
+  uint8_t reg70;        /**> register 0x70 value */
 } Sensor_Profile;
 
 static size_t order_01[]={0,1};
@@ -610,58 +618,68 @@ static size_t order_0213[]={0,2,1,3};
 
 /* *INDENT-OFF* */
 
-/**
- * database of sensor profiles
+/** @brief database of sensor profiles
+ * database of sensor profiles giving for each sensor and a given resolution, the period, and timings
+ * to setup the sensor for the scan.
  */
 static Sensor_Profile sensors[]={
         /* LiDE 110 */
-	{CIS_CANONLIDE110,  600, 1,  2768, 0x1e, 0x9f, 0x55, 2584, 154,  101,  388,  574,  393, NULL      , 0x00, 0x0c, 0x20, 0x21},
-	{CIS_CANONLIDE110,  600, 0,  5360, 0x1e, 0x9f, 0x55, 5168, 163,  101,  388,  574,  393, NULL      , 0x00, 0x0a, 0x20, 0x21},
-	{CIS_CANONLIDE110, 1200, 0, 10528, 0x1e, 0x9f, 0x55, 5168, 163,  101,  388,  574,  393, order_01  , 0x00, 0x08, 0x20, 0x22},
-	{CIS_CANONLIDE110, 2400, 0, 20864, 0x1e, 0x9f, 0x55, 5168, 163, 4679, 6839, 8401, 6859, order_0213, 0x00, 0x06, 0x20, 0x24},
+	{CIS_CANONLIDE110,  600, 1,  2768, 0x1e, 0x9f, 0x55, 2584, 154,  101,  388,  574,  393, NULL      , 0x00, 0x0c, 0x20, 0x21, 0x00, 0x00},
+	{CIS_CANONLIDE110,  600, 0,  5360, 0x1e, 0x9f, 0x55, 5168, 163,  101,  388,  574,  393, NULL      , 0x00, 0x0a, 0x20, 0x21, 0x00, 0x00},
+	{CIS_CANONLIDE110, 1200, 0, 10528, 0x1e, 0x9f, 0x55, 5168, 163,  101,  388,  574,  393, order_01  , 0x00, 0x08, 0x20, 0x22, 0x00, 0x00},
+	{CIS_CANONLIDE110, 2400, 0, 20864, 0x1e, 0x9f, 0x55, 5168, 163, 4679, 6839, 8401, 6859, order_0213, 0x00, 0x06, 0x20, 0x24, 0x00, 0x00},
 
-        /* LiDE 120 */
-	{CIS_CANONLIDE120,  600, 1,  2768, 0x0f, 0x9f, 0x55, 2552, 112,   94,  388,  574,  393, NULL      , 0x00, 0x02, 0x20, 0x21},
-	{CIS_CANONLIDE120,  600, 0,  5360, 0x0f, 0x9f, 0x55, 5168, 163,   94,  388,  574,  393, NULL      , 0x00, 0x0a, 0x20, 0x21},
-	{CIS_CANONLIDE120, 1200, 0, 10528, 0x0f, 0x9f, 0x55, 5168, 163,   94,  388,  574,  393, order_01  , 0x00, 0x08, 0x20, 0x22},
-	{CIS_CANONLIDE120, 2400, 0, 20864, 0x0f, 0x9f, 0x55, 5168, 163, 4679, 6839, 8401, 6859, order_0213, 0x00, 0x06, 0x20, 0x24},
+	/* LiDE 120 */
+	{CIS_CANONLIDE120,  600, 1,  4608, 0x0f, 0x00, 0x55, 2552, 112,   94,  894, 1044,  994, NULL      , 0x00, 0x02, 0x20, 0x21, 0x15, 0x00},
+	{CIS_CANONLIDE120,  600, 0,  5360, 0x0f, 0x00, 0x55, 5104, 139,   94, 1644, 1994, 1844, NULL      , 0x00, 0x02, 0x20, 0x21, 0x11, 0x1f},
+	{CIS_CANONLIDE120, 1200, 0, 10528, 0x0f, 0x00, 0x55,10208, 192,   94, 3194, 3794, 3594, NULL      , 0x00, 0x02, 0x20, 0x21, 0x15, 0x1f},
+	{CIS_CANONLIDE120, 2400, 0, 20864, 0x0f, 0x00, 0x55,20416, 298,   94, 6244, 7544, 7094, NULL      , 0x00, 0x02, 0x20, 0x21, 0x11, 0x00},
 
         /* LiDE 210 */
-	{CIS_CANONLIDE210,  600, 1,  2768, 0x1e, 0x9f, 0x55, 2584, 154,  101,  388,  574,  393, NULL      , 0x00, 0x0c, 0x20, 0x21},
-	{CIS_CANONLIDE210,  600, 0,  5360, 0x1e, 0x9f, 0x55, 5168, 163,  101,  388,  574,  393, NULL      , 0x00, 0x0a, 0x20, 0x21},
-	{CIS_CANONLIDE210, 1200, 0, 10528, 0x1e, 0x9f, 0x55, 5168, 163,  101,  388,  574,  393, order_01  , 0x00, 0x08, 0x20, 0x22},
-	{CIS_CANONLIDE210, 2400, 0, 20864, 0x1e, 0x9f, 0x55, 5168, 163, 4679, 6839, 8401, 6859, order_0213, 0x00, 0x06, 0x20, 0x24},
+	{CIS_CANONLIDE210,  600, 1,  2768, 0x1e, 0x9f, 0x55, 2584, 154,  101,  388,  574,  393, NULL      , 0x00, 0x0c, 0x20, 0x21, 0x00, 0x00},
+	{CIS_CANONLIDE210,  600, 0,  5360, 0x1e, 0x9f, 0x55, 5168, 163,  101,  388,  574,  393, NULL      , 0x00, 0x0a, 0x20, 0x21, 0x00, 0x00},
+	{CIS_CANONLIDE210, 1200, 0, 10528, 0x1e, 0x9f, 0x55, 5168, 163,  101,  388,  574,  393, order_01  , 0x00, 0x08, 0x20, 0x22, 0x00, 0x00},
+	{CIS_CANONLIDE210, 2400, 0, 20864, 0x1e, 0x9f, 0x55, 5168, 163, 4679, 6839, 8401, 6859, order_0213, 0x00, 0x06, 0x20, 0x24, 0x00, 0x00},
 
         /* LiDE 220 */
-	{CIS_CANONLIDE220,  600, 1,  2768, 0x0f, 0x9f, 0x55, 2584, 154,  101,  388,  574,  393, NULL      , 0x00, 0x0c, 0x20, 0x21},
-	{CIS_CANONLIDE220,  600, 0,  5360, 0x0f, 0x9f, 0x55, 5168, 163,  101,  388,  574,  393, NULL      , 0x00, 0x0a, 0x20, 0x21},
-	{CIS_CANONLIDE220, 1200, 0, 10528, 0x0f, 0x9f, 0x55, 5168, 163,  101,  388,  574,  393, order_01  , 0x00, 0x08, 0x20, 0x22},
-	{CIS_CANONLIDE220, 2400, 0, 20864, 0x0f, 0x9f, 0x55, 5168, 163, 4679, 6839, 8401, 6859, order_0213, 0x00, 0x06, 0x20, 0x24},
+	{CIS_CANONLIDE220,  600, 1,  2768, 0x0f, 0x9f, 0x55, 2584, 154,  101,  388,  574,  393, NULL      , 0x00, 0x0c, 0x20, 0x21, 0x00, 0x00},
+	{CIS_CANONLIDE220,  600, 0,  5360, 0x0f, 0x9f, 0x55, 5168, 163,  101,  388,  574,  393, NULL      , 0x00, 0x0a, 0x20, 0x21, 0x00, 0x00},
+	{CIS_CANONLIDE220, 1200, 0, 10528, 0x0f, 0x9f, 0x55, 5168, 163,  101,  388,  574,  393, order_01  , 0x00, 0x08, 0x20, 0x22, 0x00, 0x00},
+	{CIS_CANONLIDE220, 2400, 0, 20864, 0x0f, 0x9f, 0x55, 5168, 163, 4679, 6839, 8401, 6859, order_0213, 0x00, 0x06, 0x20, 0x24, 0x00, 0x00},
 };
 
 
 #define MOVE_DPI 200
 #define MOVE_EXPOSURE 2304
-
+/** @brief reference slope tables
+ * slope table directly extracted from USB logs, with a 'termination' value of 0.
+ */
 static uint32_t lide210_fast[] = { 62496, 2343, 2343, 2343, 2343, 2343, 2343, 2343, 2343, 2051, 1432, 1372, 1323, 1280, 1246, 1216, 1188, 1163, 1142, 1121, 1101, 1084, 1068, 1051, 1036, 1020, 1007, 995, 983, 971, 959, 949, 938, 929, 917, 908, 900, 891, 882, 874, 866, 857, 849, 843, 835, 829, 821, 816, 808, 802, 795, 789, 784, 778, 773, 765, 760, 755, 749, 744, 739, 734, 731, 726, 721, 716, 711, 707, 702, 698, 693, 690, 685, 682, 677, 672, 669, 665, 662, 657, 654, 650, 647, 644, 639, 637, 632, 629, 626, 622, 619, 617, 614, 610, 607, 604, 601, 599, 595, 592, 589, 587, 584, 581, 579, 576, 572, 570, 567, 564, 562, 559, 557, 554, 552, 549, 547, 544, 542, 539, 538, 536, 533, 531, 529, 526, 524, 522, 519, 518, 516, 513, 511, 509, 506, 505, 503, 501, 498, 497, 495, 493, 491, 490, 487, 485, 483, 482, 480, 477, 476, 474, 472, 470, 469, 467, 465, 464, 462, 460, 458, 456, 455, 453, 451, 450, 448, 447, 445, 444, 442, 440, 439, 437, 436, 434, 433, 431, 430, 428, 427, 425, 423, 422, 420, 419, 417, 417, 415, 414, 413, 411, 410, 408, 407, 405, 404, 402, 401, 400, 399, 398, 396, 395, 393, 392, 391, 390, 389, 387, 386, 385, 383, 382, 381, 380, 379, 377, 376, 375, 374, 373, 371, 370, 369, 368, 367, 366, 364, 363, 363, 361, 360, 359, 358, 357, 356, 355, 353, 352, 352, 350, 349, 348, 347, 346, 345, 344, 343, 342, 341, 340, 339, 338, 335, 335, 0};
-static uint32_t lide110_ok[]   = { 62496, 2343, 2343, 2343, 2343, 2343, 2343, 2343, 2343, 2051, 1961, 1901, 1852, 1809, 1775, 1745, 1717, 1692, 1671, 1650, 1630, 1613, 1597,1580,1565,1549,1536,1524,1512,1500,1488,1478,1467,1458,1446,1437,1429,1420,1411,1403,1395,1386,1378,1372,1364,1358,1350,1345,1337,1331,1324,1318,1313,1307,1302,1294,1289,1284,1278,1273,1268,1263,1260,1255,1250,1245,1240,1236,1231,1227,1222,1219,1214,1211,1206,1201,1198,1194,1191,1186,1183,1179,1176,1173,1168,1166,1161,1158,1155,1151,1148,1146,1143,1139,1136,1133,1130,1128,1124,1121,1118,1116,1113,1110,1108,1105,1101,1099,1096,1093,1091,1088,1086,1083,1081,1078,1076,1073,1071,1068,1067,1065,1062,1060,1058,1055,1053,1051,1048,1047,1045,1042,1040,1038,1035,1034,1032,1030,1027,1026,1024,1022,1020,1019,1016,1014,1012,1011,1009,1006,1005,1003,1001,999,998,996,994,993,991,989,987,985,984,982,980,979,977,976,974,973,971,969,968,966,965,963,962,960,959,957,956,954,952,951,949,948,946,946,944,943,942,940,939,937,936,934,933,931,930,929,928,927,925,924,922,921,920,919,918,916,915,914,912,911,910,909,908,906,905,904,903,902,900,899,898,897,896,895,893,892,892,890,889,888,887,886,885,884,882,881,881,879,878,877,876,875,874,873,872,871,870,869,868,867,864,857, 849, 843, 835, 829, 821, 816, 808, 802, 795, 789, 784, 778, 773, 765, 760, 755, 749, 744, 739, 734, 731, 726, 721, 716, 711, 707, 702, 698, 693, 690, 685, 682, 677, 672, 669, 665, 662, 657, 654, 650, 647, 644, 639, 637, 632, 629, 626, 622, 619, 617, 614, 610, 607, 604, 601, 599, 595, 592, 589, 587, 584, 581, 579, 576, 572, 570, 567, 564, 562, 559, 557, 554, 552, 549, 547, 544, 542, 539, 538, 536, 533, 531, 529, 526, 524, 522, 519, 518, 516, 513, 511, 509, 506, 505, 503, 501, 498, 497, 495, 493, 491, 490, 487, 485, 483, 482, 480, 477, 476, 474, 472, 470, 469, 467, 465, 464, 462, 460, 458, 456, 455, 453, 451, 450, 448, 447, 445, 444, 442, 440, 439, 437, 436, 434, 433, 431, 430, 428, 427, 425, 423, 422, 420, 419, 417, 417, 415, 414, 413, 411, 410, 408, 407, 405, 404, 402, 401, 400, 399, 398, 396, 395, 393, 392, 391, 390, 389, 387, 386, 385, 383, 382, 381, 380, 379, 377, 376, 375, 374, 373, 371, 370, 369, 368, 367, 366, 364, 363, 363, 361, 360, 359, 358, 357, 356, 355, 353, 352, 352, 350, 349, 348, 347, 346, 345, 344, 343, 342, 341, 340, 339, 338, 335, 335, 0};
+static uint32_t lide110_ok[]   = { 62496, 2343, 2343, 2343, 2343, 2343, 2343, 2343, 2343, 2051, 1961, 1901, 1852, 1809, 1775, 1745, 1717, 1692, 1671, 1650, 1630, 1613, 1597, 1580, 1565, 1549, 1536, 1524, 1512, 1500, 1488, 1478, 1467, 1458, 1446, 1437, 1429, 1420, 1411, 1403, 1395, 1386, 1378, 1372, 1364, 1358, 1350, 1345, 1337, 1331, 1324, 1318, 1313, 1307, 1302, 1294, 1289, 1284, 1278, 1273, 1268, 1263, 1260, 1255, 1250, 1245, 1240, 1236, 1231, 1227, 1222, 1219, 1214, 1211, 1206, 1201, 1198, 1194, 1191, 1186, 1183, 1179, 1176, 1173, 1168, 1166, 1161, 1158, 1155, 1151, 1148, 1146, 1143, 1139, 1136, 1133, 1130, 1128, 1124, 1121, 1118, 1116, 1113, 1110, 1108, 1105, 1101, 1099, 1096, 1093, 1091, 1088, 1086, 1083, 1081, 1078, 1076, 1073, 1071, 1068, 1067, 1065, 1062, 1060, 1058, 1055, 1053, 1051, 1048, 1047, 1045, 1042, 1040, 1038, 1035, 1034, 1032, 1030, 1027, 1026, 1024, 1022, 1020, 1019, 1016, 1014, 1012, 1011, 1009, 1006, 1005, 1003, 1001, 999, 998, 996, 994, 993, 991, 989, 987, 985, 984, 982, 980, 979, 977, 976, 974, 973, 971, 969, 968, 966, 965, 963, 962, 960, 959, 957, 956, 954, 952, 951, 949, 948, 946, 946, 944, 943, 942, 940, 939, 937, 936, 934, 933, 931, 930, 929, 928, 927, 925, 924, 922, 921, 920, 919, 918, 916, 915, 914, 912, 911, 910, 909, 908, 906, 905, 904, 903, 902, 900, 899, 898, 897, 896, 895, 893, 892, 892, 890, 889, 888, 887, 886, 885, 884, 882, 881, 881, 879, 878, 877, 876, 875, 874, 873, 872, 871, 870, 869, 868, 867, 864, 857, 849, 843, 835, 829, 821, 816, 808, 802, 795, 789, 784, 778, 773, 765, 760, 755, 749, 744, 739, 734, 731, 726, 721, 716, 711, 707, 702, 698, 693, 690, 685, 682, 677, 672, 669, 665, 662, 657, 654, 650, 647, 644, 639, 637, 632, 629, 626, 622, 619, 617, 614, 610, 607, 604, 601, 599, 595, 592, 589, 587, 584, 581, 579, 576, 572, 570, 567, 564, 562, 559, 557, 554, 552, 549, 547, 544, 542, 539, 538, 536, 533, 531, 529, 526, 524, 522, 519, 518, 516, 513, 511, 509, 506, 505, 503, 501, 498, 497, 495, 493, 491, 490, 487, 485, 483, 482, 480, 477, 476, 474, 472, 470, 469, 467, 465, 464, 462, 460, 458, 456, 455, 453, 451, 450, 448, 447, 445, 444, 442, 440, 439, 437, 436, 434, 433, 431, 430, 428, 427, 425, 423, 422, 420, 419, 417, 417, 415, 414, 413, 411, 410, 408, 407, 405, 404, 402, 401, 400, 399, 398, 396, 395, 393, 392, 391, 390, 389, 387, 386, 385, 383, 382, 381, 380, 379, 377, 376, 375, 374, 373, 371, 370, 369, 368, 367, 366, 364, 363, 363, 361, 360, 359, 358, 357, 356, 355, 353, 352, 352, 350, 349, 348, 347, 346, 345, 344, 343, 342, 341, 340, 339, 338, 335, 335, 0};
+static uint32_t lide120_fast[] = { 62496, 2343, 2343, 2343, 2343, 2343, 2343, 2343, 2343, 1957, 1845, 1768, 1710, 1665, 1624, 1588, 1557, 1529, 1504, 1481, 1458, 1440, 1420, 1403, 1386, 1370, 1356, 1343, 1329, 1316, 1303, 1293, 1280, 1270, 1260, 1250, 1241, 1231, 1222, 1214, 1206, 1197, 1189, 1182, 1174, 1167, 1160, 1153, 1147, 1140, 1133, 1128, 1121, 1116, 1110, 1104, 1099, 1093, 1088, 1082, 1077, 1072, 1067, 1062, 1058, 1053, 1049, 1045, 1040, 1035, 1032, 1027, 1023, 1020, 1015, 1012, 1008, 1004, 1000, 997, 993, 989, 985, 982, 979, 975, 972, 969, 966, 963, 959, 956, 953, 950, 947, 945, 942, 939, 936, 933, 930, 928, 925, 922, 920, 917, 914, 911, 909, 907, 904, 902, 899, 897, 895, 892, 890, 888, 886, 883, 881, 879, 876, 874, 872, 870, 864, 864, 0};
+static uint32_t lide120_ok[]   = { 62496, 2343, 2343, 2343, 2343, 2343, 2343, 2343, 2343, 2286, 2264, 2248, 2232, 2221, 2211, 2205, 2195, 2190, 2180, 2175, 2170, 2160, 2155, 2150, 2145, 2140, 2135, 2130, 2125, 2121, 2116, 2111, 2106, 2106, 2102, 2097, 2092, 2087, 2087, 2083, 2078, 2074, 2074, 2069, 2064, 2064, 2060, 2055, 2055, 2051, 2051, 2046, 2042, 2042, 2038, 2038, 2033, 2029, 2029, 2024, 2024, 2020, 2010, 2010, 670*2, 0};
 static uint32_t lide110_slow[] = { 62496, 7896, 2632, 0};
+static uint32_t lide120_slow[] = { 62464, 7896, 2632, 0};
 static uint32_t lide110_max[]  = { 62496, 31296, 10432, 0};
+static uint32_t lide120_max[]  = { 62592, 62592, 41728, 31296, 10432, 0};
 static uint32_t lide210_max[]  = { 62496, 31296, 20864, 10432, 0};
 
-/**
- * database of motor profiles
- */
-
-
 /* NEXT LPERIOD=PREVIOUS*2-192 */
+/** @brief database of motor profiles
+ * database of motor profiles, for each exposure deigned for the sensor, gives the reference slope table to use
+ * for scan.
+ */
 static Motor_Profile motors[]={
 	{MOTOR_CANONLIDE110,  2768, 0, lide210_fast},
-	{MOTOR_CANONLIDE110,  5360, 0, lide110_ok},
+	{MOTOR_CANONLIDE110,  5360, 1, lide110_ok},
 	{MOTOR_CANONLIDE110, 10528, 1, lide110_slow},
 	{MOTOR_CANONLIDE110, 20864, 2, lide110_max},
+	{MOTOR_CANONLIDE120,  4608, 0, lide120_fast},
+	{MOTOR_CANONLIDE120,  5360, 1, lide120_ok},
+	{MOTOR_CANONLIDE120, 10528, 2, lide120_slow},
+	{MOTOR_CANONLIDE120, 20864, 2, lide120_max},
 	{MOTOR_CANONLIDE210,  2768, 0, lide210_fast},
-	{MOTOR_CANONLIDE210,  5360, 0, lide110_ok},
+	{MOTOR_CANONLIDE210,  5360, 1, lide110_ok},
 	{MOTOR_CANONLIDE210, 10528, 1, lide110_slow},
 	{MOTOR_CANONLIDE210, 20864, 2, lide210_max},
 	{0, 0, 0, NULL},
@@ -670,10 +688,10 @@ static Motor_Profile motors[]={
 GENESYS_STATIC
 SANE_Status gl124_init_scan_regs (Genesys_Device * dev,
                                   Genesys_Register_Set * reg,
-                                  float xres,	/*dpi */
-                                  float yres,	/*dpi */
-                                  float startx,	/*optical_res, from dummy_pixel+1 */
-                                  float starty,	/*base_ydpi, from home! */
+				  float xres,        /*dpi */
+				  float yres,        /*dpi */
+				  float startx,        /*optical_res, from dummy_pixel+1 */
+				  float starty,        /*base_ydpi, from home! */
                                   float pixels,
                                   float lines,
                                   unsigned int depth,
diff --git a/backend/genesys_gl646.c b/backend/genesys_gl646.c
index 19b4585..58952fb 100644
--- a/backend/genesys_gl646.c
+++ b/backend/genesys_gl646.c
@@ -3,7 +3,7 @@
    Copyright (C) 2003 Oliver Rauch
    Copyright (C) 2003, 2004 Henning Meier-Geinitz <henning@meier-geinitz.de>
    Copyright (C) 2004 Gerhard Jaeger <gerhard@gjaeger.de>
-   Copyright (C) 2004-2013 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2004-2013 Stéphane Voltz <stef.dev@free.fr>
    Copyright (C) 2005-2009 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
    Copyright (C) 2007 Luke <iceyfor@gmail.com>
    Copyright (C) 2011 Alexey Osipov <simba@lerlan.ru> for HP2400 description
@@ -1999,7 +1999,7 @@ gl646_set_fe (Genesys_Device * dev, uint8_t set, int dpi)
   /* Wolfson type frontend */
   if ((dev->reg[reg_0x04].value & REG04_FESET) != 0x03)
     {
-      DBG (DBG_proc, "gl646_set_fe(): unspported frontend type %d\n",
+      DBG (DBG_proc, "gl646_set_fe(): unsupported frontend type %d\n",
 	   dev->reg[reg_0x04].value & REG04_FESET);
       return SANE_STATUS_UNSUPPORTED;
     }
@@ -3066,7 +3066,7 @@ gl646_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
   if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_error,
-	   "%s: failed to setup for scan: %s\n", __FUNCTION__,
+	   "%s: failed to setup for scan: %s\n", __func__,
 	   sane_strstatus (status));
       DBGCOMPLETED;
       return status;
@@ -3082,7 +3082,7 @@ gl646_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
   if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_error,
-	   "%s: failed to set frontend: %s\n", __FUNCTION__,
+	   "%s: failed to set frontend: %s\n", __func__,
 	   sane_strstatus (status));
       DBGCOMPLETED;
       return status;
@@ -3429,7 +3429,7 @@ setup_for_scan (Genesys_Device * dev,
   DBG (DBG_info,
        "%s settings:\nResolution: %ux%uDPI\n"
        "Lines     : %u\nPixels    : %u\nStartpos  : %.3f/%.3f\nScan mode : %d\nScan method: %s\n\n",
-       __FUNCTION__,
+       __func__,
        settings.xres, settings.yres, settings.lines, settings.pixels,
        settings.tl_x, settings.tl_y, settings.scan_mode,
        settings.scan_method == SCAN_METHOD_FLATBED ? "flatbed" : "XPA");
@@ -3482,16 +3482,16 @@ setup_for_scan (Genesys_Device * dev,
 	  move += (settings.tl_y * dev->motor.optical_ydpi) / MM_PER_INCH;
 	}
 
-      DBG (DBG_info, "%s: move=%d steps\n", __FUNCTION__, move);
+      DBG (DBG_info, "%s: move=%d steps\n", __func__, move);
 
       /* security check */
       if (move < 0)
 	{
-	  DBG (DBG_error, "%s: overriding negative move value %d\n", __FUNCTION__, move);
+	  DBG (DBG_error, "%s: overriding negative move value %d\n", __func__, move);
 	  move = 0;
 	}
     }
-  DBG (DBG_info, "%s: move=%d steps\n", __FUNCTION__, move);
+  DBG (DBG_info, "%s: move=%d steps\n", __func__, move);
 
   /* pixels are allways given at full CCD optical resolution */
   /* use detected left margin and fixed value */
@@ -3550,7 +3550,7 @@ setup_for_scan (Genesys_Device * dev,
                                   depth);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed setup registers: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed setup registers: %s\n", __func__, sane_strstatus (status));
       return status;
     }
 
@@ -3585,7 +3585,7 @@ setup_for_scan (Genesys_Device * dev,
 			    sanei_genesys_read_reg_from_set (regs, 0x21));
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to send slope table 0: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to send slope table 0: %s\n", __func__, sane_strstatus (status));
       return status;
     }
 
@@ -3594,7 +3594,7 @@ setup_for_scan (Genesys_Device * dev,
 			    sanei_genesys_read_reg_from_set (regs, 0x6b));
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to send slope table 1: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to send slope table 1: %s\n", __func__, sane_strstatus (status));
       return status;
     }
 
@@ -4414,7 +4414,7 @@ gl646_coarse_gain_calibration (Genesys_Device * dev, int dpi)
       if (status != SANE_STATUS_GOOD)
 	{
           free(line);
-	  DBG (DBG_error, "%s: failed to scan first line\n", __FUNCTION__);
+	  DBG (DBG_error, "%s: failed to scan first line\n", __func__);
 	  return status;
 	}
 
@@ -4472,7 +4472,7 @@ gl646_coarse_gain_calibration (Genesys_Device * dev, int dpi)
 	    dev->frontend.gain[k]++;
 
 	  DBG (DBG_proc,
-	       "%s: channel %d, average = %.2f, gain = %d\n", __FUNCTION__,
+	       "%s: channel %d, average = %.2f, gain = %d\n", __func__,
 	       k, average[k], dev->frontend.gain[k]);
 	}
       free (line);
@@ -4484,7 +4484,7 @@ gl646_coarse_gain_calibration (Genesys_Device * dev, int dpi)
       dev->frontend.gain[2] = dev->frontend.gain[0];
     }
 
-  DBG (DBG_info, "%s: gains=(%d,%d,%d)\n", __FUNCTION__,
+  DBG (DBG_info, "%s: gains=(%d,%d,%d)\n", __func__,
        dev->frontend.gain[0], dev->frontend.gain[1], dev->frontend.gain[2]);
   DBGCOMPLETED;
   return status;
@@ -5767,6 +5767,7 @@ static Genesys_Command_Set gl646_cmd_set = {
   gl646_led_calibration,
 
   gl646_slow_back_home,
+  NULL,
 
   gl646_bulk_write_register,
   gl646_bulk_write_data,
diff --git a/backend/genesys_gl646.h b/backend/genesys_gl646.h
index 9e328c5..4c47d03 100644
--- a/backend/genesys_gl646.h
+++ b/backend/genesys_gl646.h
@@ -2,7 +2,7 @@
 
    Copyright (C) 2003-2004 Henning Meier-Geinitz <henning@meier-geinitz.de>
    Copyright (C) 2004-2005 Gerhard Jaeger <gerhard@gjaeger.de>
-   Copyright (C) 2004-2013 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2004-2013 Stéphane Voltz <stef.dev@free.fr>
    Copyright (C) 2005-2009 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
 
    This file is part of the SANE package.
@@ -276,10 +276,10 @@ gl646_move_to_ta (Genesys_Device * dev);
 /**
  * sets up the scanner for a scan, registers, gamma tables, shading tables
  * and slope tables, based on the parameter struct.
- * @param device   device to set up
- * @param regs     registers to set up
- * @param settings settings of the scan
- * @param split    true if move before scan has to be done
+ * @param dev         device to set up
+ * @param regs        registers to set up
+ * @param settings    settings of the scan
+ * @param split       true if move before scan has to be done
  * @param xcorrection true if scanner's X geometry must be taken into account to
  * 		     compute X, ie add left margins
  * @param ycorrection true if scanner's Y geometry must be taken into account to
diff --git a/backend/genesys_gl841.c b/backend/genesys_gl841.c
index 2b16c67..43c01ff 100644
--- a/backend/genesys_gl841.c
+++ b/backend/genesys_gl841.c
@@ -3,7 +3,7 @@
    Copyright (C) 2003 Oliver Rauch
    Copyright (C) 2003, 2004 Henning Meier-Geinitz <henning@meier-geinitz.de>
    Copyright (C) 2004 Gerhard Jaeger <gerhard@gjaeger.de>
-   Copyright (C) 2004-2013 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2004-2013 Stéphane Voltz <stef.dev@free.fr>
    Copyright (C) 2005 Philipp Schmid <philipp8288@web.de>
    Copyright (C) 2005-2009 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
    Copyright (C) 2006 Laurent Charpentier <laurent_pubs@yahoo.com>
@@ -204,7 +204,7 @@ printtime(char *p) {
     gettimeofday(&t,NULL);
     dif = t.tv_sec - start_time.tv_sec;
     dif = dif*1000000 + t.tv_usec - start_time.tv_usec;
-    fprintf(stderr,"%s %lluµs\n",p,dif);
+    fprintf(stderr,"%s %lluµs\n",p,dif);
 }
 */
 
@@ -1158,7 +1158,7 @@ gl841_send_slope_table (Genesys_Device * dev, int table_nr,
 	{
 	  sprintf (msg+strlen(msg), ",%d", slope_table[i]);
 	}
-      DBG (DBG_io, "%s: %s\n", __FUNCTION__, msg);
+      DBG (DBG_io, "%s: %s\n", __func__, msg);
     }
 
   status =
@@ -1204,7 +1204,7 @@ gl841_set_lide80_fe (Genesys_Device * dev, uint8_t set)
 
   if (set == AFE_INIT)
     {
-      DBG (DBG_proc, "%s(): setting DAC %u\n", __FUNCTION__,
+      DBG (DBG_proc, "%s(): setting DAC %u\n", __func__,
 	   dev->model->dac_type);
 
       /* sets to default values */
@@ -1214,21 +1214,21 @@ gl841_set_lide80_fe (Genesys_Device * dev, uint8_t set)
       status = sanei_genesys_fe_write_data (dev, 0x00, dev->frontend.reg[0]);
       if (status != SANE_STATUS_GOOD)
 	{
-	  DBG (DBG_error, "%s: writing reg 0x00 failed: %s\n", __FUNCTION__,
+	  DBG (DBG_error, "%s: writing reg 0x00 failed: %s\n", __func__,
 	       sane_strstatus (status));
 	  return status;
 	}
       status = sanei_genesys_fe_write_data (dev, 0x03, dev->frontend.reg[1]);
       if (status != SANE_STATUS_GOOD)
 	{
-	  DBG (DBG_error, "%s: writing reg 0x03 failed: %s\n", __FUNCTION__,
+	  DBG (DBG_error, "%s: writing reg 0x03 failed: %s\n", __func__,
 	       sane_strstatus (status));
 	  return status;
 	}
       status = sanei_genesys_fe_write_data (dev, 0x06, dev->frontend.reg[2]);
       if (status != SANE_STATUS_GOOD)
 	{
-	  DBG (DBG_error, "%s: writing reg 0x06 failed: %s\n", __FUNCTION__,
+	  DBG (DBG_error, "%s: writing reg 0x06 failed: %s\n", __func__,
 	       sane_strstatus (status));
 	  return status;
 	}
@@ -1239,21 +1239,21 @@ gl841_set_lide80_fe (Genesys_Device * dev, uint8_t set)
       status = sanei_genesys_fe_write_data (dev, 0x00, dev->frontend.reg[0]);
       if (status != SANE_STATUS_GOOD)
 	{
-	  DBG (DBG_error, "%s: writing reg 0x00 failed: %s\n", __FUNCTION__,
+	  DBG (DBG_error, "%s: writing reg 0x00 failed: %s\n", __func__,
 	       sane_strstatus (status));
 	  return status;
 	}
       status = sanei_genesys_fe_write_data (dev, 0x06, dev->frontend.offset[0]);
       if (status != SANE_STATUS_GOOD)
 	{
-	  DBG (DBG_error, "%s: writing offset failed: %s\n", __FUNCTION__,
+	  DBG (DBG_error, "%s: writing offset failed: %s\n", __func__,
 	       sane_strstatus (status));
 	  return status;
 	}
       status = sanei_genesys_fe_write_data (dev, 0x03, dev->frontend.gain[0]);
       if (status != SANE_STATUS_GOOD)
 	{
-	  DBG (DBG_error, "%s: writing gain failed: %s\n", __FUNCTION__,
+	  DBG (DBG_error, "%s: writing gain failed: %s\n", __func__,
 	       sane_strstatus (status));
 	  return status;
 	}
@@ -1734,7 +1734,7 @@ gl841_init_motor_regs(Genesys_Device * dev,
                                             0,
                                             0,
                                             &scan_power_mode);
-	DBG (DBG_info, "%s : fast_exposure=%d pixels\n", __FUNCTION__, fast_exposure);
+	DBG (DBG_info, "%s : fast_exposure=%d pixels\n", __func__, fast_exposure);
       }
 
     if (action == MOTOR_ACTION_HOME_FREE) {
@@ -1911,7 +1911,7 @@ gl841_init_motor_regs_scan(Genesys_Device * dev,
                                         0,
                                         &dummy_power_mode);
 
-    DBG (DBG_info, "%s : fast_exposure=%d pixels\n", __FUNCTION__, fast_exposure);
+    DBG (DBG_info, "%s : fast_exposure=%d pixels\n", __func__, fast_exposure);
 
     memset(slow_slope_table,0xff,512);
 
@@ -2453,7 +2453,7 @@ gl841_init_optical_regs_scan(Genesys_Device * dev,
     sanei_genesys_set_double(reg, REG_DPISET, dpiset);
     sanei_genesys_set_double(reg, REG_STRPIXEL, start);
     sanei_genesys_set_double(reg, REG_ENDPIXEL, end);
-    DBG( DBG_io2, "%s: STRPIXEL=%d, ENDPIXEL=%d\n",__FUNCTION__,start,end);
+    DBG( DBG_io2, "%s: STRPIXEL=%d, ENDPIXEL=%d\n",__func__,start,end);
 
     /* words(16bit) before gamma, conversion to 8 bit or lineart*/
     words_per_line = (pixels * dpiset) / gl841_get_dpihw(dev);
@@ -2794,7 +2794,7 @@ dummy \ scanned lines
                     start,
                     used_pixels,
                     &scan_power_mode);
-  DBG (DBG_info, "%s : exposure_time=%d pixels\n", __FUNCTION__, exposure_time);
+  DBG (DBG_info, "%s : exposure_time=%d pixels\n", __func__, exposure_time);
 
   /*** optical parameters ***/
   /* in case of dynamic lineart, we use an internal 8 bit gray scan
@@ -3160,7 +3160,7 @@ dummy \ scanned lines
                     start,
                     used_pixels,
                     &scan_power_mode);
-  DBG (DBG_info, "%s : exposure_time=%d pixels\n", __FUNCTION__, exposure_time);
+  DBG (DBG_info, "%s : exposure_time=%d pixels\n", __func__, exposure_time);
 
   /* scanned area must be enlarged by max color shift needed */
   max_shift=sanei_genesys_compute_max_shift(dev,channels,yres,0);
@@ -3451,7 +3451,7 @@ gl841_stop_action (Genesys_Device * dev)
   uint8_t val40, val;
   unsigned int loop;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   status = sanei_genesys_get_status (dev, &val);
   if (DBG_LEVEL >= DBG_io)
@@ -3463,7 +3463,7 @@ gl841_stop_action (Genesys_Device * dev)
   if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_error,
-	   "%s: failed to read home sensor: %s\n",__FUNCTION__,
+	   "%s: failed to read home sensor: %s\n",__func__,
 	   sane_strstatus (status));
       DBGCOMPLETED;
       return status;
@@ -3472,7 +3472,7 @@ gl841_stop_action (Genesys_Device * dev)
   /* only stop action if needed */
   if (!(val40 & REG40_DATAENB) && !(val40 & REG40_MOTMFLG))
     {
-      DBG (DBG_info, "%s: already stopped\n", __FUNCTION__);
+      DBG (DBG_info, "%s: already stopped\n", __func__);
       DBGCOMPLETED;
       return SANE_STATUS_GOOD;
     }
@@ -3485,7 +3485,7 @@ gl841_stop_action (Genesys_Device * dev)
   status = gl841_bulk_write_register (dev, local_reg, GENESYS_GL841_MAX_REGS);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to bulk write registers: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to bulk write registers: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -3505,7 +3505,7 @@ gl841_stop_action (Genesys_Device * dev)
       if (status != SANE_STATUS_GOOD)
 	{
 	  DBG (DBG_error,
-	       "%s: failed to read home sensor: %s\n",__FUNCTION__,
+	       "%s: failed to read home sensor: %s\n",__func__,
 	       sane_strstatus (status));
 	  DBGCOMPLETED;
 	  return status;
@@ -3557,7 +3557,7 @@ gl841_eject_document (Genesys_Device * dev)
 
   DBG (DBG_proc, "gl841_eject_document\n");
 
-  if (!dev->model->is_sheetfed == SANE_TRUE)
+  if (dev->model->is_sheetfed == SANE_FALSE)
     {
       DBG (DBG_proc, "gl841_eject_document: there is no \"eject sheet\"-concept for non sheet fed\n");
       DBG (DBG_proc, "gl841_eject_document: finished\n");
@@ -3762,14 +3762,14 @@ gl841_detect_document_end (Genesys_Device * dev)
   uint8_t val;
   size_t total_bytes_to_read;
 
-  DBG (DBG_proc, "%s: begin\n", __FUNCTION__);
+  DBG (DBG_proc, "%s: begin\n", __func__);
 
   RIE (gl841_get_paper_sensor (dev, &paper_loaded));
 
   /* sheetfed scanner uses home sensor as paper present */
   if ((dev->document == SANE_TRUE) && !paper_loaded)
     {
-      DBG (DBG_info, "%s: no more document\n", __FUNCTION__);
+      DBG (DBG_info, "%s: no more document\n", __func__);
       dev->document = SANE_FALSE;
 
       /* we can't rely on total_bytes_to_read since the frontend
@@ -3781,14 +3781,14 @@ gl841_detect_document_end (Genesys_Device * dev)
         {
           dev->total_bytes_to_read = dev->total_bytes_read;
           dev->read_bytes_left = 0;
-          DBG (DBG_proc, "%s: finished\n", __FUNCTION__);
+          DBG (DBG_proc, "%s: finished\n", __func__);
           return SANE_STATUS_GOOD;
         }
       if (dev->settings.scan_mode == SCAN_MODE_COLOR && dev->model->is_cis)
         {
           scancnt/=3;
         }
-      DBG (DBG_io, "%s: scancnt=%u lines\n",__FUNCTION__, scancnt);
+      DBG (DBG_io, "%s: scancnt=%u lines\n",__func__, scancnt);
 
       RIE(sanei_genesys_read_register(dev, 0x25, &val));
       lincnt=65536*val;
@@ -3796,26 +3796,26 @@ gl841_detect_document_end (Genesys_Device * dev)
       lincnt+=256*val;
       RIE(sanei_genesys_read_register(dev, 0x27, &val));
       lincnt+=val;
-      DBG (DBG_io, "%s: lincnt=%u lines\n",__FUNCTION__, lincnt);
+      DBG (DBG_io, "%s: lincnt=%u lines\n",__func__, lincnt);
       postcnt=(SANE_UNFIX(dev->model->post_scan)/MM_PER_INCH)*dev->settings.yres;
-      DBG (DBG_io, "%s: postcnt=%u lines\n",__FUNCTION__, postcnt);
+      DBG (DBG_io, "%s: postcnt=%u lines\n",__func__, postcnt);
 
       /* the current scancnt is also the final one, so we use it to
        * compute total bytes to read. We also add the line count to eject document */
       total_bytes_to_read=(scancnt+postcnt)*dev->wpl;
 
-      DBG (DBG_io, "%s: old total_bytes_to_read=%u\n",__FUNCTION__,(unsigned int)dev->total_bytes_to_read);
-      DBG (DBG_io, "%s: new total_bytes_to_read=%u\n",__FUNCTION__,(unsigned int)total_bytes_to_read);
+      DBG (DBG_io, "%s: old total_bytes_to_read=%u\n",__func__,(unsigned int)dev->total_bytes_to_read);
+      DBG (DBG_io, "%s: new total_bytes_to_read=%u\n",__func__,(unsigned int)total_bytes_to_read);
 
       /* assign new end value */
       if(dev->total_bytes_to_read>total_bytes_to_read)
         {
-          DBG (DBG_io, "%s: scan shorten\n",__FUNCTION__);
+          DBG (DBG_io, "%s: scan shorten\n",__func__);
           dev->total_bytes_to_read=total_bytes_to_read;
         }
     }
 
-  DBG (DBG_proc, "%s: finished\n", __FUNCTION__);
+  DBG (DBG_proc, "%s: finished\n", __func__);
   return SANE_STATUS_GOOD;
 }
 
@@ -4184,7 +4184,7 @@ gl841_search_start_position (Genesys_Device * dev)
 				 SCAN_FLAG_DISABLE_BUFFER_FULL_MOVE);
   if(status!=SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to init scan registers: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to init scan registers: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -4194,7 +4194,7 @@ gl841_search_start_position (Genesys_Device * dev)
     gl841_bulk_write_register (dev, local_reg, GENESYS_GL841_MAX_REGS);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to bulk write registers: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to bulk write registers: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -4346,7 +4346,7 @@ gl841_init_regs_for_shading (Genesys_Device * dev)
   float starty=0;
 
   DBGSTART;
-  DBG (DBG_proc, "%s: lines = %d\n", __FUNCTION__, (int)(dev->calib_lines));
+  DBG (DBG_proc, "%s: lines = %d\n", __func__, (int)(dev->calib_lines));
 
   /* initial calibration reg values */
   memcpy (dev->calib_reg, dev->reg, GENESYS_GL841_MAX_REGS * sizeof (Genesys_Register_Set));
@@ -4383,7 +4383,7 @@ gl841_init_regs_for_shading (Genesys_Device * dev)
 				 SCAN_FLAG_IGNORE_LINE_DISTANCE);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to setup scan: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to setup scan: %s\n", __func__, sane_strstatus (status));
       return status;
     }
 
@@ -4393,7 +4393,7 @@ gl841_init_regs_for_shading (Genesys_Device * dev)
   status = gl841_bulk_write_register (dev, dev->calib_reg, GENESYS_GL841_MAX_REGS);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to bulk write registers: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to bulk write registers: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -4491,7 +4491,7 @@ gl841_init_regs_for_scan (Genesys_Device * dev)
   if(dev->model->is_cis && dev->settings.true_gray
     && dev->settings.scan_mode != SCAN_MODE_COLOR)
     {
-      DBG (DBG_io, "%s: activating LEDADD\n", __FUNCTION__);
+      DBG (DBG_io, "%s: activating LEDADD\n", __func__);
       flags |= SCAN_FLAG_ENABLE_LEDADD;
     }
 
@@ -4610,11 +4610,11 @@ gl841_led_calibration (Genesys_Device * dev)
     {
       move = SANE_UNFIX (dev->model->y_offset_calib);
       move = (move * (dev->motor.base_ydpi)) / MM_PER_INCH;
-      DBG (DBG_io, "%s: move=%d lines\n", __FUNCTION__, move);
+      DBG (DBG_io, "%s: move=%d lines\n", __func__, move);
       status = gl841_feed(dev, move);
       if (status != SANE_STATUS_GOOD)
 	{
-	  DBG (DBG_error, "%s: failed to feed: %s\n", __FUNCTION__,
+	  DBG (DBG_error, "%s: failed to feed: %s\n", __func__,
                sane_strstatus (status));
 	  return status;
 	}
@@ -4644,7 +4644,7 @@ gl841_led_calibration (Genesys_Device * dev)
   if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_error,
-	   "%s: failed to setup scan: %s\n", __FUNCTION__,
+	   "%s: failed to setup scan: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -4694,7 +4694,7 @@ gl841_led_calibration (Genesys_Device * dev)
 
       RIE (gl841_bulk_write_register (dev, dev->calib_reg, GENESYS_GL841_MAX_REGS));
 
-      DBG (DBG_info, "%s: starting line reading\n", __FUNCTION__);
+      DBG (DBG_info, "%s: starting line reading\n", __func__);
       RIE (gl841_begin_scan (dev, dev->calib_reg, SANE_TRUE));
       RIE (sanei_genesys_read_data_from_scanner (dev, line, total_size));
 
@@ -4727,7 +4727,7 @@ gl841_led_calibration (Genesys_Device * dev)
 	  avg[j] /= num_pixels;
       }
 
-      DBG(DBG_info,"%s: average: %d,%d,%d\n", __FUNCTION__, avg[0], avg[1], avg[2]);
+      DBG(DBG_info,"%s: average: %d,%d,%d\n", __func__, avg[0], avg[1], avg[2]);
 
       acceptable = SANE_TRUE;
 
@@ -4798,7 +4798,7 @@ gl841_led_calibration (Genesys_Device * dev)
 
   } while (!acceptable && turn < 100);
 
-  DBG(DBG_info,"%s: acceptable exposure: %d,%d,%d\n", __FUNCTION__, exp[0],exp[1],exp[2]);
+  DBG(DBG_info,"%s: acceptable exposure: %d,%d,%d\n", __func__, exp[0],exp[1],exp[2]);
 
   /* cleanup before return */
   free (line);
@@ -4891,7 +4891,7 @@ ad_fe_offset_calibration (Genesys_Device * dev)
       dev->frontend.offset[2] = (top+bottom)/2;
 
       /* scan line */
-      DBG (DBG_info, "%s: starting line reading\n",__FUNCTION__);
+      DBG (DBG_info, "%s: starting line reading\n",__func__);
       gl841_bulk_write_register (dev, dev->calib_reg, GENESYS_GL841_MAX_REGS);
       gl841_set_fe(dev, AFE_SET);
       gl841_begin_scan (dev, dev->calib_reg, SANE_TRUE);
@@ -4909,7 +4909,7 @@ ad_fe_offset_calibration (Genesys_Device * dev)
           average+=line[i];
         }
       average/=total_size;
-      DBG (DBG_data, "%s: average=%d\n", __FUNCTION__, average);
+      DBG (DBG_data, "%s: average=%d\n", __func__, average);
 
       /* if min value is above target, the current value becomes the new top
        * else it is the new bottom */
@@ -4928,7 +4928,7 @@ ad_fe_offset_calibration (Genesys_Device * dev)
   dev->frontend.offset[1]=0;
   dev->frontend.offset[2]=0;
   free(line);
-  DBG (DBG_info, "%s: offset=(%d,%d,%d)\n", __FUNCTION__,
+  DBG (DBG_info, "%s: offset=(%d,%d,%d)\n", __func__,
                                             dev->frontend.offset[0],
                                             dev->frontend.offset[1],
                                             dev->frontend.offset[2]);
@@ -5374,18 +5374,18 @@ gl841_coarse_gain_calibration (Genesys_Device * dev, int dpi)
   int lines=1;
   int move;
 
-  DBG (DBG_proc, "%s: dpi=%d\n", __FUNCTION__, dpi);
+  DBG (DBG_proc, "%s: dpi=%d\n", __func__, dpi);
 
   /* feed to white strip if needed */
   if (dev->model->y_offset_calib>0)
     {
       move = SANE_UNFIX (dev->model->y_offset_calib);
       move = (move * (dev->motor.base_ydpi)) / MM_PER_INCH;
-      DBG (DBG_io, "%s: move=%d lines\n", __FUNCTION__, move);
+      DBG (DBG_io, "%s: move=%d lines\n", __func__, move);
       status = gl841_feed(dev, move);
       if (status != SANE_STATUS_GOOD)
 	{
-	  DBG (DBG_error, "%s: failed to feed: %s\n", __FUNCTION__,
+	  DBG (DBG_error, "%s: failed to feed: %s\n", __func__,
                sane_strstatus (status));
 	  return status;
 	}
@@ -5414,7 +5414,7 @@ gl841_coarse_gain_calibration (Genesys_Device * dev, int dpi)
 
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to setup scan: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to setup scan: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -5475,7 +5475,7 @@ gl841_coarse_gain_calibration (Genesys_Device * dev, int dpi)
 	      dev->frontend.gain[j] = gain[j]*12;
         }
 
-      DBG (DBG_proc, "%s: channel %d, max=%d, gain = %f, setting:%d\n", __FUNCTION__,
+      DBG (DBG_proc, "%s: channel %d, max=%d, gain = %f, setting:%d\n", __func__,
 	   j, max[j], gain[j],dev->frontend.gain[j]);
     }
 
@@ -5516,7 +5516,7 @@ gl841_coarse_gain_calibration (Genesys_Device * dev, int dpi)
   }
 
   free (line);
-  DBG (DBG_info, "%s: gain=(%d,%d,%d)\n", __FUNCTION__,
+  DBG (DBG_info, "%s: gain=(%d,%d,%d)\n", __func__,
                                             dev->frontend.gain[0],
                                             dev->frontend.gain[1],
                                             dev->frontend.gain[2]);
@@ -5663,7 +5663,7 @@ gl841_is_compatible_calibration (Genesys_Device * dev,
       if ((time.tv_sec - cache->last_calibration > 30 * 60)
           && (dev->model->is_sheetfed == SANE_FALSE))
         {
-          DBG (DBG_proc, "%s: expired entry, non compatible cache\n",__FUNCTION__);
+          DBG (DBG_proc, "%s: expired entry, non compatible cache\n",__func__);
           return SANE_STATUS_UNSUPPORTED;
         }
     }
@@ -5969,7 +5969,7 @@ gl841_search_strip (Genesys_Device * dev, SANE_Bool forward, SANE_Bool black)
   if (status != SANE_STATUS_GOOD)
     {
       free(data);
-      DBG (DBG_error, "%s: failed to setup for scan: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to setup for scan: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -6208,7 +6208,7 @@ gl841_send_shading_data (Genesys_Device * dev, uint8_t * data, int size)
   uint8_t *buffer,*ptr,*src;
 
   DBGSTART;
-  DBG( DBG_io2, "%s: writing %d bytes of shading data\n",__FUNCTION__,size);
+  DBG( DBG_io2, "%s: writing %d bytes of shading data\n",__func__,size);
 
   /* old method if no SHDAREA */
   if((dev->reg[reg_0x01].value & REG01_SHDAREA) == 0)
@@ -6217,7 +6217,7 @@ gl841_send_shading_data (Genesys_Device * dev, uint8_t * data, int size)
       status = sanei_genesys_set_buffer_address (dev, 0x0000);
       if (status != SANE_STATUS_GOOD)
         {
-          DBG (DBG_error, "%s: failed to set buffer address: %s\n", __FUNCTION__,
+          DBG (DBG_error, "%s: failed to set buffer address: %s\n", __func__,
                sane_strstatus (status));
           return status;
         }
@@ -6226,7 +6226,7 @@ gl841_send_shading_data (Genesys_Device * dev, uint8_t * data, int size)
       status = dev->model->cmd_set->bulk_write_data (dev, 0x3c, data, size);
       if (status != SANE_STATUS_GOOD)
         {
-          DBG (DBG_error, "%s: failed to send shading table: %s\n", __FUNCTION__,
+          DBG (DBG_error, "%s: failed to send shading table: %s\n", __func__,
                sane_strstatus (status));
           return status;
         }
@@ -6238,14 +6238,14 @@ gl841_send_shading_data (Genesys_Device * dev, uint8_t * data, int size)
   length = (uint32_t) (size / 3);
   sanei_genesys_get_double(dev->reg,REG_STRPIXEL,&strpixel);
   sanei_genesys_get_double(dev->reg,REG_ENDPIXEL,&endpixel);
-  DBG( DBG_io2, "%s: STRPIXEL=%d, ENDPIXEL=%d, PIXELS=%d\n",__FUNCTION__,strpixel,endpixel,endpixel-strpixel);
+  DBG( DBG_io2, "%s: STRPIXEL=%d, ENDPIXEL=%d, PIXELS=%d\n",__func__,strpixel,endpixel,endpixel-strpixel);
 
   /* compute deletion/average factor */
   sanei_genesys_get_double(dev->reg,REG_DPISET,&dpiset);
   dpihw = gl841_get_dpihw(dev);
   half=dev->current_setup.half_ccd+1;
   factor=dpihw/dpiset;
-  DBG( DBG_io2, "%s: dpihw=%d, dpiset=%d, half_ccd=%d, factor=%d\n",__FUNCTION__,dpihw,dpiset,half-1,factor);
+  DBG( DBG_io2, "%s: dpihw=%d, dpiset=%d, half_ccd=%d, factor=%d\n",__func__,dpihw,dpiset,half-1,factor);
 
   /* binary data logging */
   if(DBG_LEVEL>=DBG_data)
@@ -6269,11 +6269,11 @@ gl841_send_shading_data (Genesys_Device * dev, uint8_t * data, int size)
    */
   beginpixel = dev->sensor.CCD_start_xoffset / half;
   beginpixel += dev->sensor.dummy_pixel + 1;
-  DBG(DBG_io2, "%s: ORIGIN PIXEL=%d\n", __FUNCTION__, beginpixel);
+  DBG(DBG_io2, "%s: ORIGIN PIXEL=%d\n", __func__, beginpixel);
   beginpixel = (strpixel-beginpixel*2*2)/factor;
-  DBG(DBG_io2, "%s: BEGIN PIXEL=%d\n",__FUNCTION__,beginpixel/4);
+  DBG(DBG_io2, "%s: BEGIN PIXEL=%d\n",__func__,beginpixel/4);
 
-  DBG(DBG_io2, "%s: using chunks of %d bytes (%d shading data pixels)\n",__FUNCTION__,length, length/4);
+  DBG(DBG_io2, "%s: using chunks of %d bytes (%d shading data pixels)\n",__func__,length, length/4);
   buffer=(uint8_t *)malloc(pixels);
   memset(buffer,0,pixels);
 
@@ -6352,6 +6352,7 @@ static Genesys_Command_Set gl841_cmd_set = {
   gl841_led_calibration,
 
   gl841_slow_back_home,
+  NULL,
 
   gl841_bulk_write_register,
   gl841_bulk_write_data,
diff --git a/backend/genesys_gl841.h b/backend/genesys_gl841.h
index bbb79f1..d1bd07e 100644
--- a/backend/genesys_gl841.h
+++ b/backend/genesys_gl841.h
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2011-2013 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2011-2013 Stéphane Voltz <stef.dev@free.fr>
 
    This file is part of the SANE package.
 
diff --git a/backend/genesys_gl843.c b/backend/genesys_gl843.c
index 2b0d8fa..b47fb7e 100644
--- a/backend/genesys_gl843.c
+++ b/backend/genesys_gl843.c
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2010-2013 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2010-2013 Stéphane Voltz <stef.dev@free.fr>
 
 
    This file is part of the SANE package.
@@ -376,7 +376,7 @@ gl843_get_step_multiplier (Genesys_Register_Set * regs)
 	  value = 1;
 	}
     }
-  DBG (DBG_io, "%s: step multiplier is %d\n", __FUNCTION__, value);
+  DBG (DBG_io, "%s: step multiplier is %d\n", __func__, value);
   return value;
 }
 
@@ -452,7 +452,7 @@ static Sensor_Profile *get_sensor_profile(int sensor_type, int dpi, int flags)
   /* default fallback */
   if(idx<0)
     {
-      DBG (DBG_warn,"%s: using default sensor profile\n",__FUNCTION__);
+      DBG (DBG_warn,"%s: using default sensor profile\n",__func__);
       idx=0;
     }
 
@@ -790,7 +790,7 @@ gl843_send_slope_table (Genesys_Device * dev, int table_nr,
   int i;
   char msg[10000];
 
-  DBG (DBG_proc, "%s (table_nr = %d, steps = %d)\n", __FUNCTION__,
+  DBG (DBG_proc, "%s (table_nr = %d, steps = %d)\n", __func__,
        table_nr, steps);
 
   table = (uint8_t *) malloc (steps * 2);
@@ -807,7 +807,7 @@ gl843_send_slope_table (Genesys_Device * dev, int table_nr,
 	{
 	  sprintf (msg+strlen(msg), "%d", slope_table[i]);
 	}
-      DBG (DBG_io, "%s: %s\n", __FUNCTION__, msg);
+      DBG (DBG_io, "%s: %s\n", __func__, msg);
     }
 
 
@@ -818,7 +818,7 @@ gl843_send_slope_table (Genesys_Device * dev, int table_nr,
     {
       DBG (DBG_error,
 	   "%s: write data failed writing slope table %d (%s)\n",
-	   __FUNCTION__, table_nr, sane_strstatus (status));
+	   __func__, table_nr, sane_strstatus (status));
     }
 
   free (table);
@@ -957,7 +957,7 @@ gl843_init_motor_regs_scan (Genesys_Device * dev,
 
   lincnt=scan_lines;
   sanei_genesys_set_triple(reg,REG_LINCNT,lincnt);
-  DBG (DBG_io, "%s: lincnt=%d\n", __FUNCTION__, lincnt);
+  DBG (DBG_io, "%s: lincnt=%d\n", __func__, lincnt);
 
   /* compute register 02 value */
   r = sanei_genesys_get_address (reg, REG02);
@@ -1036,7 +1036,7 @@ gl843_init_motor_regs_scan (Genesys_Device * dev,
     {
         dist += fast_steps*2;
     }
-  DBG (DBG_io2, "%s: acceleration distance=%d\n", __FUNCTION__, dist);
+  DBG (DBG_io2, "%s: acceleration distance=%d\n", __func__, dist);
 
   /* get sure when don't insane value : XXX STEF XXX in this case we should
    * fall back to single table move */
@@ -1046,7 +1046,7 @@ gl843_init_motor_regs_scan (Genesys_Device * dev,
     feedl = 1;
 
   sanei_genesys_set_triple(reg,REG_FEEDL,feedl);
-  DBG (DBG_io, "%s: feedl=%d\n", __FUNCTION__, feedl);
+  DBG (DBG_io, "%s: feedl=%d\n", __func__, feedl);
 
   /* doesn't seem to matter that much */
   sanei_genesys_calculate_zmode2 (use_fast_fed,
@@ -1179,13 +1179,13 @@ gl843_init_optical_regs_scan (Genesys_Device * dev,
     {
       tgtime=2;
     }
-  DBG (DBG_io2, "%s: tgtime=%d\n", __FUNCTION__, tgtime);
+  DBG (DBG_io2, "%s: tgtime=%d\n", __func__, tgtime);
 
   /* to manage high resolution device while keeping good
    * low resolution scanning speed, we make hardware dpi vary */
   dpihw=sanei_genesys_compute_dpihw(dev, used_res);
   factor=dev->sensor.optical_res/dpihw;
-  DBG (DBG_io2, "%s: dpihw=%d (factor=%d)\n", __FUNCTION__, dpihw, factor);
+  DBG (DBG_io2, "%s: dpihw=%d (factor=%d)\n", __func__, dpihw, factor);
 
   /* sensor parameters */
   gl843_setup_sensor (dev, reg, dpihw, flags);
@@ -1193,7 +1193,7 @@ gl843_init_optical_regs_scan (Genesys_Device * dev,
   /* resolution is divided according to CKSEL which is known once sensor is set up */
   r = sanei_genesys_get_address (reg, REG18);
   cksel= (r->value & REG18_CKSEL)+1;
-  DBG (DBG_io2, "%s: cksel=%d\n", __FUNCTION__, cksel);
+  DBG (DBG_io2, "%s: cksel=%d\n", __func__, cksel);
   dpiset = used_res * cksel;
 
   /* start and end coordinate in optical dpi coordinates */
@@ -1218,7 +1218,7 @@ gl843_init_optical_regs_scan (Genesys_Device * dev,
   status = gl843_set_fe (dev, AFE_SET);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to set frontend: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to set frontend: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -1329,12 +1329,12 @@ gl843_init_optical_regs_scan (Genesys_Device * dev,
   if(half_ccd)
     {
       sanei_genesys_set_double(reg,REG_DPISET,dpiset*4);
-      DBG (DBG_io2, "%s: dpiset used=%d\n", __FUNCTION__, dpiset*4);
+      DBG (DBG_io2, "%s: dpiset used=%d\n", __func__, dpiset*4);
     }
   else
     {
       sanei_genesys_set_double(reg,REG_DPISET,dpiset);
-      DBG (DBG_io2, "%s: dpiset used=%d\n", __FUNCTION__, dpiset);
+      DBG (DBG_io2, "%s: dpiset used=%d\n", __func__, dpiset);
     }
 
   sanei_genesys_set_double(reg,REG_STRPIXEL,startx/tgtime);
@@ -1355,22 +1355,22 @@ gl843_init_optical_regs_scan (Genesys_Device * dev,
   dev->wpl = words_per_line;
   dev->bpl = words_per_line;
 
-  DBG (DBG_io2, "%s: used_pixels=%d\n", __FUNCTION__, used_pixels);
-  DBG (DBG_io2, "%s: pixels     =%d\n", __FUNCTION__, pixels);
-  DBG (DBG_io2, "%s: depth      =%d\n", __FUNCTION__, depth);
-  DBG (DBG_io2, "%s: dev->bpl   =%lu\n", __FUNCTION__, (unsigned long) dev->bpl);
-  DBG (DBG_io2, "%s: dev->len   =%lu\n", __FUNCTION__, (unsigned long)dev->len);
-  DBG (DBG_io2, "%s: dev->dist  =%lu\n", __FUNCTION__, (unsigned long)dev->dist);
+  DBG (DBG_io2, "%s: used_pixels=%d\n", __func__, used_pixels);
+  DBG (DBG_io2, "%s: pixels     =%d\n", __func__, pixels);
+  DBG (DBG_io2, "%s: depth      =%d\n", __func__, depth);
+  DBG (DBG_io2, "%s: dev->bpl   =%lu\n", __func__, (unsigned long) dev->bpl);
+  DBG (DBG_io2, "%s: dev->len   =%lu\n", __func__, (unsigned long)dev->len);
+  DBG (DBG_io2, "%s: dev->dist  =%lu\n", __func__, (unsigned long)dev->dist);
 
   words_per_line *= channels;
 
   /* MAXWD is expressed in 2 words unit */
   /* nousedspace = (mem_bank_range * 1024 / 256 -1 ) * 4; */
   sanei_genesys_set_triple(reg,REG_MAXWD,(words_per_line)>>1);
-  DBG (DBG_io2, "%s: words_per_line used=%d\n", __FUNCTION__, words_per_line);
+  DBG (DBG_io2, "%s: words_per_line used=%d\n", __func__, words_per_line);
 
   sanei_genesys_set_double(reg,REG_LPERIOD,exposure/tgtime);
-  DBG (DBG_io2, "%s: exposure used=%d\n", __FUNCTION__, exposure/tgtime);
+  DBG (DBG_io2, "%s: exposure used=%d\n", __func__, exposure/tgtime);
 
   r = sanei_genesys_get_address (reg, REG_DUMMY);
   r->value = dev->sensor.dummy_pixel * tgtime;
@@ -1456,7 +1456,7 @@ gl843_init_scan_regs (Genesys_Device * dev,
     {
       stagger = (4 * yres) / dev->motor.base_ydpi;
     }
-  DBG (DBG_info, "%s : stagger=%d lines\n", __FUNCTION__, stagger);
+  DBG (DBG_info, "%s : stagger=%d lines\n", __func__, stagger);
 
   /* we enable true gray for cis scanners only, and just when doing
    * scan since color calibration is OK for this mode
@@ -1498,7 +1498,7 @@ gl843_init_scan_regs (Genesys_Device * dev,
 
   /* compute correct pixels number */
   used_pixels = (pixels * optical_res) / xres;
-  DBG (DBG_info, "%s: used_pixels=%d\n", __FUNCTION__, used_pixels);
+  DBG (DBG_info, "%s: used_pixels=%d\n", __func__, used_pixels);
 
   /* round up pixels number if needed */
   if (used_pixels * xres < pixels * optical_res)
@@ -1531,8 +1531,8 @@ gl843_init_scan_regs (Genesys_Device * dev,
       scan_step_type = sanei_genesys_compute_step_type(gl843_motors, dev->model->motor_type, exposure);
     }
 
-  DBG (DBG_info, "%s : exposure=%d pixels\n", __FUNCTION__, exposure);
-  DBG (DBG_info, "%s : scan_step_type=%d\n", __FUNCTION__, scan_step_type);
+  DBG (DBG_info, "%s : exposure=%d pixels\n", __func__, exposure);
+  DBG (DBG_info, "%s : scan_step_type=%d\n", __func__, scan_step_type);
 
   /*** optical parameters ***/
   /* in case of dynamic lineart, we use an internal 8 bit gray scan
@@ -1652,7 +1652,7 @@ gl843_init_scan_regs (Genesys_Device * dev,
 
 
   dev->current_setup.pixels = (used_pixels * used_res) / optical_res;
-  DBG (DBG_info, "%s: current_setup.pixels=%d\n", __FUNCTION__, dev->current_setup.pixels);
+  DBG (DBG_info, "%s: current_setup.pixels=%d\n", __func__, dev->current_setup.pixels);
   dev->current_setup.lines = lincnt;
   dev->current_setup.depth = depth;
   dev->current_setup.channels = channels;
@@ -1777,7 +1777,7 @@ gl843_calculate_current_setup (Genesys_Device * dev)
     stagger = (4 * yres) / dev->motor.base_ydpi;
   else
     stagger = 0;
-  DBG (DBG_info, "%s: stagger=%d lines\n", __FUNCTION__, stagger);
+  DBG (DBG_info, "%s: stagger=%d lines\n", __func__, stagger);
 
   if(xres<=optical_res)
     used_res = xres;
@@ -1790,11 +1790,11 @@ gl843_calculate_current_setup (Genesys_Device * dev)
 
   /* compute correct pixels number */
   used_pixels = (pixels * optical_res) / xres;
-  DBG (DBG_info, "%s: used_pixels=%d\n", __FUNCTION__, used_pixels);
+  DBG (DBG_info, "%s: used_pixels=%d\n", __func__, used_pixels);
 
   /* exposure */
   exposure = gl843_compute_exposure (dev, used_res, oflags);
-  DBG (DBG_info, "%s : exposure=%d pixels\n", __FUNCTION__, exposure);
+  DBG (DBG_info, "%s : exposure=%d pixels\n", __func__, exposure);
 
   /* it seems base_dpi of the G4050 motor is changed above 600 dpi*/
   if (dev->model->motor_type == MOTOR_G4050 && yres>600)
@@ -1817,7 +1817,7 @@ gl843_calculate_current_setup (Genesys_Device * dev)
   lincnt = lines + max_shift + stagger;
 
   dev->current_setup.pixels = (used_pixels * used_res) / optical_res;
-  DBG (DBG_info, "%s: current_setup.pixels=%d\n", __FUNCTION__, dev->current_setup.pixels);
+  DBG (DBG_info, "%s: current_setup.pixels=%d\n", __func__, dev->current_setup.pixels);
   dev->current_setup.lines = lincnt;
   dev->current_setup.depth = depth;
   dev->current_setup.channels = channels;
@@ -1944,7 +1944,7 @@ gl843_stop_action (Genesys_Device * dev)
   uint8_t val40, val;
   unsigned int loop;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   status = sanei_genesys_get_status (dev, &val);
   if (DBG_LEVEL >= DBG_io)
@@ -1957,17 +1957,17 @@ gl843_stop_action (Genesys_Device * dev)
   if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_error,
-	   "%s: failed to read home sensor: %s\n", __FUNCTION__,
+	   "%s: failed to read home sensor: %s\n", __func__,
 	   sane_strstatus (status));
-      DBG (DBG_proc, "%s: completed\n", __FUNCTION__);
+      DBG (DBG_proc, "%s: completed\n", __func__);
       return status;
     }
 
   /* only stop action if needed */
   if (!(val40 & REG40_DATAENB) && !(val40 & REG40_MOTMFLG))
     {
-      DBG (DBG_info, "%s: already stopped\n", __FUNCTION__);
-      DBG (DBG_proc, "%s: completed\n", __FUNCTION__);
+      DBG (DBG_info, "%s: already stopped\n", __func__);
+      DBG (DBG_proc, "%s: completed\n", __func__);
       return SANE_STATUS_GOOD;
     }
 
@@ -1978,7 +1978,7 @@ gl843_stop_action (Genesys_Device * dev)
   status = sanei_genesys_write_register (dev, REG01, val);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to write register 01: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to write register 01: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -1997,7 +1997,7 @@ gl843_stop_action (Genesys_Device * dev)
       if (status != SANE_STATUS_GOOD)
 	{
 	  DBG (DBG_error,
-	       "%s: failed to read home sensor: %s\n", __FUNCTION__,
+	       "%s: failed to read home sensor: %s\n", __func__,
 	       sane_strstatus (status));
 	  DBGCOMPLETED;
 	  return status;
@@ -2042,7 +2042,7 @@ gl843_get_paper_sensor (Genesys_Device * dev, SANE_Bool * paper_loaded)
 static SANE_Status
 gl843_eject_document (Genesys_Device * dev)
 {
-  DBG (DBG_proc, "%s: not implemented \n", __FUNCTION__);
+  DBG (DBG_proc, "%s: not implemented \n", __func__);
   if (dev == NULL)
     return SANE_STATUS_INVAL;
   return SANE_STATUS_GOOD;
@@ -2052,7 +2052,7 @@ gl843_eject_document (Genesys_Device * dev)
 static SANE_Status
 gl843_load_document (Genesys_Device * dev)
 {
-  DBG (DBG_proc, "%s: not implemented \n", __FUNCTION__);
+  DBG (DBG_proc, "%s: not implemented \n", __func__);
   if (dev == NULL)
     return SANE_STATUS_INVAL;
   return SANE_STATUS_GOOD;
@@ -2071,14 +2071,14 @@ gl843_detect_document_end (Genesys_Device * dev)
   unsigned int scancnt = 0;
   int flines, channels, depth, bytes_remain, sublines,
     bytes_to_flush, lines, sub_bytes, tmp, read_bytes_left;
-  DBG (DBG_proc, "%s: begin\n", __FUNCTION__);
+  DBG (DBG_proc, "%s: begin\n", __func__);
 
   RIE (gl843_get_paper_sensor (dev, &paper_loaded));
 
   /* sheetfed scanner uses home sensor as paper present */
   if ((dev->document == SANE_TRUE) && !paper_loaded)
     {
-      DBG (DBG_info, "%s: no more document\n", __FUNCTION__);
+      DBG (DBG_info, "%s: no more document\n", __func__);
       dev->document = SANE_FALSE;
 
       channels = dev->current_setup.channels;
@@ -2193,7 +2193,7 @@ gl843_detect_document_end (Genesys_Device * dev)
 	}
     }
 
-  DBG (DBG_proc, "%s: finished\n", __FUNCTION__);
+  DBG (DBG_proc, "%s: finished\n", __func__);
   return SANE_STATUS_GOOD;
 }
 
@@ -2483,7 +2483,7 @@ static SANE_Status gl843_park_xpa_lamp (Genesys_Device * dev)
   status = gl843_start_action (dev);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to start motor: %s\n",__FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to start motor: %s\n",__func__, sane_strstatus (status));
       gl843_stop_action (dev);
       /* restore original registers */
       dev->model->cmd_set->bulk_write_register (dev, dev->reg, GENESYS_GL843_MAX_REGS);
@@ -2496,7 +2496,7 @@ static SANE_Status gl843_park_xpa_lamp (Genesys_Device * dev)
 	  if (status != SANE_STATUS_GOOD)
 	    {
 	      DBG (DBG_error,
-		   "%s: failed to read home sensor: %s\n",__FUNCTION__,
+		   "%s: failed to read home sensor: %s\n",__func__,
 		   sane_strstatus (status));
 	      return status;
 	    }
@@ -2507,8 +2507,8 @@ static SANE_Status gl843_park_xpa_lamp (Genesys_Device * dev)
 
 	  if (val & REG41_HOMESNR)	/* home sensor */
 	    {
-	      DBG (DBG_info, "%s: reached home position\n",__FUNCTION__);
-	      DBG (DBG_proc, "%s: finished\n",__FUNCTION__);
+	      DBG (DBG_info, "%s: reached home position\n",__func__);
+	      DBG (DBG_proc, "%s: finished\n",__func__);
 
               /* clear GPOADF to avoid reparking again */
               sanei_genesys_read_register (dev, REG6B, &val);
@@ -2524,7 +2524,7 @@ static SANE_Status gl843_park_xpa_lamp (Genesys_Device * dev)
 	}
 
   /* we are not parked here.... should we fail ? */
-  DBG (DBG_info, "%s: XPA lamp is not parked\n", __FUNCTION__);
+  DBG (DBG_info, "%s: XPA lamp is not parked\n", __func__);
   DBGCOMPLETED;
   return SANE_STATUS_GOOD;
 }
@@ -2564,7 +2564,7 @@ gl843_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
   status = sanei_genesys_get_status (dev, &val);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to read home sensor: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to read home sensor: %s\n", __func__, sane_strstatus (status));
       return status;
     }
   usleep (100000);		/* sleep 100 ms */
@@ -2674,7 +2674,7 @@ gl843_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
       return SANE_STATUS_IO_ERROR;
     }
 
-  DBG (DBG_info, "%s: scanhead is still moving\n", __FUNCTION__);
+  DBG (DBG_info, "%s: scanhead is still moving\n", __func__);
   DBGCOMPLETED;
   return SANE_STATUS_GOOD;
 }
@@ -2926,7 +2926,7 @@ gl843_feed (Genesys_Device * dev, unsigned int steps)
   status = gl843_start_action (dev);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to start motor: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to start motor: %s\n", __func__, sane_strstatus (status));
       gl843_stop_action (dev);
 
       /* restore original registers */
@@ -3000,7 +3000,7 @@ gl843_init_regs_for_shading (Genesys_Device * dev)
 
   dev->scanhead_position_in_steps += dev->calib_lines + move;
   sanei_genesys_get_double(dev->calib_reg,REG_STRPIXEL,&strpixel);
-  DBG (DBG_info, "%s: STRPIXEL=%d\n", __FUNCTION__, strpixel);
+  DBG (DBG_info, "%s: STRPIXEL=%d\n", __func__, strpixel);
 
   status = dev->model->cmd_set->bulk_write_register (dev, dev->calib_reg, GENESYS_GL843_MAX_REGS);
   if (status != SANE_STATUS_GOOD)
@@ -3380,9 +3380,9 @@ dark_average_channel (uint8_t * data, unsigned int pixels, unsigned int lines,
 	}
       if (count)
 	avg[k] /= count;
-      DBG (DBG_info, "%s: avg[%d] = %d\n", __FUNCTION__, k, avg[k]);
+      DBG (DBG_info, "%s: avg[%d] = %d\n", __func__, k, avg[k]);
     }
-  DBG (DBG_info, "%s: average = %d\n", __FUNCTION__, avg[channel]);
+  DBG (DBG_info, "%s: average = %d\n", __func__, avg[channel]);
   return avg[channel];
 }
 
@@ -3786,7 +3786,7 @@ gl843_init_regs_for_warmup (Genesys_Device * dev,
 
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to setup scan: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to setup scan: %s\n", __func__, sane_strstatus (status));
       return status;
     }
 
@@ -3875,7 +3875,7 @@ gl843_boot (Genesys_Device * dev, SANE_Bool cold)
     {
       RIE (sanei_genesys_read_register (dev, 0x00, &val));
       DBG (DBG_info,
-	   "%s: reported version for genesys chip is 0x%02x\n", __FUNCTION__,
+	   "%s: reported version for genesys chip is 0x%02x\n", __func__,
 	   val);
     }
 
@@ -3998,7 +3998,7 @@ SANE_Status gl843_move_to_ta (Genesys_Device * dev)
   status = gl843_feed (dev, feed);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to move to XPA calibration area\n", __FUNCTION__);
+      DBG (DBG_error, "%s: failed to move to XPA calibration area\n", __func__);
       return status;
     }
 
@@ -4357,16 +4357,16 @@ gl843_send_shading_data (Genesys_Device * dev, uint8_t * data, int size)
       /* 16 bit words, 2 words per color, 3 color channels */
       offset=(strpixel-startx)*2*2*3;
       length=(endpixel-strpixel)*2*2*3;
-      DBG (DBG_info, "%s: STRPIXEL=%d, ENDPIXEL=%d, startx=%d\n", __FUNCTION__, strpixel, endpixel, startx);
+      DBG (DBG_info, "%s: STRPIXEL=%d, ENDPIXEL=%d, startx=%d\n", __func__, strpixel, endpixel, startx);
     }
 
   /* compute and allocate size for final data */
   final_size = ((length+251) / 252) * 256;
-  DBG (DBG_io, "%s: final shading size=%04x (length=%d)\n", __FUNCTION__, final_size, length);
+  DBG (DBG_io, "%s: final shading size=%04x (length=%d)\n", __func__, final_size, length);
   final_data = (uint8_t *) malloc (final_size);
   if(final_data==NULL)
     {
-      DBG (DBG_error, "%s: failed to allocate memory for shading data\n", __FUNCTION__);
+      DBG (DBG_error, "%s: failed to allocate memory for shading data\n", __func__);
       return SANE_STATUS_NO_MEM;
     }
   memset(final_data,0x00,final_size);
@@ -4390,7 +4390,7 @@ gl843_send_shading_data (Genesys_Device * dev, uint8_t * data, int size)
   status = sanei_genesys_set_buffer_address (dev, 0);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to set buffer address: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to set buffer address: %s\n", __func__, sane_strstatus (status));
       free(final_data);
       return status;
     }
@@ -4398,7 +4398,7 @@ gl843_send_shading_data (Genesys_Device * dev, uint8_t * data, int size)
   status = dev->model->cmd_set->bulk_write_data (dev, 0x3c, final_data, count);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to send shading table: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to send shading table: %s\n", __func__, sane_strstatus (status));
     }
 
   free(final_data);
@@ -4446,6 +4446,7 @@ static Genesys_Command_Set gl843_cmd_set = {
   gl843_led_calibration,
 
   gl843_slow_back_home,
+  NULL,
 
   sanei_genesys_bulk_write_register,
   gl843_bulk_write_data,
diff --git a/backend/genesys_gl843.h b/backend/genesys_gl843.h
index f31f0ee..4be46cc 100644
--- a/backend/genesys_gl843.h
+++ b/backend/genesys_gl843.h
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2010-2013 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2010-2013 Stéphane Voltz <stef.dev@free.fr>
 
    This file is part of the SANE package.
 
@@ -73,8 +73,8 @@ SANE_Status gl843_xpa_motor_off (Genesys_Device * dev);
 SANE_Status gl843_move_to_ta (Genesys_Device * dev);
 #endif
 
-#define DBGSTART DBG (DBG_proc, "%s start\n", __FUNCTION__);
-#define DBGCOMPLETED DBG (DBG_proc, "%s completed\n", __FUNCTION__);
+#define DBGSTART DBG (DBG_proc, "%s start\n", __func__);
+#define DBGCOMPLETED DBG (DBG_proc, "%s completed\n", __func__);
 
 #define REG01           0x01
 #define REG01_CISSET	0x80
diff --git a/backend/genesys_gl846.c b/backend/genesys_gl846.c
index 3991693..0716c17 100644
--- a/backend/genesys_gl846.c
+++ b/backend/genesys_gl846.c
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2012-2013 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2012-2013 Stéphane Voltz <stef.dev@free.fr>
 
 
    This file is part of the SANE package.
@@ -117,7 +117,7 @@ gl846_bulk_read_data (Genesys_Device * dev, uint8_t addr,
       if (status != SANE_STATUS_GOOD)
 	{
 	  DBG (DBG_error, "%s failed while writing command: %s\n",
-	       __FUNCTION__, sane_strstatus (status));
+	       __func__, sane_strstatus (status));
 	  return status;
 	}
 
@@ -162,7 +162,7 @@ gl846_bulk_read_data (Genesys_Device * dev, uint8_t addr,
           DBG (DBG_io2, "gl846_bulk_read_data: %lu bytes of data read\n", (u_long) done);
 	}
 
-      DBG (DBG_io2, "%s: read %lu bytes, %lu remaining\n", __FUNCTION__,
+      DBG (DBG_io2, "%s: read %lu bytes, %lu remaining\n", __func__,
 	   (u_long) size, (u_long) (target - size));
 
       target -= size;
@@ -269,7 +269,7 @@ gl846_get_step_multiplier (Genesys_Register_Set * regs)
       value = (r->value & 0x0f)>>1;
       value = 1 << value;
     }
-  DBG (DBG_io, "%s: step multiplier is %d\n", __FUNCTION__, value);
+  DBG (DBG_io, "%s: step multiplier is %d\n", __func__, value);
   return value;
 }
 
@@ -317,7 +317,7 @@ static Sensor_Profile *get_sensor_profile(int sensor_type, int dpi)
   /* default fallback */
   if(idx<0)
     {
-      DBG (DBG_warn,"%s: using default sensor profile\n",__FUNCTION__);
+      DBG (DBG_warn,"%s: using default sensor profile\n",__func__);
       idx=0;
     }
 
@@ -577,13 +577,13 @@ gl846_send_slope_table (Genesys_Device * dev, int table_nr,
   int i;
   char msg[10000];
 
-  DBG (DBG_proc, "%s (table_nr = %d, steps = %d)\n", __FUNCTION__,
+  DBG (DBG_proc, "%s (table_nr = %d, steps = %d)\n", __func__,
        table_nr, steps);
 
   /* sanity check */
   if(table_nr<0 || table_nr>4)
     {
-      DBG (DBG_error, "%s: invalid table number %d!\n", __FUNCTION__, table_nr);
+      DBG (DBG_error, "%s: invalid table number %d!\n", __func__, table_nr);
       return SANE_STATUS_INVAL;
     }
 
@@ -601,7 +601,7 @@ gl846_send_slope_table (Genesys_Device * dev, int table_nr,
 	{
 	  sprintf (msg+strlen(msg), "%d", slope_table[i]);
 	}
-      DBG (DBG_io, "%s: %s\n", __FUNCTION__, msg);
+      DBG (DBG_io, "%s: %s\n", __func__, msg);
     }
 
   /* slope table addresses are fixed */
@@ -610,7 +610,7 @@ gl846_send_slope_table (Genesys_Device * dev, int table_nr,
     {
       DBG (DBG_error,
 	   "%s: write to AHB failed writing slope table %d (%s)\n",
-	   __FUNCTION__, table_nr, sane_strstatus (status));
+	   __func__, table_nr, sane_strstatus (status));
     }
 
   free (table);
@@ -641,7 +641,7 @@ gl846_set_adi_fe (Genesys_Device * dev, uint8_t set)
 
   if (set == AFE_INIT)
     {
-      DBG (DBG_proc, "%s(): setting DAC %u\n", __FUNCTION__, dev->model->dac_type);
+      DBG (DBG_proc, "%s(): setting DAC %u\n", __func__, dev->model->dac_type);
 
       /* sets to default values */
       sanei_genesys_init_fe (dev);
@@ -652,7 +652,7 @@ gl846_set_adi_fe (Genesys_Device * dev, uint8_t set)
   status = sanei_genesys_fe_write_data (dev, 0x00, val);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to write reg0: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to write reg0: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -660,7 +660,7 @@ gl846_set_adi_fe (Genesys_Device * dev, uint8_t set)
   status = sanei_genesys_fe_write_data (dev, 0x01, val);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to write reg1: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to write reg1: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -672,7 +672,7 @@ gl846_set_adi_fe (Genesys_Device * dev, uint8_t set)
       if (status != SANE_STATUS_GOOD)
 	{
 	  DBG (DBG_error,
-	       "%s: failed to write gain %d: %s\n", __FUNCTION__, i,
+	       "%s: failed to write gain %d: %s\n", __func__, i,
 	       sane_strstatus (status));
 	  return status;
 	}
@@ -684,7 +684,7 @@ gl846_set_adi_fe (Genesys_Device * dev, uint8_t set)
       if (status != SANE_STATUS_GOOD)
 	{
 	  DBG (DBG_error,
-	       "%s: failed to write offset %d: %s\n", __FUNCTION__, i,
+	       "%s: failed to write offset %d: %s\n", __func__, i,
 	       sane_strstatus (status));
 	  return status;
 	}
@@ -781,10 +781,10 @@ gl846_init_motor_regs_scan (Genesys_Device * dev,
     {
       use_fast_fed=1;
     }
-  DBG (DBG_io, "%s: use_fast_fed=%d\n", __FUNCTION__, use_fast_fed);
+  DBG (DBG_io, "%s: use_fast_fed=%d\n", __func__, use_fast_fed);
 
   sanei_genesys_set_triple(reg, REG_LINCNT, scan_lines);
-  DBG (DBG_io, "%s: lincnt=%d\n", __FUNCTION__, scan_lines);
+  DBG (DBG_io, "%s: lincnt=%d\n", __func__, scan_lines);
 
   /* compute register 02 value */
   r = sanei_genesys_get_address (reg, REG02);
@@ -863,8 +863,8 @@ gl846_init_motor_regs_scan (Genesys_Device * dev,
       if (flags & MOTOR_FLAG_FEED)
         dist *=2;
     }
-  DBG (DBG_io2, "%s: scan steps=%d\n", __FUNCTION__, scan_steps);
-  DBG (DBG_io2, "%s: acceleration distance=%d\n", __FUNCTION__, dist);
+  DBG (DBG_io2, "%s: scan steps=%d\n", __func__, scan_steps);
+  DBG (DBG_io2, "%s: acceleration distance=%d\n", __func__, dist);
 
   /* check for overflow */
   if(dist<feedl)
@@ -873,7 +873,7 @@ gl846_init_motor_regs_scan (Genesys_Device * dev,
     feedl = 0;
 
   sanei_genesys_set_triple(reg,REG_FEEDL,feedl);
-  DBG (DBG_io ,"%s: feedl=%d\n",__FUNCTION__,feedl);
+  DBG (DBG_io ,"%s: feedl=%d\n",__func__,feedl);
 
   r = sanei_genesys_get_address (reg, REG0C);
   ccdlmt=(r->value & REG0C_CCDLMT)+1;
@@ -1024,13 +1024,13 @@ gl846_init_optical_regs_scan (Genesys_Device * dev,
   /* resolution is divided according to CKSEL */
   r = sanei_genesys_get_address (reg, REG18);
   cksel= (r->value & REG18_CKSEL)+1;
-  DBG (DBG_io2, "%s: cksel=%d\n", __FUNCTION__, cksel);
+  DBG (DBG_io2, "%s: cksel=%d\n", __func__, cksel);
 
   /* to manage high resolution device while keeping good
    * low resolution scanning speed, we make hardware dpi vary */
   dpihw=sanei_genesys_compute_dpihw(dev, used_res * cksel);
   factor=dev->sensor.optical_res/dpihw;
-  DBG (DBG_io2, "%s: dpihw=%d (factor=%d)\n", __FUNCTION__, dpihw, factor);
+  DBG (DBG_io2, "%s: dpihw=%d (factor=%d)\n", __func__, dpihw, factor);
 
   /* sensor parameters */
   sensor=get_sensor_profile(dev->model->ccd_type, dpihw);
@@ -1215,20 +1215,20 @@ gl846_init_optical_regs_scan (Genesys_Device * dev,
   dev->line_interp = 0;
 
   sanei_genesys_set_double(reg,REG_DPISET,dpiset);
-  DBG (DBG_io2, "%s: dpiset used=%d\n", __FUNCTION__, dpiset);
+  DBG (DBG_io2, "%s: dpiset used=%d\n", __func__, dpiset);
 
   sanei_genesys_set_double(reg,REG_STRPIXEL,startx);
   sanei_genesys_set_double(reg,REG_ENDPIXEL,endx);
-  DBG (DBG_io2, "%s: startx=%d\n", __FUNCTION__, startx);
-  DBG (DBG_io2, "%s: endx  =%d\n", __FUNCTION__, endx);
+  DBG (DBG_io2, "%s: startx=%d\n", __func__, startx);
+  DBG (DBG_io2, "%s: endx  =%d\n", __func__, endx);
 
-  DBG (DBG_io2, "%s: used_pixels=%d\n", __FUNCTION__, used_pixels);
-  DBG (DBG_io2, "%s: pixels     =%d\n", __FUNCTION__, pixels);
-  DBG (DBG_io2, "%s: depth      =%d\n", __FUNCTION__, depth);
-  DBG (DBG_io2, "%s: dev->bpl   =%lu\n", __FUNCTION__, (unsigned long)dev->bpl);
-  DBG (DBG_io2, "%s: dev->len   =%lu\n", __FUNCTION__, (unsigned long)dev->len);
-  DBG (DBG_io2, "%s: dev->dist  =%lu\n", __FUNCTION__, (unsigned long)dev->dist);
-  DBG (DBG_io2, "%s: dev->segnb =%lu\n", __FUNCTION__, (unsigned long)dev->segnb);
+  DBG (DBG_io2, "%s: used_pixels=%d\n", __func__, used_pixels);
+  DBG (DBG_io2, "%s: pixels     =%d\n", __func__, pixels);
+  DBG (DBG_io2, "%s: depth      =%d\n", __func__, depth);
+  DBG (DBG_io2, "%s: dev->bpl   =%lu\n", __func__, (unsigned long)dev->bpl);
+  DBG (DBG_io2, "%s: dev->len   =%lu\n", __func__, (unsigned long)dev->len);
+  DBG (DBG_io2, "%s: dev->dist  =%lu\n", __func__, (unsigned long)dev->dist);
+  DBG (DBG_io2, "%s: dev->segnb =%lu\n", __func__, (unsigned long)dev->segnb);
 
   words_per_line *= channels;
   dev->wpl = words_per_line;
@@ -1241,10 +1241,10 @@ gl846_init_optical_regs_scan (Genesys_Device * dev,
 
   /* MAXWD is expressed in 4 words unit */
   sanei_genesys_set_triple(reg, REG_MAXWD, (words_per_line >> 2));
-  DBG (DBG_io2, "%s: words_per_line used=%d\n", __FUNCTION__, words_per_line);
+  DBG (DBG_io2, "%s: words_per_line used=%d\n", __func__, words_per_line);
 
   sanei_genesys_set_double(reg, REG_LPERIOD, exposure_time);
-  DBG (DBG_io2, "%s: exposure_time used=%d\n", __FUNCTION__, exposure_time);
+  DBG (DBG_io2, "%s: exposure_time used=%d\n", __func__, exposure_time);
 
   r = sanei_genesys_get_address (reg, 0x34);
   r->value = dev->sensor.dummy_pixel;
@@ -1645,7 +1645,7 @@ gl846_calculate_current_setup (Genesys_Device * dev)
   slope_dpi = slope_dpi * (1 + dummy);
 
   exposure_time = gl846_compute_exposure (dev, used_res);
-  DBG (DBG_info, "%s : exposure_time=%d pixels\n", __FUNCTION__, exposure_time);
+  DBG (DBG_info, "%s : exposure_time=%d pixels\n", __func__, exposure_time);
 
   /* max_shift */
   max_shift=sanei_genesys_compute_max_shift(dev,channels,yres,0);
@@ -1761,7 +1761,7 @@ gl846_stop_action (Genesys_Device * dev)
   if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_error,
-	   "%s: failed to read home sensor: %s\n", __FUNCTION__,
+	   "%s: failed to read home sensor: %s\n", __func__,
 	   sane_strstatus (status));
       DBGCOMPLETED;
       return status;
@@ -1770,7 +1770,7 @@ gl846_stop_action (Genesys_Device * dev)
   /* only stop action if needed */
   if (!(val40 & REG40_DATAENB) && !(val40 & REG40_MOTMFLG))
     {
-      DBG (DBG_info, "%s: already stopped\n", __FUNCTION__);
+      DBG (DBG_info, "%s: already stopped\n", __func__);
       DBGCOMPLETED;
       return SANE_STATUS_GOOD;
     }
@@ -1783,7 +1783,7 @@ gl846_stop_action (Genesys_Device * dev)
   if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_error,
-	   "%s: failed to write register 01: %s\n", __FUNCTION__,
+	   "%s: failed to write register 01: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -1801,7 +1801,7 @@ gl846_stop_action (Genesys_Device * dev)
       if (status != SANE_STATUS_GOOD)
 	{
 	  DBG (DBG_error,
-	       "%s: failed to read home sensor: %s\n", __FUNCTION__,
+	       "%s: failed to read home sensor: %s\n", __func__,
 	       sane_strstatus (status));
           DBGCOMPLETED;
 	  return status;
@@ -1962,7 +1962,7 @@ gl846_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
   /* is sensor at home? */
   if (val & HOMESNR)
     {
-      DBG (DBG_info, "%s: already at home, completed\n", __FUNCTION__);
+      DBG (DBG_info, "%s: already at home, completed\n", __func__);
       dev->scanhead_position_in_steps = 0;
       DBGCOMPLETED;
       return SANE_STATUS_GOOD;
@@ -2257,7 +2257,7 @@ gl846_feed (Genesys_Device * dev, unsigned int steps)
   uint8_t val;
 
   DBGSTART;
-  DBG (DBG_io, "%s: steps=%d\n", __FUNCTION__, steps);
+  DBG (DBG_io, "%s: steps=%d\n", __func__, steps);
 
   /* prepare local registers */
   memcpy (local_reg, dev->reg, GENESYS_GL846_MAX_REGS * sizeof (Genesys_Register_Set));
@@ -2306,7 +2306,7 @@ gl846_feed (Genesys_Device * dev, unsigned int steps)
   status = gl846_start_action (dev);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to start motor: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to start motor: %s\n", __func__, sane_strstatus (status));
       gl846_stop_action (dev);
 
       /* restore original registers */
@@ -2348,8 +2348,8 @@ gl846_init_regs_for_shading (Genesys_Device * dev)
   if(dev->calib_resolution==4800)
     dev->calib_lines *= 2;
   dev->calib_pixels = (dev->sensor.sensor_pixels*dev->calib_resolution)/dev->sensor.optical_res;
-  DBG (DBG_io, "%s: calib_lines  = %d\n", __FUNCTION__, (unsigned int)dev->calib_lines);
-  DBG (DBG_io, "%s: calib_pixels = %d\n", __FUNCTION__, (unsigned int)dev->calib_pixels);
+  DBG (DBG_io, "%s: calib_lines  = %d\n", __func__, (unsigned int)dev->calib_lines);
+  DBG (DBG_io, "%s: calib_pixels = %d\n", __func__, (unsigned int)dev->calib_pixels);
 
   /* this is aworkaround insufficent distance for slope
    * motor acceleration TODO special motor slope for shading  */
@@ -2377,14 +2377,14 @@ gl846_init_regs_for_shading (Genesys_Device * dev)
 
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to setup scan: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to setup scan: %s\n", __func__, sane_strstatus (status));
       return status;
     }
 
   status = dev->model->cmd_set->bulk_write_register (dev, dev->calib_reg, GENESYS_GL846_MAX_REGS);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to bulk write registers: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to bulk write registers: %s\n", __func__, sane_strstatus (status));
       return status;
     }
 
@@ -2452,7 +2452,7 @@ gl846_init_regs_for_scan (Genesys_Device * dev)
   move += dev->settings.tl_y;
   move = (move * move_dpi) / MM_PER_INCH;
   move -= dev->scanhead_position_in_steps;
-  DBG (DBG_info, "%s: move=%f steps\n",__FUNCTION__, move);
+  DBG (DBG_info, "%s: move=%f steps\n",__func__, move);
 
   /* fast move to scan area */
   /* we don't move fast the whole distance since it would involve
@@ -2464,14 +2464,14 @@ gl846_init_regs_for_scan (Genesys_Device * dev)
       status = gl846_feed (dev, move-500);
       if (status != SANE_STATUS_GOOD)
         {
-          DBG (DBG_error, "%s: failed to move to scan area\n",__FUNCTION__);
+          DBG (DBG_error, "%s: failed to move to scan area\n",__func__);
           return status;
         }
       move=500;
     }
 
   DBG (DBG_info, "gl846_init_regs_for_scan: move=%f steps\n", move);
-  DBG (DBG_info, "%s: move=%f steps\n", __FUNCTION__, move);
+  DBG (DBG_info, "%s: move=%f steps\n", __func__, move);
 
   /* start */
   start = SANE_UNFIX (dev->model->x_offset);
@@ -2526,7 +2526,7 @@ gl846_send_shading_data (Genesys_Device * dev, uint8_t * data, int size)
   uint8_t val,*buffer,*ptr,*src;
 
   DBGSTART;
-  DBG( DBG_io2, "%s: writing %d bytes of shading data\n",__FUNCTION__,size);
+  DBG( DBG_io2, "%s: writing %d bytes of shading data\n",__func__,size);
 
   /* shading data is plit in 3 (up to 5 with IR) areas
      write(0x10014000,0x00000dd8)
@@ -2543,10 +2543,10 @@ gl846_send_shading_data (Genesys_Device * dev, uint8_t * data, int size)
   /* compute deletion factor */
   sanei_genesys_get_double(dev->reg,REG_DPISET,&tempo);
   dpiset=tempo;
-  DBG( DBG_io2, "%s: STRPIXEL=%d, ENDPIXEL=%d, PIXELS=%d, DPISET=%d\n",__FUNCTION__,strpixel,endpixel,endpixel-strpixel,dpiset);
+  DBG( DBG_io2, "%s: STRPIXEL=%d, ENDPIXEL=%d, PIXELS=%d, DPISET=%d\n",__func__,strpixel,endpixel,endpixel-strpixel,dpiset);
   dpihw=sanei_genesys_compute_dpihw(dev,dpiset);
   factor=dpihw/dpiset;
-  DBG( DBG_io2, "%s: factor=%d\n",__FUNCTION__,factor);
+  DBG( DBG_io2, "%s: factor=%d\n",__func__,factor);
 
   if(DBG_LEVEL>=DBG_data)
     {
@@ -2571,7 +2571,7 @@ gl846_send_shading_data (Genesys_Device * dev, uint8_t * data, int size)
   /* allocate temporary buffer */
   buffer=(uint8_t *)malloc(pixels);
   memset(buffer,0,pixels);
-  DBG( DBG_io2, "%s: using chunks of %d (0x%04x) bytes\n",__FUNCTION__,pixels,pixels);
+  DBG( DBG_io2, "%s: using chunks of %d (0x%04x) bytes\n",__func__,pixels,pixels);
 
   /* base addr of data has been written in reg D0-D4 in 4K word, so AHB address
    * is 8192*reg value */
@@ -2649,7 +2649,7 @@ gl846_led_calibration (Genesys_Device * dev)
     {
       RIE(gl846_feed (dev, move));
     }
-  DBG (DBG_io, "%s: move=%f steps\n", __FUNCTION__, move);
+  DBG (DBG_io, "%s: move=%f steps\n", __func__, move);
 
   /* offset calibration is always done in color mode */
   channels = 3;
@@ -2679,7 +2679,7 @@ gl846_led_calibration (Genesys_Device * dev)
 				 SCAN_FLAG_IGNORE_LINE_DISTANCE);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to setup scan: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to setup scan: %s\n", __func__, sane_strstatus (status));
       return status;
     }
 
@@ -2816,7 +2816,7 @@ gl846_init_gpio (Genesys_Device * dev)
     }
   if(gpios[idx].sensor_id==0)
     {
-      DBG (DBG_error, "%s: failed to find GPIO profile for sensor_id=%d\n", __FUNCTION__, dev->model->ccd_type);
+      DBG (DBG_error, "%s: failed to find GPIO profile for sensor_id=%d\n", __func__, dev->model->ccd_type);
       return SANE_STATUS_INVAL;
     }
 
@@ -2857,7 +2857,7 @@ gl846_init_memory_layout (Genesys_Device * dev)
     }
   if(layouts[idx].model==NULL)
     {
-      DBG(DBG_error, "%s: failed to find memory layout for model %s!\n", __FUNCTION__, dev->model->name);
+      DBG(DBG_error, "%s: failed to find memory layout for model %s!\n", __func__, dev->model->name);
       return SANE_STATUS_INVAL;
     }
 
@@ -2915,7 +2915,7 @@ gl846_boot (Genesys_Device * dev, SANE_Bool cold)
   if (val & REG40_CHKVER)
     {
       RIE (sanei_genesys_read_register (dev, 0x00, &val));
-      DBG (DBG_info, "%s: reported version for genesys chip is 0x%02x\n", __FUNCTION__, val);
+      DBG (DBG_info, "%s: reported version for genesys chip is 0x%02x\n", __func__, val);
     }
 
   /* Set default values for registers */
@@ -3680,6 +3680,7 @@ static Genesys_Command_Set gl846_cmd_set = {
   gl846_led_calibration,
 
   gl846_slow_back_home,
+  NULL,
 
   sanei_genesys_bulk_write_register,
   NULL,
diff --git a/backend/genesys_gl846.h b/backend/genesys_gl846.h
index d57f149..e1dc711 100644
--- a/backend/genesys_gl846.h
+++ b/backend/genesys_gl846.h
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2012-2013 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2012-2013 Stéphane Voltz <stef.dev@free.fr>
 
    This file is part of the SANE package.
 
diff --git a/backend/genesys_gl847.c b/backend/genesys_gl847.c
index 7c4d19c..a3b35a2 100644
--- a/backend/genesys_gl847.c
+++ b/backend/genesys_gl847.c
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2010-2013 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2010-2013 Stéphane Voltz <stef.dev@free.fr>
 
 
    This file is part of the SANE package.
@@ -113,7 +113,7 @@ gl847_bulk_read_data (Genesys_Device * dev, uint8_t addr,
       if (status != SANE_STATUS_GOOD)
 	{
 	  DBG (DBG_error, "%s failed while writing command: %s\n",
-	       __FUNCTION__, sane_strstatus (status));
+	       __func__, sane_strstatus (status));
 	  return status;
 	}
 
@@ -158,7 +158,7 @@ gl847_bulk_read_data (Genesys_Device * dev, uint8_t addr,
           DBG (DBG_io2, "gl847_bulk_read_data: %lu bytes of data read\n", (u_long) done);
 	}
 
-      DBG (DBG_io2, "%s: read %lu bytes, %lu remaining\n", __FUNCTION__,
+      DBG (DBG_io2, "%s: read %lu bytes, %lu remaining\n", __func__,
 	   (u_long) size, (u_long) (target - size));
 
       target -= size;
@@ -265,7 +265,7 @@ gl847_get_step_multiplier (Genesys_Register_Set * regs)
       value = (r->value & 0x0f)>>1;
       value = 1 << value;
     }
-  DBG (DBG_io, "%s: step multiplier is %d\n", __FUNCTION__, value);
+  DBG (DBG_io, "%s: step multiplier is %d\n", __func__, value);
   return value;
 }
 
@@ -313,7 +313,7 @@ static Sensor_Profile *get_sensor_profile(int sensor_type, int dpi)
   /* default fallback */
   if(idx<0)
     {
-      DBG (DBG_warn,"%s: using default sensor profile\n",__FUNCTION__);
+      DBG (DBG_warn,"%s: using default sensor profile\n",__func__);
       idx=0;
     }
 
@@ -600,13 +600,13 @@ gl847_send_slope_table (Genesys_Device * dev, int table_nr,
   int i;
   char msg[10000];
 
-  DBG (DBG_proc, "%s (table_nr = %d, steps = %d)\n", __FUNCTION__,
+  DBG (DBG_proc, "%s (table_nr = %d, steps = %d)\n", __func__,
        table_nr, steps);
 
   /* sanity check */
   if(table_nr<0 || table_nr>4)
     {
-      DBG (DBG_error, "%s: invalid table number %d!\n", __FUNCTION__, table_nr);
+      DBG (DBG_error, "%s: invalid table number %d!\n", __func__, table_nr);
       return SANE_STATUS_INVAL;
     }
 
@@ -624,7 +624,7 @@ gl847_send_slope_table (Genesys_Device * dev, int table_nr,
 	{
 	  sprintf (msg+strlen(msg), "%d", slope_table[i]);
 	}
-      DBG (DBG_io, "%s: %s\n", __FUNCTION__, msg);
+      DBG (DBG_io, "%s: %s\n", __func__, msg);
     }
 
   /* slope table addresses are fixed */
@@ -634,7 +634,7 @@ gl847_send_slope_table (Genesys_Device * dev, int table_nr,
     {
       DBG (DBG_error,
 	   "%s: write to AHB failed writing slope table %d (%s)\n",
-	   __FUNCTION__, table_nr, sane_strstatus (status));
+	   __func__, table_nr, sane_strstatus (status));
     }
 
   free (table);
@@ -824,10 +824,10 @@ gl847_init_motor_regs_scan (Genesys_Device * dev,
     {
       use_fast_fed=1;
     }
-  DBG (DBG_io, "%s: use_fast_fed=%d\n", __FUNCTION__, use_fast_fed);
+  DBG (DBG_io, "%s: use_fast_fed=%d\n", __func__, use_fast_fed);
 
   sanei_genesys_set_triple(reg, REG_LINCNT, scan_lines);
-  DBG (DBG_io, "%s: lincnt=%d\n", __FUNCTION__, scan_lines);
+  DBG (DBG_io, "%s: lincnt=%d\n", __func__, scan_lines);
 
   /* compute register 02 value */
   r = sanei_genesys_get_address (reg, REG02);
@@ -906,8 +906,8 @@ gl847_init_motor_regs_scan (Genesys_Device * dev,
       if (flags & MOTOR_FLAG_FEED)
         dist *=2;
     }
-  DBG (DBG_io2, "%s: scan steps=%d\n", __FUNCTION__, scan_steps);
-  DBG (DBG_io2, "%s: acceleration distance=%d\n", __FUNCTION__, dist);
+  DBG (DBG_io2, "%s: scan steps=%d\n", __func__, scan_steps);
+  DBG (DBG_io2, "%s: acceleration distance=%d\n", __func__, dist);
 
   /* check for overflow */
   if(dist<feedl)
@@ -916,7 +916,7 @@ gl847_init_motor_regs_scan (Genesys_Device * dev,
     feedl = 0;
 
   sanei_genesys_set_triple(reg,REG_FEEDL,feedl);
-  DBG (DBG_io ,"%s: feedl=%d\n",__FUNCTION__,feedl);
+  DBG (DBG_io ,"%s: feedl=%d\n",__func__,feedl);
 
   r = sanei_genesys_get_address (reg, REG0C);
   ccdlmt=(r->value & REG0C_CCDLMT)+1;
@@ -1048,13 +1048,13 @@ gl847_init_optical_regs_scan (Genesys_Device * dev,
   /* resolution is divided according to CKSEL */
   r = sanei_genesys_get_address (reg, REG18);
   cksel= (r->value & REG18_CKSEL)+1;
-  DBG (DBG_io2, "%s: cksel=%d\n", __FUNCTION__, cksel);
+  DBG (DBG_io2, "%s: cksel=%d\n", __func__, cksel);
 
   /* to manage high resolution device while keeping good
    * low resolution scanning speed, we make hardware dpi vary */
   dpihw=sanei_genesys_compute_dpihw(dev, used_res * cksel);
   factor=dev->sensor.optical_res/dpihw;
-  DBG (DBG_io2, "%s: dpihw=%d (factor=%d)\n", __FUNCTION__, dpihw, factor);
+  DBG (DBG_io2, "%s: dpihw=%d (factor=%d)\n", __func__, dpihw, factor);
 
   /* sensor parameters */
   sensor=get_sensor_profile(dev->model->ccd_type, dpihw);
@@ -1239,20 +1239,20 @@ gl847_init_optical_regs_scan (Genesys_Device * dev,
   dev->line_interp = 0;
 
   sanei_genesys_set_double(reg,REG_DPISET,dpiset);
-  DBG (DBG_io2, "%s: dpiset used=%d\n", __FUNCTION__, dpiset);
+  DBG (DBG_io2, "%s: dpiset used=%d\n", __func__, dpiset);
 
   sanei_genesys_set_double(reg,REG_STRPIXEL,startx);
   sanei_genesys_set_double(reg,REG_ENDPIXEL,endx);
-  DBG (DBG_io2, "%s: startx=%d\n", __FUNCTION__, startx);
-  DBG (DBG_io2, "%s: endx  =%d\n", __FUNCTION__, endx);
+  DBG (DBG_io2, "%s: startx=%d\n", __func__, startx);
+  DBG (DBG_io2, "%s: endx  =%d\n", __func__, endx);
 
-  DBG (DBG_io2, "%s: used_pixels=%d\n", __FUNCTION__, used_pixels);
-  DBG (DBG_io2, "%s: pixels     =%d\n", __FUNCTION__, pixels);
-  DBG (DBG_io2, "%s: depth      =%d\n", __FUNCTION__, depth);
-  DBG (DBG_io2, "%s: dev->bpl   =%lu\n", __FUNCTION__, (unsigned long)dev->bpl);
-  DBG (DBG_io2, "%s: dev->len   =%lu\n", __FUNCTION__, (unsigned long)dev->len);
-  DBG (DBG_io2, "%s: dev->dist  =%lu\n", __FUNCTION__, (unsigned long)dev->dist);
-  DBG (DBG_io2, "%s: dev->segnb =%lu\n", __FUNCTION__, (unsigned long)dev->segnb);
+  DBG (DBG_io2, "%s: used_pixels=%d\n", __func__, used_pixels);
+  DBG (DBG_io2, "%s: pixels     =%d\n", __func__, pixels);
+  DBG (DBG_io2, "%s: depth      =%d\n", __func__, depth);
+  DBG (DBG_io2, "%s: dev->bpl   =%lu\n", __func__, (unsigned long)dev->bpl);
+  DBG (DBG_io2, "%s: dev->len   =%lu\n", __func__, (unsigned long)dev->len);
+  DBG (DBG_io2, "%s: dev->dist  =%lu\n", __func__, (unsigned long)dev->dist);
+  DBG (DBG_io2, "%s: dev->segnb =%lu\n", __func__, (unsigned long)dev->segnb);
 
   words_per_line *= channels;
   dev->wpl = words_per_line;
@@ -1265,10 +1265,10 @@ gl847_init_optical_regs_scan (Genesys_Device * dev,
 
   /* MAXWD is expressed in 4 words unit */
   sanei_genesys_set_triple(reg, REG_MAXWD, (words_per_line >> 2));
-  DBG (DBG_io2, "%s: words_per_line used=%d\n", __FUNCTION__, words_per_line);
+  DBG (DBG_io2, "%s: words_per_line used=%d\n", __func__, words_per_line);
 
   sanei_genesys_set_double(reg, REG_LPERIOD, exposure_time);
-  DBG (DBG_io2, "%s: exposure_time used=%d\n", __FUNCTION__, exposure_time);
+  DBG (DBG_io2, "%s: exposure_time used=%d\n", __func__, exposure_time);
 
   r = sanei_genesys_get_address (reg, 0x34);
   r->value = dev->sensor.dummy_pixel;
@@ -1669,7 +1669,7 @@ gl847_calculate_current_setup (Genesys_Device * dev)
   slope_dpi = slope_dpi * (1 + dummy);
 
   exposure_time = gl847_compute_exposure (dev, used_res);
-  DBG (DBG_info, "%s : exposure_time=%d pixels\n", __FUNCTION__, exposure_time);
+  DBG (DBG_info, "%s : exposure_time=%d pixels\n", __func__, exposure_time);
 
   /* max_shift */
   max_shift=sanei_genesys_compute_max_shift(dev,channels,yres,0);
@@ -1785,7 +1785,7 @@ gl847_stop_action (Genesys_Device * dev)
   if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_error,
-	   "%s: failed to read home sensor: %s\n", __FUNCTION__,
+	   "%s: failed to read home sensor: %s\n", __func__,
 	   sane_strstatus (status));
       DBGCOMPLETED;
       return status;
@@ -1794,7 +1794,7 @@ gl847_stop_action (Genesys_Device * dev)
   /* only stop action if needed */
   if (!(val40 & REG40_DATAENB) && !(val40 & REG40_MOTMFLG))
     {
-      DBG (DBG_info, "%s: already stopped\n", __FUNCTION__);
+      DBG (DBG_info, "%s: already stopped\n", __func__);
       DBGCOMPLETED;
       return SANE_STATUS_GOOD;
     }
@@ -1807,7 +1807,7 @@ gl847_stop_action (Genesys_Device * dev)
   if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_error,
-	   "%s: failed to write register 01: %s\n", __FUNCTION__,
+	   "%s: failed to write register 01: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -1825,7 +1825,7 @@ gl847_stop_action (Genesys_Device * dev)
       if (status != SANE_STATUS_GOOD)
 	{
 	  DBG (DBG_error,
-	       "%s: failed to read home sensor: %s\n", __FUNCTION__,
+	       "%s: failed to read home sensor: %s\n", __func__,
 	       sane_strstatus (status));
           DBGCOMPLETED;
 	  return status;
@@ -1929,10 +1929,50 @@ gl847_end_scan (Genesys_Device * dev, Genesys_Register_Set * reg,
   return status;
 }
 
-/* Moves the slider to the home (top) postion slowly */
-#ifndef UNIT_TESTING
-static
-#endif
+/** rewind scan
+ * Move back by the same amount of distance than previous scan.
+ * @param dev device to rewind
+ * @returns SANE_STATUS_GOOD on success
+ */
+GENESYS_STATIC
+SANE_Status gl847_rewind(Genesys_Device * dev)
+{
+  SANE_Status status;
+  uint8_t byte;
+
+  DBGSTART;
+
+  /* set motor reverse */
+  RIE (sanei_genesys_read_register (dev, 0x02, &byte));
+  byte |= 0x04;
+  RIE (sanei_genesys_write_register(dev, 0x02, byte));
+
+  /* and start scan, then wait completion */
+  RIE (gl847_begin_scan (dev, dev->reg, SANE_TRUE));
+  do
+    {
+      usleep(100*1000);
+      RIE (sanei_genesys_read_register (dev, REG40, &byte));
+    }
+  while(byte & REG40_MOTMFLG);
+  RIE (gl847_end_scan (dev, dev->reg, SANE_TRUE));
+
+  /* restore direction */
+  RIE (sanei_genesys_read_register (dev, 0x02, &byte));
+  byte &= 0xfb;
+  RIE (sanei_genesys_write_register(dev, 0x02, byte));
+
+  DBGCOMPLETED;
+  return SANE_STATUS_GOOD;
+}
+
+/** Park head
+ * Moves the slider to the home (top) position slowly
+ * @param dev device to park
+ * @param wait_until_home true to make the function waiting for head
+ * to be home before returning, if fals returne immediately
+ * @returns SANE_STATUS_GOO on success */
+GENESYS_STATIC
 SANE_Status
 gl847_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
 {
@@ -1982,7 +2022,7 @@ gl847_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home)
   /* is sensor at home? */
   if (val & HOMESNR)
     {
-      DBG (DBG_info, "%s: already at home, completed\n", __FUNCTION__);
+      DBG (DBG_info, "%s: already at home, completed\n", __func__);
       dev->scanhead_position_in_steps = 0;
       DBGCOMPLETED;
       return SANE_STATUS_GOOD;
@@ -2279,7 +2319,7 @@ gl847_feed (Genesys_Device * dev, unsigned int steps)
   uint8_t val;
 
   DBGSTART;
-  DBG (DBG_io, "%s: steps=%d\n", __FUNCTION__, steps);
+  DBG (DBG_io, "%s: steps=%d\n", __func__, steps);
 
   /* prepare local registers */
   memcpy (local_reg, dev->reg, GENESYS_GL847_MAX_REGS * sizeof (Genesys_Register_Set));
@@ -2328,7 +2368,7 @@ gl847_feed (Genesys_Device * dev, unsigned int steps)
   status = gl847_start_action (dev);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to start motor: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to start motor: %s\n", __func__, sane_strstatus (status));
       gl847_stop_action (dev);
 
       /* restore original registers */
@@ -2370,8 +2410,8 @@ gl847_init_regs_for_shading (Genesys_Device * dev)
   if(dev->calib_resolution==4800)
     dev->calib_lines *= 2;
   dev->calib_pixels = (dev->sensor.sensor_pixels*dev->calib_resolution)/dev->sensor.optical_res;
-  DBG (DBG_io, "%s: calib_lines  = %d\n", __FUNCTION__, (int)dev->calib_lines);
-  DBG (DBG_io, "%s: calib_pixels = %d\n", __FUNCTION__, (int)dev->calib_pixels);
+  DBG (DBG_io, "%s: calib_lines  = %d\n", __func__, (int)dev->calib_lines);
+  DBG (DBG_io, "%s: calib_pixels = %d\n", __func__, (int)dev->calib_pixels);
 
   /* this is aworkaround insufficent distance for slope
    * motor acceleration TODO special motor slope for shading  */
@@ -2399,14 +2439,14 @@ gl847_init_regs_for_shading (Genesys_Device * dev)
 
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to setup scan: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to setup scan: %s\n", __func__, sane_strstatus (status));
       return status;
     }
 
   status = dev->model->cmd_set->bulk_write_register (dev, dev->calib_reg, GENESYS_GL847_MAX_REGS);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to bulk write registers: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to bulk write registers: %s\n", __func__, sane_strstatus (status));
       return status;
     }
 
@@ -2474,7 +2514,7 @@ gl847_init_regs_for_scan (Genesys_Device * dev)
   move += dev->settings.tl_y;
   move = (move * move_dpi) / MM_PER_INCH;
   move -= dev->scanhead_position_in_steps;
-  DBG (DBG_info, "%s: move=%f steps\n",__FUNCTION__, move);
+  DBG (DBG_info, "%s: move=%f steps\n",__func__, move);
 
   /* fast move to scan area */
   /* we don't move fast the whole distance since it would involve
@@ -2486,14 +2526,14 @@ gl847_init_regs_for_scan (Genesys_Device * dev)
       status = gl847_feed (dev, move-500);
       if (status != SANE_STATUS_GOOD)
         {
-          DBG (DBG_error, "%s: failed to move to scan area\n",__FUNCTION__);
+          DBG (DBG_error, "%s: failed to move to scan area\n",__func__);
           return status;
         }
       move=500;
     }
 
   DBG (DBG_info, "gl124_init_regs_for_scan: move=%f steps\n", move);
-  DBG (DBG_info, "%s: move=%f steps\n", __FUNCTION__, move);
+  DBG (DBG_info, "%s: move=%f steps\n", __func__, move);
 
   /* start */
   start = SANE_UNFIX (dev->model->x_offset);
@@ -2548,7 +2588,7 @@ gl847_send_shading_data (Genesys_Device * dev, uint8_t * data, int size)
   uint8_t val,*buffer,*ptr,*src;
 
   DBGSTART;
-  DBG( DBG_io2, "%s: writing %d bytes of shading data\n",__FUNCTION__,size);
+  DBG( DBG_io2, "%s: writing %d bytes of shading data\n",__func__,size);
 
   /* shading data is plit in 3 (up to 5 with IR) areas
      write(0x10014000,0x00000dd8)
@@ -2565,10 +2605,10 @@ gl847_send_shading_data (Genesys_Device * dev, uint8_t * data, int size)
   /* compute deletion factor */
   sanei_genesys_get_double(dev->reg,REG_DPISET,&tempo);
   dpiset=tempo;
-  DBG( DBG_io2, "%s: STRPIXEL=%d, ENDPIXEL=%d, PIXELS=%d, DPISET=%d\n",__FUNCTION__,strpixel,endpixel,endpixel-strpixel,dpiset);
+  DBG( DBG_io2, "%s: STRPIXEL=%d, ENDPIXEL=%d, PIXELS=%d, DPISET=%d\n",__func__,strpixel,endpixel,endpixel-strpixel,dpiset);
   dpihw=sanei_genesys_compute_dpihw(dev,dpiset);
   factor=dpihw/dpiset;
-  DBG( DBG_io2, "%s: factor=%d\n",__FUNCTION__,factor);
+  DBG( DBG_io2, "%s: factor=%d\n",__func__,factor);
 
   if(DBG_LEVEL>=DBG_data)
     {
@@ -2593,7 +2633,7 @@ gl847_send_shading_data (Genesys_Device * dev, uint8_t * data, int size)
   /* allocate temporary buffer */
   buffer=(uint8_t *)malloc(pixels);
   memset(buffer,0,pixels);
-  DBG( DBG_io2, "%s: using chunks of %d (0x%04x) bytes\n",__FUNCTION__,pixels,pixels);
+  DBG( DBG_io2, "%s: using chunks of %d (0x%04x) bytes\n",__func__,pixels,pixels);
 
   /* base addr of data has been written in reg D0-D4 in 4K word, so AHB address
    * is 8192*reg value */
@@ -2670,7 +2710,7 @@ gl847_led_calibration (Genesys_Device * dev)
     {
       RIE(gl847_feed (dev, move));
     }
-  DBG (DBG_io, "%s: move=%f steps\n", __FUNCTION__, move);
+  DBG (DBG_io, "%s: move=%f steps\n", __func__, move);
 
   /* offset calibration is always done in color mode */
   channels = 3;
@@ -2700,7 +2740,7 @@ gl847_led_calibration (Genesys_Device * dev)
 				 SCAN_FLAG_IGNORE_LINE_DISTANCE);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to setup scan: %s\n", __FUNCTION__, sane_strstatus (status));
+      DBG (DBG_error, "%s: failed to setup scan: %s\n", __func__, sane_strstatus (status));
       return status;
     }
 
@@ -2837,7 +2877,7 @@ gl847_init_gpio (Genesys_Device * dev)
     }
   if(gpios[idx].sensor_id==0)
     {
-      DBG (DBG_error, "%s: failed to find GPIO profile for sensor_id=%d\n", __FUNCTION__, dev->model->ccd_type);
+      DBG (DBG_error, "%s: failed to find GPIO profile for sensor_id=%d\n", __func__, dev->model->ccd_type);
       return SANE_STATUS_INVAL;
     }
 
@@ -2972,7 +3012,7 @@ gl847_boot (Genesys_Device * dev, SANE_Bool cold)
   if (val & REG40_CHKVER)
     {
       RIE (sanei_genesys_read_register (dev, 0x00, &val));
-      DBG (DBG_info, "%s: reported version for genesys chip is 0x%02x\n", __FUNCTION__, val);
+      DBG (DBG_info, "%s: reported version for genesys chip is 0x%02x\n", __func__, val);
     }
 
   /* Set default values for registers */
@@ -3753,6 +3793,7 @@ static Genesys_Command_Set gl847_cmd_set = {
   gl847_led_calibration,
 
   gl847_slow_back_home,
+  gl847_rewind,
 
   sanei_genesys_bulk_write_register,
   NULL,
diff --git a/backend/genesys_gl847.h b/backend/genesys_gl847.h
index 9901e23..1da2065 100644
--- a/backend/genesys_gl847.h
+++ b/backend/genesys_gl847.h
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2010-2013 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2010-2013 Stéphane Voltz <stef.dev@free.fr>
 
    This file is part of the SANE package.
 
diff --git a/backend/genesys_low.c b/backend/genesys_low.c
index f28b72c..4cbd75d 100644
--- a/backend/genesys_low.c
+++ b/backend/genesys_low.c
@@ -1,6 +1,6 @@
 /* sane - Scanner Access Now Easy.
 
-   Copyright (C) 2010-2013 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2010-2013 Stéphane Voltz <stef.dev@free.fr>
 
 
    This file is part of the SANE package.
@@ -516,7 +516,7 @@ sanei_genesys_set_buffer_address (Genesys_Device * dev, uint32_t addr)
   return status;
 }
 
-/** read data for analog frontend
+/**@brief read data from analog frontend (AFE)
  * @param dev device owning the AFE
  * @param addr register address to read
  * @param data placeholder for the result
@@ -558,7 +558,13 @@ sanei_genesys_fe_read_data (Genesys_Device * dev, uint8_t addr,
   return status;
 }
 
-/* Write data for analog frontend */
+/*@brief write data to analog frontend
+ * writes data to analog frontend to set it up accordingly
+ * to the sensor settings (exposure, timings, color, bit depth, ...)
+ * @param dev devie owning the AFE to write to
+ * @param addr AFE rister address
+ * @param data value to write to AFE register
+ **/
 SANE_Status
 sanei_genesys_fe_write_data (Genesys_Device * dev, uint8_t addr,
 			     uint16_t data)
@@ -737,7 +743,7 @@ sanei_genesys_read_valid_words (Genesys_Device * dev, unsigned int *words)
 	*words += ((value & 0x0f) * 256 * 256);
     }
 
-  DBG (DBG_proc, "%s: %d words\n", __FUNCTION__, *words);
+  DBG (DBG_proc, "%s: %d words\n", __func__, *words);
   DBGCOMPLETED;
   return SANE_STATUS_GOOD;
 }
@@ -1098,7 +1104,7 @@ sanei_genesys_bulk_write_register (Genesys_Device * dev,
 	}
     }
 
-  DBG (DBG_io, "%s: wrote %lu registers\n", __FUNCTION__, (u_long) elems);
+  DBG (DBG_io, "%s: wrote %lu registers\n", __func__, (u_long) elems);
   return status;
 }
 
@@ -1136,8 +1142,8 @@ sanei_genesys_write_ahb (SANE_Int dn, int usb_mode, uint32_t addr, uint32_t size
 	{
           sprintf (msg+strlen(msg), " 0x%02x", outdata[i]);
 	}
-      DBG (DBG_io, "%s: write(0x%08x,0x%08x)\n", __FUNCTION__, addr,size);
-      DBG (DBG_io, "%s: %s\n", __FUNCTION__, msg);
+      DBG (DBG_io, "%s: write(0x%08x,0x%08x)\n", __func__, addr,size);
+      DBG (DBG_io, "%s: %s\n", __func__, msg);
     }
 
   /* no effective write if fake USB */
@@ -1315,7 +1321,7 @@ sanei_genesys_send_gamma_table (Genesys_Device * dev)
 	{
           free (gamma);
 	  DBG (DBG_error,
-	       "%s: write to AHB failed writing table %d (%s)\n", __FUNCTION__,
+	       "%s: write to AHB failed writing table %d (%s)\n", __func__,
 	       i, sane_strstatus (status));
 	}
     }
@@ -1352,12 +1358,12 @@ sanei_genesys_asic_init (Genesys_Device * dev, int max_regs)
       status = sanei_usb_control_msg (dev->dn, REQUEST_TYPE_IN, REQUEST_REGISTER, VALUE_GET_REGISTER, 0x00, 1, &val);
       if (status != SANE_STATUS_GOOD)
         {
-          DBG (DBG_error, "%s: request register failed %s\n", __FUNCTION__,
+          DBG (DBG_error, "%s: request register failed %s\n", __func__,
                sane_strstatus (status));
           return status;
         }
-      DBG (DBG_io2, "%s: value=0x%02x\n", __FUNCTION__, val);
-      DBG (DBG_info, "%s: device is %s\n", __FUNCTION__, (val & 0x08) ? "USB 1.0" : "USB2.0");
+      DBG (DBG_io2, "%s: value=0x%02x\n", __func__, val);
+      DBG (DBG_info, "%s: device is %s\n", __func__, (val & 0x08) ? "USB 1.0" : "USB2.0");
       if (val & 0x08)
         {
           dev->usb_mode = 1;
@@ -1377,7 +1383,7 @@ sanei_genesys_asic_init (Genesys_Device * dev, int max_regs)
       if (dev->sensor.gamma_table[i] == NULL)
         {
           DBG (DBG_error, "%s: could not allocate memory for gamma table %d\n",
-               __FUNCTION__, i);
+               __func__, i);
           return SANE_STATUS_NO_MEM;
         }
       sanei_genesys_create_gamma_table (dev->sensor.gamma_table[i],
@@ -1397,13 +1403,13 @@ sanei_genesys_asic_init (Genesys_Device * dev, int max_regs)
     {
       cold = SANE_FALSE;
     }
-  DBG (DBG_info, "%s: device is %s\n", __FUNCTION__, cold ? "cold" : "warm");
+  DBG (DBG_info, "%s: device is %s\n", __func__, cold ? "cold" : "warm");
 
   /* don't do anything if backend is initialized and hardware hasn't been
    * replug */
   if (dev->already_initialized && !cold)
     {
-      DBG (DBG_info, "%s: already initialized, nothing to do\n", __FUNCTION__);
+      DBG (DBG_info, "%s: already initialized, nothing to do\n", __func__);
       return SANE_STATUS_GOOD;
     }
 
@@ -1459,7 +1465,7 @@ sanei_genesys_wait_for_home (Genesys_Device * dev)
   if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_error,
-	   "%s: failed to read home sensor: %s\n", __FUNCTION__,
+	   "%s: failed to read home sensor: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -1468,7 +1474,7 @@ sanei_genesys_wait_for_home (Genesys_Device * dev)
   if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_error,
-	   "%s: failed to read home sensor: %s\n", __FUNCTION__,
+	   "%s: failed to read home sensor: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
@@ -1477,7 +1483,7 @@ sanei_genesys_wait_for_home (Genesys_Device * dev)
   if(val & HOMESNR)
     {
 	  DBG (DBG_info,
-	       "%s: already at home\n", __FUNCTION__);
+	       "%s: already at home\n", __func__);
 	  return status;
     }
 
@@ -1491,7 +1497,7 @@ sanei_genesys_wait_for_home (Genesys_Device * dev)
       if (status != SANE_STATUS_GOOD)
 	{
 	  DBG (DBG_error,
-	       "%s: failed to read home sensor: %s\n", __FUNCTION__,
+	       "%s: failed to read home sensor: %s\n", __func__,
 	       sane_strstatus (status));
 	  return status;
 	}
@@ -1506,7 +1512,7 @@ sanei_genesys_wait_for_home (Genesys_Device * dev)
   /* if after the timeout, head is still not parked, error out */
   if(loop >= max && !(val & HOMESNR) && status == SANE_STATUS_GOOD) 
     {
-      DBG (DBG_error, "%s: failed to reach park position %ds\n", __FUNCTION__, max/10);
+      DBG (DBG_error, "%s: failed to reach park position %ds\n", __func__, max/10);
       return SANE_STATUS_IO_ERROR;
     }
 
@@ -1597,7 +1603,7 @@ Motor_Profile *sanei_genesys_get_motor_profile(Motor_Profile *motors, int motor_
   /* default fallback */
   if(idx<0)
     {
-      DBG (DBG_warn,"%s: using default motor profile\n",__FUNCTION__);
+      DBG (DBG_warn,"%s: using default motor profile\n",__func__);
       idx=0;
     }
 
@@ -1654,7 +1660,7 @@ Motor_Profile *profile;
 
 	/* required speed */
 	target=((exposure * dpi) / base_dpi)>>step_type;
-        DBG (DBG_io2, "%s: exposure=%d, dpi=%d, target=%d\n", __FUNCTION__, exposure, dpi, target);
+        DBG (DBG_io2, "%s: exposure=%d, dpi=%d, target=%d\n", __func__, exposure, dpi, target);
 
 	/* fill result with target speed */
         for(i=0;i<SLOPE_TABLE_SIZE;i++)
@@ -1689,11 +1695,11 @@ Motor_Profile *profile;
         /* range checking */
         if(profile->table[i]==0 && DBG_LEVEL >= DBG_warn && current>target)
           {
-            DBG (DBG_warn,"%s: short slope table, failed to reach %d. target too low ?\n",__FUNCTION__,target);
+            DBG (DBG_warn,"%s: short slope table, failed to reach %d. target too low ?\n",__func__,target);
           }
         if(i<3 && DBG_LEVEL >= DBG_warn)
           {
-            DBG (DBG_warn,"%s: short slope table, failed to reach %d. target too high ?\n",__FUNCTION__,target);
+            DBG (DBG_warn,"%s: short slope table, failed to reach %d. target too high ?\n",__func__,target);
           }
 
         /* align on factor */
@@ -1791,20 +1797,20 @@ sanei_genesys_is_compatible_calibration (Genesys_Device * dev,
 
   if(dev->model->cmd_set->calculate_current_setup==NULL)
     {
-      DBG (DBG_proc, "%s: no calculate_setup, non compatible cache\n", __FUNCTION__);
+      DBG (DBG_proc, "%s: no calculate_setup, non compatible cache\n", __func__);
       return SANE_STATUS_UNSUPPORTED;
     }
 
   status = dev->model->cmd_set->calculate_current_setup (dev);
   if (status != SANE_STATUS_GOOD)
     {
-      DBG (DBG_error, "%s: failed to calculate current setup: %s\n", __FUNCTION__,
+      DBG (DBG_error, "%s: failed to calculate current setup: %s\n", __func__,
 	   sane_strstatus (status));
       return status;
     }
   dev->current_setup.scan_method = dev->settings.scan_method;
 
-  DBG (DBG_proc, "%s: checking\n", __FUNCTION__);
+  DBG (DBG_proc, "%s: checking\n", __func__);
 
   /* a calibration cache is compatible if color mode and x dpi match the user
    * requested scan. In the case of CIS scanners, dpi isn't a criteria */
@@ -1822,22 +1828,22 @@ sanei_genesys_is_compatible_calibration (Genesys_Device * dev,
       resolution=sanei_genesys_compute_dpihw(dev,dev->settings.xres);
       compatible = (resolution == ((int) sanei_genesys_compute_dpihw(dev,cache->used_setup.xres)));
     }
-  DBG (DBG_io, "%s: after resolution check current compatible=%d\n", __FUNCTION__, compatible);
+  DBG (DBG_io, "%s: after resolution check current compatible=%d\n", __func__, compatible);
   if (dev->current_setup.half_ccd != cache->used_setup.half_ccd)
     {
-      DBG (DBG_io, "%s: half_ccd=%d, used=%d\n", __FUNCTION__,
+      DBG (DBG_io, "%s: half_ccd=%d, used=%d\n", __func__,
 	   dev->current_setup.half_ccd, cache->used_setup.half_ccd);
       compatible = 0;
     }
   if (dev->current_setup.scan_method != cache->used_setup.scan_method)
     {
-      DBG (DBG_io, "%s: current method=%d, used=%d\n", __FUNCTION__,
+      DBG (DBG_io, "%s: current method=%d, used=%d\n", __func__,
 	   dev->current_setup.scan_method, cache->used_setup.scan_method);
       compatible = 0;
     }
   if (!compatible)
     {
-      DBG (DBG_proc, "%s: completed, non compatible cache\n", __FUNCTION__);
+      DBG (DBG_proc, "%s: completed, non compatible cache\n", __func__);
       return SANE_STATUS_UNSUPPORTED;
     }
 
@@ -1851,7 +1857,7 @@ sanei_genesys_is_compatible_calibration (Genesys_Device * dev,
           && (dev->model->is_sheetfed == SANE_FALSE)
           && (dev->settings.scan_method == SCAN_METHOD_FLATBED))
         {
-          DBG (DBG_proc, "%s: expired entry, non compatible cache\n", __FUNCTION__);
+          DBG (DBG_proc, "%s: expired entry, non compatible cache\n", __func__);
           return SANE_STATUS_UNSUPPORTED;
         }
     }
diff --git a/backend/genesys_low.h b/backend/genesys_low.h
index b5a0a8f..56627b4 100644
--- a/backend/genesys_low.h
+++ b/backend/genesys_low.h
@@ -3,7 +3,7 @@
    Copyright (C) 2003 Oliver Rauch
    Copyright (C) 2003, 2004 Henning Meier-Geinitz <henning@meier-geinitz.de>
    Copyright (C) 2004, 2005 Gerhard Jaeger <gerhard@gjaeger.de>
-   Copyright (C) 2004-2013 Stéphane Voltz <stef.dev@free.fr>
+   Copyright (C) 2004-2013 Stéphane Voltz <stef.dev@free.fr>
    Copyright (C) 2005-2009 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
    Copyright (C) 2006 Laurent Charpentier <laurent_pubs@yahoo.com>
    Parts of the structs have been taken from the gt68xx backend by
@@ -104,7 +104,7 @@
   do { status = function;                               \
     if (status != SANE_STATUS_GOOD) \
       { \
-        DBG(DBG_error, "%s: %s\n", __FUNCTION__, sane_strstatus (status)); \
+        DBG(DBG_error, "%s: %s\n", __func__, sane_strstatus (status)); \
 	return status; \
       }	\
   } while (SANE_FALSE)
@@ -114,7 +114,7 @@
     if (status != SANE_STATUS_GOOD) \
       { \
 	 free(mem); \
-	 DBG(DBG_error, "%s: %s\n", __FUNCTION__, sane_strstatus (status)); \
+	 DBG(DBG_error, "%s: %s\n", __func__, sane_strstatus (status)); \
 	 return status;      \
       } \
   } while (SANE_FALSE)
@@ -129,8 +129,8 @@
 	  } \
   } while (SANE_FALSE)
 
-#define DBGSTART DBG (DBG_proc, "%s start\n", __FUNCTION__);
-#define DBGCOMPLETED DBG (DBG_proc, "%s completed\n", __FUNCTION__);
+#define DBGSTART DBG (DBG_proc, "%s start\n", __func__);
+#define DBGCOMPLETED DBG (DBG_proc, "%s completed\n", __func__);
 
 #define FREE_IFNOT_NULL(x)		if(x!=NULL) { free(x); x=NULL;}
 
@@ -352,6 +352,7 @@ Genesys_Color_Order;
 #define DAC_IMG101         18
 #define DAC_PLUSTEK3800    19
 #define DAC_CANONLIDE80    20
+#define DAC_CANONLIDE120   21
 
 #define CCD_UMAX         0
 #define CCD_ST12         1	/* SONY ILX548: 5340 Pixel  ??? */
@@ -410,6 +411,7 @@ Genesys_Color_Order;
 #define GPO_IMG101       22
 #define GPO_PLUSTEK3800  23
 #define GPO_CANONLIDE80  24
+#define GPO_CANONLIDE120 25
 
 #define MOTOR_UMAX          0
 #define MOTOR_5345          1
@@ -435,6 +437,7 @@ Genesys_Color_Order;
 #define MOTOR_PLUSTEK3800  22
 #define MOTOR_CANONLIDE210 23
 #define MOTOR_CANONLIDE80  24
+#define MOTOR_CANONLIDE120 25
 
 
 /* Forward typedefs */
@@ -506,8 +509,8 @@ typedef struct Genesys_Command_Set
     SANE_Status (*coarse_gain_calibration) (Genesys_Device * dev, int dpi);
     SANE_Status (*led_calibration) (Genesys_Device * dev);
 
-    SANE_Status (*slow_back_home) (Genesys_Device * dev,
-				   SANE_Bool wait_until_home);
+    SANE_Status (*slow_back_home) (Genesys_Device * dev, SANE_Bool wait_until_home);
+    SANE_Status (*rewind) (Genesys_Device * dev);
 
     SANE_Status (*bulk_write_register) (Genesys_Device * dev,
 					Genesys_Register_Set * reg,
diff --git a/backend/gphoto2.c b/backend/gphoto2.c
index 7b297c4..c8af306 100644
--- a/backend/gphoto2.c
+++ b/backend/gphoto2.c
@@ -353,14 +353,23 @@ static const SANE_Device *devlist[] = {
  * debug_func - called for gphoto2 debugging output (if enabled)
  */
 static void
+#ifdef GPLOGFUNC_NO_VARGS
+debug_func (GPLogLevel level, const char *domain, const char *message,
+            void __sane_unused__ * data)
+#else
 debug_func (GPLogLevel level, const char *domain, const char *format,
-	    va_list args, void UNUSEDARG * data)
+	    va_list args, void __sane_unused__ * data)
+#endif
 {
   if (level == GP_LOG_ERROR)
     DBG (0, "%s(ERROR): ", domain);
   else
     DBG (0, "%s(%i): ", domain, level);
+#ifdef GPLOGFUNC_NO_VARGS
+  DBG (0, "%s", message);
+#else
   sanei_debug_msg (0, DBG_LEVEL, STRINGIFY (BACKEND_NAME), format, args);
+#endif
   DBG (0, "\n");
 }
 
@@ -650,7 +659,7 @@ change_res (SANE_Byte res)
  *	is present, and initialize gphoto2
  */
 SANE_Status
-sane_init (SANE_Int * version_code, SANE_Auth_Callback UNUSEDARG authorize)
+sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize)
 {
   SANE_Int n, entries;
   SANE_Char f[] = "sane_init";
@@ -940,7 +949,7 @@ sane_exit (void)
  */
 SANE_Status
 sane_get_devices (const SANE_Device *** device_list, SANE_Bool
-		  UNUSEDARG local_only)
+		  __sane_unused__ local_only)
 {
   DBG (127, "sane_get_devices called\n");
 
@@ -1314,7 +1323,7 @@ my_source_mgr;
 typedef my_source_mgr *my_src_ptr;
 
 METHODDEF (void)
-jpeg_init_source (j_decompress_ptr UNUSEDARG cinfo)
+jpeg_init_source (j_decompress_ptr __sane_unused__ cinfo)
 {
   /* nothing to do */
 }
@@ -1361,7 +1370,7 @@ METHODDEF (void) jpeg_skip_input_data (j_decompress_ptr cinfo, long num_bytes)
 }
 
 METHODDEF (void)
-jpeg_term_source (j_decompress_ptr UNUSEDARG cinfo)
+jpeg_term_source (j_decompress_ptr __sane_unused__ cinfo)
 {
   /* no work necessary here */
 }
@@ -1476,7 +1485,7 @@ sane_start (SANE_Handle handle)
  * sane_read() - From SANE API
  */
 SANE_Status
-sane_read (SANE_Handle UNUSEDARG handle, SANE_Byte * data,
+sane_read (SANE_Handle __sane_unused__ handle, SANE_Byte * data,
 	   SANE_Int max_length, SANE_Int * length)
 {
   if (Cam_data.scanning == SANE_FALSE)
@@ -1530,7 +1539,7 @@ sane_read (SANE_Handle UNUSEDARG handle, SANE_Byte * data,
  * sane_cancel() - From SANE API
  */
 void
-sane_cancel (SANE_Handle UNUSEDARG handle)
+sane_cancel (SANE_Handle __sane_unused__ handle)
 {
   if (Cam_data.scanning)
     {
@@ -1544,8 +1553,8 @@ sane_cancel (SANE_Handle UNUSEDARG handle)
  * sane_set_io_mode() - From SANE API
  */
 SANE_Status
-sane_set_io_mode (SANE_Handle UNUSEDARG handle, SANE_Bool
-		  UNUSEDARG non_blocking)
+sane_set_io_mode (SANE_Handle __sane_unused__ handle, SANE_Bool
+		  __sane_unused__ non_blocking)
 {
   /* sane_set_io_mode() is only valid during a scan */
   if (Cam_data.scanning)
@@ -1570,7 +1579,7 @@ sane_set_io_mode (SANE_Handle UNUSEDARG handle, SANE_Bool
  * sane_get_select_fd() - From SANE API
  */
 SANE_Status
-sane_get_select_fd (SANE_Handle UNUSEDARG handle, SANE_Int UNUSEDARG *  fd)
+sane_get_select_fd (SANE_Handle __sane_unused__ handle, SANE_Int __sane_unused__ *  fd)
 {
   return SANE_STATUS_UNSUPPORTED;
 }
@@ -1738,13 +1747,13 @@ read_dir (SANE_String dir, SANE_Bool read_files)
     {
       if (gp_list_free (dir_list) < 0)
 	{
-	  DBG (0, "%s: errror: gp_list_free failed\n", f);
+	  DBG (0, "%s: error: gp_list_free failed\n", f);
 	}
       dir_list = NULL;
     }
   if (gp_list_new (&dir_list) < 0)
     {
-      DBG (0, "%s: errror: gp_list_new failed\n", f);
+      DBG (0, "%s: error: gp_list_new failed\n", f);
     }
 
   if (read_files)
@@ -1783,7 +1792,7 @@ read_info (SANE_String_Const fname)
  *  set_res - set picture size depending on resolution settings 
  */
 static void
-set_res (SANE_Int UNUSEDARG lowres)
+set_res (SANE_Int __sane_unused__ lowres)
 {
   if (gphoto2_opt_thumbnails)
     {
@@ -1943,7 +1952,6 @@ converter_scan_complete (void)
 static SANE_Status
 converter_init (SANE_Handle handle)
 {
-  SANE_Int row_stride;
   struct jpeg_error_mgr jerr;
   my_src_ptr src;
 
@@ -1982,8 +1990,6 @@ exit(1);
   dest_mgr = sanei_jpeg_jinit_write_ppm (&cinfo);
   (void) jpeg_start_decompress (&cinfo);
 
-  row_stride = cinfo.output_width * cinfo.output_components;
-
   parms.bytes_per_line = cinfo.output_width * 3;	/* 3 colors */
   parms.pixels_per_line = cinfo.output_width;
   parms.lines = cinfo.output_height;
diff --git a/backend/gphoto2.h b/backend/gphoto2.h
index 4ef953b..60591cf 100644
--- a/backend/gphoto2.h
+++ b/backend/gphoto2.h
@@ -155,12 +155,6 @@ struct cam_dirent
   long size;
 };
 
-#ifdef __GNUC__
-#define UNUSEDARG __attribute__ ((unused))
-#else
-#define UNUSEDARG
-#endif
-
 struct cam_dirlist
 {
   SANE_Char name[48];
diff --git a/backend/gt68xx.c b/backend/gt68xx.c
index ea71d91..13efe91 100644
--- a/backend/gt68xx.c
+++ b/backend/gt68xx.c
@@ -2346,7 +2346,7 @@ sane_cancel (SANE_Handle handle)
   else
     {
       DBG (4, "sane_cancel: scan has not been initiated yet, "
-           "or it is allready aborted\n");
+           "or it is already aborted\n");
     }
 
   DBG (5, "sane_cancel: exit\n");
diff --git a/backend/gt68xx_low.h b/backend/gt68xx_low.h
index 68cd7c5..0743230 100644
--- a/backend/gt68xx_low.h
+++ b/backend/gt68xx_low.h
@@ -73,9 +73,6 @@
 
 /* return if an error occured while the function was called */
 #ifdef MAX_DEBUG
-#  ifndef __FUNCTION__
-#    define __FUNCTION__ "somewhere"
-#  endif
 
 #  define RIE(function) \
   do \
@@ -83,7 +80,7 @@
       status = function; \
       if (status != SANE_STATUS_GOOD) \
         { \
-          DBG (7, "%s: %s: %s\n", __FUNCTION__, STRINGIFY(function), \
+          DBG (7, "%s: %s: %s\n", __func__, STRINGIFY(function), \
                sane_strstatus (status)); \
           return status; \
         } \
diff --git a/backend/hp-accessor.c b/backend/hp-accessor.c
index b1acd7c..8b79ad4 100644
--- a/backend/hp-accessor.c
+++ b/backend/hp-accessor.c
@@ -687,20 +687,20 @@ sanei_hp_accessor_vector_new (HpData data, unsigned length, unsigned depth)
 }
 
 static unsigned short
-_gamma_vector_unscale (HpAccessorVector UNUSEDARG this, SANE_Fixed fval)
+_gamma_vector_unscale (HpAccessorVector __sane_unused__ this, SANE_Fixed fval)
 {
   unsigned short unscaled = fval / SANE_FIX(1.0);
   if (unscaled > 255) unscaled = 255;
-  unscaled = 255 - unscaled;  /* Dont know why. But this is how it works */
+  unscaled = 255 - unscaled;  /* Don't know why. But this is how it works. */
 
   return unscaled;
 }
 
 static SANE_Fixed
-_gamma_vector_scale (HpAccessorVector UNUSEDARG this, unsigned short val)
+_gamma_vector_scale (HpAccessorVector __sane_unused__ this, unsigned short val)
 {
   SANE_Fixed scaled;
-  val = 255-val;     /* Dont know why. But this is how it works */
+  val = 255-val;     /* Don't know why. But this is how it works. */
   scaled = val * SANE_FIX(1.0);
 
   return scaled;
diff --git a/backend/hp-device.c b/backend/hp-device.c
index 2b96ad6..6a50f84 100644
--- a/backend/hp-device.c
+++ b/backend/hp-device.c
@@ -249,7 +249,6 @@ sanei_hp_device_probe_model (enum hp_device_compat_e *compat, HpScsi scsi,
   };
   int		i;
   char		buf[8];
-  size_t	len;
   SANE_Status	status;
   static char	*last_device = NULL;
   static enum hp_device_compat_e last_compat;
@@ -279,7 +278,6 @@ sanei_hp_device_probe_model (enum hp_device_compat_e *compat, HpScsi scsi,
     {
       DBG(1,"probing %s\n",probes[i].model);
 
-      len = sizeof(buf);
       if (!FAILED( status = sanei_hp_scl_upload(scsi, probes[i].cmd,
 					  buf, sizeof(buf)) ))
 	{
diff --git a/backend/hp-handle.c b/backend/hp-handle.c
index d9be2d5..ec8adbc 100644
--- a/backend/hp-handle.c
+++ b/backend/hp-handle.c
@@ -192,7 +192,7 @@ hp_handle_startReader (HpHandle this, HpScsi scsi)
         this->pipe_write_fd = -1;
       }
 
-      if (this->reader_pid == -1)  /* Creating child failed ? Clean up pipe */
+      if (!sanei_thread_is_valid (this->reader_pid))
 	{
           if ( !this->child_forked )
           {
diff --git a/backend/hp-option.c b/backend/hp-option.c
index 10bcb3e..ba799b7 100644
--- a/backend/hp-option.c
+++ b/backend/hp-option.c
@@ -114,7 +114,7 @@ static SANE_Status hp_probe_parameter_support_table (enum hp_device_compat_e
 
 #define HP_EOL -9999
 
-/* Dont need requiries for commands that are probed */
+/* Don't need requiries for commands that are probed */
 #define HP_PROBE_SCL_COMMAND 1
 
 /* Scale factor for vectors (gtk seems not to like vectors/curves
@@ -298,15 +298,15 @@ sanei_hp_choice_isEnabled (HpChoice this, HpOptSet optset, HpData data,
 }
 
 static hp_bool_t
-_cenable_incolor (HpChoice UNUSEDARG this, HpOptSet optset, HpData data,
-                  const HpDeviceInfo UNUSEDARG *info)
+_cenable_incolor (HpChoice __sane_unused__ this, HpOptSet optset, HpData data,
+                  const HpDeviceInfo __sane_unused__ *info)
 {
   return sanei_hp_optset_scanmode(optset, data) == HP_SCANMODE_COLOR;
 }
 
 static hp_bool_t
-_cenable_notcolor (HpChoice UNUSEDARG this, HpOptSet optset, HpData data,
-                   const HpDeviceInfo UNUSEDARG *info)
+_cenable_notcolor (HpChoice __sane_unused__ this, HpOptSet optset, HpData data,
+                   const HpDeviceInfo __sane_unused__ *info)
 {
   return sanei_hp_optset_scanmode(optset, data) != HP_SCANMODE_COLOR;
 }
@@ -744,7 +744,7 @@ _set_size (HpOption opt, HpData data, SANE_Int size)
 
 /* #ifdef HP_EXPERIMENTAL */
 static SANE_Status
-_probe_int (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset, HpData data)
+_probe_int (_HpOption this, HpScsi scsi, HpOptSet __sane_unused__ optset, HpData data)
 {
   HpScl		scl	= this->descriptor->scl_command;
   int		minval, maxval;
@@ -770,7 +770,7 @@ _probe_int (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset, HpData data)
 /* #endif */
 
 static SANE_Status
-_probe_int_brightness (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
+_probe_int_brightness (_HpOption this, HpScsi scsi, HpOptSet __sane_unused__ optset,
                       HpData data)
 {
   HpScl		scl	= this->descriptor->scl_command;
@@ -811,7 +811,7 @@ _probe_int_brightness (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
 }
 
 static SANE_Status
-_probe_resolution (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
+_probe_resolution (_HpOption this, HpScsi scsi, HpOptSet __sane_unused__ optset,
                    HpData data)
 {
   int		minval, maxval, min2, max2;
@@ -868,7 +868,7 @@ _probe_resolution (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
 }
 
 static SANE_Status
-_probe_bool (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
+_probe_bool (_HpOption this, HpScsi scsi, HpOptSet __sane_unused__ optset,
              HpData data)
 {
   HpScl		scl	= this->descriptor->scl_command;
@@ -891,7 +891,7 @@ _probe_bool (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
 
 
 static SANE_Status
-_probe_change_doc (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
+_probe_change_doc (_HpOption this, HpScsi scsi, HpOptSet __sane_unused__ optset,
                    HpData data)
 
 {SANE_Status status;
@@ -927,7 +927,7 @@ _probe_change_doc (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
  * _probe_change_doc(), to hide the unnecessary "Unload" button on
  * non-ADF OfficeJets. */
 static SANE_Status
-_probe_unload (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
+_probe_unload (_HpOption this, HpScsi scsi, HpOptSet __sane_unused__ optset,
                HpData data)
 
 {SANE_Status status;
@@ -959,7 +959,7 @@ _probe_unload (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
 }
 
 static SANE_Status
-_probe_calibrate (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
+_probe_calibrate (_HpOption this, HpScsi scsi, HpOptSet __sane_unused__ optset,
                   HpData data)
 {
   int val = 0;  /* Always false */
@@ -1144,7 +1144,7 @@ _probe_choice (_HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
 }
 
 static SANE_Status
-_probe_each_choice (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
+_probe_each_choice (_HpOption this, HpScsi scsi, HpOptSet __sane_unused__ optset,
                     HpData data)
 {
   HpScl		scl	= this->descriptor->scl_command;
@@ -1194,7 +1194,7 @@ _probe_each_choice (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
 
 /* pseudo probe for exposure times in Photosmart */
 static SANE_Status
-_probe_ps_exposure_time (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
+_probe_ps_exposure_time (_HpOption this, HpScsi scsi, HpOptSet __sane_unused__ optset,
                          HpData data)
 {
     int           minval = 0, maxval = 9, val = 0;
@@ -1229,7 +1229,7 @@ _probe_ps_exposure_time (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
 
 /* probe scan type (normal, adf, xpa) */
 static SANE_Status
-_probe_scan_type (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
+_probe_scan_type (_HpOption this, HpScsi scsi, HpOptSet __sane_unused__ optset,
                   HpData data)
 {
   int           val;
@@ -1300,7 +1300,7 @@ _probe_scan_type (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
 }
 
 static SANE_Status
-_probe_mirror_horiz (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
+_probe_mirror_horiz (_HpOption this, HpScsi scsi, HpOptSet __sane_unused__ optset,
                      HpData data)
 {
   HpScl		scl	= this->descriptor->scl_command;
@@ -1345,7 +1345,7 @@ _probe_mirror_horiz (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
 }
 
 static SANE_Status
-_probe_mirror_vert (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
+_probe_mirror_vert (_HpOption this, HpScsi scsi, HpOptSet __sane_unused__ optset,
                     HpData data)
 {
   int		minval = HP_MIRROR_VERT_OFF,
@@ -1390,7 +1390,7 @@ _probe_mirror_vert (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
 
 
 static SANE_Status _probe_front_button(_HpOption this, HpScsi scsi,
-                                      HpOptSet UNUSEDARG optset, HpData data)
+                                      HpOptSet __sane_unused__ optset, HpData data)
 {
   int val = 0;
 
@@ -1501,7 +1501,7 @@ _probe_download_type (HpScl scl, HpScsi scsi)
 }
 
 static SANE_Status
-_probe_custom_gamma (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
+_probe_custom_gamma (_HpOption this, HpScsi scsi, HpOptSet __sane_unused__ optset,
                      HpData data)
 {
  HpScl       scl = this->descriptor->scl_command;
@@ -1694,8 +1694,8 @@ _probe_matrix (_HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
 }
 
 static SANE_Status
-_probe_num_options (_HpOption this, HpScsi UNUSEDARG scsi,
-                    HpOptSet UNUSEDARG optset, HpData data)
+_probe_num_options (_HpOption this, HpScsi __sane_unused__ scsi,
+                    HpOptSet __sane_unused__ optset, HpData data)
 {
   /* If we dont have an accessor, get one */
   if (!this->data_acsr)
@@ -1708,7 +1708,7 @@ _probe_num_options (_HpOption this, HpScsi UNUSEDARG scsi,
 }
 
 static SANE_Status
-_probe_devpix (_HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
+_probe_devpix (_HpOption this, HpScsi scsi, HpOptSet __sane_unused__ optset,
                HpData data)
 {
   HpScl	scl	= this->descriptor->scl_command;
@@ -2102,7 +2102,7 @@ _program_matrix (HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
 }
 
 static SANE_Status
-_program_resolution (HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
+_program_resolution (HpOption this, HpScsi scsi, HpOptSet __sane_unused__ optset,
                      HpData data)
 {
 
@@ -2326,7 +2326,7 @@ _program_media (HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
 
 static SANE_Status
 _program_unload_after_scan (HpOption this, HpScsi scsi,
-                            HpOptSet UNUSEDARG optset, HpData data)
+                            HpOptSet __sane_unused__ optset, HpData data)
 { HpDeviceInfo *info;
 
   info = sanei_hp_device_info_get ( sanei_hp_scsi_devicename  (scsi) );
@@ -2340,8 +2340,8 @@ _program_unload_after_scan (HpOption this, HpScsi scsi,
 }
 
 static SANE_Status
-_program_lamp_off (HpOption UNUSEDARG this, HpScsi scsi,
-                   HpOptSet UNUSEDARG optset, HpData UNUSEDARG data)
+_program_lamp_off (HpOption __sane_unused__ this, HpScsi scsi,
+                   HpOptSet __sane_unused__ optset, HpData __sane_unused__ data)
 {
   DBG(3,"program_lamp_off: shut off lamp\n");
 
@@ -2436,8 +2436,8 @@ _program_scan_type (HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
 }
 
 static SANE_Status
-_program_change_doc (HpOption UNUSEDARG this, HpScsi scsi,
-                     HpOptSet UNUSEDARG optset, HpData UNUSEDARG data)
+_program_change_doc (HpOption __sane_unused__ this, HpScsi scsi,
+                     HpOptSet __sane_unused__ optset, HpData __sane_unused__ data)
 {
   int istat;
 
@@ -2492,8 +2492,8 @@ _program_unload (HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
 }
 
 static SANE_Status
-_program_calibrate (HpOption UNUSEDARG this, HpScsi scsi,
-                    HpOptSet UNUSEDARG optset, HpData UNUSEDARG data)
+_program_calibrate (HpOption __sane_unused__ this, HpScsi scsi,
+                    HpOptSet __sane_unused__ optset, HpData __sane_unused__ data)
 {
   struct passwd *pw;
   SANE_Status status = SANE_STATUS_GOOD;
@@ -2525,7 +2525,7 @@ _program_calibrate (HpOption UNUSEDARG this, HpScsi scsi,
  * speed for higher exposure times */
 static SANE_Status
 _program_ps_exposure_time (HpOption this, HpScsi scsi,
-                           HpOptSet UNUSEDARG optset, HpData data)
+                           HpOptSet __sane_unused__ optset, HpData data)
 {
     SANE_Status status = SANE_STATUS_GOOD;
     size_t calib_size = 0;
@@ -2650,7 +2650,7 @@ _program_scanmode (HpOption this, HpScsi scsi, HpOptSet optset, HpData data)
 }
 
 static SANE_Status
-_program_mirror_horiz (HpOption this, HpScsi scsi, HpOptSet UNUSEDARG optset,
+_program_mirror_horiz (HpOption this, HpScsi scsi, HpOptSet __sane_unused__ optset,
                        HpData data)
 {
   int sec_dir, mirror = hp_option_getint(this, data);
@@ -2695,8 +2695,8 @@ _enable_rgb_maps (HpOption this, HpOptSet optset, HpData data,
 #endif
 
 static hp_bool_t
-_enable_mono_map (HpOption UNUSEDARG this, HpOptSet optset, HpData data,
-                  const HpDeviceInfo UNUSEDARG *info)
+_enable_mono_map (HpOption __sane_unused__ this, HpOptSet optset, HpData data,
+                  const HpDeviceInfo __sane_unused__ *info)
 {
   HpOption 	cgam	= hp_optset_get(optset, CUSTOM_GAMMA);
 
@@ -2706,8 +2706,8 @@ _enable_mono_map (HpOption UNUSEDARG this, HpOptSet optset, HpData data,
 }
 
 static hp_bool_t
-_enable_rgb_matrix (HpOption UNUSEDARG this, HpOptSet optset, HpData data,
-                    const HpDeviceInfo UNUSEDARG *info)
+_enable_rgb_matrix (HpOption __sane_unused__ this, HpOptSet optset, HpData data,
+                    const HpDeviceInfo __sane_unused__ *info)
 {
   HpOption 	type = hp_optset_get(optset, MATRIX_TYPE);
 
@@ -2746,8 +2746,8 @@ _enable_brightness (HpOption this, HpOptSet optset, HpData data,
 }
 
 static hp_bool_t
-_enable_autoback (HpOption UNUSEDARG this, HpOptSet optset, HpData data,
-                  const HpDeviceInfo UNUSEDARG *info)
+_enable_autoback (HpOption __sane_unused__ this, HpOptSet optset, HpData data,
+                  const HpDeviceInfo __sane_unused__ *info)
 {
   return sanei_hp_optset_scanmode(optset, data) == HP_SCANMODE_LINEART;
 }
@@ -2788,15 +2788,15 @@ _enable_custom_gamma (HpOption this, HpOptSet optset, HpData data,
 }
 
 static hp_bool_t
-_enable_halftone (HpOption UNUSEDARG this, HpOptSet optset, HpData data,
-                  const HpDeviceInfo UNUSEDARG *info)
+_enable_halftone (HpOption __sane_unused__ this, HpOptSet optset, HpData data,
+                  const HpDeviceInfo __sane_unused__ *info)
 {
   return sanei_hp_optset_scanmode(optset, data) == HP_SCANMODE_HALFTONE;
 }
 
 static hp_bool_t
-_enable_halftonevec (HpOption UNUSEDARG this, HpOptSet optset, HpData data,
-                     const HpDeviceInfo UNUSEDARG *info)
+_enable_halftonevec (HpOption __sane_unused__ this, HpOptSet optset, HpData data,
+                     const HpDeviceInfo __sane_unused__ *info)
 {
   if (sanei_hp_optset_scanmode(optset, data) == HP_SCANMODE_HALFTONE)
     {
@@ -2808,8 +2808,8 @@ _enable_halftonevec (HpOption UNUSEDARG this, HpOptSet optset, HpData data,
 }
 
 static hp_bool_t
-_enable_data_width (HpOption UNUSEDARG this, HpOptSet optset, HpData data,
-                   const HpDeviceInfo UNUSEDARG *info)
+_enable_data_width (HpOption __sane_unused__ this, HpOptSet optset, HpData data,
+                   const HpDeviceInfo __sane_unused__ *info)
 {enum hp_scanmode_e mode;
 
  mode = sanei_hp_optset_scanmode (optset, data);
@@ -2817,7 +2817,7 @@ _enable_data_width (HpOption UNUSEDARG this, HpOptSet optset, HpData data,
 }
 
 static hp_bool_t
-_enable_out8 (HpOption UNUSEDARG this, HpOptSet optset, HpData data,
+_enable_out8 (HpOption __sane_unused__ this, HpOptSet optset, HpData data,
               const HpDeviceInfo *info)
 {
   if (hp_optset_isEnabled (optset, data, SANE_NAME_BIT_DEPTH, info))
@@ -2829,8 +2829,8 @@ _enable_out8 (HpOption UNUSEDARG this, HpOptSet optset, HpData data,
 }
 
 static hp_bool_t
-_enable_calibrate (HpOption UNUSEDARG this, HpOptSet optset, HpData data,
-                   const HpDeviceInfo UNUSEDARG *info)
+_enable_calibrate (HpOption __sane_unused__ this, HpOptSet optset, HpData data,
+                   const HpDeviceInfo __sane_unused__ *info)
 {
   HpOption 	media	= hp_optset_get(optset, MEDIA);
 
diff --git a/backend/hp-scl.c b/backend/hp-scl.c
index e58508b..f1813c7 100644
--- a/backend/hp-scl.c
+++ b/backend/hp-scl.c
@@ -339,7 +339,7 @@ hp_nonscsi_write (HpScsi this, hp_byte_t *data, size_t len, HpConnect connect)
 
 static SANE_Status
 hp_nonscsi_read (HpScsi this, hp_byte_t *data, size_t *len, HpConnect connect,
-  int UNUSEDARG isResponse)
+  int __sane_unused__ isResponse)
 
 {int n = -1;
  static int retries = -1;
@@ -905,7 +905,7 @@ hp_scsi_scl(HpScsi this, HpScl scl, int val)
 
   RETURN_IF_FAIL( hp_scsi_need(this, 10) );
 
-  /* Dont try to optimize SCL-commands like using <ESC>*a1b0c5T */
+  /* Don't try to optimize SCL-commands like using <ESC>*a1b0c5T */
   /* Some scanners have problems with it (e.g. HP Photosmart Photoscanner */
   /* with window position/extent, resolution) */
   count = sprintf((char *)this->bufp, "\033*%c%d%c", group, val, param);
@@ -1011,7 +1011,7 @@ hp_scsi_read (HpScsi this, void * dest, size_t *len, int isResponse)
 
 static int signal_caught = 0;
 
-static RETSIGTYPE
+static void
 signal_catcher (int sig)
 {
   DBG(1,"signal_catcher(sig=%d): old signal_caught=%d\n",sig,signal_caught);
@@ -1338,13 +1338,11 @@ static SANE_Status
 process_data (PROCDATA_HANDLE *ph, unsigned char *read_ptr, int nread)
 
 {int bytes_left;
- HpProcessData *procdata;
 
  if (nread <= 0) return SANE_STATUS_GOOD;
 
  if (ph == NULL) return SANE_STATUS_INVAL;
 
- procdata = &(ph->procdata);
  if ( ph->tmp_buf_len > 0 )  /* Something left ? */
  {
    bytes_left = ph->tmp_buf_size - ph->tmp_buf_len;
@@ -2083,7 +2081,7 @@ hp_scl_strerror (int errnum)
       case 1024: return "ADF Paper Jam";
       case 1025: return "Home Position Missing";
       case 1026: return "Paper Not Loaded";
-      default: return "??Unkown Error??";
+      default: return "??Unknown Error??";
       }
 }
 
diff --git a/backend/hp.c b/backend/hp.c
index c85e40c..f00b82d 100644
--- a/backend/hp.c
+++ b/backend/hp.c
@@ -468,13 +468,11 @@ static void
 hp_device_info_remove (void)
 {
  HpDeviceInfoList  next, infolistelement = global.infolist;
- HpDeviceInfo *info;
 
  if (!global.is_up) return;
 
  while (infolistelement)
  {
-   info = &(infolistelement->info);
    next = infolistelement->next;
    sanei_hp_free (infolistelement);
    infolistelement = next;
@@ -811,7 +809,7 @@ hp_update_devlist (void)
  */
 
 SANE_Status
-sane_init (SANE_Int *version_code, SANE_Auth_Callback UNUSEDARG authorize)
+sane_init (SANE_Int *version_code, SANE_Auth_Callback __sane_unused__ authorize)
 {SANE_Status status;
 
   DBG_INIT();
@@ -839,7 +837,7 @@ sane_exit (void)
 
 SANE_Status
 sane_get_devices (const SANE_Device ***device_list,
-                  SANE_Bool UNUSEDARG local_only)
+                  SANE_Bool __sane_unused__ local_only)
 {
   DBG(3, "sane_get_devices called\n");
 
diff --git a/backend/hp.h b/backend/hp.h
index b86ee04..42b3be5 100644
--- a/backend/hp.h
+++ b/backend/hp.h
@@ -53,12 +53,6 @@
 #define DEBUG_NOT_STATIC
 #include "../include/sane/sanei_debug.h"
 
-#ifdef __GNUC__
-#define UNUSEDARG __attribute__ ((unused))
-#else
-#define UNUSEDARG
-#endif
-
 /* FIXME: these should be options? */
 #undef ENABLE_7x12_TONEMAPS
 #define ENABLE_16x16_DITHERS
diff --git a/backend/hp3500.c b/backend/hp3500.c
index 48a8035..26fe071 100644
--- a/backend/hp3500.c
+++ b/backend/hp3500.c
@@ -84,6 +84,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <time.h>
+#include <math.h>
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -145,6 +146,7 @@ enum hp3500_option
   OPT_MODE,
   OPT_BRIGHTNESS,
   OPT_CONTRAST,
+  OPT_GAMMA,
 
   NUM_OPTIONS
 };
@@ -189,6 +191,8 @@ struct hp3500_data
   int brightness;
   int contrast;
 
+  double gamma;
+
   SANE_Option_Descriptor opt[NUM_OPTIONS];
   SANE_Device sane;
 };
@@ -218,6 +222,8 @@ static const SANE_Range range_brightness =
   { 0, 255, 0 };
 static const SANE_Range range_contrast =
   { 0, 255, 0 };
+static const SANE_Range range_gamma =
+  { SANE_FIX (0.2), SANE_FIX(4.0), SANE_FIX(0.01) };
 
 
 #define HP3500_COLOR_SCAN 0
@@ -233,6 +239,7 @@ static int reader_process (void *);
 static void calculateDerivedValues (struct hp3500_data *scanner);
 static void do_reset (struct hp3500_data *scanner);
 static void do_cancel (struct hp3500_data *scanner);
+static size_t max_string_size(char const **);
 
 /*
  * used by sane_get_devices
@@ -382,6 +389,7 @@ sane_open (SANE_String_Const name, SANE_Handle * handle)
   scanner->mode = 0;
   scanner->brightness = 128;
   scanner->contrast = 64;
+  scanner->gamma = 2.2;
   calculateDerivedValues (scanner);
 
   return SANE_STATUS_GOOD;
@@ -536,6 +544,10 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
 	  *(SANE_Word *) val = scanner->contrast;
 	  return SANE_STATUS_GOOD;
 
+        case OPT_GAMMA:
+          *(SANE_Word *) val = SANE_FIX(scanner->gamma);
+	  return SANE_STATUS_GOOD;
+
 	case OPT_BRIGHTNESS:
 	  *(SANE_Word *) val = scanner->brightness;
 	  return SANE_STATUS_GOOD;
@@ -649,6 +661,10 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
 	case OPT_CONTRAST:
 	  scanner->contrast = *(SANE_Word *) val;
 	  return SANE_STATUS_GOOD;
+
+        case OPT_GAMMA:
+          scanner->gamma = SANE_UNFIX(*(SANE_Word *) val);
+          return SANE_STATUS_GOOD;
 	}			/* switch */
     }				/* else */
   return SANE_STATUS_INVAL;
@@ -703,7 +719,7 @@ sane_start (SANE_Handle handle)
   scanner->reader_pid = sanei_thread_begin (reader_process, scanner);
   time (&scanner->last_scan);
 
-  if (scanner->reader_pid == -1)
+  if (!sanei_thread_is_valid (scanner->reader_pid))
     {
       DBG (MSG_ERR, "cannot fork reader process.\n");
       DBG (MSG_ERR, "%s", strerror (errno));
@@ -952,7 +968,7 @@ attachScanner (const char *devicename)
   dev->devicename = strdup (devicename);
   dev->sfd = -1;
   dev->last_scan = 0;
-  dev->reader_pid = -1;
+  dev->reader_pid = (SANE_Pid) -1;
   dev->pipe_r = dev->pipe_w = -1;
 
   dev->sane.name = dev->devicename;
@@ -1064,8 +1080,9 @@ init_options (struct hp3500_data *scanner)
   opt->title = SANE_TITLE_SCAN_MODE;
   opt->desc = SANE_DESC_SCAN_MODE;
   opt->type = SANE_TYPE_STRING;
+  opt->size = max_string_size(scan_mode_list);
   opt->constraint_type = SANE_CONSTRAINT_STRING_LIST;
-  opt->constraint.string_list = scan_mode_list;
+  opt->constraint.string_list = (SANE_String_Const *) scan_mode_list;
   opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
 
   opt = scanner->opt + OPT_BRIGHTNESS;
@@ -1086,6 +1103,16 @@ init_options (struct hp3500_data *scanner)
   opt->constraint.range = &range_contrast;
   opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
 
+  opt = scanner->opt + OPT_GAMMA;
+  opt->name = SANE_NAME_ANALOG_GAMMA;
+  opt->title = SANE_TITLE_ANALOG_GAMMA;
+  opt->desc = SANE_DESC_ANALOG_GAMMA;
+  opt->type = SANE_TYPE_FIXED;
+  opt->unit = SANE_UNIT_NONE;
+  opt->constraint_type = SANE_CONSTRAINT_RANGE;
+  opt->constraint.range = &range_gamma;
+  opt->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
+
   return SANE_STATUS_GOOD;
 }
 
@@ -1098,7 +1125,7 @@ do_reset (struct hp3500_data *scanner)
 static void
 do_cancel (struct hp3500_data *scanner)
 {
-  if (scanner->reader_pid != -1)
+  if (sanei_thread_is_valid (scanner->reader_pid))
     {
 
       if (sanei_thread_kill (scanner->reader_pid) == 0)
@@ -1749,14 +1776,14 @@ rt_set_basic_calibration (unsigned char *regs,
 			  int greengain,
 			  int blueoffset1, int blueoffset2, int bluegain)
 {
-  regs[0x05] = redoffset1;
-  regs[0x02] = redoffset2;
+  regs[0x02] = redoffset1;
+  regs[0x05] = redoffset2;
   regs[0x08] = redgain;
-  regs[0x06] = greenoffset1;
-  regs[0x03] = greenoffset2;
+  regs[0x03] = greenoffset1;
+  regs[0x06] = greenoffset2;
   regs[0x09] = greengain;
-  regs[0x07] = blueoffset1;
-  regs[0x04] = blueoffset2;
+  regs[0x04] = blueoffset1;
+  regs[0x07] = blueoffset2;
   regs[0x0a] = bluegain;
   return 0;
 }
@@ -1765,13 +1792,36 @@ static int
 rt_set_calibration_addresses (unsigned char *regs,
 			      unsigned redaddr,
 			      unsigned greenaddr,
-			      unsigned blueaddr, unsigned endaddr)
+			      unsigned blueaddr,
+			      unsigned endaddr,
+			      unsigned width)
 {
+  unsigned endpage = (endaddr + 31) / 32;
+  unsigned scanline_pages = ((width + 1) * 3 + 31) / 32;
+
+  /* Red, green and blue detailed calibration addresses */
+
   regs[0x84] = redaddr;
   regs[0x8e] = (regs[0x8e] & 0x0f) | ((redaddr >> 4) & 0xf0);
   rt_set_value_lsbfirst (regs, 0x85, 2, greenaddr);
   rt_set_value_lsbfirst (regs, 0x87, 2, blueaddr);
-  rt_set_value_lsbfirst (regs, 0x89, 2, (endaddr + 31) / 32);
+
+  /* I don't know what the next three are used for, but each buffer commencing
+   * at 0x80 and 0x82 needs to hold a full scan line.
+   */
+
+  rt_set_value_lsbfirst (regs, 0x80, 2, endpage);
+  rt_set_value_lsbfirst (regs, 0x82, 2, endpage + scanline_pages);
+  rt_set_value_lsbfirst (regs, 0x89, 2, endpage + scanline_pages * 2);
+
+  /* I don't know what this is, but it seems to be a number of pages that can hold
+   * 16 complete scan lines, but not calculated as an offset from any other page
+   */
+
+  rt_set_value_lsbfirst (regs, 0x51, 2, (48 * (width + 1) + 31) / 32);
+
+  /* I don't know what this is either, but this is what the Windows driver does */
+  rt_set_value_lsbfirst (regs, 0x8f, 2, 0x1c00);
   return 0;
 }
 
@@ -1798,6 +1848,13 @@ rt_set_data_feed_on (unsigned char *regs)
 }
 
 static int
+rt_set_data_feed_off (unsigned char *regs)
+{
+  regs[0xb2] |= 0x04;
+  return 0;
+}
+
+static int
 rt_enable_ccd (unsigned char *regs, int enable)
 {
   if (enable)
@@ -2245,10 +2302,14 @@ rt_nvram_read (int block, int location, unsigned char *data, int bytes)
   return 0;
 }
 
+/* This is what we want as the initial registers, not what they
+ * are at power on time. In particular 13 bytes at 0x10 are
+ * different, and the byte at 0x94 is different.
+ */
 static unsigned char initial_regs[] = {
   /* 0x00 */ 0xf5, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   /* 0x08 */ 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00,
-  /* 0x10 */ 0xe1, 0xfc, 0xff, 0xff, 0x00, 0x00, 0x00, 0xfc,
+  /* 0x10 */ 0x81, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00,
   /* 0x18 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
   /* 0x20 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   /* 0x28 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0x19,
@@ -2264,7 +2325,7 @@ static unsigned char initial_regs[] = {
   /* 0x78 */ 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   /* 0x80 */ 0x0f, 0x02, 0x4b, 0x02, 0x00, 0xec, 0x19, 0xd8,
   /* 0x88 */ 0x2d, 0x87, 0x02, 0xff, 0x3f, 0x78, 0x60, 0x00,
-  /* 0x90 */ 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  /* 0x90 */ 0x1c, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00,
   /* 0x98 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   /* 0xa0 */ 0x00, 0x00, 0x00, 0x0c, 0x27, 0x64, 0x00, 0x00,
   /* 0xa8 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2363,14 +2424,14 @@ static struct resolution_parameters resparms[] = {
   /* My values - all work */
   /*res   r39 rC3 rC6 freq cph0s rgo gbo intra mmcm d3 tg            stepsz */
   {1200, 3, 6, 4, 2, 1, 22, 22, 4, 2, 1, RT_NORMAL_TG, 0x157b},
-  {600, 15, 6, 4, 1, 0, 9, 10, 0, 2, 1, RT_NORMAL_TG, 0x055e},
+  {600, 15, 6, 4, 1, 1, 9, 10, 0, 2, 1, RT_NORMAL_TG, 0x055e},
   {400, 3, 1, 4, 1, 1, 6, 6, 1, 2, 1, RT_NORMAL_TG, 0x157b},
-  {300, 15, 3, 4, 1, 0, 5, 4, 0, 2, 1, RT_NORMAL_TG, 0x02af},
-  {200, 7, 1, 4, 1, 0, 3, 3, 0, 2, 1, RT_NORMAL_TG, 0x055e},
-  {150, 15, 3, 1, 1, 0, 2, 2, 0, 2, 1, RT_NORMAL_TG, 0x02af},
-  {100, 3, 1, 3, 1, 0, 1, 1, 0, 2, 1, RT_NORMAL_TG, 0x0abd},
-  {75, 15, 3, 3, 1, 0, 1, 1, 0, 2, 1, RT_NORMAL_TG, 0x02af},
-  {50, 15, 1, 1, 1, 0, 0, 0, 0, 2, 1, RT_NORMAL_TG, 0x055e},
+  {300, 15, 3, 4, 1, 1, 5, 4, 0, 2, 1, RT_NORMAL_TG, 0x02af},
+  {200, 7, 1, 4, 1, 1, 3, 3, 0, 2, 1, RT_NORMAL_TG, 0x055e},
+  {150, 15, 3, 1, 1, 1, 2, 2, 0, 2, 1, RT_NORMAL_TG, 0x02af},
+  {100, 3, 1, 3, 1, 1, 1, 1, 0, 2, 1, RT_NORMAL_TG, 0x0abd},
+  {75, 15, 3, 3, 1, 1, 1, 1, 0, 2, 1, RT_NORMAL_TG, 0x02af},
+  {50, 15, 1, 1, 1, 1, 0, 0, 0, 2, 1, RT_NORMAL_TG, 0x055e},
   {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 };
 
@@ -2597,6 +2658,90 @@ constrain (int val, int min, int max)
   return val;
 }
 
+#if 0
+static void
+sram_dump_byte(FILE *fp,
+               unsigned char const *left,
+               unsigned leftstart,
+               unsigned leftlimit,
+               unsigned char const *right,
+               unsigned rightstart,
+               unsigned rightlimit,
+               unsigned idx)
+{
+  unsigned ridx = rightstart + idx;
+  unsigned lidx = leftstart + idx;
+
+  putc(' ', fp);
+  if (rightstart < rightlimit && leftstart < leftlimit && left[lidx] != right[ridx])
+    fputs("<b>", fp);
+  if (leftstart < leftlimit)
+    fprintf(fp, "%02x", left[lidx]);
+  else
+    fputs("  ", fp);
+  if (rightstart < rightlimit && leftstart < leftlimit && left[lidx] != right[ridx])
+    fputs("</b>", fp);
+}
+
+static void
+dump_sram_to_file(char const *fname,
+                  unsigned char const *expected,
+                  unsigned end_calibration_offset)
+{
+  FILE *fp = fopen(fname, "w");
+  rt_set_sram_page(0);
+
+  if (fp)
+    {
+      unsigned char buf[1024];
+      unsigned loc = 0;
+
+      fprintf(fp, "<html><head></head><body><pre>\n");
+      while (loc < end_calibration_offset)
+        {
+          unsigned byte = 0;
+
+          rt_read_sram(1024, buf);
+
+          while (byte < 1024)
+            {
+              unsigned idx = 0;
+
+              fprintf(fp, "%06x:", loc);
+              do
+                {
+		  sram_dump_byte(fp, buf, byte, 1024, expected, loc, end_calibration_offset, idx);
+                } while (++idx & 0x7);
+              fprintf(fp, " -");
+              do
+                {
+		  sram_dump_byte(fp, buf, byte, 1024, expected, loc, end_calibration_offset, idx);
+                } while (++idx & 0x7);
+
+              idx = 0;
+              fputs("     ", fp);
+
+              do
+                {
+                  sram_dump_byte(fp, expected, loc, end_calibration_offset, buf, byte, 1024, idx);
+                } while (++idx & 0x7);
+              fprintf(fp, " -");
+              do
+                {
+                  sram_dump_byte(fp, expected, loc, end_calibration_offset, buf, byte, 1024, idx);
+                } while (++idx & 0x7);
+
+
+              fputs("\n", fp);
+              byte += 16;
+              loc += 16;
+            }
+        }
+      fprintf(fp, "</pre></body></html>");
+      fclose(fp);
+    }
+}
+#endif
 
 static int
 rts8801_doscan (unsigned width,
@@ -2610,13 +2755,13 @@ rts8801_doscan (unsigned width,
 		int oddfirst,
 		unsigned char const *calib_info,
 		int merged_channels,
-		detailed_calibration_data const *detailed_calib_data)
+		double *postprocess_offsets,
+		double *postprocess_gains)
 {
   unsigned rowbytes = 0;
   unsigned output_rowbytes = 0;
   unsigned channels = 0;
   unsigned total_rows = 0;
-  unsigned bytesperchannel;
   unsigned char *row_buffer;
   unsigned char *output_buffer;
   unsigned buffered_rows;
@@ -2638,7 +2783,7 @@ rts8801_doscan (unsigned width,
 
   channels = 3;
   rowbytes = width * 3;
-  bytesperchannel = width;
+
   switch (colour)
     {
     case HP3500_GRAY_SCAN:
@@ -2710,32 +2855,27 @@ rts8801_doscan (unsigned width,
 		      if (!rows_to_begin || !--rows_to_begin)
 			{
 			  unsigned char *outnow = output_buffer;
+                          unsigned x;
 
-			  for (i = 0;
-			       i < (merged_channels ? rowbytes : width);
-			       i += merged_channels ? channels : 1)
+			  for (i = x = 0;
+			       x < width;
+			       ++x, i += merged_channels ? channels : 1)
 			    {
 			      for (j = 0; j < channels; ++j)
 				{
 				  unsigned pix =
 				    (unsigned char) channel_data[j][i & 1][i];
 
-				  if (detailed_calib_data)
-				    {
-				      unsigned char const *calib_start =
-					detailed_calib_data->channeldata[j] +
-					2 *
-					detailed_calib_data->
-					resolution_divisor * i /
-					(merged_channels ? channels : 1);
-				      pix =
-					constrain ((int) pix -
-						   (int) calib_start[0], 0,
-						   255);
-				      pix =
-					constrain (pix * calib_start[1] /
-						   0x40, 0, 255);
-				    }
+                                  if (postprocess_gains && postprocess_offsets)
+                                  {
+                                    int ppidx = j * width + x;
+
+                                    pix = constrain ( pix
+                                                       * postprocess_gains[ppidx]
+                                                       - postprocess_offsets[ppidx],
+                                                      0,
+                                                      255);
+                                  }
 				  *outnow++ = pix;
 				}
 			    }
@@ -2818,6 +2958,9 @@ static unsigned local_sram_size;
 static unsigned char r93setting;
 
 #define RTS8801_F_SUPPRESS_MOVEMENT	1
+#define	RTS8801_F_LAMP_OFF		2
+#define RTS8801_F_NO_DISPLACEMENTS	4
+#define RTS8801_F_ODDX			8
 
 static int
 find_resolution_index (unsigned resolution)
@@ -2848,7 +2991,8 @@ rts8801_fullscan (unsigned x,
 		  int green_calib_offset,
 		  int blue_calib_offset,
 		  int end_calib_offset,
-		  detailed_calibration_data const *detailed_calib_data)
+                  double *postprocess_offsets,
+                  double *postprocess_gains)
 {
   int ires, jres;
   int tg_setting;
@@ -2856,6 +3000,10 @@ rts8801_fullscan (unsigned x,
   unsigned char offdutytime;
   int result;
   int scan_frequency;
+  unsigned intra_channel_offset;
+  unsigned red_green_offset;
+  unsigned green_blue_offset;
+  unsigned total_offsets;
 
   ires = find_resolution_index (xresolution);
   jres = find_resolution_index (yresolution);
@@ -2889,47 +3037,32 @@ rts8801_fullscan (unsigned x,
 
   rt_set_movement_pattern (regs, 0x800000);
 
-
-  tg_setting = resparms[jres].tg;
-  rt_set_ccd_shift_clock_multiplier (regs, tg_info[tg_setting].tg_cph0p);
-  rt_set_ccd_clock_reset_interval (regs, tg_info[tg_setting].tg_crsp);
-  rt_set_ccd_clamp_clock_multiplier (regs, tg_info[tg_setting].tg_cclpp);
-
-
-  rt_set_one_register (0xc6, 0);
-  rt_set_one_register (0xc6, 0);
-
-  rt_set_step_size (regs, resparms[jres].step_size);
-
   rt_set_direction_forwards (regs);
-
   rt_set_stop_when_rewound (regs, 0);
-  rt_set_data_feed_on (regs);
 
-  rt_set_calibration_addresses (regs, 0, 0, 0, 0);
+  rt_set_calibration_addresses (regs, 0, 0, 0, 0, 0);
 
   rt_set_basic_calibration (regs,
 			    calib_info[0], calib_info[1], calib_info[2],
 			    calib_info[3], calib_info[4], calib_info[5],
 			    calib_info[6], calib_info[7], calib_info[8]);
   regs[0x0b] = 0x70;		/* If set to 0x71, the alternative, all values are low */
+  regs[0x40] &= 0xc0;
 
   if (red_calib_offset >= 0
       && green_calib_offset >= 0
-      && blue_calib_offset >= 0 &&
-      yresolution < 400)
+      && blue_calib_offset >= 0)
     {
       rt_set_calibration_addresses (regs, red_calib_offset,
 				    green_calib_offset, blue_calib_offset,
-				    end_calib_offset);
+				    end_calib_offset,
+				    w);
       regs[0x40] |= 0x2f;
-      detailed_calib_data = 0;
     }
   else if (end_calib_offset >= 0)
     {
       rt_set_calibration_addresses (regs, 0x600, 0x600, 0x600,
-				    end_calib_offset);
-      regs[0x40] &= 0xc0;
+				    end_calib_offset, w);
     }
 
   rt_set_channel (regs, RT_CHANNEL_ALL);
@@ -2937,23 +3070,9 @@ rts8801_fullscan (unsigned x,
   rt_set_merge_channels (regs, 1);
   rt_set_colour_mode (regs, 1);
 
-  rt_set_motor_movement_clock_multiplier (regs,
-					  resparms[jres].
-					  motor_movement_clock_multiplier);
-
-  rt_set_cdss (regs, tg_info[tg_setting].tg_cdss1,
-	       tg_info[tg_setting].tg_cdss2);
-  rt_set_cdsc (regs, tg_info[tg_setting].tg_cdsc1,
-	       tg_info[tg_setting].tg_cdsc2);
-  rt_update_after_setting_cdss2 (regs);
-
   rt_set_last_sram_page (regs, (local_sram_size - 1) >> 5);
 
-  regs[0x39] = resparms[jres].reg_39_value;
-  regs[0xc3] = (regs[0xc3] & 0xf8) | resparms[jres].reg_c3_value;
-  regs[0xc6] = (regs[0xc6] & 0xf8) | resparms[jres].reg_c6_value;
   scan_frequency = resparms[jres].scan_frequency;
-  rt_set_scan_frequency (regs, scan_frequency);
   rt_set_cph0s (regs, resparms[ires].cph0s);
   if (resparms[ires].d3_bit_3_value)
     regs[0xd3] |= 0x08;
@@ -2962,15 +3081,10 @@ rts8801_fullscan (unsigned x,
 
   if (flags & RTS8801_F_SUPPRESS_MOVEMENT)
     regs[0xc3] &= 0x7f;
-  rt_set_horizontal_resolution (regs, xresolution);
 
-  rt_set_noscan_distance (regs, y * scan_frequency - 1);
-  rt_set_total_distance (regs, scan_frequency *
-			 (y +
-			  h +
-			  resparms[jres].red_green_offset +
-			  resparms[jres].green_blue_offset +
-			  resparms[jres].intra_channel_offset) - 1);
+  regs[0xb2] &= 0xf7;
+
+  rt_set_horizontal_resolution (regs, xresolution);
 
   rt_set_scanline_start (regs,
 			 x * (1200 / xresolution) /
@@ -2982,6 +3096,118 @@ rts8801_fullscan (unsigned x,
 		       (resparms[ires].cph0s ? 1 : 2) /
 		       (resparms[ires].d3_bit_3_value ? 1 : 2));
 
+  if (flags & RTS8801_F_NO_DISPLACEMENTS)
+    {
+      red_green_offset = green_blue_offset = intra_channel_offset = 0;
+    }
+  else
+    {
+      red_green_offset = resparms[jres].red_green_offset;
+      green_blue_offset = resparms[jres].green_blue_offset;
+      intra_channel_offset = resparms[jres].intra_channel_offset;
+    }
+  total_offsets = red_green_offset + green_blue_offset + intra_channel_offset;
+  if (y > total_offsets + 2)
+    y -= total_offsets;
+  h += total_offsets;
+
+  if (yresolution > 75 && !(flags & RTS8801_F_SUPPRESS_MOVEMENT))
+    {
+      int rmres = find_resolution_index (50);
+
+      if (rmres >= 0)
+	{
+	  int factor = yresolution / 50;
+	  int fastres = y / factor;
+	  int remainder = y % factor;
+
+	  while (remainder < 2)
+	    {
+		--fastres;
+		remainder += factor;
+	    }
+
+	  if (fastres >= 3)
+	    {
+	      y = remainder;
+
+	      rt_set_noscan_distance(regs, fastres * resparms[rmres].scan_frequency - 2);
+	      rt_set_total_distance(regs, fastres * resparms[rmres].scan_frequency - 1);
+
+	      rt_set_scan_frequency(regs, 1);
+
+	      tg_setting = resparms[rmres].tg;
+	      rt_set_ccd_shift_clock_multiplier (regs, tg_info[tg_setting].tg_cph0p);
+	      rt_set_ccd_clock_reset_interval (regs, tg_info[tg_setting].tg_crsp);
+	      rt_set_ccd_clamp_clock_multiplier (regs, tg_info[tg_setting].tg_cclpp);	      
+
+	      rt_set_one_register (0xc6, 0);
+	      rt_set_one_register (0xc6, 0);
+
+	      rt_set_step_size (regs, resparms[rmres].step_size);
+
+	      rt_set_motor_movement_clock_multiplier (regs,
+						      resparms[rmres].
+							  motor_movement_clock_multiplier);
+
+	      rt_set_cdss (regs, tg_info[tg_setting].tg_cdss1,
+			   tg_info[tg_setting].tg_cdss2);
+	      rt_set_cdsc (regs, tg_info[tg_setting].tg_cdsc1,
+			   tg_info[tg_setting].tg_cdsc2);
+	      rt_update_after_setting_cdss2 (regs);
+
+	      regs[0x39] = resparms[rmres].reg_39_value;
+	      regs[0xc3] = (regs[0xc3] & 0xf8) | resparms[rmres].reg_c3_value;
+	      regs[0xc6] = (regs[0xc6] & 0xf8) | resparms[rmres].reg_c6_value;
+
+	      rt_set_data_feed_off (regs);
+
+	      rt_set_all_registers (regs);
+
+  	      rt_set_one_register (0x2c, regs[0x2c]);
+
+	      if (DBG_LEVEL >= 5)
+	        dump_registers (regs);
+
+	      rt_start_moving ();
+	      while (rt_is_moving ());
+	    }
+	}
+    }
+
+
+  rt_set_noscan_distance (regs, y * scan_frequency - 1);
+  rt_set_total_distance (regs, scan_frequency * (y + h) - 1);
+
+  rt_set_scan_frequency (regs, scan_frequency);
+
+  tg_setting = resparms[jres].tg;
+
+  rt_set_ccd_shift_clock_multiplier (regs, tg_info[tg_setting].tg_cph0p);
+  rt_set_ccd_clock_reset_interval (regs, tg_info[tg_setting].tg_crsp);
+  rt_set_ccd_clamp_clock_multiplier (regs, tg_info[tg_setting].tg_cclpp);
+
+  rt_set_one_register (0xc6, 0);
+  rt_set_one_register (0xc6, 0);
+
+  rt_set_step_size (regs, resparms[jres].step_size);
+
+  rt_set_motor_movement_clock_multiplier (regs,
+					  resparms[jres].
+					  motor_movement_clock_multiplier);
+
+  rt_set_cdss (regs, tg_info[tg_setting].tg_cdss1,
+	       tg_info[tg_setting].tg_cdss2);
+  rt_set_cdsc (regs, tg_info[tg_setting].tg_cdsc1,
+	       tg_info[tg_setting].tg_cdsc2);
+  rt_update_after_setting_cdss2 (regs);
+
+  regs[0x39] = resparms[jres].reg_39_value;
+  regs[0xc3] = (regs[0xc3] & 0xf8) | resparms[jres].reg_c3_value;
+  regs[0xc6] = (regs[0xc6] & 0xf8) | resparms[jres].reg_c6_value;
+
+  rt_set_data_feed_on (regs);
+
   rt_set_all_registers (regs);
 
   rt_set_one_register (0x2c, regs[0x2c]);
@@ -2992,12 +3218,13 @@ rts8801_fullscan (unsigned x,
   result = rts8801_doscan (w,
 			   h,
 			   colour,
-			   resparms[jres].red_green_offset,
-			   resparms[jres].green_blue_offset,
-			   resparms[jres].intra_channel_offset,
+			   red_green_offset,
+			   green_blue_offset,
+			   intra_channel_offset,
 			   cbfunc, param, (x & 1), calib_info,
-			   (regs[0x2f] & 0x04) != 0, detailed_calib_data);
-
+			   (regs[0x2f] & 0x04) != 0,
+                           postprocess_offsets,
+                           postprocess_gains);
   return result;
 }
 
@@ -3080,6 +3307,11 @@ sum_channel (unsigned char *p, int n, int bytwo)
 
 static int do_warmup = 1;
 
+#define DETAILED_PASS_COUNT		3
+#define DETAILED_PASS_OFFSETS		0
+#define	DETAILED_PASS_GAINS_FIRSTPASS	1
+#define	DETAILED_PASS_GAINS_SECONDPASS	2
+
 static int
 rts8801_scan (unsigned x,
 	      unsigned y,
@@ -3090,26 +3322,22 @@ rts8801_scan (unsigned x,
 	      unsigned brightness,
 	      unsigned contrast,
 	      rts8801_callback cbfunc,
-	      void *param)
+	      void *param,
+	      double gamma)
 {
   unsigned char calib_info[9];
   unsigned char calibbuf[2400];
   struct dcalibdata dcd;
   struct calibdata cd;
   unsigned char *detail_buffer = 0;
-  int iCalibOffset;
-  int iCalibX;
   int iCalibY;
-  int iCalibWidth;
   int iCalibTarget;
-  int iCalibPixels;
   int iMoveFlags = 0;
-  unsigned int aiLow[3] = { 0, 0, 0 };
-  unsigned int aiHigh[3] = { 256, 256, 256 };
-  unsigned aiBestOffset[3];
+  unsigned aiBestOffset[6];
+  int aiPassed[6];
   int i;
   unsigned j;
-  int anychanged;
+  int k;
   int calibration_size;
   unsigned char *pDetailedCalib;
   int red_calibration_offset;
@@ -3121,7 +3349,13 @@ rts8801_scan (unsigned x,
   int resolution_index;
   int detailed_calibration_rows = 50;
   unsigned char *tdetail_buffer;
-  detailed_calibration_data detailed_calib_data;
+  int pass;
+  int onechanged;
+  double *postprocess_gains;
+  double *postprocess_offsets;
+  int needs_postprocessed_calibration = 0;
+  double contrast_adjust = (double) contrast / 64;
+  int brightness_adjust = brightness - 0x80;
 
   /* Initialise and power up */
 
@@ -3150,99 +3384,101 @@ rts8801_scan (unsigned x,
 
   calib_info[2] = calib_info[5] = calib_info[8] = 1;
 
-  calib_info[0] = calib_info[1] = calib_info[3] = calib_info[4] =
-    calib_info[6] = calib_info[7] = 0xb4;
-
-  iCalibOffset = 0;		/* Note that horizontal resolution is always 600dpi for calibration. 330 is 110 dots in (for R,G,B channels) */
-  iCalibX = 1;
-  iCalibPixels = 50;
-  iCalibY = (resolution == 25) ? 1 : 2;	/* Was 1200 / resolution, which would take us past the calibration area for 50dpi */
-  iCalibWidth = 100;
+  iCalibY = (resolution == 25) ? 1 : 2;
   iCalibTarget = 550;
+ 
+  rt_turn_off_lamp();
 
-  for (i = 0; i < 3; ++i)
-    aiBestOffset[i] = 0xb4;
-
+  for (i = 0; i < 6; ++i)
+    {
+      aiBestOffset[i] = 0xbf;
+      aiPassed[i] = 0;
+    }
+ 
   do
     {
       DBG (30, "Initial calibration pass commences\n");
-      anychanged = 0;
-
-      for (i = 0; i < 3; ++i)
-	{
-	  aiBestOffset[i] = (aiHigh[i] + aiLow[i] + 1) / 2;
-	}
 
+      onechanged = 0;
       for (i = 0; i < 3; ++i)
-	calib_info[i * 3] = calib_info[i * 3 + 1] = aiBestOffset[i];
-
+        {
+	  calib_info[i * 3] = aiBestOffset[i];
+	  calib_info[i * 3 + 1] = aiBestOffset[i + 3];
+        }
+ 
       cd.buffer = calibbuf;
       cd.space = sizeof (calibbuf);
       DBG (30, "Commencing scan for initial calibration pass\n");
-      rts8801_fullscan (iCalibX, iCalibY, iCalibWidth, 2, 600, resolution,
+      rts8801_fullscan (1401, iCalibY, 100, 2, 400, resolution,
 			HP3500_COLOR_SCAN, (rts8801_callback) storefunc, &cd,
-			calib_info, iMoveFlags, -1, -1, -1, -1, 0);
+			calib_info, iMoveFlags, -1, -1, -1, -1, 0, 0);
       DBG (30, "Completed scan for initial calibration pass\n");
-      iMoveFlags = RTS8801_F_SUPPRESS_MOVEMENT;
+      iMoveFlags = RTS8801_F_SUPPRESS_MOVEMENT | RTS8801_F_NO_DISPLACEMENTS;
+      iCalibY = 2;
 
-      for (i = 0; i < 3; ++i)
+      for (i = 0; i < 6; ++i)
 	{
 	  int sum;
 
-	  if (aiBestOffset[i] >= 255)
+	  if (aiBestOffset[i] >= 255 || aiPassed[i] > 2)
 	    continue;
-	  sum = sum_channel (calibbuf + iCalibOffset + i, iCalibPixels, 0);
+	  sum = sum_channel (calibbuf + i, 50, 1);
 	  DBG (20, "channel[%d] sum = %d (target %d)\n", i, sum,
 	       iCalibTarget);
 
-	  if (sum >= iCalibTarget)
-	    aiHigh[i] = aiBestOffset[i];
-	  else
-	    aiLow[i] = aiBestOffset[i];
+	  if (sum < iCalibTarget)
+            {
+              onechanged = 1;
+              ++aiBestOffset[i];
+            }
+          else
+            {
+              ++aiPassed[i];
+            }
 	}
       DBG (30, "Initial calibration pass completed\n");
     }
-  while (aiLow[0] < aiHigh[0] - 1 && aiLow[1] < aiHigh[1] - 1
-	 && aiLow[1] < aiHigh[1] + 1);
+  while (onechanged);
 
   DBG (20, "Offsets calculated\n");
-  cd.buffer = calibbuf;
-  cd.space = sizeof (calibbuf);
-  DBG (20, "Scanning for part 2 of initial calibration\n");
-  rts8801_fullscan (iCalibX + 2100, iCalibY, iCalibWidth, 2, 600, resolution,
-		    HP3500_COLOR_SCAN, (rts8801_callback) storefunc, &cd,
-		    calib_info, RTS8801_F_SUPPRESS_MOVEMENT, -1, -1, -1, -1,
-		    0);
-  DBG (20, "Scan for part 2 of initial calibration completed\n");
 
-  DBG (20, "Initial calibration completed\n");
+  rt_turn_on_lamp();
+  usleep(500000);
 
   tdetail_buffer =
     (unsigned char *) malloc (w * 3 * detailed_calibration_rows);
-  aiLow[0] = aiLow[1] = aiLow[2] = 1;
-  aiHigh[0] = aiHigh[1] = aiHigh[2] = 64;
 
+  for (i = 0; i < 3; ++i)
+    {
+      calib_info[i * 3 + 2] = 1;
+      aiPassed[i] = 0;
+    }
+ 
   do
     {
       struct dcalibdata dcdt;
 
-      for (i = 0; i < 3; ++i)
-	calib_info[i * 3 + 2] = (aiLow[i] + aiHigh[i]) / 2;
-
       dcdt.buffers[0] = tdetail_buffer;
       dcdt.buffers[1] = (tdetail_buffer + w * detailed_calibration_rows);
       dcdt.buffers[2] = (dcdt.buffers[1] + w * detailed_calibration_rows);
       dcdt.pixelsperrow = w;
       dcdt.pixelnow = dcdt.channelnow = dcdt.firstrowdone = 0;
+      DBG (20, "Scanning for part 2 of initial calibration\n");
       rts8801_fullscan (x, 4, w, detailed_calibration_rows + 1, resolution,
 			resolution, HP3500_COLOR_SCAN,
 			(rts8801_callback) accumfunc, &dcdt, calib_info,
-			RTS8801_F_SUPPRESS_MOVEMENT, -1, -1, -1, -1, 0);
+			RTS8801_F_SUPPRESS_MOVEMENT | RTS8801_F_NO_DISPLACEMENTS, -1, -1, -1, -1, 0, 0);
+      DBG (20, "Scan for part 2 of initial calibration completed\n");
+
+      onechanged = 0;
       for (i = 0; i < 3; ++i)
 	{
 	  int largest = 1;
 
-	  for (j = 0; j < w; ++j)
+          if (aiPassed[i] > 2 || calib_info[i * 3 + 2] >= 63)
+            continue;
+
+ 	  for (j = 0; j < w; ++j)
 	    {
 	      int val =
 		calcmedian (dcdt.buffers[i], j, w, detailed_calibration_rows);
@@ -3252,16 +3488,17 @@ rts8801_scan (unsigned x,
 	    }
 
 	  if (largest < 0xe0)
-	    aiLow[i] = calib_info[i * 3 + 2];
-	  else
-	    aiHigh[i] = calib_info[i * 3 + 2];
+            {
+              ++calib_info[i * 3 + 2];
+              onechanged = 1;
+            }
+          else
+            {
+              ++aiPassed[i];
+            }
 	}
     }
-  while (aiLow[0] < aiHigh[0] - 1 && aiLow[1] < aiHigh[1] - 1
-	 && aiLow[1] < aiHigh[1] + 1);
-
-  for (i = 0; i < 3; ++i)
-    calib_info[i * 3 + 2] = aiLow[i];
+  while (onechanged);
 
   for (i = 0; i < 3; ++i)
     {
@@ -3282,15 +3519,7 @@ rts8801_scan (unsigned x,
   dcd.buffers[1] = (detail_buffer + w * detailed_calibration_rows);
   dcd.buffers[2] = (dcd.buffers[1] + w * detailed_calibration_rows);
   dcd.pixelsperrow = w;
-  dcd.pixelnow = dcd.channelnow = dcd.firstrowdone = 0;
-
-  DBG (10, "Performing detailed calibration scan\n");
-  rts8801_fullscan (x, iCalibY, w, detailed_calibration_rows + 1,
-		    resolution, resolution, HP3500_COLOR_SCAN,
-		    (rts8801_callback) accumfunc, &dcd, calib_info,
-		    RTS8801_F_SUPPRESS_MOVEMENT, -1, -1, -1, -1, 0);
 
-  DBG (10, "Detailed calibration scan completed\n");
 
   /* And now for the detailed calibration */
   resolution_index = find_resolution_index (resolution);
@@ -3301,101 +3530,221 @@ rts8801_scan (unsigned x,
     base_resolution *= 2;
   resolution_divisor = base_resolution / resolution;
 
-  calibration_size = w * resolution_divisor * 6 + 1536;
-  red_calibration_offset = 1536;
-  blue_calibration_offset =
-    red_calibration_offset + w * resolution_divisor * 2;
+  calibration_size = w * resolution_divisor * 6 + 1568 + 96;
+  red_calibration_offset = 0x600;
   green_calibration_offset =
-    blue_calibration_offset + w * resolution_divisor * 2;
-  end_calibration_offset =
+    red_calibration_offset + w * resolution_divisor * 2;
+  blue_calibration_offset =
     green_calibration_offset + w * resolution_divisor * 2;
+  end_calibration_offset =
+    blue_calibration_offset + w * resolution_divisor * 2;
   pDetailedCalib = (unsigned char *) malloc (calibration_size);
 
   memset (pDetailedCalib, 0, calibration_size);
+
   for (i = 0; i < 3; ++i)
     {
       int idx =
-	(i == 0) ? red_calibration_offset : (i ==
-					     1) ? green_calibration_offset :
-	blue_calibration_offset;
-      double g = calib_info[i * 3 + 2];
+        (i == 0) ? red_calibration_offset :
+        (i == 1) ? green_calibration_offset :
+                       blue_calibration_offset;
 
       for (j = 0; j < 256; j++)
-	{
-	  int val = j;
-
-	  if (val < 0)
-	    val = 0;
-	  if (val > 255)
-	    val = 255;
-	  pDetailedCalib[i * 512 + j * 2] = val;
-	  pDetailedCalib[i * 512 + j * 2 + 1] = val;
-	}
+        {
+          /* Gamma table - appears to be 256 byte pairs for each input
+           * range (so the first entry cover inputs in the range 0 to 1,
+           * the second 1 to 2, and so on), mapping that input range
+           * (including the fractional parts within it) to an output
+           * range.
+           */
+          pDetailedCalib[i * 512 + j * 2] = j;
+          pDetailedCalib[i * 512 + j * 2 + 1] = j;
+        }
 
       for (j = 0; j < w; ++j)
-	{
-	  int multnow;
-	  int offnow;
-
-	  /* This seems to be the approach for reg 0x40 & 0x3f == 0x27, which allows detailed
-	   * calibration to return either higher or lower values.
-	   */
-	  int k;
-
-	  {
-	    double denom1 =
-	      calcmedian (dcd.buffers[i], j, w, detailed_calibration_rows);
-	    double f = 0xff / (denom1 - 2 * g);
-	    double contrast_adjust = (double) (contrast + 1) / 64;
-
-	    multnow = f * 64 * contrast_adjust;
-	    offnow = 4 * g + 128 - brightness;
-	  }
-	  if (multnow < 0)
-	    multnow = 0;
-	  if (multnow > 255)
-	    multnow = 255;
-	  if (offnow < 0)
-	    offnow = 0;
-	  if (offnow > 255)
-	    offnow = 255;
-
-	  for (k = 0; k < resolution_divisor; ++k)
-	    {
-	      /*multnow = j * resolution_divisor + k; */
-	      pDetailedCalib[idx++] = offnow;	/* Subtract this value from the result */
-	      pDetailedCalib[idx++] = multnow;	/* Then multiply by this value divided by 0x40 */
-	    }
-	}
+        {
+          for (k = 0; k < resolution_divisor; ++k)
+            {
+              pDetailedCalib[idx++] = 0;
+              pDetailedCalib[idx++] = 0x80;
+            }
+        }
     }
 
-  DBG (10, "\n");
-
   rt_set_sram_page (0);
   rt_set_one_register (0x93, r93setting);
   rt_write_sram (calibration_size, pDetailedCalib);
 
-  /* And finally, perform the scan */
+  postprocess_gains = (double *) malloc(sizeof(double) * 3 * w);
+  postprocess_offsets = (double *) malloc(sizeof(double) * 3 * w);
+
+  for (pass = 0; pass < DETAILED_PASS_COUNT; ++pass)
+    {
+      int ppidx = 0;
+
+      DBG (10, "Performing detailed calibration scan %d\n", pass);
+
+      switch (pass)
+      {
+      case DETAILED_PASS_OFFSETS:
+        rt_turn_off_lamp();
+	usleep(500000); /* To be sure it has gone off */
+        break;
+
+      case DETAILED_PASS_GAINS_FIRSTPASS:
+        rt_turn_on_lamp();
+	usleep(500000); /* Give the lamp time to settle */
+        break;
+      }
+
+      dcd.pixelnow = dcd.channelnow = dcd.firstrowdone = 0;
+      rts8801_fullscan (x, iCalibY, w, detailed_calibration_rows + 1,
+                        resolution, resolution, HP3500_COLOR_SCAN,
+                        (rts8801_callback) accumfunc, &dcd,
+			calib_info,
+                        RTS8801_F_SUPPRESS_MOVEMENT | RTS8801_F_NO_DISPLACEMENTS,
+			red_calibration_offset,
+			green_calibration_offset,
+			blue_calibration_offset,
+			end_calibration_offset,
+			0, 0);
+
+      DBG (10, " Detailed calibration scan %d completed\n", pass);
+
+      for (i = 0; i < 3; ++i)
+        {
+          int idx =
+            (i == 0) ? red_calibration_offset :
+	    (i == 1) ? green_calibration_offset :
+                       blue_calibration_offset;
+
+          for (j = 0; j < w; ++j)
+            {
+              double multnow = 0x80;
+              int offnow = 0;
+
+              /* This seems to be the approach for reg 0x40 & 0x3f == 0x27, which allows detailed
+               * calibration to return either higher or lower values.
+               */
+
+              {
+                double denom1 =
+                  calcmedian (dcd.buffers[i], j, w, detailed_calibration_rows);
+
+		switch (pass)
+                  {
+                  case DETAILED_PASS_OFFSETS:
+                    /* The offset is the number needed to be subtracted from "black" at detailed gain = 0x80,
+                     * which is the value we started with. For the next round, pull the gain down to 0x20. Our
+                     * next scan is a test scan to confirm the offset works.
+                     */
+                    multnow = 0x20;
+                    offnow = denom1;
+                    break;
+
+                  case DETAILED_PASS_GAINS_FIRSTPASS:
+                    multnow = 128.0 / denom1 * 0x20; /* Then bring it up to whatever we need to hit 192 */
+                    if (multnow > 255)
+                      multnow = 255;
+                    offnow = pDetailedCalib[idx];
+                    break;
+
+                  case DETAILED_PASS_GAINS_SECONDPASS:
+                    multnow = 255.0 / denom1 * contrast_adjust * pDetailedCalib[idx+1]; /* And finally to 255 */
+                    offnow = pDetailedCalib[idx] - brightness_adjust * 0x80 / multnow;
+
+                    if (offnow < 0)
+                      {
+                        postprocess_offsets[ppidx] = multnow * offnow / 0x80;
+                        offnow = 0;
+                        needs_postprocessed_calibration = 1;
+                      }
+                    else if (offnow > 255)
+                      {
+                        postprocess_offsets[ppidx] = multnow * (offnow - 255) / 0x80;
+                        offnow = 255;
+                        needs_postprocessed_calibration = 1;
+                      }
+                    else
+                      {
+                        postprocess_offsets[ppidx] = 0;
+                      }
+                    if (multnow > 255)
+                      {
+                        postprocess_gains[ppidx] = multnow / 255;
+                        multnow = 255;
+                        needs_postprocessed_calibration = 1;
+                      }
+                    else
+                      {
+                        postprocess_gains[ppidx] = 1.0;
+                      }
+                    break;
+                  }
+              }
+              if (offnow > 255)
+                offnow = 255;
+
+              for (k = 0; k < resolution_divisor; ++k)
+                {
+                  pDetailedCalib[idx++] = offnow;         /* Subtract this value from the result  at gains = 0x80*/
+                  pDetailedCalib[idx++] = multnow;        /* Then multiply by this value divided by 0x80	*/
+                }
+              ++ppidx;
+            }
+        }
+
+      if (pass == DETAILED_PASS_GAINS_SECONDPASS)
+        {
+           /* Build gamma table */
+           unsigned char *redgamma = pDetailedCalib;
+           unsigned char *greengamma = redgamma + 512;
+           unsigned char *bluegamma = greengamma + 512;
+           double val;
+	   double invgamma = 1.0l / gamma;
+
+           *redgamma++ = *bluegamma++ = *greengamma++ = 0;
+
+           /* The windows driver does a linear interpolation for the next 19 boundaries */
+           val = pow (20.0l / 255, invgamma) * 255;
+
+	   for (j = 1; j <= 20; ++j)
+             {
+               *redgamma++ = *bluegamma++ = *greengamma++ = val * j / 20 + 0.5;
+               *redgamma++ = *bluegamma++ = *greengamma++ = val * j / 20 + 0.5;
+             }
+
+           for (; j <= 255; ++j)
+             {
+               val = pow((double) j / 255, invgamma) * 255;
+
+               *redgamma++ = *bluegamma++ = *greengamma++ = val + 0.5;
+               *redgamma++ = *bluegamma++ = *greengamma++ = val + 0.5;
+             }
+           *redgamma++ = *bluegamma++ = *greengamma++ = 255;
+        }
+
+      DBG (10, "\n");
+
+      rt_set_sram_page (0);
+      rt_set_one_register (0x93, r93setting);
+      rt_write_sram (calibration_size, pDetailedCalib);
+    }
 
+  /* And finally, perform the scan */
   DBG (10, "Scanning\n");
 
   rts8801_rewind ();
 
-  detailed_calib_data.channeldata[0] =
-    pDetailedCalib + red_calibration_offset;
-  detailed_calib_data.channeldata[1] =
-    pDetailedCalib + green_calibration_offset;
-  detailed_calib_data.channeldata[2] =
-    pDetailedCalib + blue_calibration_offset;
-  detailed_calib_data.resolution_divisor = resolution_divisor;
-
   rts8801_fullscan (x, y, w, h, resolution, resolution, colour, cbfunc, param,
 		    calib_info, 0,
 		    red_calibration_offset, green_calibration_offset,
 		    blue_calibration_offset, end_calibration_offset,
-		    &detailed_calib_data);
+                    needs_postprocessed_calibration ? postprocess_offsets : 0,
+                    needs_postprocessed_calibration ? postprocess_gains : 0);
 
   rt_turn_off_lamp ();
+
   rts8801_rewind ();
   rt_set_powersave_mode (1);
 
@@ -3403,6 +3752,12 @@ rts8801_scan (unsigned x,
     free (pDetailedCalib);
   if (detail_buffer)
     free (detail_buffer);
+  if (tdetail_buffer)
+    free(tdetail_buffer);
+  if (postprocess_gains)
+    free(postprocess_gains);
+  if (postprocess_offsets)
+    free(postprocess_offsets);
   return 0;
 }
 
@@ -3466,7 +3821,6 @@ reader_process (void *pv)
       sigaction (SIGTERM, &act, 0);
     }
 
-
   /* Warm up the lamp again if our last scan ended more than 5 minutes ago. */
   time (&t);
   do_warmup = (t - scanner->last_scan) > 300;
@@ -3498,9 +3852,25 @@ reader_process (void *pv)
        scanner->actres_pixels.right - scanner->actres_pixels.left,
        scanner->actres_pixels.bottom - scanner->actres_pixels.top,
        scanner->resolution, scanner->mode, scanner->brightness,
-       scanner->contrast, (rts8801_callback) writefunc, &winfo) >= 0)
+       scanner->contrast, (rts8801_callback) writefunc, &winfo,
+       scanner->gamma) >= 0)
     status = SANE_STATUS_GOOD;
   status = SANE_STATUS_IO_ERROR;
   close (scanner->pipe_w);
   return status;
 }
+
+static size_t
+max_string_size (char const **strings)
+{
+  size_t size, max_size = 0;
+  SANE_Int i;
+
+  for (i = 0; strings[i]; ++i)
+    {
+      size = strlen (strings[i]) + 1;
+      if (size > max_size)
+	max_size = size;
+    }
+  return max_size;
+}
diff --git a/backend/hp3900_sane.c b/backend/hp3900_sane.c
index b815572..410e35e 100644
--- a/backend/hp3900_sane.c
+++ b/backend/hp3900_sane.c
@@ -1159,7 +1159,7 @@ options_init (TScanner * scanner)
       TOptionValue *pVal;
 
       /* set gamma */
-      gamma_create (scanner, 2.2);
+      gamma_create (scanner, 1.0);
 
       /* color convertion */
       scanner->cnv.colormode = -1;
diff --git a/backend/hp4200.c b/backend/hp4200.c
index a069be6..589157d 100644
--- a/backend/hp4200.c
+++ b/backend/hp4200.c
@@ -698,7 +698,6 @@ compute_first_gain_offset (int target, int max, int min, int *gain,
 static int
 write_gamma (HP4200_Scanner * s)
 {
-  SANE_Status status;
   int color;
   int i;
   unsigned char gamma[1024];
@@ -728,7 +727,7 @@ write_gamma (HP4200_Scanner * s)
       sanei_pv8630_write_byte (s->fd, PV8630_REPPADDRESS, 0x06);
       sanei_pv8630_prep_bulkread (s->fd, sizeof (read_gamma));
       to_read = sizeof (read_gamma);
-      status = sanei_usb_read_bulk (s->fd, read_gamma, &to_read);
+      sanei_usb_read_bulk (s->fd, read_gamma, &to_read);
       retval = memcmp (read_gamma, gamma, sizeof (read_gamma));
       if (retval != 0)
 	{
@@ -1047,7 +1046,6 @@ do_coarse_calibration (HP4200_Scanner * s, struct coarse_t *coarse)
   int step_size;
   int ff_step_size;
   char steps_to_reverse;
-  char hdpi_div;
   char line_rate_color;
   int vdpi;			/* vertical dots per inch */
   int hdpi_code;
@@ -1085,7 +1083,6 @@ do_coarse_calibration (HP4200_Scanner * s, struct coarse_t *coarse)
 
   vdpi = 150;
   hdpi_code = 0;
-  hdpi_div = hdpi_mapping[hdpi_code];
   active_pixels_start = 0x40;
   line_end = 0x2ee0;
   s->mclk_div = 2;
@@ -1395,7 +1392,6 @@ do_fine_calibration (HP4200_Scanner * s, struct coarse_t *coarse)
   int vdpi;			/* vertical dots per inch */
   int hdpi_code;
   int calibrated;
-  int first_time;
   int lines_to_process;
 
   static char me[] = "do_fine_calibration";
@@ -1495,7 +1491,6 @@ do_fine_calibration (HP4200_Scanner * s, struct coarse_t *coarse)
   cache_write (s);
 
   calibrated = 0;
-  first_time = 1;
   cal_line = malloc (cal_line_size + 1024);
   average = malloc (sizeof (int) * line_length * 3);
   memset (average, 0, sizeof (int) * line_length * 3);
@@ -2437,7 +2432,7 @@ sane_exit (void)
 	}
       if (device->dev.name)
 	{
-	  free (device->dev.name);
+	  free ((void *) device->dev.name);
 	}
       free (device);
     }
diff --git a/backend/hp5400.c b/backend/hp5400.c
index 61de3db..cfa2dc9 100644
--- a/backend/hp5400.c
+++ b/backend/hp5400.c
@@ -67,6 +67,9 @@
 #include <stdlib.h>		/* malloc, free */
 #include <string.h>		/* memcpy */
 #include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 
 
 #define HP5400_CONFIG_FILE "hp5400.conf"
diff --git a/backend/hp5400_internal.c b/backend/hp5400_internal.c
index d7e2325..65a434f 100644
--- a/backend/hp5400_internal.c
+++ b/backend/hp5400_internal.c
@@ -282,7 +282,9 @@ SetCalibration (int iHandle, int numPixels, unsigned int *low_vals[3],
   cmd[3] = 0x00;
   cmd[4] = 0x54;
   cmd[5] = 0x02;
-  cmd[6] = 0x80;
+  cmd[6] = -128;                // 0x80; fixes compiler warning (for
+                                // signed char implementations), see
+                                // also comment above
   cmd[7] = 0x00;
 
   hp5400_bulk_command_write (iHandle, 0xE603, cmd, 8, calSize, calSize,
diff --git a/backend/hp5590.c b/backend/hp5590.c
index 7b1cd60..fabf40a 100644
--- a/backend/hp5590.c
+++ b/backend/hp5590.c
@@ -48,6 +48,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 
 #include "../include/sane/sane.h"
 #define BACKEND_NAME hp5590
@@ -168,7 +171,7 @@ calc_image_params (struct hp5590_scanner *scanner,
   unsigned int	_image_size;
   float		var;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   if (!scanner)
     return SANE_STATUS_INVAL;
@@ -196,7 +199,7 @@ calc_image_params (struct hp5590_scanner *scanner,
 
   DBG (DBG_verbose, "%s: pixel_bits: %u, pixels_per_line: %u, "
        "bytes_per_line: %u, lines: %u, image_size: %u\n",
-       __FUNCTION__,
+       __func__,
        _pixel_bits, _pixels_per_line, _bytes_per_line, _lines, _image_size);
 
   if (pixel_bits)
@@ -229,10 +232,10 @@ attach_usb_device (SANE_String_Const devname,
   SANE_Status			ret;
   const struct hp5590_model	*hp5590_model;
 
-  DBG (DBG_proc, "%s: Opening USB device\n", __FUNCTION__);
+  DBG (DBG_proc, "%s: Opening USB device\n", __func__);
   if (sanei_usb_open (devname, &dn) != SANE_STATUS_GOOD)
     return SANE_STATUS_IO_ERROR;
-  DBG (DBG_proc, "%s: USB device opened\n", __FUNCTION__);
+  DBG (DBG_proc, "%s: USB device opened\n", __func__);
 
   ret = hp5590_model_def (hp_scanner_type, &hp5590_model);
   if (ret != SANE_STATUS_GOOD)
@@ -243,19 +246,19 @@ attach_usb_device (SANE_String_Const devname,
     return SANE_STATUS_IO_ERROR;
 
   DBG (1, "%s: found HP%s scanner at '%s'\n",
-       __FUNCTION__, info->model, devname);
+       __func__, info->model, devname);
 
-  DBG (DBG_verbose, "%s: Reading max scan count\n", __FUNCTION__);
+  DBG (DBG_verbose, "%s: Reading max scan count\n", __func__);
   if (hp5590_read_max_scan_count (dn, hp5590_model->proto_flags,
     				  &max_count) != 0)
     return SANE_STATUS_IO_ERROR;
-  DBG (DBG_verbose, "%s: Max Scanning count %u\n", __FUNCTION__, max_count);
+  DBG (DBG_verbose, "%s: Max Scanning count %u\n", __func__, max_count);
 
-  DBG (DBG_verbose, "%s: Reading scan count\n", __FUNCTION__);
+  DBG (DBG_verbose, "%s: Reading scan count\n", __func__);
   if (hp5590_read_scan_count (dn, hp5590_model->proto_flags,
     			      &count) != 0)
     return SANE_STATUS_IO_ERROR;
-  DBG (DBG_verbose, "%s: Scanning count %u\n", __FUNCTION__, count);
+  DBG (DBG_verbose, "%s: Scanning count %u\n", __func__, count);
 
   ret = hp5590_read_part_number (dn, hp5590_model->proto_flags);
   if (ret != SANE_STATUS_GOOD)
@@ -381,7 +384,7 @@ void sane_exit (void)
 {
   struct hp5590_scanner *ptr, *pnext;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   for (ptr = scanners_list; ptr; ptr = pnext)
     {
@@ -399,7 +402,7 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
   struct hp5590_scanner *ptr;
   unsigned int found, i;
 
-  DBG (DBG_proc, "%s, local only: %u\n", __FUNCTION__, local_only);
+  DBG (DBG_proc, "%s, local only: %u\n", __func__, local_only);
 
   if (!device_list)
     return SANE_STATUS_INVAL;
@@ -431,7 +434,7 @@ sane_open (SANE_String_Const devicename, SANE_Handle * handle)
   SANE_String_Const 		*sources_list;
   unsigned int 			source_idx;
 
-  DBG (DBG_proc, "%s: device name: %s\n", __FUNCTION__, devicename);
+  DBG (DBG_proc, "%s: device name: %s\n", __func__, devicename);
 
   if (!handle)
     return SANE_STATUS_INVAL;
@@ -623,7 +626,7 @@ sane_close (SANE_Handle handle)
 {
   struct hp5590_scanner *scanner = handle;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   sanei_usb_close (scanner->dn);
   scanner->dn = -1;
@@ -635,7 +638,7 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
 {
   struct hp5590_scanner *scanner = handle;
 
-  DBG (DBG_proc, "%s, option: %u\n", __FUNCTION__, option);
+  DBG (DBG_proc, "%s, option: %u\n", __func__, option);
 
   if (option >= HP5590_OPT_LAST)
     return NULL;
@@ -664,7 +667,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
     {
       if (option == HP5590_OPT_NUM)
 	{
-	  DBG(3, "%s: get total number of options - %u\n", __FUNCTION__, HP5590_OPT_LAST);
+	  DBG(3, "%s: get total number of options - %u\n", __func__, HP5590_OPT_LAST);
 	  *((SANE_Int *) value) = HP5590_OPT_LAST;
 	  return SANE_STATUS_GOOD;
 	}
@@ -672,7 +675,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
       if (!scanner->opts)
 	return SANE_STATUS_INVAL;
       
-      DBG (DBG_proc, "%s: get option '%s' value\n", __FUNCTION__, scanner->opts[option].name);
+      DBG (DBG_proc, "%s: get option '%s' value\n", __func__, scanner->opts[option].name);
 
       if (option == HP5590_OPT_BR_X)
 	{
@@ -923,7 +926,7 @@ SANE_Status sane_get_parameters (SANE_Handle handle,
   SANE_Status		ret;
   unsigned int		pixel_bits;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   if (!params)
     return SANE_STATUS_INVAL;
@@ -961,7 +964,7 @@ SANE_Status sane_get_parameters (SANE_Handle handle,
       params->format = SANE_FRAME_RGB;
       break;
     default:
-      DBG(0, "%s: Unknown depth\n", __FUNCTION__);
+      DBG(0, "%s: Unknown depth\n", __func__);
       return SANE_STATUS_INVAL;
   }
 
@@ -983,7 +986,7 @@ sane_start (SANE_Handle handle)
   SANE_Status		ret;
   unsigned int		bytes_per_line;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   if (!scanner)
     return SANE_STATUS_INVAL;
@@ -993,11 +996,11 @@ sane_start (SANE_Handle handle)
 	 || scanner->source == SOURCE_ADF_DUPLEX))
     {
       DBG (DBG_verbose, "%s: Scanner is scanning, check if more data is available\n",
-	   __FUNCTION__);
+	   __func__);
       ret = hp5590_is_data_available (scanner->dn, scanner->proto_flags);
       if (ret == SANE_STATUS_GOOD)
 	{
-	  DBG (DBG_verbose, "%s: More data is available\n", __FUNCTION__);
+	  DBG (DBG_verbose, "%s: More data is available\n", __func__);
 	  scanner->transferred_image_size = scanner->image_size;
 	  return SANE_STATUS_GOOD;
 	}
@@ -1147,7 +1150,7 @@ convert_lineart (struct hp5590_scanner *scanner, SANE_Byte *data, SANE_Int size)
 {
   SANE_Int i;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   hp5590_assert (scanner != NULL);
   hp5590_assert (data != NULL);
@@ -1182,7 +1185,7 @@ convert_to_rgb (struct hp5590_scanner *scanner, SANE_Byte *data, SANE_Int size)
       || scanner->depth == DEPTH_GRAY)
     return SANE_STATUS_GOOD;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
 #ifndef HAS_WORKING_COLOR_48
   if (scanner->depth == DEPTH_COLOR_48)
@@ -1263,7 +1266,7 @@ sane_read (SANE_Handle handle, SANE_Byte * data,
   SANE_Status 		ret;
 
   DBG (DBG_proc, "%s, length %u, left %u\n",
-       __FUNCTION__,
+       __func__,
        max_length,
        scanner->transferred_image_size);
 
@@ -1282,7 +1285,7 @@ sane_read (SANE_Handle handle, SANE_Byte * data,
       if (ret != SANE_STATUS_GOOD)
 	return ret;
 
-      /* Dont free bulk read state, some bytes could be left
+      /* Don't free bulk read state, some bytes could be left
        * for the next images from ADF
        */
       return SANE_STATUS_EOF;
@@ -1350,7 +1353,7 @@ sane_cancel (SANE_Handle handle)
   struct hp5590_scanner	*scanner = handle;
   SANE_Status		ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   scanner->scanning = SANE_FALSE;
 
@@ -1370,7 +1373,7 @@ SANE_Status
 sane_set_io_mode (SANE_Handle __sane_unused__ handle,
 		  SANE_Bool __sane_unused__ non_blocking)
 {
-  DBG (DBG_proc, "%s\n", __FUNCTION__);  
+  DBG (DBG_proc, "%s\n", __func__);
 
   return SANE_STATUS_UNSUPPORTED;
 }
@@ -1380,7 +1383,7 @@ SANE_Status
 sane_get_select_fd (SANE_Handle __sane_unused__ handle,
 		    SANE_Int __sane_unused__ * fd)
 {
-  DBG (DBG_proc, "%s\n", __FUNCTION__);  
+  DBG (DBG_proc, "%s\n", __func__);
 
   return SANE_STATUS_UNSUPPORTED;
 }
diff --git a/backend/hp5590_cmds.c b/backend/hp5590_cmds.c
index 894101b..06fd91a 100644
--- a/backend/hp5590_cmds.c
+++ b/backend/hp5590_cmds.c
@@ -483,7 +483,7 @@ hp5590_init_scanner (SANE_Int dn,
    * 09 60 4F B0 6D E0 00 00 00 00 00 00 00 00 00 64  ..O.m..........d
    * 03 E8                                            ..
    */
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   hp5590_cmds_assert (sizeof (init_resp) == 50);
 
@@ -512,7 +512,7 @@ hp5590_init_scanner (SANE_Int dn,
 		{
 		  DBG (DBG_err, "%s: Vendor id mismatch for scanner HP%s - "
 		       "required  '%s', got '%s'\n",
-		       __FUNCTION__,
+		       __func__,
 		       hp5590_models[i].model,
 		       hp5590_models[i].vendor_id, id_buf);
 		  return SANE_STATUS_INVAL;
@@ -593,10 +593,10 @@ hp5590_init_scanner (SANE_Int dn,
   if (ret != SANE_STATUS_GOOD)
     {
       DBG (DBG_err, "%s: scanner reports non-zero status: %s\n",
-	   __FUNCTION__, sane_strstatus (ret));
+	   __func__, sane_strstatus (ret));
       return ret;
     }
-  DBG (DBG_cmds, "%s: scanner status OK\n", __FUNCTION__);
+  DBG (DBG_cmds, "%s: scanner status OK\n", __func__);
 
   return SANE_STATUS_GOOD;
 }
@@ -614,7 +614,7 @@ hp5590_read_eeprom (SANE_Int dn,
   hp5590_cmds_assert (data != NULL);
   hp5590_cmds_assert (sizeof (eeprom_addr) == 1);
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
   DBG (DBG_proc, "Reading EEPROM: addr %04x, size %u\n", addr, size);
 
   ret = hp5590_cmd (dn,
@@ -649,7 +649,7 @@ hp5590_write_eeprom (SANE_Int dn,
   hp5590_cmds_assert (data != NULL);
   hp5590_cmds_assert (sizeof (eeprom_addr) == 1);
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
   DBG (DBG_proc, "Writing EEPROM: addr %04x, size: %u\n", addr, size);
 
   ret = hp5590_cmd (dn,
@@ -683,7 +683,7 @@ hp5590_read_scan_count (SANE_Int dn,
   hp5590_cmds_assert (count != NULL);
   hp5590_cmds_assert (sizeof (scan_count) == 4);
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
   DBG (DBG_proc, "Reading scan count\n");
 
   ret = hp5590_read_eeprom (dn,
@@ -713,7 +713,7 @@ hp5590_inc_scan_count (SANE_Int dn,
   unsigned int new_count;
   SANE_Status ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
   hp5590_cmds_assert (sizeof (scan_count) == 4);
 
   ret = hp5590_read_scan_count (dn, proto_flags, &count);
@@ -756,7 +756,7 @@ hp5590_read_max_scan_count (SANE_Int dn,
   hp5590_cmds_assert (max_count != NULL);
   hp5590_cmds_assert (sizeof (max_scan_count) == 3);
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
   DBG (DBG_proc, "Reading max scan count\n");
 
   ret = hp5590_read_eeprom (dn,
@@ -811,7 +811,7 @@ hp5590_read_eeprom_all_cmd (SANE_Int dn,
   uint8_t eeprom[255];
   SANE_Status ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   ret = hp5590_read_eeprom (dn,
   			    proto_flags,
@@ -835,7 +835,7 @@ hp5590_read_part_number (SANE_Int dn,
   unsigned char part_number[PART_NUMBER_LEN + 1];
   SANE_Status ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   memset (part_number, 0, sizeof (part_number));
   ret = hp5590_read_eeprom (dn,
@@ -859,7 +859,7 @@ hp5590_is_data_available (SANE_Int dn,
   SANE_Status ret;
   SANE_Bool data_available;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   hp5590_cmds_assert (sizeof (data_status) == 1);
   data_available = SANE_FALSE;
@@ -873,13 +873,13 @@ hp5590_is_data_available (SANE_Int dn,
   if (ret != SANE_STATUS_GOOD)
     return ret;
 
-  DBG (DBG_cmds, "%s: Data status: %02x\n", __FUNCTION__, data_status);
+  DBG (DBG_cmds, "%s: Data status: %02x\n", __func__, data_status);
 
   if (data_status == 0x40)
     data_available = SANE_TRUE;
 
   DBG (DBG_cmds, "%s: Data is %s\n",
-       __FUNCTION__,
+       __func__,
        data_available == SANE_TRUE ? "available" : "not available");
 
   return data_available == SANE_TRUE ? SANE_STATUS_GOOD : SANE_STATUS_NO_DOCS;
@@ -893,7 +893,7 @@ hp5590_stop_scan (SANE_Int dn,
   uint8_t reg_011b = 0x40;
   SANE_Status ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   hp5590_cmds_assert (sizeof (reg_011b) == 1);
 
@@ -920,7 +920,7 @@ hp5590_turnon_lamp (SANE_Int dn,
   struct lamp_state lamp_state;
   SANE_Status ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   hp5590_cmds_assert (sizeof (lamp_state) == 4);
 
@@ -930,7 +930,7 @@ hp5590_turnon_lamp (SANE_Int dn,
       lamp_state.unk1 = 0x02;
       lamp_state.flag = 0x01;
       lamp_state.turnoff_time = htons (0x0a0a);
-      DBG (DBG_cmds, "%s: turning lamp on\n", __FUNCTION__);
+      DBG (DBG_cmds, "%s: turning lamp on\n", __func__);
     }
 
   if (state == LAMP_STATE_TURNOFF)
@@ -939,7 +939,7 @@ hp5590_turnon_lamp (SANE_Int dn,
       lamp_state.unk1 = 0x02;
       lamp_state.flag = 0x02;
       lamp_state.turnoff_time = htons (0x0a0a);
-      DBG (DBG_cmds, "%s: turning lamp off\n", __FUNCTION__);
+      DBG (DBG_cmds, "%s: turning lamp off\n", __func__);
     }
 
   if (state == LAMP_STATE_SET_TURNOFF_TIME)
@@ -948,7 +948,7 @@ hp5590_turnon_lamp (SANE_Int dn,
       lamp_state.unk1 = 0x02;
       lamp_state.flag = 0x03;
       lamp_state.turnoff_time = htons (0x0336);
-      DBG (DBG_cmds, "%s: setting turnoff time\n", __FUNCTION__);
+      DBG (DBG_cmds, "%s: setting turnoff time\n", __func__);
     }
 
   if (state == LAMP_STATE_SET_TURNOFF_TIME_LONG)
@@ -957,7 +957,7 @@ hp5590_turnon_lamp (SANE_Int dn,
       lamp_state.unk1 = 0x02;
       lamp_state.flag = 0x03;
       lamp_state.turnoff_time = htons (0x0f36);
-      DBG (DBG_cmds, "%s: setting long turnoff time\n", __FUNCTION__);
+      DBG (DBG_cmds, "%s: setting long turnoff time\n", __func__);
     }
 
   ret = hp5590_cmd (dn,
@@ -987,7 +987,7 @@ hp5590_power_status (SANE_Int dn,
   struct power_resp power_resp;
   SANE_Status ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   hp5590_cmds_assert (sizeof (power_resp) == 3);
 
@@ -1023,7 +1023,7 @@ hp5590_read_error_code (SANE_Int dn,
   struct reg_03 reg_03;
   SANE_Status 	ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
   
   hp5590_cmds_assert (sizeof (reg_03) == 3);
   hp5590_cmds_assert (adf_flags != NULL);
@@ -1040,9 +1040,9 @@ hp5590_read_error_code (SANE_Int dn,
   if (ret != SANE_STATUS_GOOD)
     return ret;
 
-  DBG (DBG_cmds, "%s: adf_flags: %04x\n", __FUNCTION__, reg_03.adf_flags);
-  DBG (DBG_cmds, "%s: unk1     : %04x\n", __FUNCTION__, reg_03.unk1);
-  DBG (DBG_cmds, "%s: unk2     : %04x\n", __FUNCTION__, reg_03.unk2);
+  DBG (DBG_cmds, "%s: adf_flags: %04x\n", __func__, reg_03.adf_flags);
+  DBG (DBG_cmds, "%s: unk1     : %04x\n", __func__, reg_03.unk1);
+  DBG (DBG_cmds, "%s: unk2     : %04x\n", __func__, reg_03.unk2);
 
   *adf_flags = reg_03.adf_flags;
 
@@ -1056,7 +1056,7 @@ hp5590_reset_scan_head (SANE_Int dn,
 {
   SANE_Status	ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
   
   ret = hp5590_turnon_lamp (dn, proto_flags, LAMP_STATE_TURNOFF);
   if (ret != SANE_STATUS_GOOD)
@@ -1082,7 +1082,7 @@ hp5590_select_source_and_wakeup (SANE_Int dn,
   SANE_Status 	ret;
   unsigned int	adf_flags;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   hp5590_cmds_assert (sizeof (reg_d6) == 1);
 
@@ -1161,7 +1161,7 @@ hp5590_lock_unlock_scanner (SANE_Int dn,
   unsigned int	adf_flags;
   unsigned int	waiting;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
   hp5590_cmds_assert (sizeof (reg_00) == 1);
 
   for (waiting = 0; waiting < WAKEUP_TIMEOUT; waiting++, sleep (1))
@@ -1206,7 +1206,7 @@ hp5590_set_base_dpi (SANE_Int dn,
   uint16_t _base_dpi;
   SANE_Status ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   hp5590_cmds_assert (scanner_info != NULL);
   hp5590_cmds_assert (base_dpi != 0);
@@ -1246,7 +1246,7 @@ hp5590_set_color_map (SANE_Int dn,
   struct color_map color_map;
   SANE_Status ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   hp5590_cmds_assert (sizeof (color_map) == 18);
   hp5590_cmds_assert (base_dpi != 0);
@@ -1301,7 +1301,7 @@ static SANE_Status
 calc_base_dpi (unsigned int dpi, unsigned int *base_dpi)
 {
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   hp5590_cmds_assert (base_dpi != NULL);
   hp5590_cmds_assert (dpi != 0);
@@ -1346,7 +1346,7 @@ calc_base_dpi (unsigned int dpi, unsigned int *base_dpi)
 static SANE_Status
 calc_scanner_dpi (unsigned int dpi, unsigned int *scanner_dpi)
 {
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   hp5590_cmds_assert (scanner_dpi != NULL);
   hp5590_cmds_assert (dpi != 0);
@@ -1399,7 +1399,7 @@ hp5590_calc_pixel_bits (unsigned int dpi, enum color_depths color_depth,
   unsigned int scanner_dpi;
   SANE_Status ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   hp5590_cmds_assert (pixel_bits != NULL);
   hp5590_cmds_assert (dpi != 0);
@@ -1465,7 +1465,7 @@ hp5590_set_scan_area (SANE_Int dn,
   unsigned int 		pixels_y;
   SANE_Status 		ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   hp5590_cmds_assert (sizeof (scan_params) == 37);
   hp5590_cmds_assert (dpi != 0);
@@ -1579,14 +1579,14 @@ hp5590_set_scan_area (SANE_Int dn,
 
   if (top_x + pixels_x > max_pixels_x_current_dpi)
     {
-      DBG (DBG_err, "Top X (%u) + pixels X (%u) exceedes max X %u\n",
+      DBG (DBG_err, "Top X (%u) + pixels X (%u) exceeds max X %u\n",
 	   top_x, pixels_x, max_pixels_x_current_dpi);
       return SANE_STATUS_INVAL;
     }
 
   if (top_y + pixels_y > max_pixels_y_current_dpi)
     {
-      DBG (DBG_err, "Top Y (%u) + pixels Y (%u) exceedes max Y %u\n",
+      DBG (DBG_err, "Top Y (%u) + pixels Y (%u) exceeds max Y %u\n",
 	   top_y, pixels_y, max_pixels_y_current_dpi);
       return SANE_STATUS_INVAL;
     }
@@ -1628,7 +1628,7 @@ hp5590_read_image_params (SANE_Int dn,
   struct image_params image_params;
   SANE_Status ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   hp5590_cmds_assert (sizeof (image_params) == 16);
 
@@ -1676,7 +1676,7 @@ hp5590_set_scan_params (SANE_Int dn,
   unsigned int base_dpi;
   SANE_Status ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   hp5590_cmds_assert (scanner_info != NULL);
   hp5590_cmds_assert (dpi != 0);
@@ -1754,7 +1754,7 @@ hp5590_send_reverse_calibration_map (SANE_Int dn,
   unsigned int len;
   SANE_Status ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
   DBG (DBG_proc, "Preparing reverse calibration map\n");
   val = 0xffff;
   len = reverse_map_size / 4;
@@ -1805,7 +1805,7 @@ hp5590_send_forward_calibration_maps (SANE_Int dn,
   unsigned int i;
   uint16_t val;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
   DBG (DBG_proc, "Preparing forward calibration map\n");
   val = 0x0000;
   for (i = 0; i < forward_map_size; i++)
@@ -1852,7 +1852,7 @@ hp5590_read (SANE_Int dn,
 {
   SANE_Status ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   hp5590_cmds_assert (bytes != NULL);
   hp5590_cmds_assert (state != NULL);
@@ -1872,7 +1872,7 @@ hp5590_start_scan (SANE_Int dn,
   uint8_t reg_051b = 0x40;
   SANE_Status ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   hp5590_cmds_assert (sizeof (reg_051b) == 1);
 
@@ -1897,7 +1897,7 @@ hp5590_read_buttons (SANE_Int dn,
   uint16_t button_status;
   SANE_Status ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   hp5590_cmds_assert (status != NULL);
   hp5590_cmds_assert (sizeof (button_status) == 2);
diff --git a/backend/hp5590_low.c b/backend/hp5590_low.c
index 51da01a..4961fd7 100644
--- a/backend/hp5590_low.c
+++ b/backend/hp5590_low.c
@@ -143,7 +143,7 @@ hp5590_get_ack (SANE_Int dn,
   if (proto_flags & PF_NO_USB_IN_USB_ACK)
     return SANE_STATUS_GOOD;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   /* Check if USB-in-USB operation was accepted */
   ret = sanei_usb_control_msg (dn, USB_DIR_IN | USB_TYPE_VENDOR,
@@ -152,17 +152,17 @@ hp5590_get_ack (SANE_Int dn,
   if (ret != SANE_STATUS_GOOD)
     {
       DBG (DBG_err, "%s: USB-in-USB: error getting acknowledge\n",
-	   __FUNCTION__);
+	   __func__);
       return ret;
     }
 
-  DBG (DBG_usb, "%s: USB-in-USB: accepted\n", __FUNCTION__);
+  DBG (DBG_usb, "%s: USB-in-USB: accepted\n", __func__);
 
   /* Check if we received correct acknowledgement */
   if (status != 0x01)
     {
       DBG (DBG_err, "%s: USB-in-USB: not accepted (status %u)\n",
-	   __FUNCTION__, status);
+	   __func__, status);
       return SANE_STATUS_DEVICE_BUSY;
     }
 
@@ -186,7 +186,7 @@ hp5590_get_status (SANE_Int dn,
   uint8_t status;
   SANE_Status ret;
 
-  DBG (DBG_proc, "%s\n", __FUNCTION__);
+  DBG (DBG_proc, "%s\n", __func__);
 
   ret = sanei_usb_control_msg (dn, USB_DIR_IN | USB_TYPE_VENDOR,
 			       0x0c, 0x8e, 0x00,
@@ -194,7 +194,7 @@ hp5590_get_status (SANE_Int dn,
   if (ret != SANE_STATUS_GOOD)
     {
       DBG (DBG_err, "%s: USB-in-USB: error getting device status\n",
-	   __FUNCTION__);
+	   __func__);
       return ret;
     }
 
@@ -202,7 +202,7 @@ hp5590_get_status (SANE_Int dn,
   if (status != 0x00)
     {
       DBG (DBG_err, "%s: USB-in-USB: got non-zero device status (status %u)\n",
-	   __FUNCTION__, status);
+	   __func__, status);
       return SANE_STATUS_DEVICE_BUSY;
     }
 
@@ -244,7 +244,7 @@ hp5590_control_msg (SANE_Int dn,
   unsigned int 			needed_response;
 
   DBG (DBG_proc, "%s: USB-in-USB: core data: %s\n",
-       __FUNCTION__, core_flags & CORE_DATA ? "yes" : "no");
+       __func__, core_flags & CORE_DATA ? "yes" : "no");
 
   hp5590_low_assert (bytes != NULL);
 
@@ -259,7 +259,7 @@ hp5590_control_msg (SANE_Int dn,
       ctrl.wIndex = htons (index);
       ctrl.wLength = htole16 (size);
 
-      DBG (DBG_usb, "%s: USB-in-USB: sending control msg\n", __FUNCTION__);
+      DBG (DBG_usb, "%s: USB-in-USB: sending control msg\n", __func__);
       /* Send USB-in-USB control message */
       ret = sanei_usb_control_msg (dn, USB_DIR_OUT | USB_TYPE_VENDOR,
 				   0x04, 0x8f, 0x00,
@@ -267,7 +267,7 @@ hp5590_control_msg (SANE_Int dn,
       if (ret != SANE_STATUS_GOOD)
 	{
 	  DBG (DBG_err, "%s: USB-in-USB: error sending control message\n",
-	       __FUNCTION__);
+	       __func__);
 	  return ret;
 	}
 
@@ -292,7 +292,7 @@ hp5590_control_msg (SANE_Int dn,
 				       0x90, 0x00, next_packet_size, ptr);
 	  if (ret != SANE_STATUS_GOOD)
 	    {
-	      DBG (DBG_err, "%s: USB-in-USB: error reading data\n", __FUNCTION__);
+	      DBG (DBG_err, "%s: USB-in-USB: error reading data\n", __func__);
 	      return ret;
 	    }
 
@@ -308,7 +308,7 @@ hp5590_control_msg (SANE_Int dn,
       if (ret != SANE_STATUS_GOOD)
 	{
 	  DBG (DBG_err, "%s: USB-in-USB: error confirming data reception\n",
-	       __FUNCTION__);
+	       __func__);
 	  return -1;
 	}
 
@@ -329,7 +329,7 @@ hp5590_control_msg (SANE_Int dn,
       ctrl.wIndex = htons (index);
       ctrl.wLength = htole16 (size);
 
-      DBG (DBG_usb, "%s: USB-in-USB: sending control msg\n", __FUNCTION__);
+      DBG (DBG_usb, "%s: USB-in-USB: sending control msg\n", __func__);
       /* Send USB-in-USB control message */
       ret = sanei_usb_control_msg (dn, USB_DIR_OUT | USB_TYPE_VENDOR,
 				   0x04, 0x8f, 0x00,
@@ -337,7 +337,7 @@ hp5590_control_msg (SANE_Int dn,
       if (ret != SANE_STATUS_GOOD)
 	{
 	  DBG (DBG_err, "%s: USB-in-USB: error sending control message\n",
-	       __FUNCTION__);
+	       __func__);
 	  return ret;
 	}
 
@@ -362,7 +362,7 @@ hp5590_control_msg (SANE_Int dn,
 				       0x8f, 0x00, next_packet_size, ptr);
 	  if (ret != SANE_STATUS_GOOD)
 	    {
-	      DBG (DBG_err, "%s: USB-in-USB: error sending data\n", __FUNCTION__);
+	      DBG (DBG_err, "%s: USB-in-USB: error sending data\n", __func__);
 	      return ret;
 	    }
 
@@ -389,13 +389,13 @@ hp5590_control_msg (SANE_Int dn,
 	}
 
       /* Getting  response after data transmission */
-      DBG (DBG_usb, "%s: USB-in-USB: getting response\n", __FUNCTION__);
+      DBG (DBG_usb, "%s: USB-in-USB: getting response\n", __func__);
       ret = sanei_usb_control_msg (dn, USB_DIR_IN | USB_TYPE_VENDOR,
 				   0x0c, 0x90, 0x00,
 				   sizeof (response), &response);
       if (ret != SANE_STATUS_GOOD)
 	{
-	  DBG (DBG_err, "%s: USB-in-USB: error getting response\n", __FUNCTION__);
+	  DBG (DBG_err, "%s: USB-in-USB: error getting response\n", __func__);
 	  return ret;
 	}
 
@@ -405,14 +405,14 @@ hp5590_control_msg (SANE_Int dn,
       needed_response = core_flags & CORE_BULK_OUT ? 0x24 : 0x00;
       if (response == needed_response)
 	DBG (DBG_usb, "%s: USB-in-USB: got correct response\n",
-	     __FUNCTION__);
+	     __func__);
 
       if (response != needed_response)
 	{
 	  DBG (DBG_err,
 	       "%s: USB-in-USB: invalid response received "
 	       "(needed %04x, got %04x)\n",
-	       __FUNCTION__, needed_response, response);
+	       __func__, needed_response, response);
 	  return SANE_STATUS_IO_ERROR;
 	}
 
@@ -421,7 +421,7 @@ hp5590_control_msg (SANE_Int dn,
 	{
 	  uint8_t bulk_flags = 0x24;
 	  DBG (DBG_usb, "%s: USB-in-USB: sending bulk flags\n",
-	       __FUNCTION__);
+	       __func__);
 
 	  ret = sanei_usb_control_msg (dn, USB_DIR_OUT | USB_TYPE_VENDOR,
 				       0x0c, 0x83, 0x00,
@@ -429,7 +429,7 @@ hp5590_control_msg (SANE_Int dn,
 	  if (ret != SANE_STATUS_GOOD)
 	    {
 	      DBG (DBG_err, "%s: USB-in-USB: error sending bulk flags\n",
-		   __FUNCTION__);
+		   __func__);
 	      return ret;
 	    }
 
@@ -467,7 +467,7 @@ hp5590_verify_last_cmd (SANE_Int dn,
   SANE_Status 	ret;
 
   DBG (3, "%s: USB-in-USB: command verification requested\n",
-       __FUNCTION__);
+       __func__);
 
   /* Read last command along with CORE status */
   ret = hp5590_control_msg (dn,
@@ -489,17 +489,17 @@ hp5590_verify_last_cmd (SANE_Int dn,
   /* Verify last command */
   DBG (DBG_usb, "%s: USB-in-USB: command verification %04x, "
        "last command: %04x, core status: %04x\n",
-       __FUNCTION__, verify_cmd, last_cmd, core_status);
+       __func__, verify_cmd, last_cmd, core_status);
   if ((cmd & 0x00ff) != last_cmd)
     {
       DBG (DBG_err, "%s: USB-in-USB: command verification failed: "
 	   "expected 0x%04x, got 0x%04x\n",
-	   __FUNCTION__, cmd, last_cmd);
+	   __func__, cmd, last_cmd);
       return SANE_STATUS_IO_ERROR;
     }
 
   DBG (DBG_usb, "%s: USB-in-USB: command verified successfully\n",
-       __FUNCTION__);
+       __func__);
 
   /* Return value depends on CORE status */
   return core_status & CORE_FLAG_NOT_READY ?
@@ -534,7 +534,7 @@ hp5590_cmd (SANE_Int dn,
 {
   SANE_Status ret;
 
-  DBG (3, "%s: USB-in-USB: command : %04x\n", __FUNCTION__, cmd);
+  DBG (3, "%s: USB-in-USB: command : %04x\n", __func__, cmd);
 
   ret = hp5590_control_msg (dn,
   			    proto_flags,
@@ -568,7 +568,7 @@ hp5590_low_init_bulk_read_state (void **state)
 {
   struct bulk_read_state *bulk_read_state;
 
-  DBG (3, "%s: USB-in-USB: initializing bulk read state\n", __FUNCTION__);
+  DBG (3, "%s: USB-in-USB: initializing bulk read state\n", __func__);
 
   hp5590_low_assert (state != NULL);
 
@@ -582,7 +582,7 @@ hp5590_low_init_bulk_read_state (void **state)
   if (!bulk_read_state->buffer)
     {
       DBG (DBG_err, "%s: Memory allocation failed for %u bytes\n",
-	   __FUNCTION__, ALLOCATE_BULK_READ_PAGES * BULK_READ_PAGE_SIZE);
+	   __func__, ALLOCATE_BULK_READ_PAGES * BULK_READ_PAGE_SIZE);
       return SANE_STATUS_NO_MEM;
     }
   bulk_read_state->buffer_size = ALLOCATE_BULK_READ_PAGES
@@ -613,7 +613,7 @@ hp5590_low_free_bulk_read_state (void **state)
 {
   struct bulk_read_state *bulk_read_state;
 
-  DBG (3, "%s\n", __FUNCTION__);
+  DBG (3, "%s\n", __func__);
 
   hp5590_low_assert (state != NULL);
   /* Just return if NULL bulk read state was given */
@@ -622,7 +622,7 @@ hp5590_low_free_bulk_read_state (void **state)
 
   bulk_read_state = *state;
 
-  DBG (3, "%s: USB-in-USB: freeing bulk read state\n", __FUNCTION__);
+  DBG (3, "%s: USB-in-USB: freeing bulk read state\n", __func__);
 
   free (bulk_read_state->buffer);
   bulk_read_state->buffer = NULL;
@@ -656,7 +656,7 @@ hp5590_bulk_read (SANE_Int dn,
   struct bulk_read_state	*bulk_read_state;
   unsigned int 			bytes_until_buffer_end;
 
-  DBG (3, "%s\n", __FUNCTION__);
+  DBG (3, "%s\n", __func__);
 
   hp5590_low_assert (state != NULL);
   hp5590_low_assert (bytes != NULL);
@@ -665,7 +665,7 @@ hp5590_bulk_read (SANE_Int dn,
   if (bulk_read_state->initialized == 0)
     {
       DBG (DBG_err, "%s: USB-in-USB: bulk read state not initialized\n",
-	   __FUNCTION__);
+	   __func__);
       return SANE_STATUS_INVAL;
     }
 
@@ -685,7 +685,7 @@ hp5590_bulk_read (SANE_Int dn,
     {
       DBG (DBG_usb, "%s: USB-in-USB: not enough data in buffer available "
 	   "(available: %u, requested: %u)\n",
-	   __FUNCTION__, bulk_read_state->bytes_available, size);
+	   __func__, bulk_read_state->bytes_available, size);
 
       /* IMPORTANT! 'next_pages' means 'request and receive next_pages pages in
        * one bulk transfer request '. Windows driver uses 4 pages between each
@@ -703,7 +703,7 @@ hp5590_bulk_read (SANE_Int dn,
        */
       bulk_read_state->total_pages++;
       DBG (DBG_usb, "%s: USB-in-USB: total pages done: %u\n",
-	   __FUNCTION__, bulk_read_state->total_pages);
+	   __func__, bulk_read_state->total_pages);
 
       /* Send another bulk request for 'next_pages' before first
        * page or next necessary one
@@ -713,7 +713,7 @@ hp5590_bulk_read (SANE_Int dn,
 	{
 	  /* Send bulk flags */
 	  DBG (DBG_usb, "%s: USB-in-USB: sending USB-in-USB bulk flags\n",
-	       __FUNCTION__);
+	       __func__);
 	  bulk_flags = 0x24;
 	  ret = sanei_usb_control_msg (dn, USB_DIR_OUT | USB_TYPE_VENDOR,
 				       0x0c, 0x83, 0x00,
@@ -721,7 +721,7 @@ hp5590_bulk_read (SANE_Int dn,
 	  if (ret != SANE_STATUS_GOOD)
 	    {
 	      DBG (DBG_err, "%s: USB-in-USB: error sending bulk flags\n",
-		   __FUNCTION__);
+		   __func__);
 	      return ret;
 	    }
 
@@ -738,7 +738,7 @@ hp5590_bulk_read (SANE_Int dn,
 
 	  /* Send bulk read request */
 	  DBG (DBG_usb, "%s: USB-in-USB: sending control msg for bulk\n",
-	       __FUNCTION__);
+	       __func__);
 	  ret = sanei_usb_control_msg (dn, USB_DIR_OUT | USB_TYPE_VENDOR,
 				       0x04, 0x82, 0x00,
 				       sizeof (ctrl),
@@ -746,7 +746,7 @@ hp5590_bulk_read (SANE_Int dn,
 	  if (ret != SANE_STATUS_GOOD)
 	    {
 	      DBG (DBG_err, "%s: USB-in-USB: error sending control msg\n",
-		   __FUNCTION__);
+		   __func__);
 	      return ret;
 	    }
 
@@ -761,13 +761,13 @@ hp5590_bulk_read (SANE_Int dn,
       if (bulk_read_state->buffer_size
 	  - bulk_read_state->bytes_available < next_portion)
 	{
-	  DBG (DBG_err, "%s: USB-in-USB: buffer too small\n", __FUNCTION__);
+	  DBG (DBG_err, "%s: USB-in-USB: buffer too small\n", __func__);
 	  return SANE_STATUS_NO_MEM;
 	}
 
       /* Bulk read next page */
       DBG (DBG_usb, "%s: USB-in-USB: bulk reading %lu bytes\n",
-	   __FUNCTION__, (u_long) next_portion);
+	   __func__, (u_long) next_portion);
       ret = sanei_usb_read_bulk (dn,
 				 bulk_read_state->buffer_in_ptr,
 				 &next_portion);
@@ -776,7 +776,7 @@ hp5590_bulk_read (SANE_Int dn,
 	  if (ret == SANE_STATUS_EOF)
 	    return ret;
 	  DBG (DBG_err, "%s: USB-in-USB: error during bulk read: %s\n",
-	       __FUNCTION__, sane_strstatus (ret));
+	       __func__, sane_strstatus (ret));
 	  return ret;
 	}
 
@@ -785,7 +785,7 @@ hp5590_bulk_read (SANE_Int dn,
 	{
 	  DBG (DBG_err, "%s: USB-in-USB: incomplete bulk read "
 	       "(requested %u bytes, got %lu bytes)\n",
-	       __FUNCTION__, BULK_READ_PAGE_SIZE, (u_long) next_portion);
+	       __func__, BULK_READ_PAGE_SIZE, (u_long) next_portion);
 	  return SANE_STATUS_IO_ERROR;
 	}
 
@@ -798,7 +798,7 @@ hp5590_bulk_read (SANE_Int dn,
 	  DBG (DBG_err,
 	       "%s: USB-in-USB: attempted to access over the end of buffer "
 	       "(in_ptr: %p, end_ptr: %p, ptr: %p, buffer size: %u\n",
-	       __FUNCTION__, bulk_read_state->buffer_in_ptr,
+	       __func__, bulk_read_state->buffer_in_ptr,
 	       bulk_read_state->buffer_end_ptr, bulk_read_state->buffer,
 	       bulk_read_state->buffer_size);
 	  return SANE_STATUS_NO_MEM;
@@ -808,7 +808,7 @@ hp5590_bulk_read (SANE_Int dn,
       if (bulk_read_state->buffer_in_ptr == bulk_read_state->buffer_end_ptr)
 	{
 	  DBG (DBG_usb, "%s: USB-in-USB: buffer wrapped while writing\n",
-	       __FUNCTION__);
+	       __func__);
 	  bulk_read_state->buffer_in_ptr = bulk_read_state->buffer;
 	}
 
@@ -819,7 +819,7 @@ hp5590_bulk_read (SANE_Int dn,
   /* Transfer requested amount of data to the caller */
   DBG (DBG_usb, "%s: USB-in-USB: data in bulk buffer is available "
        "(requested %u bytes, available %u bytes)\n",
-       __FUNCTION__, size, bulk_read_state->bytes_available);
+       __func__, size, bulk_read_state->bytes_available);
 
   /* Check for buffer pointer wrapping */
   bytes_until_buffer_end = bulk_read_state->buffer_end_ptr
@@ -827,13 +827,13 @@ hp5590_bulk_read (SANE_Int dn,
   if (bytes_until_buffer_end <= size)
     {
       /* First buffer part */
-      DBG (DBG_usb, "%s: USB-in-USB: reached bulk read buffer end\n", __FUNCTION__);
+      DBG (DBG_usb, "%s: USB-in-USB: reached bulk read buffer end\n", __func__);
       memcpy (bytes, bulk_read_state->buffer_out_ptr, bytes_until_buffer_end);
       bulk_read_state->buffer_out_ptr = bulk_read_state->buffer;
       /* And second part (if any) */
       if (bytes_until_buffer_end < size)
 	{
-	  DBG (DBG_usb, "%s: USB-in-USB: giving 2nd buffer part\n", __FUNCTION__);
+	  DBG (DBG_usb, "%s: USB-in-USB: giving 2nd buffer part\n", __func__);
 	  memcpy (bytes + bytes_until_buffer_end,
 		  bulk_read_state->buffer_out_ptr,
 		  size - bytes_until_buffer_end);
@@ -848,7 +848,7 @@ hp5590_bulk_read (SANE_Int dn,
       if (bulk_read_state->buffer_out_ptr == bulk_read_state->buffer_end_ptr)
 	{
 	  DBG (DBG_usb, "%s: USB-in-USB: buffer wrapped while reading\n",
-	       __FUNCTION__);
+	       __func__);
 	  bulk_read_state->buffer_out_ptr = bulk_read_state->buffer;
 	}
     }
@@ -886,7 +886,7 @@ hp5590_bulk_write (SANE_Int dn,
   unsigned char *ptr;
   size_t next_portion;
 
-  DBG (3, "%s: USB-in-USB: command: %04x, size %u\n", __FUNCTION__, cmd,
+  DBG (3, "%s: USB-in-USB: command: %04x, size %u\n", __func__, cmd,
        size);
 
   hp5590_low_assert (bytes != NULL);
@@ -898,7 +898,7 @@ hp5590_bulk_write (SANE_Int dn,
 
   /* Send bulk write request */
   DBG (3, "%s: USB-in-USB: total %u pages (each of %u bytes)\n",
-       __FUNCTION__, bulk_size.size, BULK_WRITE_PAGE_SIZE);
+       __func__, bulk_size.size, BULK_WRITE_PAGE_SIZE);
   ret = hp5590_control_msg (dn,
   			    proto_flags,
   			    USB_DIR_OUT,
@@ -919,7 +919,7 @@ hp5590_bulk_write (SANE_Int dn,
 	next_portion = len;
 
       DBG (3, "%s: USB-in-USB: next portion %lu bytes\n",
-	   __FUNCTION__, (u_long) next_portion);
+	   __func__, (u_long) next_portion);
 
       /* Prepare bulk write request */
       memset (&ctrl, 0, sizeof (ctrl));
@@ -941,7 +941,7 @@ hp5590_bulk_write (SANE_Int dn,
 
       /* Write bulk data */
       DBG (3, "%s: USB-in-USB: bulk writing %lu bytes\n",
-	   __FUNCTION__, (u_long) next_portion);
+	   __func__, (u_long) next_portion);
       ret = sanei_usb_write_bulk (dn, ptr, &next_portion);
       if (ret != SANE_STATUS_GOOD)
 	{
@@ -949,7 +949,7 @@ hp5590_bulk_write (SANE_Int dn,
 	  if (ret == SANE_STATUS_EOF)
 	    break;
 	  DBG (DBG_err, "%s: USB-in-USB: error during bulk write: %s\n",
-	       __FUNCTION__, sane_strstatus (ret));
+	       __func__, sane_strstatus (ret));
 	  return ret;
 	}
 
diff --git a/backend/hpsj5s.c b/backend/hpsj5s.c
index 75f3526..9c6ad79 100644
--- a/backend/hpsj5s.c
+++ b/backend/hpsj5s.c
@@ -161,7 +161,6 @@ SANE_Status
 sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
 {
   char line[PATH_MAX];		/*Line from config file */
-  int len;			/*Length of string from config file */
   FILE *config_file;		/*Handle to config file of this backend */
 
   DBG_INIT ();
@@ -189,7 +188,6 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
     {
       if ((line[0] == '#') || (line[0] == '\0'))	/*comment line or empty line */
 	continue;
-      len = strlen (line);	/*sanei_config_read guaranty, it's not more then PATH_MAX-1 */
       strcpy (scanner_path, line);	/*so, we choose last in file (uncommented) */
     }
 
diff --git a/backend/hs2p-saneopts.h b/backend/hs2p-saneopts.h
index 7ea50c2..0e712a3 100644
--- a/backend/hs2p-saneopts.h
+++ b/backend/hs2p-saneopts.h
@@ -110,7 +110,7 @@
 
 #define SANE_NAME_BARCODE_HMIN "barcode-hmin"
 #define SANE_TITLE_BARCODE_HMIN "Barcode Minimum Height"
-#define SANE_DESC_BARCODE_HMIN "Sets the Barcode Minimun Height (larger values increase recognition speed)"
+#define SANE_DESC_BARCODE_HMIN "Sets the Barcode Minimum Height (larger values increase recognition speed)"
 
 #define SANE_NAME_BARCODE_SEARCH_MODE "barcode-search-mode"
 #define SANE_TITLE_BARCODE_SEARCH_MODE "Barcode Search Mode"
diff --git a/backend/hs2p-scsi.c b/backend/hs2p-scsi.c
index a14e6cb..431ba9d 100644
--- a/backend/hs2p-scsi.c
+++ b/backend/hs2p-scsi.c
@@ -373,7 +373,7 @@ print_sense_data (int dbg_level, SENSE_DATA * data)
        (data->sense_key & 0x0F));
   DBG (dbg_level, "Information Byte = %lu\n", _4btol (data->information));
   DBG (dbg_level, "Additional Sense Length = %d\n", data->sense_length);
-  DBG (dbg_level, "Command Specific Infomation = %lu\n",
+  DBG (dbg_level, "Command Specific Information = %lu\n",
        _4btol (data->command_specific_information));
   DBG (dbg_level, "Additional Sense Code = %#x\n", data->sense_code);
   DBG (dbg_level, "Additional Sense Code Qualifier = %#x\n",
diff --git a/backend/kodak.c b/backend/kodak.c
index 80a5700..73243db 100644
--- a/backend/kodak.c
+++ b/backend/kodak.c
@@ -1,5 +1,12 @@
 /* sane - Scanner Access Now Easy.
 
+   This file is part of the SANE package, and implements a SANE backend
+   for various large Kodak scanners.
+
+   Copyright (C) 2008-2010 m. allan noah
+
+   --------------------------------------------------------------------------
+
    This file is part of the SANE package.
 
    This program is free software; you can redistribute it and/or
@@ -40,8 +47,6 @@
 
    --------------------------------------------------------------------------
 
-   This file implements a SANE backend for various large Kodak scanners.
-
    The source code is divided in sections which you can easily find by
    searching for the tag "@@".
 
@@ -2749,7 +2754,6 @@ do_cmd(struct scanner *s, int runRS, int shortTime,
 )
 {
   SANE_Status ret = SANE_STATUS_GOOD;
-  size_t actLen = 0;
 
   /*shut up compiler*/
   runRS=runRS;
@@ -2766,7 +2770,6 @@ do_cmd(struct scanner *s, int runRS, int shortTime,
   }
   if (inBuff && inLen){
     DBG(25, "in: reading %d bytes\n", (int)*inLen);
-    actLen = *inLen;
   }
 
   ret = sanei_scsi_cmd2(s->fd, cmdBuff, cmdLen, outBuff, outLen, inBuff, inLen);
diff --git a/backend/kodakaio.c b/backend/kodakaio.c
index 42b59a5..a9bec7b 100644
--- a/backend/kodakaio.c
+++ b/backend/kodakaio.c
@@ -1,7 +1,7 @@
 /*
  * kodakaio.c - SANE library for Kodak ESP Aio scanners.
  *
- * Copyright (C)   2011-2015 Paul Newall
+ * Copyright (C)   2011-2017 Paul Newall
  *
  * Based on the Magicolor sane backend: 
  * Based on the epson2 sane backend:
@@ -19,6 +19,7 @@
  * 01/01/13 Now with adf, the scan can be padded to make up the full page length, 
  * or the page can terminate at the end of the paper. This is a selectable option.
  * 25/11/12 Using avahi now for net autodiscovery. Use configure option --enable-avahi
+ * 1/5/17 patched to use local pointer for avahi callback
  */
 
 /* 
@@ -31,13 +32,13 @@ convenient lines to paste
 export SANE_DEBUG_KODAKAIO=20
 
 for ubuntu prior to 12.10
-./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-avahi --disable-latex BACKENDS="kodakaio test"
+./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-avahi --without-api-spec BACKENDS="kodakaio test"
 
 for ubuntu 12.10
-./configure --prefix=/usr --libdir=/usr/lib/i386-linux-gnu --sysconfdir=/etc --localstatedir=/var --enable-avahi --disable-latex BACKENDS="kodakaio test"
+./configure --prefix=/usr --libdir=/usr/lib/i386-linux-gnu --sysconfdir=/etc --localstatedir=/var --enable-avahi --without-api-spec BACKENDS="kodakaio test"
 
-for ubuntu 14.10
-./configure --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu --sysconfdir=/etc --localstatedir=/var --enable-avahi --disable-latex BACKENDS="kodakaio test"
+for ubuntu 14.10 up to at least 17.04
+./configure --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu --sysconfdir=/etc --localstatedir=/var --enable-avahi --without-api-spec BACKENDS="kodakaio test"
 
 If you want to use the test backend, for example with sane-troubleshoot, you should enable it in /etc/sane.d/dll.conf
 
@@ -153,7 +154,7 @@ If you want to use the test backend, for example with sane-troubleshoot, you sho
 
 #define KODAKAIO_VERSION	02
 #define KODAKAIO_REVISION	7
-#define KODAKAIO_BUILD		2
+#define KODAKAIO_BUILD		3
 
 /* for usb (but also used for net though it's not required). */
 #define MAX_BLOCK_SIZE		32768
@@ -207,6 +208,7 @@ normal levels. This system is a plan rather than a reality
 #include <math.h>
 #include <poll.h>
 #include <time.h>
+#include <sys/socket.h>
 
 #if WITH_AVAHI
 /* used for auto detecting network printers  */
@@ -216,9 +218,6 @@ normal levels. This system is a plan rather than a reality
 #include <avahi-common/simple-watch.h>
 #include <avahi-common/malloc.h>
 #include <avahi-common/error.h>
-
-static AvahiSimplePoll *simple_poll = NULL; /* global because called by several functions */
-
 #endif
 
 #include "../include/sane/saneopts.h"
@@ -639,8 +638,10 @@ static SANE_Status attach_one_usb(SANE_String_Const devname);
 static SANE_Status attach_one_net(SANE_String_Const devname, unsigned int device);
 void kodakaio_com_str(unsigned char *buf, char *fmt_buf);
 int cmparray (unsigned char *array1, unsigned char *array2, size_t len);
+#if WITH_AVAHI
 static struct KodakaioCap *get_device_from_identification (const char *ident, const char *vid, const char *pid);
 void ProcessAvahiDevice(const char *device_id, const char *vid, const char *pid, const char *ip_addr);
+#endif
 
 
 /* Some utility functions */
@@ -731,7 +732,7 @@ That is probably if the scanner disconnected the network connection
 		if (read == 0)
 			*status = SANE_STATUS_IO_ERROR;
 
-		DBG(32, "net read %d bytes:%x,%x,%x,%x,%x,%x,%x,%x\n",read,buf[0],buf[1],buf[2],buf[3],buf[4],buf[5],buf[6],buf[7]);
+		DBG(32, "net read %lu bytes:%x,%x,%x,%x,%x,%x,%x,%x\n",(unsigned long)read,buf[0],buf[1],buf[2],buf[3],buf[4],buf[5],buf[6],buf[7]);
 
 		return read;
 	}
@@ -881,7 +882,7 @@ In NET mode the timeout is in kodakaio_net_read
 		time(&time_start);
 		DBG(min(16,DBG_READ), "[%ld]  %s: net req size = %ld  ", (long) time_start, __func__, (long) buf_size);
  		n = kodakaio_net_read(s, buf, buf_size, status);
-		DBG(min(16,DBG_READ), "returned %d\n", n);
+		DBG(min(16,DBG_READ), "returned %lu\n", (unsigned long)n);
 		if (*status != SANE_STATUS_GOOD) {
 			DBG(1, "%s: err returned from kodakaio_net_read, %s\n", __func__, sane_strstatus(*status));
 		}
@@ -1109,7 +1110,7 @@ cmd_start_scan (SANE_Handle handle, size_t expect_total)
 		return SANE_STATUS_IO_ERROR;
 	}
 
-	DBG(20, "starting the scan, expected total bytes %d\n",expect_total);
+	DBG(20, "starting the scan, expected total bytes %lu\n",(unsigned long)expect_total);
 	k_send(s, KodakEsp_Go, 8, &status);
 
 	if (status != SANE_STATUS_GOOD)
@@ -1365,25 +1366,25 @@ But it seems that the scanner takes care of that, and gives you the ack as a sep
 		/* only compare 4 bytes because we sometimes get escSS02.. or escSS00.. 
 		is 4 the right number ? */
 		if (cmparray(Last8,KodakEsp_Ack,4) == 0) {
-			DBG(min(10,DBG_READ), "%s: found KodakEsp_Ack at %d bytes of %d\n", __func__, bytecount, *len);
+			DBG(min(10,DBG_READ), "%s: found KodakEsp_Ack at %lu bytes of %lu\n", __func__, (unsigned long) bytecount, (unsigned long) *len);
 			s->ack = SANE_TRUE;
 			*len = bytecount - 8; /* discard the Ack response */
 			s->bytes_unread -= *len; /* return a short block */
 		}
 		else {
 		/* a not full buffer is returned usb does this */
-		DBG(min(10,DBG_READ), "%s: buffer not full, got %d bytes of %d\n", __func__, bytecount, *len);
+		DBG(min(10,DBG_READ), "%s: buffer not full, got %lu bytes of %lu\n", __func__, (unsigned long) bytecount, (unsigned long) *len);
 		*len = bytecount;
 		s->bytes_unread -= bytecount;
 		}
 	}
 	else {
-		DBG(min(1,DBG_READ), "%s: tiny read, got %d bytes of %d\n", __func__, (int) bytecount, *len);
+		DBG(min(1,DBG_READ), "%s: tiny read, got %lu bytes of %lu\n", __func__, (unsigned long) bytecount, (unsigned long) *len);
 		return SANE_STATUS_IO_ERROR;
 	}
-	if (*len > s->params.bytes_per_line) {
+	lines = *len / s->params.bytes_per_line;
+	if (lines > 1) {
 		/* store average colour as background. That's not the ideal method but it's easy to implement. What's it used for? */
-		lines = *len / s->params.bytes_per_line;
 		s->background[0] = 0;
 		s->background[1] = 0;
 		s->background[2] = 0;
@@ -1934,17 +1935,18 @@ you don't know how many blocks there will be in advance because their size may b
  *   SANE API implementation (high-level functions) 
 */
 
+#if WITH_AVAHI
 static struct KodakaioCap *
 get_device_from_identification (const char *ident, const char *vid, const char *pid)
 {
 	int n;
 	SANE_Word pidnum, vidnum;
 
-	if(sscanf(vid, "%x", &vidnum) == EOF) {
+	if(sscanf(vid, "%x", (unsigned int *)&vidnum) == EOF) {
     		DBG(5, "could not convert hex vid <%s>\n", vid);
     		return NULL;
 	}
-	if(sscanf(pid, "%x", &pidnum) == EOF) {
+	if(sscanf(pid, "%x", (unsigned int *)&pidnum) == EOF) {
     		DBG(5, "could not convert hex pid <%s>\n", pid);
     		return NULL;
 	}
@@ -1965,6 +1967,7 @@ get_device_from_identification (const char *ident, const char *vid, const char *
 	}
 	return NULL;
 }
+#endif /* WITH_AVAHI */
 
 /*
  * close_scanner()
@@ -2359,9 +2362,9 @@ static void browse_callback(
     const char *domain,
     AVAHI_GCC_UNUSED AvahiLookupResultFlags flags,
     void* userdata) {
+    AvahiSimplePoll *simple_poll = userdata;
 
-    AvahiClient *c = userdata;
-    assert(b);
+    AvahiClient *c = avahi_service_browser_get_client (b);
 
     /* Called whenever a new services becomes available on the LAN or is removed from the LAN */
     switch (event) {
@@ -2395,7 +2398,8 @@ static void browse_callback(
     }
 }
 
-static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UNUSED void * userdata) {
+static void client_callback(AvahiClient *c, AvahiClientState state, void * userdata) {
+    AvahiSimplePoll *simple_poll = userdata;
     assert(c);
 
     /* Called whenever the client or server state changes */
@@ -2412,6 +2416,7 @@ kodak_network_discovery(const char*host)
 /* If host = NULL do autodiscovery. If host != NULL try to verify the model 
 First version only does autodiscovery */
 {
+    AvahiSimplePoll *simple_poll;
     AvahiClient *client = NULL;
     AvahiServiceBrowser *sb = NULL;
     int error;
@@ -2427,7 +2432,7 @@ First version only does autodiscovery */
     }
 
     /* Allocate a new client */
-    client = avahi_client_new(avahi_simple_poll_get(simple_poll), 0, client_callback, NULL, &error);
+    client = avahi_client_new(avahi_simple_poll_get(simple_poll), 0, client_callback, simple_poll, &error);
 
     /* Check wether creating the client object succeeded */
     if (!client) {
@@ -2436,14 +2441,15 @@ First version only does autodiscovery */
     }
 
     /* Create the service browser */
-    if (!(sb = avahi_service_browser_new(client, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_scanner._tcp", NULL, 0, browse_callback, client))) {
+    if (!(sb = avahi_service_browser_new(client, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_scanner._tcp", NULL, 0, browse_callback, simple_poll))) {
         DBG(min(1,DBG_AUTO), "Failed to create service browser: %s\n", avahi_strerror(avahi_client_errno(client)));
         goto fail;
     }
 
     /* Run the main loop */
 	for(i=1;i<K_SNMP_Timeout/POLL_ITN_MS;++i) {
-    		avahi_simple_poll_iterate(simple_poll,POLL_ITN_MS);
+    		if (avahi_simple_poll_iterate(simple_poll,POLL_ITN_MS) != 0)
+    			break;
 	}
     ret = 0;
 
diff --git a/backend/kodakaio.h b/backend/kodakaio.h
index 6804e3b..2e81592 100644
--- a/backend/kodakaio.h
+++ b/backend/kodakaio.h
@@ -46,12 +46,6 @@
 #include "../include/sane/sanei_debug.h"
 #include "../include/sane/sanei_backend.h"
 
-#ifdef __GNUC__
-#define __func__ __FUNCTION__
-#else
-#define __func__ "(undef)"
-#endif
-
 /* Silence the compiler for unused arguments */
 #define NOT_USED(x) ( (void)(x) )
 
diff --git a/backend/kvs1025.conf.in b/backend/kvs1025.conf.in
new file mode 100644
index 0000000..1e3cb59
--- /dev/null
+++ b/backend/kvs1025.conf.in
@@ -0,0 +1,2 @@
+usb "Panasonic KV-S1025C"
+/dev/scanner
diff --git a/backend/kvs20xx.c b/backend/kvs20xx.c
index 955252a..8864d7d 100644
--- a/backend/kvs20xx.c
+++ b/backend/kvs20xx.c
@@ -156,7 +156,8 @@ sane_get_devices (const SANE_Device *** device_list,
 			       known_devices[curr_scan_dev].scanner.model,
 			       NULL, -1, -1, -1, -1, attach);
     }
-  *device_list = (const SANE_Device **) devlist;
+  if(device_list)
+    *device_list = (const SANE_Device **) devlist;
   return SANE_STATUS_GOOD;
 }
 
@@ -168,6 +169,12 @@ sane_open (SANE_String_Const devname, SANE_Handle * handle)
   struct scanner *s;
   SANE_Int h, bus;
   SANE_Status st;
+  if (!devlist)
+    {
+      st = sane_get_devices (NULL, 0);
+      if (st)
+        return st;
+    }
   for (i = 0; devlist[i]; i++)
     {
       if (!strcmp (devlist[i]->name, devname))
diff --git a/backend/kvs20xx.h b/backend/kvs20xx.h
index 9bc833d..442f1c7 100644
--- a/backend/kvs20xx.h
+++ b/backend/kvs20xx.h
@@ -168,6 +168,12 @@ swap_bytes32 (u32 x)
     (x & (u32) 0x0000ff00UL) << 8 | (x & (u32) 0x00ff0000UL) >> 8;
 }
 
+static inline void
+copy16 (u8 * p, u16 x)
+{
+  memcpy (p, (u8 *) &x, sizeof (x));
+}
+
 #if __BYTE_ORDER == __BIG_ENDIAN
 static inline void
 set24 (u8 * p, u32 x)
diff --git a/backend/kvs20xx_cmd.c b/backend/kvs20xx_cmd.c
index 7579701..d0f18ee 100644
--- a/backend/kvs20xx_cmd.c
+++ b/backend/kvs20xx_cmd.c
@@ -187,7 +187,7 @@ kvs20xx_set_timeout (struct scanner * s, int timeout)
   };
   c.cmd[0] = SET_TIMEOUT;
   c.cmd[2] = 0x8d;
-  *((u16 *) (c.cmd + 7)) = cpu2be16 (sizeof (t));
+  copy16 (c.cmd + 7, cpu2be16 (sizeof (t)));
 
   c.data = &t;
   c.data_size = sizeof (t);
@@ -210,7 +210,7 @@ kvs20xx_set_window (struct scanner * s, int wnd_id)
     CMD_OUT
   };
   c.cmd[0] = SET_WINDOW;
-  *((u16 *) (c.cmd + 7)) = cpu2be16 (sizeof (wnd));
+  copy16 (c.cmd + 7, cpu2be16 (sizeof (wnd)));
 
   c.data = &wnd;
   c.data_size = sizeof (wnd);
@@ -301,29 +301,6 @@ kvs20xx_read_picture_element (struct scanner * s, unsigned side,
   return SANE_STATUS_GOOD;
 }
 
-static SANE_Status
-get_buffer_status (struct scanner * s, unsigned *data_avalible)
-{
-  SANE_Status status;
-  struct cmd c = {
-    {0},
-    10,
-    0,
-    12,
-    CMD_IN
-  };
-  u32 *data;
-  c.cmd[0] = GET_BUFFER_STATUS;
-  c.cmd[7] = 12;
-
-  status = send_command (s, &c);
-  if (status)
-    return status;
-  data = (u32 *) c.data;
-  *data_avalible = be2cpu32 (data[3]);
-  return SANE_STATUS_GOOD;
-}
-
 SANE_Status
 kvs20xx_read_image_data (struct scanner * s, unsigned page, unsigned side,
 			 void *buf, unsigned max_size, unsigned *size)
diff --git a/backend/kvs20xx_cmd.h b/backend/kvs20xx_cmd.h
index c18b754..4acaf62 100644
--- a/backend/kvs20xx_cmd.h
+++ b/backend/kvs20xx_cmd.h
@@ -9,6 +9,10 @@
    Panasonic KV-S20xx USB-SCSI scanners.
 */
 
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
 #define COMMAND_BLOCK	1
 #define DATA_BLOCK	2
 #define RESPONSE_BLOCK	3
diff --git a/backend/kvs20xx_opt.c b/backend/kvs20xx_opt.c
index 83d3385..94c4133 100644
--- a/backend/kvs20xx_opt.c
+++ b/backend/kvs20xx_opt.c
@@ -23,6 +23,7 @@
 #include "kvs20xx.h"
 #include "kvs20xx_cmd.h"
 
+#include <stdlib.h>
 
 static size_t
 max_string_size (SANE_String_Const strings[])
diff --git a/backend/kvs40xx.h b/backend/kvs40xx.h
index fa17163..7fdebe6 100644
--- a/backend/kvs40xx.h
+++ b/backend/kvs40xx.h
@@ -10,6 +10,9 @@
 
 #include "../include/sane/config.h"
 #include <semaphore.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 
 #undef  BACKEND_NAME
 #define BACKEND_NAME kvs40xx
@@ -225,6 +228,18 @@ swap_bytes32 (u32 x)
     (x & (u32) 0x0000ff00UL) << 8 | (x & (u32) 0x00ff0000UL) >> 8;
 }
 
+static inline void
+copy16 (u8 * p, u16 x)
+{
+  memcpy (p, (u8 *) &x, sizeof (x));
+}
+
+static inline void
+copy32 (u8 * p, u32 x)
+{
+  memcpy (p, (u8 *) &x, sizeof (x));
+}
+
 #if WORDS_BIGENDIAN
 static inline void
 set24 (u8 * p, u32 x)
diff --git a/backend/kvs40xx_cmd.c b/backend/kvs40xx_cmd.c
index ade2014..52ccc38 100644
--- a/backend/kvs40xx_cmd.c
+++ b/backend/kvs40xx_cmd.c
@@ -360,7 +360,7 @@ kvs40xx_set_timeout (struct scanner * s, int timeout)
   c.data_size = sizeof (t);
   c.cmd[0] = SET_TIMEOUT;
   c.cmd[2] = 0x8d;
-  *((u16 *) (c.cmd + 7)) = cpu2be16 (sizeof (t));
+  copy16 (c.cmd + 7, cpu2be16 (sizeof (t)));
   if (s->bus == USB)
     sanei_usb_set_timeout (timeout * 1000);
 
@@ -379,7 +379,7 @@ kvs40xx_set_window (struct scanner * s, int wnd_id)
   c.data = &wnd;
   c.data_size = sizeof (wnd);
   c.cmd[0] = SET_WINDOW;
-  *((u16 *) (c.cmd + 7)) = cpu2be16 (sizeof (wnd));
+  copy16 (c.cmd + 7, cpu2be16 (sizeof (wnd)));
   kvs40xx_init_window (s, &wnd, wnd_id);
 
   return send_command (s, &c);
@@ -534,28 +534,6 @@ kvs40xx_read_image_data (struct scanner * s, unsigned page, unsigned side,
   return status;
 }
 
-static SANE_Status
-get_adjust_data (struct scanner * s, unsigned *dummy_length)
-{
-  SANE_Status status;
-  struct cmd c = {
-    {0}, 10,
-    NULL, 40,
-    CMD_IN
-  };
-  u16 *data;
-
-  c.cmd[0] = GET_ADJUST_DATA;
-  c.cmd[2] = 0x9b;
-  c.cmd[8] = 40;
-  status = send_command (s, &c);
-  if (status)
-    return status;
-  data = (u16 *) c.data;
-  *dummy_length = be2cpu16 (data[0]);
-  return SANE_STATUS_GOOD;
-}
-
 SANE_Status
 read_support_info (struct scanner * s, struct support_info * inf)
 {
diff --git a/backend/kvs40xx_opt.c b/backend/kvs40xx_opt.c
index c4f478b..bd9d85e 100644
--- a/backend/kvs40xx_opt.c
+++ b/backend/kvs40xx_opt.c
@@ -22,6 +22,7 @@
 
 #include "../include/sane/sanei_debug.h"
 
+#include <stdlib.h>
 
 static inline unsigned
 mm2scanner_units (unsigned mm)
@@ -1271,41 +1272,45 @@ kvs40xx_init_window (struct scanner *s, struct window *wnd, int wnd_id)
 {
   int paper = str_index (paper_list, s->val[PAPER_SIZE].s), i;
   memset (wnd, 0, sizeof (struct window));
-  *(u16 *) wnd->window_descriptor_block_length = cpu2be16 (66);
+  copy16 (wnd->window_descriptor_block_length, cpu2be16 (66));
 
   wnd->window_identifier = wnd_id;
-  *(u16 *) wnd->x_resolution = cpu2be16 (s->val[RESOLUTION].w);
-  *(u16 *) wnd->y_resolution = cpu2be16 (s->val[RESOLUTION].w);
+  copy16 (wnd->x_resolution, cpu2be16 (s->val[RESOLUTION].w));
+  copy16 (wnd->y_resolution, cpu2be16 (s->val[RESOLUTION].w));
   if (!paper)
     {
-      *(u32 *) wnd->upper_left_x =
-	cpu2be32 (mm2scanner_units (s->val[TL_X].w));
-      *(u32 *) wnd->upper_left_y =
-	cpu2be32 (mm2scanner_units (s->val[TL_Y].w));
-      *(u32 *) wnd->document_width =
-	cpu2be32 (mm2scanner_units (s->val[BR_X].w));
-      *(u32 *) wnd->width =
-	cpu2be32 (mm2scanner_units (s->val[BR_X].w - s->val[TL_X].w));
-      *(u32 *) wnd->document_length = cpu2be32 (mm2scanner_units
-						(s->val[BR_Y].w));
-      *(u32 *) wnd->length =
-	cpu2be32 (mm2scanner_units (s->val[BR_Y].w - s->val[TL_Y].w));
+      copy32 (wnd->upper_left_x,
+              cpu2be32 (mm2scanner_units (s->val[TL_X].w)));
+      copy32 (wnd->upper_left_y,
+              cpu2be32 (mm2scanner_units (s->val[TL_Y].w)));
+      copy32 (wnd->document_width,
+              cpu2be32 (mm2scanner_units (s->val[BR_X].w)));
+      copy32 (wnd->width,
+              cpu2be32 (mm2scanner_units (s->val[BR_X].w - s->val[TL_X].w)));
+      copy32 (wnd->document_length, cpu2be32 (mm2scanner_units
+                                              (s->val[BR_Y].w)));
+      copy32 (wnd->length,
+              cpu2be32 (mm2scanner_units (s->val[BR_Y].w - s->val[TL_Y].w)));
     }
   else
     {
       u32 w = cpu2be32 (mm2scanner_units (paper_sizes[paper].width));
       u32 h = cpu2be32 (mm2scanner_units (paper_sizes[paper].height));
-      *(u32 *) wnd->upper_left_x = cpu2be32 (mm2scanner_units (0));
-      *(u32 *) wnd->upper_left_y = cpu2be32 (mm2scanner_units (0));
+      copy32 (wnd->upper_left_x, cpu2be32 (mm2scanner_units (0)));
+      copy32 (wnd->upper_left_y, cpu2be32 (mm2scanner_units (0)));
       if (!s->val[LANDSCAPE].b)
 	{
-	  *(u32 *) wnd->document_width = *(u32 *) wnd->width = w;
-	  *(u32 *) wnd->document_length = *(u32 *) wnd->length = h;
+	  copy32 (wnd->width, w);
+	  copy32 (wnd->length, h);
+	  copy32 (wnd->document_width, w);
+	  copy32 (wnd->document_length, h);
 	}
       else
 	{
-	  *(u32 *) wnd->document_width = *(u32 *) wnd->width = h;
-	  *(u32 *) wnd->document_length = *(u32 *) wnd->length = w;
+	  copy32 (wnd->width, h);
+	  copy32 (wnd->length, w);
+	  copy32 (wnd->document_width, h);
+	  copy32 (wnd->document_length, w);
 	}
     }
   wnd->brightness = s->val[BRIGHTNESS].w;
@@ -1314,11 +1319,11 @@ kvs40xx_init_window (struct scanner *s, struct window *wnd, int wnd_id)
   wnd->image_composition = mode_val[str_index (mode_list, s->val[MODE].s)];
   wnd->bit_per_pixel = bps_val[str_index (mode_list, s->val[MODE].s)];
 
-  *(u16 *) wnd->halftone_pattern =
-    cpu2be16 (str_index (halftone_pattern, s->val[HALFTONE_PATTERN].s));
+  copy16 (wnd->halftone_pattern,
+          cpu2be16 (str_index (halftone_pattern, s->val[HALFTONE_PATTERN].s)));
 
   wnd->rif_padding = s->val[INVERSE].b << 7;
-  *(u16 *) wnd->bit_ordering = cpu2be16 (BIT_ORDERING);
+  copy16 (wnd->bit_ordering, cpu2be16 (BIT_ORDERING));
   wnd->compression_type = s->val[COMPRESSION].b ? 0x81 : 0;
   wnd->compression_argument = s->val[COMPRESSION_PAR].w;
 
diff --git a/backend/lexmark_low.c b/backend/lexmark_low.c
index 821b621..fe20e89 100644
--- a/backend/lexmark_low.c
+++ b/backend/lexmark_low.c
@@ -2369,6 +2369,9 @@ low_get_start_loc (SANE_Int resolution, SANE_Int * vert_start,
 	  return SANE_STATUS_INVAL;
 	}
       break;
+    default:
+      /* If we're here we have an unknown dev->model.sensor_type */
+      return SANE_STATUS_INVAL;
     }
   /* Calculate vertical start distance at 600dpi */
   switch (resolution)
diff --git a/backend/ma1509.c b/backend/ma1509.c
index 5fccd1c..e38ddc5 100644
--- a/backend/ma1509.c
+++ b/backend/ma1509.c
@@ -1738,7 +1738,6 @@ sane_start (SANE_Handle handle)
 {
   Ma1509_Scanner *s = handle;
   SANE_Status status;
-  SANE_String_Const mode;
   struct timeval start;
 
   if (!s)
@@ -1778,8 +1777,6 @@ sane_start (SANE_Handle handle)
   /* save start time */
   gettimeofday (&start, 0);
   s->start_time = start.tv_sec;
-  /* translate options into s->mode for convenient access: */
-  mode = s->val[OPT_MODE].s;
 
   status = set_window (s);
   if (status != SANE_STATUS_GOOD)
diff --git a/backend/magicolor.c b/backend/magicolor.c
index 660f517..d3af142 100644
--- a/backend/magicolor.c
+++ b/backend/magicolor.c
@@ -1385,7 +1385,6 @@ static SANE_Status
 mc_init_parameters(Magicolor_Scanner * s)
 {
 	int dpi, optres;
-	struct mode_param *mparam;
 
 	DBG(5, "%s\n", __func__);
 
@@ -1394,8 +1393,6 @@ mc_init_parameters(Magicolor_Scanner * s)
 	dpi = s->val[OPT_RESOLUTION].w;
 	optres = s->hw->cap->optical_res;
 
-	mparam = &mode_params[s->val[OPT_MODE].w];
-
 	if (SANE_UNFIX(s->val[OPT_BR_Y].w) == 0 ||
 		SANE_UNFIX(s->val[OPT_BR_X].w) == 0)
 		return SANE_STATUS_INVAL;
@@ -1521,6 +1518,7 @@ mc_read(struct Magicolor_Scanner *s)
  ****************************************************************************/
 
 
+#if HAVE_LIBSNMP
 static struct MagicolorCap *
 mc_get_device_from_identification (const char*ident)
 {
@@ -1531,6 +1529,7 @@ mc_get_device_from_identification (const char*ident)
 	}
 	return NULL;
 }
+#endif
 
 
 /*
@@ -1970,10 +1969,10 @@ mc_network_discovery(const char*host)
 	init_snmp("sane-magicolor-backend");
 	snmp_sess_init (&session);
 	session.version = SNMP_VERSION_2c;
-	session.community = "public";
-	session.community_len = strlen (session.community);
+	session.community = (u_char *) "public";
+	session.community_len = strlen ((char *)session.community);
 	if (host) {
-		session.peername = host;
+		session.peername = (char *) host;
 	} else {
 		/* Do a network discovery via a broadcast */
 		session.peername = "255.255.255.255";
diff --git a/backend/magicolor.h b/backend/magicolor.h
index 7ea1e1e..b1195a0 100644
--- a/backend/magicolor.h
+++ b/backend/magicolor.h
@@ -44,13 +44,6 @@
 #include "../include/sane/sanei_debug.h"
 #include "../include/sane/sanei_backend.h"
 
-#ifdef __GNUC__
-#define __func__ __FUNCTION__
-#else
-#define __func__ "(undef)"
-/* I cast my vote for C99... :) */
-#endif
-
 /* Silence the compiler for unused arguments */
 #define NOT_USED(x) ( (void)(x) )
 
diff --git a/backend/microtek2.c b/backend/microtek2.c
index 8fdf497..dccd707 100644
--- a/backend/microtek2.c
+++ b/backend/microtek2.c
@@ -443,12 +443,14 @@ sane_get_select_fd (SANE_Handle handle, SANE_Int *fd)
 /*---------- sane_init() -----------------------------------------------------*/
 
 SANE_Status
+#ifdef HAVE_AUTHORIZATION
 sane_init(SANE_Int *version_code, SANE_Auth_Callback authorize)
+#else
+sane_init(SANE_Int *version_code, SANE_Auth_Callback __sane_unused__ authorize)
+#endif
 {
     Microtek2_Device *md;
     FILE *fp;
-    int match;
-    SANE_Auth_Callback trash;
 
 
     DBG_INIT();
@@ -460,13 +462,10 @@ sane_init(SANE_Int *version_code, SANE_Auth_Callback authorize)
 
 #ifdef HAVE_AUTHORIZATION
     auth_callback = authorize;
-#else
-    trash = authorize;     /* prevents compiler warning "unused variable" */
 #endif
 
     sanei_thread_init();
 
-    match = 0;
     fp = sanei_config_open(MICROTEK2_CONFIG_FILE);
     if ( fp == NULL )
         DBG(10, "sane_init: file not opened: '%s'\n", MICROTEK2_CONFIG_FILE);
@@ -909,7 +908,7 @@ cancel_scan(Microtek2_Scanner *ms)
        of material on a feeder, then pid may be already -1 and
        kill(-1, SIGTERM), i.e. killing all our processes, is not
        likely what we really want - --mj, 2001/Nov/19 */
-    if (ms->pid != -1)
+    if (sanei_thread_is_valid (ms->pid))
       {
        sanei_thread_kill(ms->pid);
        sanei_thread_waitpid(ms->pid, NULL);
@@ -1346,14 +1345,10 @@ check_inquiry(Microtek2_Device *md, SANE_String *model_string)
 static void
 cleanup_scanner(Microtek2_Scanner *ms)
 {
-    SANE_Status status;
-    Microtek2_Device *md;
-    md = ms->dev;
-
     DBG(30, "cleanup_scanner: ms=%p, ms->sfd=%d\n", (void *) ms, ms->sfd);
 
     if ( ms->scanning == SANE_TRUE )
-      status=cancel_scan(ms);
+      cancel_scan(ms);
 
     if ( ms->sfd != -1 )
       sanei_scsi_close(ms->sfd);
@@ -1616,10 +1611,9 @@ dump_area2(uint8_t *area, int len, char *info)
 
 #define BPL    16               /* bytes per line to print */
 
-    int i, linelength;
+    int i;
     char outputline[100];
     char *outbuf;
-    linelength = BPL * 3;
 
     if ( ! info[0] )
         info = "No additional info available";    
@@ -1991,7 +1985,7 @@ parse_config_file(FILE *fp, Config_Temp **ct)
 
 /*---------- signal_handler() ------------------------------------------------*/
 
-static RETSIGTYPE
+static void
 signal_handler (int signal)
 {
   if ( signal == SIGTERM )
@@ -4466,15 +4460,12 @@ scsi_read_attributes(Microtek2_Info *pmi, char *device, uint8_t scan_source)
 static SANE_Status
 scsi_read_control_bits(Microtek2_Scanner *ms)
 {
-    Microtek2_Device *md;
     SANE_Status status;
     uint8_t cmd[RCB_CMD_L];
     uint32_t byte;
     int bit;
     int count_1s;
 
-    md = ms->dev;
-
     DBG(30, "scsi_read_control_bits: ms=%p, fd=%d\n", (void *) ms, ms->sfd);
     DBG(30, "ms->control_bytes = %p\n", ms->control_bytes);
 
@@ -4795,7 +4786,6 @@ scsi_read_image_status(Microtek2_Scanner *ms)
 static SANE_Status
 scsi_read_shading(Microtek2_Scanner *ms, uint8_t *buffer, uint32_t length)
 {
-    Microtek2_Device *md;
     uint8_t cmd[RSI_CMD_L];
     SANE_Bool endiantype;
     SANE_Status status = SANE_STATUS_GOOD;
@@ -4804,8 +4794,6 @@ scsi_read_shading(Microtek2_Scanner *ms, uint8_t *buffer, uint32_t length)
     DBG(30, "scsi_read_shading: pos=%p, size=%d, word=%d, color=%d, dark=%d\n",
              buffer, length, ms->word, ms->current_color, ms->dark);
 
-    md = ms->dev;
-
     size = length;
 
     RSI_SET_CMD(cmd);
@@ -5080,7 +5068,6 @@ scsi_sense_handler (int fd, u_char *sense, void *arg)
 {
     int as_info_length;
     uint8_t sense_key;
-    uint8_t asl;
     uint8_t asc;
     uint8_t ascq;
 
@@ -5090,7 +5077,6 @@ scsi_sense_handler (int fd, u_char *sense, void *arg)
     dump_area(sense, RQS_LENGTH(sense), "SenseBuffer");
 
     sense_key = RQS_SENSEKEY(sense);
-    asl = RQS_ASL(sense);
     asc = RQS_ASC(sense);
     ascq = RQS_ASCQ(sense);
 
@@ -5152,7 +5138,7 @@ scsi_sense_handler (int fd, u_char *sense, void *arg)
           else if ( asc == 0x3d  && ascq == 0x00)
               DBG(5, "scsi_sense_handler: Invalid bit in IDENTIFY\n");
           else if ( asc == 0x2c && ascq == 0x02 )
-/* Ok */      DBG(5, "scsi_sense_handler: Invalid comb. of windows specfied\n");
+/* Ok */      DBG(5, "scsi_sense_handler: Invalid comb. of windows specified\n");
           else if ( asc == 0x20 && ascq == 0x00 )
 /* Ok */      DBG(5, "scsi_sense_handler: Invalid command opcode\n");
           else if ( asc == 0x24 && ascq == 0x00 )
@@ -5503,7 +5489,7 @@ sane_start(SANE_Handle handle)
     /* create reader routine as new thread or process */
     ms->pid = sanei_thread_begin( reader_process,(void*) ms);
 
-    if ( ms->pid == -1 )
+    if ( !sanei_thread_is_valid (ms->pid) )
       {
         DBG(1, "sane_start: fork failed\n");
         status = SANE_STATUS_IO_ERROR;
@@ -7279,7 +7265,6 @@ chunky_proc_data(Microtek2_Scanner *ms)
 {
     SANE_Status status;
     Microtek2_Device *md;
-    Microtek2_Info *mi;
     uint32_t line;
     uint8_t *from;
     int pad;
@@ -7292,7 +7277,6 @@ chunky_proc_data(Microtek2_Scanner *ms)
     DBG(30, "chunky_proc_data: ms=%p\n", (void *) ms);
              
     md = ms->dev;
-    mi = &md->info[md->scan_source];
     bits_pp_in = ms->bits_per_pixel_in;
     bits_pp_out = ms->bits_per_pixel_out;
     pad = (int) ceil( (double) (ms->ppl * bits_pp_in) / 8.0 ) % 2;
@@ -7410,7 +7394,6 @@ segreg_proc_data(Microtek2_Scanner *ms)
     int color;
     int save_current_src;
     int frame;
-    int right_to_left;
 
     DBG(30, "segreg_proc_data: ms=%p\n", (void *) ms);
 
@@ -7420,7 +7403,6 @@ segreg_proc_data(Microtek2_Scanner *ms)
     pad = (int) ceil( (double) (ms->ppl * ms->bits_per_pixel_in) / 8.0 ) % 2;
     bpp = ms->bits_per_pixel_out / 8; /* bits_per_pixel_out is either 8 or 16 */
     bpf = ms->bpl / 3;
-    right_to_left = mi->direction & MI_DATSEQ_RTOL;
 
     DBG(30, "segreg_proc_data: lines=%d, bpl=%d, ppl=%d, bpf=%d, bpp=%d,\n"
             "depth=%d, pad=%d, freelines=%d, calib_backend=%d\n",
@@ -7688,7 +7670,6 @@ lplconcat_proc_data(Microtek2_Scanner *ms)
     uint8_t *save_from[3];
     int color;
     int bpp;
-    int pad;
     int gamma_by_backend;
     int right_to_left;       /* 0=left to right, 1=right to left */
 
@@ -7701,7 +7682,6 @@ lplconcat_proc_data(Microtek2_Scanner *ms)
     mi = &md->info[md->scan_source];
 
     bpp = ms->bits_per_pixel_out / 8; /* ms->bits_per_pixel_out is 8 or 16 */
-    pad = (ms->ppl * bpp) % 2;
     right_to_left = mi->direction & MI_DATSEQ_RTOL;
     gamma_by_backend =  md->model_flags & MD_NO_GAMMA ? 1 : 0;
 
diff --git a/backend/microtek2.h b/backend/microtek2.h
index 4100fad..2a1f697 100644
--- a/backend/microtek2.h
+++ b/backend/microtek2.h
@@ -1307,7 +1307,7 @@ set_option_dependencies(Microtek2_Scanner *,
 static SANE_Status
 shading_function(Microtek2_Scanner *, uint8_t *);
 
-static RETSIGTYPE
+static void
 signal_handler (int);
 
 static SANE_Status
diff --git a/backend/mustek.c b/backend/mustek.c
index 7f0db8c..8426dfe 100644
--- a/backend/mustek.c
+++ b/backend/mustek.c
@@ -1669,7 +1669,7 @@ attach (SANE_String_Const devname, Mustek_Device ** devp, SANE_Bool may_wait)
       DBG (0,
 	   "WARNING: Your scanner was detected by the SANE Mustek backend, "
 	   "but\n  it is not fully tested. It may or may not work. Be "
-	   "carefull and read\n  the PROBLEMS file in the sane directory. "
+	   "careful and read\n  the PROBLEMS file in the sane directory. "
 	   "Please set the debug level of this\n  backend to maximum "
 	   "(export SANE_DEBUG_MUSTEK=255) and send the output of\n  "
 	   "scanimage -L to the SANE mailing list sane-devel@lists.alioth.debian.org. "
@@ -2335,16 +2335,14 @@ send_calibration_lines_se (Mustek_Scanner * s, SANE_Word color)
   SANE_Byte *cmd;
   size_t buf_size;
   SANE_Word column;
-  SANE_Word lines, bytes_per_color;
+  SANE_Word bytes_per_color;
 
   if (s->mode == MUSTEK_MODE_COLOR)
     {
-      lines = s->hw->cal.lines * 3;
       bytes_per_color = s->hw->cal.bytes / 3;
     }
   else
     {
-      lines = s->hw->cal.lines;
       bytes_per_color = s->hw->cal.bytes;
     }
 
@@ -2952,7 +2950,7 @@ do_stop (Mustek_Scanner * s)
   s->scanning = SANE_FALSE;
   s->pass = 0;
 
-  if (s->reader_pid != -1)
+  if (sanei_thread_is_valid (s->reader_pid))
     {
       SANE_Int exit_status;
       struct timeval now;
@@ -2983,7 +2981,7 @@ do_stop (Mustek_Scanner * s)
       sanei_thread_kill (s->reader_pid);
 
       pid = sanei_thread_waitpid (s->reader_pid, &exit_status);
-      if (pid == -1)
+      if (!sanei_thread_is_valid (pid))
 	{
 	  DBG (1,
 	       "do_stop: sanei_thread_waitpid failed, already terminated? (%s)\n",
@@ -4826,7 +4824,7 @@ output_data (Mustek_Scanner * s, FILE * fp,
   DBG (5, "output_data: end\n");
 }
 
-static RETSIGTYPE
+static void
 sigterm_handler (int signal)
 {
   DBG (4,
@@ -6565,7 +6563,7 @@ sane_start (SANE_Handle handle)
   /* create reader routine as new process or thread */
   s->reader_pid = sanei_thread_begin (reader_process, (void *) s);
 
-  if (s->reader_pid == -1)
+  if (!sanei_thread_is_valid (s->reader_pid))
     {
       DBG (1, "sane_start: sanei_thread_begin failed (%s)\n",
 	   strerror (errno));
@@ -6593,7 +6591,6 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len,
 {
   Mustek_Scanner *s = handle;
   SANE_Status status;
-  ssize_t ntotal;
   ssize_t nread;
 
 
@@ -6617,7 +6614,6 @@ sane_read (SANE_Handle handle, SANE_Byte * buf, SANE_Int max_len,
 
   DBG (5, "sane_read\n");
   *len = 0;
-  ntotal = 0;
 
   if (s->cancelled)
     {
diff --git a/backend/mustek_pp.c b/backend/mustek_pp.c
index cd86bb9..9c9a533 100644
--- a/backend/mustek_pp.c
+++ b/backend/mustek_pp.c
@@ -237,7 +237,7 @@ do_stop(Mustek_pp_Handle *hndl)
  */
 static int fd_to_release = 0;
 /*ARGSUSED*/
-static RETSIGTYPE
+static void
 sigterm_handler (int signal __UNUSED__)
 {
 	sanei_pa4s2_enable(fd_to_release, SANE_FALSE);
diff --git a/backend/mustek_pp_cis.c b/backend/mustek_pp_cis.c
index d5ef86d..96e89f1 100644
--- a/backend/mustek_pp_cis.c
+++ b/backend/mustek_pp_cis.c
@@ -1526,7 +1526,7 @@ static void
 cis_get_next_line (Mustek_PP_CIS_dev * dev, SANE_Byte * buf)
 {
    SANE_Byte *dest, *tmpbuf = dev->tmpbuf;
-   int ctr, channel, first, last, stride, ignore, step = dev->CIS.line_step;
+   int ctr, channel, first, last, stride, step = dev->CIS.line_step;
    SANE_Byte gotline;
    
    if (dev->desc->mode == MODE_COLOR)
@@ -1534,14 +1534,12 @@ cis_get_next_line (Mustek_PP_CIS_dev * dev, SANE_Byte * buf)
       first = MUSTEK_PP_CIS_CHANNEL_RED;
       last = MUSTEK_PP_CIS_CHANNEL_BLUE;
       stride = 3;
-      ignore = 1; /* 1 * 3 channels */
    }
    else
    {
       first = MUSTEK_PP_CIS_CHANNEL_GRAY;
       last = MUSTEK_PP_CIS_CHANNEL_GRAY;
       stride = 1;
-      ignore = 3; /* 3 * 1 channel */
    }
    
    gotline = SANE_FALSE;
diff --git a/backend/mustek_usb.c b/backend/mustek_usb.c
index 66b1813..58dcc58 100644
--- a/backend/mustek_usb.c
+++ b/backend/mustek_usb.c
@@ -1572,7 +1572,7 @@ sane_cancel (SANE_Handle handle)
   else
     {
       DBG (4, "sane_cancel: scan has not been initiated yet, "
-	   "or it is allready aborted\n");
+	   "or it is already aborted\n");
     }
   DBG (5, "sane_cancel: exit\n");
   return;
diff --git a/backend/mustek_usb2.c b/backend/mustek_usb2.c
index 25b8464..58d9e9e 100644
--- a/backend/mustek_usb2.c
+++ b/backend/mustek_usb2.c
@@ -1270,14 +1270,12 @@ AutoLevel (SANE_Byte *lpSource, SCANMODE scanMode, unsigned short ScanLines,
   unsigned short R, G, B, max_R, max_G, max_B, min_R, min_G, min_B;
   float fmax_R, fmax_G, fmax_B;
   unsigned int sum_R = 0, sum_G = 0, sum_B = 0;
-  float mean_R, mean_G, mean_B;
   unsigned int hisgram_R[256], hisgram_G[256], hisgram_B[256];
 
   unsigned int iWidth = BytesPerLine / 3;
   unsigned int iHeight = ScanLines;
   SANE_Byte *pbmpdata = (SANE_Byte *) lpSource;
 
-  unsigned int tmp = 0;
   unsigned short imin_threshold[3];
   unsigned short imax_threshold[3];
 
@@ -1350,10 +1348,6 @@ AutoLevel (SANE_Byte *lpSource, SCANMODE scanMode, unsigned short ScanLines,
 
   DBG (DBG_INFO, "AutoLevel: Find min , max is over!\n");
 
-  mean_R = (float) (sum_R / TotalImgSize);
-  mean_G = (float) (sum_G / TotalImgSize);
-  mean_B = (float) (sum_B / TotalImgSize);
-
 
   imin_threshold[0] = 0;
   imin_threshold[1] = 0;
@@ -1372,7 +1366,6 @@ AutoLevel (SANE_Byte *lpSource, SCANMODE scanMode, unsigned short ScanLines,
 	  }
     }
 
-  tmp = 0;
   for (ii = 255; ii >= 0; ii--)
     {
       if (hisgram_R[ii] > 0)
@@ -1383,7 +1376,6 @@ AutoLevel (SANE_Byte *lpSource, SCANMODE scanMode, unsigned short ScanLines,
 	  }
     }
 
-  tmp = 0;
   for (ii = 0; ii < 256; ii++)
     {
       if (hisgram_G[ii] > 0)
@@ -1394,7 +1386,6 @@ AutoLevel (SANE_Byte *lpSource, SCANMODE scanMode, unsigned short ScanLines,
 	  }
     }
 
-  tmp = 0;
   for (ii = 255; ii >= 0; ii--)
     {
       if (hisgram_G[ii] > 0)
@@ -1405,7 +1396,6 @@ AutoLevel (SANE_Byte *lpSource, SCANMODE scanMode, unsigned short ScanLines,
 	  }
     }
 
-  tmp = 0;
   for (ii = 0; ii < 256; ii++)
     {
       if (hisgram_B[ii] > 0)
@@ -1416,7 +1406,6 @@ AutoLevel (SANE_Byte *lpSource, SCANMODE scanMode, unsigned short ScanLines,
 	  }
     }
 
-  tmp = 0;
   for (ii = 255; ii >= 0; ii--)
     {
       if (hisgram_B[ii] > 0)
diff --git a/backend/mustek_usb2_asic.c b/backend/mustek_usb2_asic.c
index 3019e5e..d9b1a28 100644
--- a/backend/mustek_usb2_asic.c
+++ b/backend/mustek_usb2_asic.c
@@ -1607,7 +1607,6 @@ LLFMotorMove (PAsic chip, LLF_MOTORMOVE * LLF_MotorMove)
   STATUS status = STATUS_GOOD;
   unsigned int motor_steps;
   SANE_Byte temp_motor_action;
-  SANE_Byte temp_status;
 
   DBG (DBG_ASIC, "LLFMotorMove:Enter\n");
 
@@ -1727,7 +1726,6 @@ LLFMotorMove (PAsic chip, LLF_MOTORMOVE * LLF_MotorMove)
 		   SCAN_BACK_TRACKING_DISABLE | temp_motor_action);
   Mustek_SendData (chip, ES01_F4_ActiveTriger, ACTION_TRIGER_ENABLE);
 
-  temp_status = 0;
   if (LLF_MotorMove->WaitOrNoWait == 1)
     {
       if (LLF_MotorMove->ActionType == ACTION_TYPE_BACKTOHOME)
@@ -3020,10 +3018,8 @@ SetPackAddress (PAsic chip, unsigned short wXResolution, unsigned short wWidth,
 {
   STATUS status = STATUS_GOOD;
 
-  unsigned short LineTotalOverlapPixel;
   SANE_Byte OverLapPixel;
   SANE_Byte TotalLineShift;
-  SANE_Byte InvalidPixelNumberBackup;
   unsigned short SegmentTotalPixel;
   unsigned int dwLineTotalPixel;
   unsigned short ValidPixelNumber = *PValidPixelNumber;
@@ -3038,7 +3034,6 @@ SetPackAddress (PAsic chip, unsigned short wXResolution, unsigned short wWidth,
 
   DBG (DBG_ASIC, "SetPackAddress:Enter\n");
 
-  LineTotalOverlapPixel = 0;
   OverLapPixel = 0;
   TotalLineShift = 1;
   PackAreaUseLine = TotalLineShift + 1;
@@ -3067,7 +3062,6 @@ SetPackAddress (PAsic chip, unsigned short wXResolution, unsigned short wWidth,
       Mustek_SendData (chip, ES01_2C0_VALID_PIXEL_PARAMETER_OF_SEGMENT1 + i,
 		       0);
     }
-  LineTotalOverlapPixel = OverLapPixel * 16;
 
   FinalLinePixelPerSegment = ValidPixelNumber + OverLapPixel * 2;
 
@@ -3080,8 +3074,6 @@ SetPackAddress (PAsic chip, unsigned short wXResolution, unsigned short wWidth,
       InValidPixelNumber = 0;
     }
 
-  InvalidPixelNumberBackup = InValidPixelNumber;
-
   Mustek_SendData (chip, ES01_1B0_SEGMENT_PIXEL_NUMBER_LB,
 		   LOBYTE (ValidPixelNumber));
   Mustek_SendData (chip, ES01_1B1_SEGMENT_PIXEL_NUMBER_HB,
@@ -3823,9 +3815,7 @@ Asic_SetWindow (PAsic chip, SANE_Byte bScanBits,
 
   unsigned short ValidPixelNumber;
 
-  unsigned short wPerLineNeedBufferSize = 0;
   unsigned short BytePerPixel = 0;
-  unsigned int dwTotal_PerLineNeedBufferSize = 0;
   unsigned int dwTotalLineTheBufferNeed = 0;
   unsigned short dwTotal_CCDResolution = 1200;
   unsigned short wThinkCCDResolution = 0;
@@ -3890,31 +3880,26 @@ Asic_SetWindow (PAsic chip, SANE_Byte bScanBits,
   /* calculate byte per line */
   if (bScanBits > 24)
     {
-      wPerLineNeedBufferSize = wWidth * 6;
       BytePerPixel = 6;
       chip->dwBytesCountPerRow = (unsigned int) (wWidth) * 6;
     }
   else if (bScanBits == 24)
     {
-      wPerLineNeedBufferSize = wWidth * 3;
       BytePerPixel = 3;
       chip->dwBytesCountPerRow = (unsigned int) (wWidth) * 3;
     }
   else if ((bScanBits > 8) && (bScanBits <= 16))
     {
-      wPerLineNeedBufferSize = wWidth * 2;
       BytePerPixel = 2;
       chip->dwBytesCountPerRow = (unsigned int) (wWidth) * 2;
     }
   else if ((bScanBits == 8))
     {
-      wPerLineNeedBufferSize = wWidth;
       BytePerPixel = 1;
       chip->dwBytesCountPerRow = (unsigned int) (wWidth);
     }
   else if ((bScanBits < 8))
     {
-      wPerLineNeedBufferSize = wWidth >> 3;
       BytePerPixel = 1;
       chip->dwBytesCountPerRow = (unsigned int) (wWidth);
     }
@@ -3983,7 +3968,6 @@ Asic_SetWindow (PAsic chip, SANE_Byte bScanBits,
 	}
     }
 
-  dwTotal_PerLineNeedBufferSize = wPerLineNeedBufferSize;
   dwTotalLineTheBufferNeed = wLength;
 
   chip->Scan.Dpi = wXResolution;
@@ -4318,7 +4302,7 @@ Asic_SetSource (PAsic chip, LIGHTSOURCE lsLightSource)
       DBG (DBG_ASIC, "Asic_SetSource: Source is Reflect\n");
       break;
     case 2:
-      DBG (DBG_ASIC, "Asic_SetSource: Source is Postion\n");
+      DBG (DBG_ASIC, "Asic_SetSource: Source is Position\n");
       break;
     case 4:
       DBG (DBG_ASIC, "Asic_SetSource: Source is Negtive\n");
@@ -4848,7 +4832,6 @@ Asic_SetCalibrate (PAsic chip, SANE_Byte bScanBits, unsigned short wXResolution,
 
   unsigned short wPerLineNeedBufferSize = 0;
   unsigned short BytePerPixel = 0;
-  unsigned int dwTotal_PerLineNeedBufferSize = 0;
   unsigned int dwTotalLineTheBufferNeed = 0;
   unsigned short dwTotal_CCDResolution = 0;
   unsigned short wThinkCCDResolution = 0;
@@ -4952,7 +4935,6 @@ Asic_SetCalibrate (PAsic chip, SANE_Byte bScanBits, unsigned short wXResolution,
        wPerLineNeedBufferSize, BytePerPixel, chip->dwBytesCountPerRow);
 
 
-  dwTotal_PerLineNeedBufferSize = wPerLineNeedBufferSize;
   dwTotalLineTheBufferNeed = wLength;
   DBG (DBG_ASIC, "wPerLineNeedBufferSize=%d,wLength=%d\n",
        wPerLineNeedBufferSize, wLength);
diff --git a/backend/mustek_usb2_high.c b/backend/mustek_usb2_high.c
index a10dbc7..664528e 100644
--- a/backend/mustek_usb2_high.c
+++ b/backend/mustek_usb2_high.c
@@ -1696,7 +1696,6 @@ static SANE_Bool
 MustScanner_GetRgb24BitLine1200DPI (SANE_Byte * lpLine, SANE_Bool isOrderInvert,
 				    unsigned short * wLinesCount)
 {
-  SANE_Byte *lpTemp;
   unsigned short wWantedTotalLines;
   unsigned short TotalXferLines;
   unsigned short wRLinePosOdd = 0;
@@ -1717,7 +1716,6 @@ MustScanner_GetRgb24BitLine1200DPI (SANE_Byte * lpLine, SANE_Bool isOrderInvert,
   g_isScanning = TRUE;
   TotalXferLines = 0;
   wWantedTotalLines = *wLinesCount;
-  lpTemp = lpLine;
 
   if (g_bFirstReadImage)
     {
diff --git a/backend/nec.c b/backend/nec.c
index c7af955..d5179d3 100644
--- a/backend/nec.c
+++ b/backend/nec.c
@@ -2823,7 +2823,7 @@ send_threshold_data(NEC_Scanner *s)
 SANE_Status
 sane_start (SANE_Handle handle)
 {
-  char *mode, *halftone, *paper, *gamma, *edge, *lightcolor, *adf_fsu;
+  char *mode, *halftone, *gamma, *edge, *lightcolor, *adf_fsu;
   NEC_Scanner *s = handle;
   SANE_Status status;
   size_t buf_size;
@@ -2953,7 +2953,6 @@ sane_start (SANE_Handle handle)
 
   mode = s->val[OPT_MODE].s;
   halftone = s->val[OPT_HALFTONE].s;
-  paper = s->val[OPT_PAPER].s;
   gamma = s->val[OPT_GAMMA].s;
   edge = s->val[OPT_EDGE_EMPHASIS].s;
   lightcolor = s->val[OPT_LIGHTCOLOR].s;
diff --git a/backend/net.c b/backend/net.c
index 4beb45d..57889a2 100644
--- a/backend/net.c
+++ b/backend/net.c
@@ -846,15 +846,15 @@ net_avahi_callback (AvahiClient *c, AvahiClientState state, void * userdata)
 	if (error == AVAHI_ERR_DISCONNECTED)
 	  {
 	    /* Server disappeared - try to reconnect */
-	    avahi_client_free (avahi_client);
-	    avahi_client = NULL;
-
 	    if (avahi_browser)
 	      {
 		avahi_service_browser_free (avahi_browser);
 		avahi_browser = NULL;
 	      }
 
+	    avahi_client_free (avahi_client);
+	    avahi_client = NULL;
+
 	    avahi_client = avahi_client_new (avahi_threaded_poll_get (avahi_thread), AVAHI_CLIENT_NO_FAIL, net_avahi_callback, NULL, &error);
 	    if (avahi_client == NULL)
 	      {
diff --git a/backend/niash.c b/backend/niash.c
index 950df21..bbc90d3 100644
--- a/backend/niash.c
+++ b/backend/niash.c
@@ -1491,7 +1491,7 @@ sane_set_io_mode (SANE_Handle __sane_unused__ h, SANE_Bool m)
 
 
 SANE_Status
-sane_get_select_fd (SANE_Handle __sane_unused__ h, SANE_Int * __sane_unused__ fd)
+sane_get_select_fd (SANE_Handle __sane_unused__ h, SANE_Int __sane_unused__ * fd)
 {
   DBG (DBG_MSG, "sane_select_fd\n");
   return SANE_STATUS_UNSUPPORTED;
diff --git a/backend/niash_core.c b/backend/niash_core.c
index e3ae2b8..b87f4f6 100644
--- a/backend/niash_core.c
+++ b/backend/niash_core.c
@@ -645,9 +645,6 @@ InitScan (TScanParams * pParams, THWParams * pHWParams)
   int iHeight;
   int iExpTime;
   TScanParams Params;
-  int iHandle;
-
-  iHandle = pHWParams->iXferHandle;
 
   /* check validity of scanparameters */
   switch (pParams->iDpi)
@@ -1228,7 +1225,7 @@ SimpleCalibExt (THWParams * pHWPar, unsigned char *pabCalibTable,
   SANE_Bool iReversedHead;
   int startWhiteY, endWhiteY;
   int startBlackY, endBlackY;
-  int startBlackX, endBlackX;
+  int endBlackX;
 
   iHandle = pHWPar->iXferHandle;
   iReversedHead = pHWPar->iReversedHead;
@@ -1265,7 +1262,6 @@ SimpleCalibExt (THWParams * pHWPar, unsigned char *pabCalibTable,
       endWhiteY = 15;
       startBlackY = 16;
       endBlackY = 135;
-      startBlackX = 0;
       endBlackX = HW_PIXELS;
     }
   else
@@ -1274,7 +1270,6 @@ SimpleCalibExt (THWParams * pHWPar, unsigned char *pabCalibTable,
       endWhiteY = 70;
       startBlackY = 86;
       endBlackY = 135;
-      startBlackX = 1666;
       endBlackX = 3374;
     }
 
diff --git a/backend/p5_device.c b/backend/p5_device.c
index c065ca2..924144e 100644
--- a/backend/p5_device.c
+++ b/backend/p5_device.c
@@ -214,19 +214,19 @@ read_data (int fd, uint8_t * data, int length)
 static void
 index_write_data (int fd, uint8_t index, uint8_t * data, int length)
 {
-  int mode, rc;
+  int mode;
   unsigned char bval;
 
   bval = index;
   mode = IEEE1284_MODE_EPP | IEEE1284_ADDR;
-  rc = ioctl (fd, PPSETMODE, &mode);
-  rc = write (fd, &bval, 1);
+  ioctl (fd, PPSETMODE, &mode);
+  write (fd, &bval, 1);
 
   mode = IEEE1284_MODE_EPP | IEEE1284_DATA;
-  rc = ioctl (fd, PPSETMODE, &mode);
+  ioctl (fd, PPSETMODE, &mode);
   mode = 0;			/* data forward */
-  rc = ioctl (fd, PPDATADIR, &mode);
-  rc = write (fd, data, length);
+  ioctl (fd, PPDATADIR, &mode);
+  write (fd, data, length);
   return;
 }
 
@@ -469,7 +469,7 @@ setadresses (int fd, uint16_t start, uint16_t end)
 static int
 open_pp (const char *devicename)
 {
-  int fd, rc, mode = 0;
+  int fd, mode = 0;
   char *name;
 
   DBG (DBG_proc, "open_pp: start, devicename=%s\n", devicename);
@@ -512,8 +512,8 @@ open_pp (const char *devicename)
   free(name);
 
   /* claim device and set it to EPP */
-  rc = ioctl (fd, PPCLAIM);
-  rc = ioctl (fd, PPGETMODES, &mode);
+  ioctl (fd, PPCLAIM);
+  ioctl (fd, PPGETMODES, &mode);
   if (mode & PARPORT_MODE_PCSPP)
     DBG (DBG_io, "PARPORT_MODE_PCSPP\n");
   if (mode & PARPORT_MODE_TRISTATE)
@@ -546,12 +546,12 @@ open_pp (const char *devicename)
   if (mode == -1)
     {
       DBG (DBG_error, "open_pp: no EPP mode, giving up ...\n");
-      rc = ioctl (fd, PPRELEASE);
+      ioctl (fd, PPRELEASE);
       close (fd);
       return -1;
     }
-  rc = ioctl (fd, PPNEGOT, &mode);
-  rc = ioctl (fd, PPSETMODE, &mode);
+  ioctl (fd, PPNEGOT, &mode);
+  ioctl (fd, PPSETMODE, &mode);
   DBG (DBG_proc, "open_pp: exit\n");
   return fd;
 }
diff --git a/backend/pie.c b/backend/pie.c
index 941ed62..76cbb47 100644
--- a/backend/pie.c
+++ b/backend/pie.c
@@ -2781,7 +2781,7 @@ pie_reader_process (Pie_Scanner * scanner, FILE * fp)
 /* --------------------------------- READER PROCESS SIGTERM HANDLER  ------------ */

 

 

-static RETSIGTYPE

+static void

 reader_process_sigterm_handler (int signal)

 {

   DBG (DBG_sane_info, "reader_process: terminated by signal %d\n", signal);

@@ -2896,7 +2896,7 @@ do_cancel (Pie_Scanner * scanner)
 

   scanner->scanning = SANE_FALSE;

 

-  if (scanner->reader_pid != -1)

+  if (sanei_thread_is_valid (scanner->reader_pid))

     {

       DBG (DBG_sane_info, "killing reader_process\n");

       sanei_thread_kill (scanner->reader_pid);

@@ -3703,7 +3703,7 @@ sane_start (SANE_Handle handle)
   scanner->reader_fds = fds[1];

   scanner->reader_pid = sanei_thread_begin( reader_process, (void*)scanner );

 

-  if (scanner->reader_pid == -1)

+  if (!sanei_thread_is_valid (scanner->reader_pid))

     {

       DBG (1, "sane_start: sanei_thread_begin failed (%s)\n",

              strerror (errno));

diff --git a/backend/pieusb.c b/backend/pieusb.c
index 4b07304..9730888 100644
--- a/backend/pieusb.c
+++ b/backend/pieusb.c
@@ -109,6 +109,10 @@ extern void write_tiff_rgbi_header (FILE *fptr, int width, int height, int depth
 #define DBG_info_scan   11      /* information scanner commands */
 #define DBG_info_usb    13      /* information usb level functions */
 
+/* device flags */
+
+#define FLAG_SLIDE_TRANSPORT 0x01
+
 /* --------------------------------------------------------------------------
  *
  * SUPPORTED DEVICES SPECIFICS
@@ -150,7 +154,8 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
     char config_line[PATH_MAX];
     SANE_Word vendor_id;
     SANE_Word product_id;
-    SANE_Word model_number;
+    SANE_Int model_number;
+    SANE_Int flags;
     SANE_Status status;
     int i;
 
@@ -183,18 +188,22 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
     pieusb_supported_usb_device_list[0].vendor = 0x05e3;
     pieusb_supported_usb_device_list[0].product = 0x0145;
     pieusb_supported_usb_device_list[0].model = 0x30;
+    pieusb_supported_usb_device_list[0].flags = 0;
     /* Reflecta ProScan 7200, model number 0x36 */
     pieusb_supported_usb_device_list[1].vendor = 0x05e3;
     pieusb_supported_usb_device_list[1].product = 0x0145;
     pieusb_supported_usb_device_list[1].model = 0x36;
-    /* Reflecta 6000 Multiple Slide Scanner */
+    pieusb_supported_usb_device_list[1].flags = 0;
+    /* Reflecta 6000 Multiple Slide Scanner, model number 0x3a */
     pieusb_supported_usb_device_list[2].vendor = 0x05e3;
     pieusb_supported_usb_device_list[2].product = 0x0142;
     pieusb_supported_usb_device_list[2].model = 0x3a;
+    pieusb_supported_usb_device_list[2].flags = FLAG_SLIDE_TRANSPORT;
     /* end of list */
     pieusb_supported_usb_device_list[3].vendor = 0;
     pieusb_supported_usb_device_list[3].product = 0;
     pieusb_supported_usb_device_list[3].model = 0;
+    pieusb_supported_usb_device_list[3].flags = 0;
 
     /* Add entries from config file */
     fp = sanei_config_open (PIEUSB_CONFIG_FILE);
@@ -209,14 +218,14 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
             if (strncmp (config_line, "usb ", 4) != 0) continue;
             /* Parse vendor-id, product-id and model number and add to list */
             DBG (DBG_info_sane, "sane_init() config file parsing %s\n", config_line);
-            status = sanei_pieusb_parse_config_line(config_line, &vendor_id, &product_id, &model_number);
+            status = sanei_pieusb_parse_config_line(config_line, &vendor_id, &product_id, &model_number, &flags);
             if (status == SANE_STATUS_GOOD) {
-                DBG (DBG_info_sane, "sane_init() config file lists device %04x %04x %02x\n",vendor_id, product_id, model_number);
-                if (!sanei_pieusb_supported_device_list_contains(vendor_id, product_id, model_number)) {
-                    DBG (DBG_info_sane, "sane_init() adding device %04x %04x %02x\n",vendor_id, product_id, model_number);
-                    sanei_pieusb_supported_device_list_add(vendor_id, product_id, model_number);
+                DBG (DBG_info_sane, "sane_init() config file lists device %04x %04x %02x %02x\n",vendor_id, product_id, model_number, flags);
+                if (!sanei_pieusb_supported_device_list_contains(vendor_id, product_id, model_number, flags)) {
+                    DBG (DBG_info_sane, "sane_init() adding device %04x %04x %02x %02x\n",vendor_id, product_id, model_number, flags);
+                    sanei_pieusb_supported_device_list_add(vendor_id, product_id, model_number, flags);
                 } else {
-                    DBG (DBG_info_sane, "sane_init() list already contains %04x %04x %02x\n", vendor_id, product_id, model_number);
+                    DBG (DBG_info_sane, "sane_init() list already contains %04x %04x %02x %02x\n", vendor_id, product_id, model_number, flags);
                 }
             } else {
                 DBG (DBG_info_sane, "sane_init() config file parsing %s: error\n", config_line);
@@ -235,8 +244,13 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
         pieusb_supported_usb_device.vendor = pieusb_supported_usb_device_list[i].vendor;
         pieusb_supported_usb_device.product = pieusb_supported_usb_device_list[i].product;
         pieusb_supported_usb_device.model = pieusb_supported_usb_device_list[i].model;
+        pieusb_supported_usb_device.flags = pieusb_supported_usb_device_list[i].flags;
         pieusb_supported_usb_device.device_number = -1; /* No device number (yet) */
-        DBG( DBG_info_sane, "sane_init() looking for Reflecta scanner %04x %04x model %02x\n", pieusb_supported_usb_device.vendor, pieusb_supported_usb_device.product, pieusb_supported_usb_device.model);
+        DBG( DBG_info_sane, "sane_init() looking for scanner %04x %04x model %02x, flags %02x\n",
+             pieusb_supported_usb_device.vendor,
+             pieusb_supported_usb_device.product,
+             pieusb_supported_usb_device.model,
+             pieusb_supported_usb_device.flags);
         sanei_usb_find_devices (pieusb_supported_usb_device.vendor, pieusb_supported_usb_device.product, sanei_pieusb_find_device_callback);
         i++;
     }
@@ -354,6 +368,7 @@ sane_open (SANE_String_Const devicename, SANE_Handle * handle)
                     pieusb_supported_usb_device.vendor = vendor;
                     pieusb_supported_usb_device.product = product;
                     pieusb_supported_usb_device.model = pieusb_supported_usb_device_list[i].model;
+                    pieusb_supported_usb_device.flags = pieusb_supported_usb_device_list[i].flags;
                     pieusb_supported_usb_device.device_number = -1;
                     sanei_usb_find_devices (vendor, product, sanei_pieusb_find_device_callback);
                     if (pieusb_supported_usb_device.device_number == -1) {
@@ -994,17 +1009,18 @@ sane_start (SANE_Handle handle)
      *
      * ---------------------------------------------------------------------- */
 
-    sanei_pieusb_cmd_17 (scanner->device_number, 1, &status);
-    if (status.pieusb_status != PIEUSB_STATUS_GOOD) {
-      DBG (DBG_error, "sane_start(): sanei_pieusb_cmd_17 failed: %d\n", status.pieusb_status);
-      return SANE_STATUS_IO_ERROR;
-    }
-    st = sanei_pieusb_wait_ready (scanner, 0);
-    if (st != SANE_STATUS_GOOD) {
-      DBG (DBG_error, "sane_start(): scanner not ready after sanei_pieusb_cmd_17: %d\n", st);
-      return st;
+    if (scanner->device->flags & FLAG_SLIDE_TRANSPORT) {
+        sanei_pieusb_cmd_17 (scanner->device_number, 1, &status);
+        if (status.pieusb_status != PIEUSB_STATUS_GOOD) {
+          DBG (DBG_error, "sane_start(): sanei_pieusb_cmd_17 failed: %d\n", status.pieusb_status);
+          return SANE_STATUS_IO_ERROR;
+        }
+        st = sanei_pieusb_wait_ready (scanner, 0);
+        if (st != SANE_STATUS_GOOD) {
+          DBG (DBG_error, "sane_start(): scanner not ready after sanei_pieusb_cmd_17: %d\n", st);
+          return st;
+        }
     }
-
     /* ----------------------------------------------------------------------
      *
      * Get & set initial gains and offsets
@@ -1039,20 +1055,21 @@ sane_start (SANE_Handle handle)
 
     /* ----------------------------------------------------------------------
      *
-     * Lamp on
+     * Init slide transport
      *
      * ---------------------------------------------------------------------- */
-    sanei_pieusb_cmd_slide (scanner->device_number, SLIDE_LAMP_ON, &status);
-    if (status.pieusb_status != PIEUSB_STATUS_GOOD) {
-      DBG (DBG_error, "sane_start(): sanei_pieusb_cmd_slide failed: %d\n", status.pieusb_status);
-      return SANE_STATUS_IO_ERROR;
-    }
-    st = sanei_pieusb_wait_ready (scanner, 0);
-    if (st != SANE_STATUS_GOOD) {
-      DBG (DBG_error, "sane_start: scanner not ready %d\n", st);
-      return st;
+    if (scanner->device->flags & FLAG_SLIDE_TRANSPORT) {
+        sanei_pieusb_cmd_slide (scanner->device_number, SLIDE_INIT, &status);
+        if (status.pieusb_status != PIEUSB_STATUS_GOOD) {
+          DBG (DBG_error, "sane_start(): sanei_pieusb_cmd_slide failed: %d\n", status.pieusb_status);
+          return SANE_STATUS_IO_ERROR;
+        }
+        st = sanei_pieusb_wait_ready (scanner, 0);
+        if (st != SANE_STATUS_GOOD) {
+          DBG (DBG_error, "sane_start: scanner not ready %d\n", st);
+          return st;
+        }
     }
-
     /* Enter SCAN phase 1 */
     DBG (DBG_info_sane, "sane_start(): scan phase 1\n");
 
@@ -1200,12 +1217,14 @@ sane_start (SANE_Handle handle)
      * Advance to next slide (except for preview)
      *
      * ---------------------------------------------------------------------- */
-    if (scanner->val[OPT_ADVANCE_SLIDE].b && !scanner->val[OPT_PREVIEW].b) {
-      sanei_pieusb_cmd_slide (scanner->device_number, SLIDE_NEXT, &status);
-      if (status.pieusb_status != PIEUSB_STATUS_GOOD) {
-	DBG (DBG_error, "sane_start(): sanei_pieusb_cmd_slide failed: %d\n", status.pieusb_status);
 
-      }
+    if (scanner->device->flags & FLAG_SLIDE_TRANSPORT) {
+        if (scanner->val[OPT_ADVANCE_SLIDE].b && !scanner->val[OPT_PREVIEW].b) {
+            sanei_pieusb_cmd_slide (scanner->device_number, SLIDE_NEXT, &status);
+            if (status.pieusb_status != PIEUSB_STATUS_GOOD) {
+                DBG (DBG_error, "sane_start(): sanei_pieusb_cmd_slide failed: %d\n", status.pieusb_status);
+            }
+        }
     }
 
     /* ----------------------------------------------------------------------
diff --git a/backend/pieusb.conf.in b/backend/pieusb.conf.in
index ec5ba7e..8904d3d 100644
--- a/backend/pieusb.conf.in
+++ b/backend/pieusb.conf.in
@@ -1,9 +1,20 @@
 # pieusb.conf: Configuration file for PIE/Reflecta USB scanner
 # Read man sane-pieusb for documentation
 
-# Autodetect
-# Reflecta 6000 Multiple Slide Scanner
-usb 0x05e3 0x0142
+# Format
+# usb <vendor-id> <device-id> <model-nr> <has-slide-transport>
+#
+# Autodetect (built-in)
+# Reflecta DigitDia 6000 Multiple Slide Scanner
+# usb 0x05e3 0x0142 0x3a 0x01
 # Reflecta CrystalScan 7200
+# usb 0x05e3 0x0145 0x30 0x00
 # Reflecta ProScan 7200
-usb 0x05e3 0x0145
+# usb 0x05e3 0x0145 0x36 0x00
+
+# Reflecta ProScan 10T
+usb 0x05e3 0x0145 0x47 0x00
+# Reflecta CrystalScan 3600
+usb 0x05e3 0x0145 0x2e 0x00
+# Reflecta DigitDia 4000
+usb 0x05e3 0x0142 0x2f 0x00
diff --git a/backend/pieusb.h b/backend/pieusb.h
index 10ce106..dc4cda7 100644
--- a/backend/pieusb.h
+++ b/backend/pieusb.h
@@ -80,6 +80,7 @@ struct Pieusb_USB_Device_Entry
     SANE_Word product;		/* USB product identifier */
     SANE_Word model;		/* USB model number */
     SANE_Int device_number;     /* USB device number if the device is present */
+    SANE_Int flags;             /* flags */
 };
 
 extern struct Pieusb_USB_Device_Entry* pieusb_supported_usb_device_list;
diff --git a/backend/pieusb_buffer.c b/backend/pieusb_buffer.c
index 53bd867..8c67a65 100644
--- a/backend/pieusb_buffer.c
+++ b/backend/pieusb_buffer.c
@@ -100,15 +100,8 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/mman.h>
-#include <endian.h>
 
-/* When creating the release backend, make complains about unresolved external
- * le16toh, although it finds the include <endian.h> */
-#if __BYTE_ORDER == __LITTLE_ENDIAN
- #define le16toh(x) (x)
-#else
- #define le16toh(x) __bswap_16 (x)
-#endif
+#include "byteorder.h"
 
 static void buffer_update_read_index(struct Pieusb_Read_Buffer* buffer, int increment);
 
@@ -163,7 +156,7 @@ sanei_pieusb_buffer_create(struct Pieusb_Read_Buffer* buffer, SANE_Int width, SA
     snprintf(buffer->buffer_name, L_tmpnam, "/tmp/sane.XXXXXX");
     if (buffer->data_file != 0) /* might still be open from previous invocation */
       close(buffer->data_file);
-    buffer->data_file = mkostemp(buffer->buffer_name, O_RDWR | O_CREAT | O_EXCL | O_TRUNC);
+    buffer->data_file = mkstemp(buffer->buffer_name);
     if (buffer->data_file == -1) {
         buffer->data_file = 0;
         buffer->data = NULL;
diff --git a/backend/pieusb_scancmd.c b/backend/pieusb_scancmd.c
index a86f8fe..672716f 100644
--- a/backend/pieusb_scancmd.c
+++ b/backend/pieusb_scancmd.c
@@ -212,7 +212,7 @@ sanei_pieusb_cmd_test_unit_ready(SANE_Int device_number, struct Pieusb_Command_S
 
 /**
  * slide action
- * @param action  SLIDE_NEXT, SLIDE_PREV, SLIDE_LAMP_ON, SLIDE_RELOAD
+ * @param action  SLIDE_NEXT, SLIDE_PREV, SLIDE_INIT, SLIDE_RELOAD
  * @return Pieusb_Command_Status
  */
 
@@ -295,57 +295,6 @@ sanei_pieusb_cmd_get_sense(SANE_Int device_number, struct Pieusb_Sense* sense, s
 }
 
 /**
- * Read the halftone pattern with the specified index. This requires two
- * commands, one to ask the device to prepare the pattern, and one to read it.
- *
- * @param device_number Device number
- * @param index index of halftone pattern
- * @param pattern Halftone pattern (not implemented)
- * @return Pieusb_Command_Status
- * @see Pieusb_Halftone_Pattern
- */
-void
-sanei_pieusb_cmd_get_halftone_pattern(SANE_Int device_number, SANE_Int index, struct Pieusb_Halftone_Pattern* pattern, struct Pieusb_Command_Status *status)
-{
-    SANE_Byte command[SCSI_COMMAND_LEN];
-#define PATTERN_SIZE 256 /* Assumed maximum pattern size */
-    SANE_Int size = PATTERN_SIZE;
-    SANE_Byte data[PATTERN_SIZE];
-    int psize;
-    SANE_Char* desc;
-    PIEUSB_Status st;
-
-    DBG (DBG_info_scan, "sanei_pieusb_cmd_get_halftone_pattern()\n");
-
-    /* Ask scanner to prepare the pattern with the given index. Only SCSI_COMMAND_LEN bytes of data. */
-    _prep_scsi_cmd(command, SCSI_WRITE, SCSI_COMMAND_LEN);
-    memset(data, '\0', SCSI_COMMAND_LEN);
-    data[0] = SCSI_HALFTONE_PATTERN | 0x80; /* set bit 7 means prepare read */
-    data[4] = index;
-
-    st = sanei_pieusb_command(device_number, command, data, SCSI_COMMAND_LEN);
-    if (st != PIEUSB_STATUS_GOOD) {
-      status->pieusb_status = st;
-      /* FIXME */
-        return;
-    }
-
-    /* Read pattern */
-    _prep_scsi_cmd(command, SCSI_READ, size);
-
-    memset(data, '\0', size);
-    status->pieusb_status = sanei_pieusb_command (device_number, command, data, size);
-
-    /*FIXME: analyse */
-    fprintf(stderr, "Halftone pattern %d:\n", index);
-    psize = (data[3]<<8) + data[2];
-    desc = (SANE_Char*)(data + 4 + psize);
-    data[4 + psize + 16] = '\0';
-    fprintf(stderr,"Descr. offset from byte 4 = %d, %16s, index = %d, size = %dx%d\n", psize, desc, data[4]&0x7F, data[6], data[7]);
-#undef PATTERN_SIZE
-}
-
-/**
  * Read the scan frame with the specified index. This requires two
  * commands, one to ask the device to prepare the pattern, and one to read it.
  *
@@ -426,38 +375,6 @@ sanei_pieusb_cmd_17(SANE_Int device_number, SANE_Int value, struct Pieusb_Comman
 }
 
 /**
- * Read the relative exposure time for the specified colorbits. This requires two
- * commands, one to ask the device to prepare the value, and one to read it.
- *
- * @param device_number Device number
- * @param time Relative exposure time(s)
- * @return Pieusb_Command_Status
- * @see Pieusb_Exposure_Time
- */
-void
-sanei_pieusb_cmd_get_exposure_time(SANE_Int device_number, SANE_Int colorbits, struct Pieusb_Exposure_Time* time, struct Pieusb_Command_Status *status)
-{
-    DBG (DBG_info_scan, "sanei_pieusb_cmd_get_exposure_time(): not implemented\n");
-    status->pieusb_status = PIEUSB_STATUS_INVAL;
-}
-
-/**
- * Read the highlight and shadow levels with the specified colorbits. This requires two
- * commands, one to ask the device to prepare the value, and one to read it.
- *
- * @param device_number Device number
- * @param hgltshdw Highlight and shadow level(s)
- * @return Pieusb_Command_Status
- * @see Pieusb_Highlight_Shadow
- */
-void
-sanei_pieusb_cmd_get_highlight_shadow(SANE_Int device_number, SANE_Int colorbits, struct Pieusb_Highlight_Shadow* hgltshdw, struct Pieusb_Command_Status *status)
-{
-    DBG (DBG_info_scan, "sanei_pieusb_cmd_get_highlight_shadow(): not implemented\n");
-    status->pieusb_status = PIEUSB_STATUS_INVAL;
-}
-
-/**
  * Read the shading data parameters. This requires two
  * commands, one to ask the device to prepare the value, and one to read it.
  *
@@ -552,23 +469,6 @@ sanei_pieusb_cmd_get_scanned_lines(SANE_Int device_number, SANE_Byte* data, SANE
 }
 
 /**
- * Set the halftone pattern with the given index to the specified pattern. The
- * command is a SCSI WRITE command (code 0x0A, write code 0x11).
- *
- * @param device_number Device number
- * @param index Pattern index (0-7)
- * @param pattern Halftone pattern (not implemented)
- * @return Pieusb_Command_Status
- * @see Pieusb_Halftone_Pattern
- */
-void
-sanei_pieusb_cmd_set_halftone_pattern(SANE_Int device_number, SANE_Int index, struct Pieusb_Halftone_Pattern* pattern, struct Pieusb_Command_Status *status)
-{
-    DBG (DBG_info_scan, "sanei_pieusb_cmd_set_halftone_pattern(): not implemented\n");
-    status->pieusb_status = PIEUSB_STATUS_INVAL;
-}
-
-/**
  * Set the scan frame with the given index to the frame. The command is a SCSI
  * WRITE command (code SCSI_WRITE, write code SCSI_SCAN_FRAME).
  *
@@ -682,24 +582,6 @@ sanei_pieusb_cmd_set_highlight_shadow(SANE_Int device_number, struct Pieusb_High
 #undef HIGHLIGHT_SHADOW_SIZE
 }
 
-/**
- * Set the CCD-mask for the colors set in the given color bit mask. The mask
- * array must contain mask_size. The command is a SCSI WRITE command
- * (code 0x0A, write code 0x16).
- * (The command is able to handle more masks at once, but that is not implemented.)
- *
- * @param device_number Device number
- * @param colorbits 0000RGB0 color bit mask; at least one color bit must be set
- * @param mask CCD mask to use
- * @return Pieusb_Command_Status
- */
-void
-sanei_pieusb_cmd_set_ccd_mask(SANE_Int device_number, SANE_Byte colorbits, SANE_Byte* mask, SANE_Int mask_size, struct Pieusb_Command_Status *status)
-{
-    DBG (DBG_info_scan, "sanei_pieusb_cmd_set_ccd_mask(): not implemented\n");
-    status->pieusb_status = PIEUSB_STATUS_INVAL;
-}
-
 /* SCSI PARAM, code 0x0F */
 /**
  * Get the parameters of an executed scan, such as width, lines and bytes, which
diff --git a/backend/pieusb_scancmd.h b/backend/pieusb_scancmd.h
index 0dee646..5eefa55 100644
--- a/backend/pieusb_scancmd.h
+++ b/backend/pieusb_scancmd.h
@@ -318,7 +318,7 @@ struct Pieusb_Command_Status {
 typedef struct Pieusb_Scanner_Properties Pieusb_Scanner_Properties;
 
 typedef enum {
-  SLIDE_NEXT = 0x04, SLIDE_PREV = 0x05, SLIDE_LAMP_ON = 0x10, SLIDE_RELOAD = 0x40
+  SLIDE_NEXT = 0x04, SLIDE_PREV = 0x05, SLIDE_INIT = 0x10, SLIDE_RELOAD = 0x40
 } slide_action;
 
 void sanei_pieusb_cmd_slide(SANE_Int device_number, slide_action action, struct Pieusb_Command_Status *status);
diff --git a/backend/pieusb_specific.c b/backend/pieusb_specific.c
index 8231075..ce107cf 100644
--- a/backend/pieusb_specific.c
+++ b/backend/pieusb_specific.c
@@ -292,6 +292,8 @@ sanei_pieusb_find_device_callback (const char *devicename)
         return SANE_STATUS_INVAL;
     }
 
+    dev->flags = pieusb_supported_usb_device.flags;
+
     /* Found a supported scanner, put it in the definitions list*/
     DBG (DBG_info_proc, "sanei_pieusb_find_device_callback: success\n");
     dev->next = pieusb_definition_list_head;
@@ -996,18 +998,23 @@ sanei_pieusb_init_options (Pieusb_Scanner* scanner)
 }
 
 /**
- * Parse line from config file into a vendor id, product id and a model number
+ * Parse line from config file into a vendor id, product id, model number, and flags
  *
  * @param config_line Text to parse
  * @param vendor_id
  * @param product_id
  * @param model_number
+ * @param flags
  * @return SANE_STATUS_GOOD, or SANE_STATUS_INVAL in case of a parse error
  */
 SANE_Status
-sanei_pieusb_parse_config_line(const char* config_line, SANE_Word* vendor_id, SANE_Word* product_id, SANE_Word* model_number)
+sanei_pieusb_parse_config_line(const char* config_line,
+                               SANE_Word* vendor_id,
+                               SANE_Word* product_id,
+                               SANE_Int* model_number,
+                               SANE_Int* flags)
 {
-    char *vendor_id_string, *product_id_string, *model_number_string;
+    char *vendor_id_string, *product_id_string, *model_number_string, *flags_string;
 
     if (strncmp (config_line, "usb ", 4) != 0) {
         return SANE_STATUS_INVAL;
@@ -1041,12 +1048,12 @@ sanei_pieusb_parse_config_line(const char* config_line, SANE_Word* vendor_id, SA
     } else {
         return SANE_STATUS_INVAL;
     }
-    /* Detect product-id */
+    /* Detect model number */
     config_line = sanei_config_skip_whitespace (config_line);
     if (*config_line) {
         config_line = sanei_config_get_string (config_line, &model_number_string);
         if (model_number_string) {
-            *model_number = strtol (model_number_string, 0, 0);
+            *model_number = (SANE_Int) strtol (model_number_string, 0, 0);
             free (model_number_string);
         } else {
             return SANE_STATUS_INVAL;
@@ -1055,6 +1062,16 @@ sanei_pieusb_parse_config_line(const char* config_line, SANE_Word* vendor_id, SA
     } else {
         return SANE_STATUS_INVAL;
     }
+    /* Detect (optional) flags */
+    *flags = 0;
+    config_line = sanei_config_skip_whitespace (config_line);
+    if (*config_line) {
+        config_line = sanei_config_get_string (config_line, &flags_string);
+        if (flags_string) {
+            *flags = (SANE_Int) strtol (flags_string, 0, 0);
+            free (flags_string);
+        }
+    }
     return SANE_STATUS_GOOD;
 }
 
@@ -1064,16 +1081,18 @@ sanei_pieusb_parse_config_line(const char* config_line, SANE_Word* vendor_id, SA
  * @param vendor_id
  * @param product_id
  * @param model_number
+ * @param flags
  * @return
  */
 SANE_Bool
-sanei_pieusb_supported_device_list_contains(SANE_Word vendor_id, SANE_Word product_id, SANE_Word model_number)
+sanei_pieusb_supported_device_list_contains(SANE_Word vendor_id, SANE_Word product_id, SANE_Int model_number, SANE_Int flags)
 {
     int i = 0;
     while (pieusb_supported_usb_device_list[i].vendor != 0) {
         if (pieusb_supported_usb_device_list[i].vendor == vendor_id
               && pieusb_supported_usb_device_list[i].product == product_id
-              && pieusb_supported_usb_device_list[i].model == model_number) {
+              && pieusb_supported_usb_device_list[i].model == model_number
+              && pieusb_supported_usb_device_list[i].flags == flags) {
             return SANE_TRUE;
         }
         i++;
@@ -1086,10 +1105,11 @@ sanei_pieusb_supported_device_list_contains(SANE_Word vendor_id, SANE_Word produ
  * @param vendor_id
  * @param product_id
  * @param model_number
+ * @param flags
  * @return
  */
 SANE_Status
-sanei_pieusb_supported_device_list_add(SANE_Word vendor_id, SANE_Word product_id, SANE_Word model_number)
+sanei_pieusb_supported_device_list_add(SANE_Word vendor_id, SANE_Word product_id, SANE_Int model_number, SANE_Int flags)
 {
     int i = 0, k;
     struct Pieusb_USB_Device_Entry* dl;
@@ -1099,10 +1119,11 @@ sanei_pieusb_supported_device_list_add(SANE_Word vendor_id, SANE_Word product_id
     }
     /* i is index of last entry */
     for (k=0; k<=i; k++) {
-        DBG(DBG_info_proc,"sanei_pieusb_supported_device_list_add(): current %03d: %04x %04x %02x\n", i,
+        DBG(DBG_info_proc,"sanei_pieusb_supported_device_list_add(): current %03d: %04x %04x %02x %02x\n", i,
             pieusb_supported_usb_device_list[k].vendor,
             pieusb_supported_usb_device_list[k].product,
-            pieusb_supported_usb_device_list[k].model);
+            pieusb_supported_usb_device_list[k].model,
+            pieusb_supported_usb_device_list[k].flags);
     }
 
     dl = realloc(pieusb_supported_usb_device_list,(i+2)*sizeof(struct Pieusb_USB_Device_Entry)); /* Add one entry to list */
@@ -1114,14 +1135,17 @@ sanei_pieusb_supported_device_list_add(SANE_Word vendor_id, SANE_Word product_id
     pieusb_supported_usb_device_list[i].vendor = vendor_id;
     pieusb_supported_usb_device_list[i].product = product_id;
     pieusb_supported_usb_device_list[i].model = model_number;
+    pieusb_supported_usb_device_list[i].flags = flags;
     pieusb_supported_usb_device_list[i+1].vendor = 0;
     pieusb_supported_usb_device_list[i+1].product = 0;
     pieusb_supported_usb_device_list[i+1].model = 0;
+    pieusb_supported_usb_device_list[i+1].flags = 0;
     for (k=0; k<=i+1; k++) {
-        DBG(DBG_info_proc,"sanei_pieusb_supported_device_list_add() add: %03d: %04x %04x %02x\n", i,
+        DBG(DBG_info_proc,"sanei_pieusb_supported_device_list_add() add: %03d: %04x %04x %02x %02x\n", i,
             pieusb_supported_usb_device_list[k].vendor,
             pieusb_supported_usb_device_list[k].product,
-            pieusb_supported_usb_device_list[k].model);
+            pieusb_supported_usb_device_list[k].model,
+            pieusb_supported_usb_device_list[k].flags);
     }
     return SANE_STATUS_GOOD;
 }
diff --git a/backend/pieusb_specific.h b/backend/pieusb_specific.h
index 3928adf..f516960 100644
--- a/backend/pieusb_specific.h
+++ b/backend/pieusb_specific.h
@@ -193,6 +193,7 @@ struct Pieusb_Device_Definition
       /* USB id's like 0x05e3 0x0145, see pieusb.conf */
     SANE_String version; /* INQUIRY productRevision */
     SANE_Byte model; /* INQUIRY model */
+    SANE_Byte flags; /* pieusb.conf flags */
 
     /* Ranges for various quantities */
     SANE_Range dpi_range;
@@ -315,7 +316,11 @@ struct Pieusb_Scanner
 
 typedef struct Pieusb_Scanner Pieusb_Scanner;
 
-SANE_Status sanei_pieusb_parse_config_line(const char* config_line, SANE_Word* vendor_id, SANE_Word* product_id, SANE_Word* model_number);
+SANE_Status sanei_pieusb_parse_config_line(const char* config_line,
+                                           SANE_Word* vendor_id,
+                                           SANE_Word* product_id,
+                                           SANE_Int* model_number,
+                                           SANE_Int* flags);
 /* sub to sane_start() */
 SANE_Status sanei_pieusb_post (Pieusb_Scanner *scanner,  uint16_t **in_img, int planes);
 void sanei_pieusb_correct_shading(struct Pieusb_Scanner *scanner, struct Pieusb_Read_Buffer *buffer);
@@ -329,8 +334,8 @@ SANE_Status sanei_pieusb_set_frame_from_options(Pieusb_Scanner * scanner);
 void sanei_pieusb_print_options(struct Pieusb_Scanner *scanner);
 /* sub to sane_control_option() and sane_start() */
 int sanei_pieusb_analyse_options(struct Pieusb_Scanner *scanner);
-SANE_Bool sanei_pieusb_supported_device_list_contains(SANE_Word vendor_id, SANE_Word product_id, SANE_Word model_number);
-SANE_Status sanei_pieusb_supported_device_list_add(SANE_Word vendor_id, SANE_Word product_id, SANE_Word model_number);
+SANE_Bool sanei_pieusb_supported_device_list_contains(SANE_Word vendor_id, SANE_Word product_id, SANE_Int model_number, SANE_Int flags);
+SANE_Status sanei_pieusb_supported_device_list_add(SANE_Word vendor_id, SANE_Word product_id, SANE_Int model_number, SANE_Int flags);
 /* sub to sane_init() and sane_open() */
 SANE_Status sanei_pieusb_find_device_callback (const char *devicename);
 /* sub to sane_open() */
diff --git a/backend/pixma.c b/backend/pixma.c
index 3396155..d50e4ca 100644
--- a/backend/pixma.c
+++ b/backend/pixma.c
@@ -1,6 +1,6 @@
 /* SANE - Scanner Access Now Easy.
 
-   Copyright (C) 2011-2015 Rolf Bensch <rolf at bensch hyphen online dot de>
+   Copyright (C) 2011-2016 Rolf Bensch <rolf at bensch hyphen online dot de>
    Copyright (C) 2007-2008 Nicolas Martin, <nicols-guest at alioth dot debian dot org>
    Copyright (C) 2006-2007 Wittawat Yamwong <wittawat@web.de>
 
@@ -782,6 +782,14 @@ control_option (pixma_sane_t * ss, SANE_Int n,
               enable_option (ss, opt_threshold, SANE_FALSE);
               enable_option (ss, opt_threshold_curve, SANE_FALSE);
             }
+          if (cfg->cap & (PIXMA_CAP_ADF_WAIT))
+            { /* adf-wait */
+              enable_option (ss, opt_adf_wait, SANE_TRUE);
+            }
+          else
+            { /* disable adf-wait */
+              enable_option (ss, opt_adf_wait, SANE_FALSE);
+            }
           *info |= SANE_INFO_RELOAD_OPTIONS;
         }
       break;
@@ -801,6 +809,7 @@ print_scan_param (int level, const pixma_scan_param_t * sp)
 	     sp->xdpi, sp->ydpi, sp->x, sp->y, sp->w, sp->h);
   pixma_dbg (level, "  gamma_table=%p source=%d\n", sp->gamma_table,
 	     sp->source);
+  pixma_dbg (level, "  adf-wait=%d\n", sp->adf_wait);
 }
 #endif
 
@@ -850,6 +859,7 @@ calc_scan_param (pixma_sane_t * ss, pixma_scan_param_t * sp)
   sp->adf_pageid = ss->page_count;
   sp->threshold = 2.55 * OVAL (opt_threshold).w;
   sp->threshold_curve = OVAL (opt_threshold_curve).w;
+  sp->adf_wait = OVAL (opt_adf_wait).w;
 
   error = pixma_check_scan_param (ss->s, sp);
   if (error < 0)
@@ -928,7 +938,7 @@ init_option_descriptors (pixma_sane_t * ss)
 /* Writing to reader_ss outside reader_process() is a BUG! */
 static pixma_sane_t *reader_ss = NULL;
 
-static RETSIGTYPE
+static void
 reader_signal_handler (int sig)
 {
   if (reader_ss)
@@ -1083,7 +1093,7 @@ terminate_reader_task (pixma_sane_t * ss, int *exit_code)
   int status = 0;
 
   pid = ss->reader_taskid;
-  if (pid == -1)
+  if (!sanei_thread_is_valid (pid))
     return -1;
   if (sanei_thread_is_forked ())
     {
@@ -1129,7 +1139,7 @@ start_reader_task (pixma_sane_t * ss)
       ss->rpipe = -1;
       ss->wpipe = -1;
     }
-  if (ss->reader_taskid != -1)
+  if (sanei_thread_is_valid (ss->reader_taskid))
     {
       PDBG (pixma_dbg
 	    (1, "BUG:reader_taskid(%ld) != -1\n", (long) ss->reader_taskid));
@@ -1159,7 +1169,7 @@ start_reader_task (pixma_sane_t * ss)
     {
       pid = sanei_thread_begin (reader_thread, ss);
     }
-  if (pid == -1)
+  if (!sanei_thread_is_valid (pid))
     {
       close (ss->wpipe);
       close (ss->rpipe);
@@ -1227,7 +1237,7 @@ read_image (pixma_sane_t * ss, void *buf, unsigned size, int *readlen)
 		       ss->image_bytes_read, ss->sp.image_size));
       close (ss->rpipe);
       ss->rpipe = -1;
-      if (terminate_reader_task (ss, &status) != -1
+      if (sanei_thread_is_valid (terminate_reader_task (ss, &status))
       	  && status != SANE_STATUS_GOOD)
         {
           return status;
@@ -1371,6 +1381,7 @@ sane_open (SANE_String_Const name, SANE_Handle * h)
   ss->rpipe = -1;
   ss->idle = SANE_TRUE;
   ss->scanning = SANE_FALSE;
+  ss->sp.frontend_cancel = SANE_FALSE;
   for (j=0; j < BUTTON_GROUP_SIZE; j++)
     ss->button_option_is_cached[j] = 0;
   error = pixma_open (i, &ss->s);
@@ -1620,6 +1631,7 @@ sane_cancel (SANE_Handle h)
   if (!ss)
     return;
   ss->cancel = SANE_TRUE;
+  ss->sp.frontend_cancel = SANE_TRUE;
   if (ss->idle)
     return;
   close (ss->rpipe);
@@ -1812,6 +1824,13 @@ type int threshold-curve
   desc  Dynamic threshold curve, from light to dark, normally 50-65
   cap soft_select soft_detect automatic inactive
 
+type int adf-wait
+  default 0
+  constraint (0,3600,1)
+  title ADF Waiting Time
+  desc  When set, the scanner searches the waiting time in seconds for a new document inserted into the automatic document feeder.
+  cap soft_select soft_detect automatic inactive
+
 rem -------------------------------------------
 END SANE_Option_Descriptor
 */
diff --git a/backend/pixma.conf.in b/backend/pixma.conf.in
index a275b03..3f5c61a 100644
--- a/backend/pixma.conf.in
+++ b/backend/pixma.conf.in
@@ -1,5 +1,11 @@
 # pixma.conf configuration for the sane pixma backend
 #
+# bjnp-timeout=5000
+# Specify the timeout (in ms) to be used for all the folllowing
+# scanners.
+# May be specified multiple times.
+# The last value (if any) will be used for auto-detection
+#
 # define URI's of scanners (one per line)
 # This is only used for network scanners.
 # normally scanners will be detected by sending a broadcast
@@ -8,7 +14,12 @@
 #
 # method must be bjnp
 # port number can normally be left out, port 8612 is used as default
+# The timeout parameter sets a timeout value for the scanner on
+# the same line
 # Example:
-# bjnp://myscanner.my.domain:8612
-# bjnp://printer-1.pheasant.org
+# bjnp://myscanner.my.domain:8612 // uses the default 1000ms timeout
+# bjnp-timeout=5000
+# bjnp://printer-1.pheasant.org // will use the 5000 ms timeout
+# bjnp://scanner.bad-network.org/timeout=1500 // timeout set to 1500 ms
+# bjnp-timeout=3000 // will be used for auto-detected scanners
 #
diff --git a/backend/pixma.h b/backend/pixma.h
index 620f038..6d723fb 100644
--- a/backend/pixma.h
+++ b/backend/pixma.h
@@ -1,6 +1,6 @@
 /* SANE - Scanner Access Now Easy.
 
-   Copyright (C) 2011-2015 Rolf Bensch <rolf at bensch hyphen online dot de>
+   Copyright (C) 2011-2016 Rolf Bensch <rolf at bensch hyphen online dot de>
    Copyright (C) 2007-2008 Nicolas Martin, <nicols-guest at alioth dot debian dot org>
    Copyright (C) 2006-2007 Wittawat Yamwong <wittawat@web.de>
 
@@ -110,11 +110,14 @@ typedef uint32_t uint32_t;
 
 /** \addtogroup API
  *  @{ */
+/** Don't forget to update the backend version in the SANE Backend specification
+ *  file: doc/descriptions/pixma.desc !!!
+ */
 /** \name Version of the driver */
 /**@{*/
 #define PIXMA_VERSION_MAJOR 0
 #define PIXMA_VERSION_MINOR 17
-#define PIXMA_VERSION_BUILD 23
+#define PIXMA_VERSION_BUILD 37
 /**@}*/
 
 /** \name Error codes */
@@ -150,6 +153,7 @@ typedef uint32_t uint32_t;
 #define PIXMA_CAP_LINEART      (1 << 9)
 #define PIXMA_CAP_NEGATIVE     (1 << 10)
 #define PIXMA_CAP_TPUIR        ((1 << 11) | PIXMA_CAP_TPU)
+#define PIXMA_CAP_ADF_WAIT     (1 << 12)
 #define PIXMA_CAP_EXPERIMENT   (1 << 31)
 /**@}*/
 
@@ -337,6 +341,10 @@ struct pixma_scan_param_t
 
     /** The current page # in the same ADF scan session, 0 in non ADF */
   unsigned adf_pageid;
+
+  /** adf-wait */
+  unsigned adf_wait;
+  unsigned frontend_cancel;
 };
 
 /** PIXMA model information */
diff --git a/backend/pixma_bjnp.c b/backend/pixma_bjnp.c
index 7d2d541..fc4c501 100644
--- a/backend/pixma_bjnp.c
+++ b/backend/pixma_bjnp.c
@@ -85,7 +85,7 @@
 #ifdef HAVE_IFADDRS_H
 #include <ifaddrs.h>
 #endif
-#ifdef HAVE_SYS_SELSECT_H
+#ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
 #ifdef HAVE_PWD_H
@@ -395,18 +395,19 @@ determine_scanner_serial (const char *hostname, const char * mac_address, char *
   /* if we only have a literal ipv6 address, we use the mac-address */
 
   strcpy(copy, hostname);
-  while (strlen (copy) >= SHORT_HOSTNAME_MAX)
+  if (strlen (copy) >= SERIAL_MAX)
     {
+      /* make the string fit into the serial */
       /* if this is a FQDN, not an ip-address, remove domain part of the name */
       if ((dot = strchr (copy, '.')) != NULL)
         {
           *dot = '\0';
         }
-      else
-        {
-          strcpy(copy, mac_address);
-          break;
-        }
+    }
+  /* check if name is still to long. If so use the mac-address */
+  if (strlen(copy) >= SERIAL_MAX)
+    {
+      strcpy(copy, mac_address);
     }
   strcpy( serial, copy );
   return serial;
@@ -566,6 +567,7 @@ split_uri (const char *devname, char *method, char *host, char *port,
           return -1;
         }
       strcpy(port, start);
+      start = end_of_port + 1;
     }
 
 /*
@@ -613,7 +615,6 @@ set_cmd_for_dev (int devno, struct BJNP_command *cmd, char cmd_code, int payload
   /*
    * Set command buffer with command code, session_id and length of payload
    * Returns: sequence number of command
-   * If devno < 0, then use devno as negativ index into bjnp_protocol_defs
    */
 
   strncpy (cmd->BJNP_id, device[devno].protocol_string, sizeof (cmd->BJNP_id));
@@ -706,8 +707,8 @@ udp_command (const int dev_no, char *command, int cmd_len, char *response,
 	  FD_ZERO (&fdset);
 	  FD_SET (sockfd, &fdset);
 
-	  timeout.tv_sec = BJNP_TIMEOUT_UDP;
-	  timeout.tv_usec = 0; 
+	  timeout.tv_sec = device[dev_no].bjnp_timeout /1000;
+	  timeout.tv_usec = device[dev_no].bjnp_timeout %1000;
 	}
       while (((result =
 	       select (sockfd + 1, &fdset, NULL, NULL, &timeout)) <= 0)
@@ -737,7 +738,7 @@ udp_command (const int dev_no, char *command, int cmd_len, char *response,
 
   close(sockfd);
   PDBG (bjnp_dbg
-        (LOG_CRIT, "udp_command: ERROR - no data received\n" ) );
+        (LOG_CRIT, "udp_command: ERROR - no data received (timeout = %d)\n", device[dev_no].bjnp_timeout ) );
   return -1;
 }
 
@@ -807,7 +808,7 @@ get_scanner_name(const bjnp_sockaddr_t *scanner_sa, char *host)
 {
   /*
    * Parse identify command responses to ip-address
-   * and hostname
+   * and hostname. Return qulity of the address
    */
 
   struct addrinfo *results;
@@ -1423,8 +1424,8 @@ bjnp_recv_header (int devno, size_t *payload_size )
       FD_ZERO (&input);
       FD_SET (fd, &input);
 
-      timeout.tv_sec = BJNP_TIMEOUT_TCP;
-      timeout.tv_usec = 0;
+      timeout.tv_sec = device[devno].bjnp_timeout /1000;
+      timeout.tv_usec = device[devno].bjnp_timeout %1000;
     }
   while ( ( (result = select (fd + 1, &input, NULL, NULL, &timeout)) <= 0) &&
 	 (errno == EINTR) && (attempt++ < BJNP_MAX_SELECT_ATTEMPTS));
@@ -1442,7 +1443,8 @@ bjnp_recv_header (int devno, size_t *payload_size )
     {
       terrno = errno;
       PDBG (bjnp_dbg (LOG_CRIT,
-		       "bjnp_recv_header: ERROR - could not read response header (select timed out)!\n" ) );
+		"bjnp_recv_header: ERROR - could not read response header (select timed out after %d ms)!\n", 
+		device[devno].bjnp_timeout ) );
       errno = terrno;
       return SANE_STATUS_IO_ERROR;
     }
@@ -1502,7 +1504,7 @@ bjnp_recv_header (int devno, size_t *payload_size )
 }
 
 static int
-bjnp_init_device_structure(int dn, bjnp_sockaddr_t *sa, bjnp_protocol_defs_t *protocol_defs)
+bjnp_init_device_structure(int dn, bjnp_sockaddr_t *sa, bjnp_protocol_defs_t *protocol_defs, int min_timeout)
 {
   /* initialize device structure */
 
@@ -1524,7 +1526,8 @@ bjnp_init_device_structure(int dn, bjnp_sockaddr_t *sa, bjnp_protocol_defs_t *pr
   device[dn].address_level = get_scanner_name(sa, name);
   device[dn].session_id = 0;
   device[dn].serial = -1;
-  device[dn].bjnp_timeout = 0;
+  device[dn].bjnp_timeout = min_timeout;
+  device[dn].bjnp_min_timeout = min_timeout;
   device[dn].scanner_data_left = 0;
   device[dn].last_cmd = 0;
   device[dn].blocksize = BJNP_BLOCKSIZE_START;	
@@ -1597,8 +1600,8 @@ bjnp_recv_data (int devno, SANE_Byte * buffer, size_t start_pos, size_t * len)
       /* wait for data to be received, retry on a signal being received */
       FD_ZERO (&input);
       FD_SET (fd, &input);
-      timeout.tv_sec = BJNP_TIMEOUT_TCP;
-      timeout.tv_usec = 0;
+      timeout.tv_sec = device[devno].bjnp_timeout /1000;
+      timeout.tv_usec = device[devno].bjnp_timeout %1000;
     }
   while (((result = select (fd + 1, &input, NULL, NULL, &timeout)) <= 0) &&
 	 (errno == EINTR) && (attempt++ < BJNP_MAX_SELECT_ATTEMPTS));
@@ -1617,7 +1620,8 @@ bjnp_recv_data (int devno, SANE_Byte * buffer, size_t start_pos, size_t * len)
     {
       terrno = errno;
       PDBG (bjnp_dbg (LOG_CRIT,
-		       "bjnp_recv_data: ERROR - could not read response payload (select timed out)!\n") );
+		"bjnp_recv_data: ERROR - could not read response payload (select timed out after %d ms)!\n", 
+		device[devno].bjnp_timeout) );
       errno = terrno;
       *len = 0;
       return SANE_STATUS_IO_ERROR;
@@ -1643,7 +1647,7 @@ bjnp_recv_data (int devno, SANE_Byte * buffer, size_t start_pos, size_t * len)
 
 static BJNP_Status
 bjnp_allocate_device (SANE_String_Const devname, 
-                      SANE_Int * dn, char *res_host)
+                      SANE_Int * dn, char *resulting_host)
 {
   char method[BJNP_METHOD_MAX]; 
   char host[BJNP_HOST_MAX];
@@ -1654,6 +1658,7 @@ bjnp_allocate_device (SANE_String_Const devname,
   struct addrinfo hints;
   int result;
   int i;
+  int min_timeout = BJNP_TIMEOUT_DEFAULT;
 
   PDBG (bjnp_dbg (LOG_DEBUG, "bjnp_allocate_device(%s) %d\n", devname, bjnp_no_devices));
 
@@ -1662,20 +1667,29 @@ bjnp_allocate_device (SANE_String_Const devname,
       return BJNP_STATUS_INVAL;
     }
 
-  if (strlen (args) != 0)
+  if (strlen (args) > 0)
     {
-      PDBG (bjnp_dbg
-	    (LOG_CRIT,
-	     "bjnp_allocate_device: ERROR - URI may not contain userid, password or aguments: %s\n",
-	     devname));
+      /* get device specific timeout if any */
+
+      if (strncmp(args, "timeout=", strlen("timeout=")) == 0)
+        {
+          min_timeout = atoi(args + strlen("timeout="));
+          if (min_timeout < BJNP_TIMEOUT_DEFAULT)
+            min_timeout = BJNP_TIMEOUT_DEFAULT;
+        } else {
+		PDBG (bjnp_dbg
+	    		(LOG_CRIT,
+				"bjnp_allocate_device: ERROR - Unrecognized argument: %s\n",
+	     			devname));
 
       return BJNP_STATUS_INVAL;
+        }
     }
   if ( (protocol_defs = get_protocol_by_method(method)) == NULL)
     {
       PDBG (bjnp_dbg
-	    (LOG_CRIT, "bjnp_allocate_device: ERROR - URI %s contains invalid method: %s\n", devname,
-	     method));
+		(LOG_CRIT, "bjnp_allocate_device: ERROR - URI %s contains invalid method: %s\n",
+		 devname, method));
       return BJNP_STATUS_INVAL;
     }
 
@@ -1715,24 +1729,26 @@ bjnp_allocate_device (SANE_String_Const devname,
         {
           PDBG (bjnp_dbg
     	    (LOG_CRIT,
-    	     "bjnp_allocate_device: WARNING - Too many devices, ran out of device structures, can not add %s\n",
+    	     "bjnp_allocate_device: WARNING - Too many devices, ran out of device structures, cannot add %s\n",
     	     devname));
           freeaddrinfo(res);
           return BJNP_STATUS_INVAL;
         }
       if (bjnp_init_device_structure( bjnp_no_devices, (bjnp_sockaddr_t *)cur -> ai_addr,
-                                      protocol_defs) != 0)
+                                      protocol_defs, min_timeout) != 0)
         {
           /* giving up on this address, try next one if any */
           break;
         }
       for (i = 0; i < bjnp_no_devices; i++)
         {
-          /* we check for matching addresses as wel as matching mac_addresses as */
-          /* an IPv6 host can have multiple adresses */
 
-          if ( (sa_is_equal( device[i].addr, (bjnp_sockaddr_t *)cur -> ai_addr) ) ||
-               ( strcmp( device[i].mac_address, device[bjnp_no_devices].mac_address ) == 0 ) )
+          /* Check if found the scanner before, if so we use the best address 
+	   * but still make sure the scanner is listed only once.
+	   * We check for matching addresses as wel as matching mac_addresses as 
+           * an IPv6 host can have multiple adresses */
+
+          if ( strcmp( device[i].mac_address, device[bjnp_no_devices].mac_address ) == 0 )
             {
               if ( device[i].address_level < device[bjnp_no_devices].address_level ) 
                 {
@@ -1742,6 +1758,16 @@ bjnp_allocate_device (SANE_String_Const devname,
                   device[bjnp_no_devices].addr = NULL;
                   device[i].address_level = device[bjnp_no_devices].address_level;
                 }
+
+	      /* check if new timeout value was defined (e.g. from sanei_bjnp_device_open)
+	       * if so, use new timout value */
+
+              if (device[i].bjnp_min_timeout < device[bjnp_no_devices].bjnp_min_timeout)
+                {
+                  /* use the longer timeout as requested */
+                  device[i].bjnp_timeout = device[bjnp_no_devices].bjnp_min_timeout;
+                  device[i].bjnp_min_timeout = device[bjnp_no_devices].bjnp_min_timeout;
+                }
               freeaddrinfo(res); 
               *dn = i;
               bjnp_free_device_structure( bjnp_no_devices);
@@ -1754,17 +1780,17 @@ bjnp_allocate_device (SANE_String_Const devname,
 
   PDBG (bjnp_dbg (LOG_INFO, "bjnp_allocate_device: Scanner not yet in our list, added it: %s:%s\n", host, port));
 
-  /* return hostname if required */
+  /* Commit new device structure */
 
-  if (res_host != NULL)
-    {
-      strcpy (res_host, host);
-    }
   *dn = bjnp_no_devices;
+  bjnp_no_devices++;
 
-  /* Commit new device structure */
+  /* return hostname if required */
 
-  bjnp_no_devices++;
+  if (resulting_host != NULL)
+    {
+      strcpy (resulting_host, host);
+    }
 
   return BJNP_STATUS_GOOD;
 }
@@ -1800,10 +1826,11 @@ static void add_scanner(SANE_Int *dev_no,
            */
 
            determine_scanner_serial (scanner_host, device[*dev_no].mac_address, serial);
+
            attach_bjnp (uri, makemodel,
                         serial, pixma_devices);
-           PDBG (bjnp_dbg (LOG_NOTICE, "add_scanner: New scanner at %s added!\n",
-	                 uri));
+           PDBG (bjnp_dbg (LOG_NOTICE, "add_scanner: New scanner added: %s, serial %s, mac addres: %s.\n",
+	                 uri, serial, device[*dev_no].mac_address));
           }
         break;
       case BJNP_STATUS_ALREADY_ALLOCATED:
@@ -1818,6 +1845,34 @@ static void add_scanner(SANE_Int *dev_no,
     }
 }
 
+int rewrite_uri(char *uri, int timeout, int max_len)
+{
+  char method[BJNP_METHOD_MAX];
+  char host[BJNP_HOST_MAX];
+  char port_str[BJNP_PORT_MAX];
+  char args[BJNP_HOST_MAX];
+  int port;
+
+  if (split_uri(uri, method, host, port_str, args ) != 0)
+    {
+      return -1;
+    }
+
+  port = atoi(port_str);
+  if (port == 0)
+    {
+      port = 8612;
+    }
+
+  if (strstr(args, "timeout=") == NULL)
+    {
+      sprintf(args, "timeout=%d", timeout);
+    }
+
+  snprintf(uri, max_len -1, "bjnp://%s:%d/%s", host, port, args);
+  return 0;
+}
+
 
 /*
  * Public functions
@@ -1870,6 +1925,7 @@ sanei_bjnp_find_devices (const char **conf_devices,
   char uri[256];
   int dev_no;
   int port;
+  int timeout_default = BJNP_TIMEOUT_DEFAULT;
   bjnp_sockaddr_t broadcast_addr[BJNP_SOCK_MAX];
   bjnp_sockaddr_t scanner_sa; 
   socklen_t socklen;
@@ -1885,16 +1941,30 @@ sanei_bjnp_find_devices (const char **conf_devices,
     {
       socket_fd[i] = -1;
     }
-  /* First add devices from config file */
+
+  /* Add devices from config file */
 
   if (conf_devices[0] == NULL)
     PDBG (bjnp_dbg( LOG_DEBUG, "sanei_bjnp_find_devices: No devices specified in configuration file.\n" ) );
 
   for (i = 0; conf_devices[i] != NULL; i++)
     {
+      if (strncmp(conf_devices[i], "bjnp-timeout=", strlen("bjnp-timeout="))== 0)
+        {
+	  timeout_default = atoi(conf_devices[i] + strlen("bjnp-timeout=") );
+          if (timeout_default < BJNP_TIMEOUT_DEFAULT)
+	    {
+	      timeout_default = BJNP_TIMEOUT_DEFAULT;	    
+	    }
+	  PDBG ( bjnp_dbg
+                  (LOG_DEBUG, "Set new default timeout value: %d ms.", timeout_default));
+	  continue;
+	}
       PDBG (bjnp_dbg
 	    (LOG_DEBUG, "sanei_bjnp_find_devices: Adding scanner from pixma.conf: %s\n", conf_devices[i]));
-      add_scanner(&dev_no, conf_devices[i], attach_bjnp, pixma_devices);
+      strncpy(uri, conf_devices[i], sizeof(uri));
+      rewrite_uri(uri, timeout_default, sizeof(uri));
+      add_scanner(&dev_no, uri, attach_bjnp, pixma_devices);
     }
   PDBG (bjnp_dbg
 	(LOG_DEBUG,
@@ -2062,8 +2132,8 @@ sanei_bjnp_find_devices (const char **conf_devices,
               get_scanner_name( &scanner_sa, scanner_host);
 
 	      /* construct URI */
-	      sprintf (uri, "%s://%s:%d", protocol_defs->method_string, scanner_host,
-		       port);
+	      sprintf (uri, "%s://%s:%d/timeout=%d", protocol_defs->method_string, scanner_host,
+		           port, timeout_default);
 
               add_scanner( &dev_no, uri, attach_bjnp, pixma_devices); 
 
@@ -2182,8 +2252,15 @@ sanei_bjnp_deactivate (SANE_Int dn)
 extern void
 sanei_bjnp_set_timeout (SANE_Int devno, SANE_Int timeout)
 {
-  PDBG (bjnp_dbg (LOG_INFO, "bjnp_set_timeout to %d\n",
+  if (timeout < device[devno].bjnp_min_timeout)
+    {
+      PDBG (bjnp_dbg (LOG_INFO, "bjnp_set_timeout to %d, but using minimum value %d\n",
+        timeout, device[devno].bjnp_min_timeout));
+      timeout = device[devno].bjnp_min_timeout;
+    } else {
+      PDBG (bjnp_dbg (LOG_INFO, "bjnp_set_timeout to %d\n",
 		   timeout));
+    }
 
   device[devno].bjnp_timeout = timeout;
 }
@@ -2460,16 +2537,6 @@ sanei_bjnp_read_int (SANE_Int dn, SANE_Byte * buffer, size_t * size)
           if ( resp_len > 0 )
             {
               device[dn].polling_status = BJNP_POLL_STATUS_RECEIVED;
-
-              /* this is a bit of a hack, but the scanner does not like */
-              /* us to continue using the existing tcp socket */
-
-              /* No longer required? Does not work anymore now we moved code from sanei_bjnp_activate/sanei_bjnp_deactivate
-                 to the isanei_bjnp_open and sanei_bjnp_close
-              sanei_bjnp_deactivate(dn);
-              sanei_bjnp_activate(dn);
-              */ 
-
               return SANE_STATUS_GOOD;
             }
           seconds = timeout > 2 ? 2 : timeout;
diff --git a/backend/pixma_bjnp.h b/backend/pixma_bjnp.h
index 3770bfd..998c331 100644
--- a/backend/pixma_bjnp.h
+++ b/backend/pixma_bjnp.h
@@ -65,9 +65,10 @@ extern void sanei_bjnp_init (void);
 
 /** Find scanners responding to a BJNP broadcast.
  *
- * The function attach is called for every device which has been found.
+ * The function sanei_bjnp_attach is called for every device which has 
+ * been found.
  * Serial is the address of the scanner in human readable form of max
- * SHORT_HOSTNAME_MAX characters
+ * SERIAL_MAX characters
  * @param conf_devices list of pre-configures device URI's to attach
  * @param attach attach function
  * @param pixma_devices device informatio needed by attach function
@@ -75,7 +76,7 @@ extern void sanei_bjnp_init (void);
  * @return SANE_STATUS_GOOD - on success (even if no scanner was found)
  */
 
-#define SHORT_HOSTNAME_MAX 16
+#define SERIAL_MAX 16
 
 extern SANE_Status
 sanei_bjnp_find_devices (const char **conf_devices,
diff --git a/backend/pixma_bjnp_private.h b/backend/pixma_bjnp_private.h
index 1902c7a..9ecc6ae 100644
--- a/backend/pixma_bjnp_private.h
+++ b/backend/pixma_bjnp_private.h
@@ -80,8 +80,7 @@
 /* timers */
 #define BJNP_BROADCAST_INTERVAL 10 	/* ms between broadcasts */
 #define BJNP_BC_RESPONSE_TIMEOUT 500  	/* waiting time for broadc. responses */
-#define BJNP_TIMEOUT_UDP 4 		/* standard UDP timeout in seconds */
-#define BJNP_TIMEOUT_TCP 4		/* standard TCP timeout in seconds */
+#define BJNP_TIMEOUT_DEFAULT 1000	/* minimum tiemout value for network operations */
 #define BJNP_USLEEP_MS 1000          	/* sleep for 1 msec */
 
 /* retries */
@@ -371,6 +370,7 @@ typedef struct device_s
   bjnp_sockaddr_t * addr;	/* ip-address of the scanner */
   int address_level;		/* link local, public or has a FQDN */
   int bjnp_timeout;		/* timeout (msec) for next poll command */
+  int bjnp_min_timeout;		/* device specific min timeout  */
 
 #ifdef PIXMA_BJNP_USE_STATUS
   /* polling state information */
diff --git a/backend/pixma_common.c b/backend/pixma_common.c
index 9d41f7a..2882453 100644
--- a/backend/pixma_common.c
+++ b/backend/pixma_common.c
@@ -1,6 +1,6 @@
 /* SANE - Scanner Access Now Easy.
 
-   Copyright (C) 2011-2015 Rolf Bensch <rolf at bensch hyphen online dot de>
+   Copyright (C) 2011-2016 Rolf Bensch <rolf at bensch hyphen online dot de>
    Copyright (C) 2007-2008 Nicolas Martin, <nicols-guest at alioth dot debian dot org>
    Copyright (C) 2006-2007 Wittawat Yamwong <wittawat@web.de>
 
@@ -57,6 +57,8 @@
 #include "pixma_common.h"
 #include "pixma_io.h"
 
+#include "../include/sane/sanei_usb.h"
+
 
 #ifdef __GNUC__
 # define UNUSED(v) (void) v
@@ -649,15 +651,21 @@ pixma_cmd_transaction (pixma_t * s, const void *cmd, unsigned cmdlen,
      immediatly answer with PIXMA_STATUS_BUSY.
 
      Is 8 seconds timeout enough? This affects ALL commands that use
-     pixma_cmd_transaction(). */
-  tmo = 8;
+     pixma_cmd_transaction(). Default value set in pixma_open(). */
+  tmo = s->rec_tmo;
   do
     {
       error = pixma_read (s->io, data, expected_len);
       if (error == PIXMA_ETIMEDOUT)
       {
         PDBG (pixma_dbg (2, "No response yet. Timed out in %d sec.\n", tmo));
-        pixma_sleep (1000000);          /* 1s timeout */
+
+#ifndef HAVE_SANEI_USB_SET_TIMEOUT
+        /* 1s timeout
+           Only needed, if sanei_usb_set_timeout() isn't available.
+           pixma_read() has an internal timeout of 1 sec. */
+        pixma_sleep (1000000);
+#endif
       }
     }
   while (error == PIXMA_ETIMEDOUT && --tmo != 0);
@@ -761,6 +769,7 @@ pixma_open (unsigned devnr, pixma_t ** handle)
   first_pixma = s;
 
   s->cfg = cfg;
+  s->rec_tmo = 8;               /* set receive timeout to 8 seconds */
   error = pixma_connect (devnr, &s->io);
   if (error < 0)
     {
@@ -839,6 +848,7 @@ pixma_scan (pixma_t * s, pixma_scan_param_t * sp)
 	     sp->xdpi, sp->ydpi, sp->x, sp->y, sp->w, sp->h);
   pixma_dbg (3, "  gamma_table=%p source=%d\n", sp->gamma_table, sp->source);
   pixma_dbg (3, "  threshold=%d threshold_curve=%d\n", sp->threshold, sp->threshold_curve);
+  pixma_dbg (3, "  adf-wait=%d\n", sp->adf_wait);
   pixma_dbg (3, "  ADF page count: %d\n", sp->adf_pageid);
 #endif
 
diff --git a/backend/pixma_common.h b/backend/pixma_common.h
index dbaa23f..6c55c71 100644
--- a/backend/pixma_common.h
+++ b/backend/pixma_common.h
@@ -1,6 +1,6 @@
 /* SANE - Scanner Access Now Easy.
 
-   Copyright (C) 2011-2015 Rolf Bensch <rolf at bensch hyphen online dot de>
+   Copyright (C) 2011-2016 Rolf Bensch <rolf at bensch hyphen online dot de>
    Copyright (C) 2006-2007 Wittawat Yamwong <wittawat@web.de>
 
    This file is part of the SANE package.
@@ -118,6 +118,7 @@ struct pixma_t
   int cancel;			/* NOTE: It can be set in a signal handler. */
   uint32_t events;
   void *subdriver;		/* can be used by model driver. */
+  int rec_tmo;                  /* receive timeout [s] */
 
   /* private */
   uint64_t cur_image_size;
diff --git a/backend/pixma_imageclass.c b/backend/pixma_imageclass.c
index b2d45ee..8ad0083 100644
--- a/backend/pixma_imageclass.c
+++ b/backend/pixma_imageclass.c
@@ -1,6 +1,6 @@
 /* SANE - Scanner Access Now Easy.
 
-   Copyright (C) 2011-2015 Rolf Bensch <rolf at bensch hyphen online dot de>
+   Copyright (C) 2011-2016 Rolf Bensch <rolf at bensch hyphen online dot de>
    Copyright (C) 2007-2009 Nicolas Martin, <nicols-guest at alioth dot debian dot org>
    Copyright (C) 2008 Dennis Lou, dlou 99 at yahoo dot com
 
@@ -103,6 +103,8 @@
 #define MF820_PID  0x27a6
 #define MF220_PID  0x27a8
 #define MF210_PID  0x27a9
+#define MF230_PID  0x27d1
+#define MF240_PID  0x27d2
 
 
 enum iclass_state_t
@@ -140,9 +142,22 @@ typedef struct iclass_t
   unsigned last_block;
 
   uint8_t generation;           /* New multifunctionals are (generation == 2) */
+
+  uint8_t adf_state;            /* handle adf scanning */
 } iclass_t;
 
 
+static int is_scanning_from_adf (pixma_t * s)
+{
+  return (s->param->source == PIXMA_SOURCE_ADF
+          || s->param->source == PIXMA_SOURCE_ADFDUP);
+}
+
+static int is_scanning_from_adfdup (pixma_t * s)
+{
+  return (s->param->source == PIXMA_SOURCE_ADFDUP);
+}
+
 static void iclass_finish_scan (pixma_t * s);
 
 /* checksumming is sometimes different than pixmas */
@@ -163,7 +178,8 @@ static int
 has_paper (pixma_t * s)
 {
   iclass_t *mf = (iclass_t *) s->subdriver;
-  return ((mf->current_status[1] & 0x0f) == 0);         /* allow 0x10 as ADF paper OK */
+  return ((mf->current_status[1] & 0x0f) == 0           /* allow 0x10 as ADF paper OK */
+          || mf->current_status[1] == 81);              /* allow 0x51 as ADF paper OK */
 }
 
 static int
@@ -185,9 +201,9 @@ query_status (pixma_t * s)
   if (error >= 0)
     {
       memcpy (mf->current_status, data, 12);
-      DBG (3, "Current status: paper=%u cal=%u lamp=%u\n",
-	   data[1], data[8], data[7]);
-      PDBG (pixma_dbg (3, "Current status: paper=%u cal=%u lamp=%u\n",
+      /*DBG (3, "Current status: paper=0x%02x cal=%u lamp=%u\n",
+	   data[1], data[8], data[7]);*/
+      PDBG (pixma_dbg (3, "Current status: paper=0x%02x cal=%u lamp=%u\n",
 		       data[1], data[8], data[7]));
     }
   return error;
@@ -229,9 +245,9 @@ select_source (pixma_t * s)
 {
   iclass_t *mf = (iclass_t *) s->subdriver;
   uint8_t *data = pixma_newcmd (&mf->cb, cmd_select_source, 10, 0);
-  data[0] = (s->param->source == PIXMA_SOURCE_ADF ||
-             s->param->source == PIXMA_SOURCE_ADFDUP) ? 2 : 1;
-  data[5] = (s->param->source == PIXMA_SOURCE_ADFDUP) ? 3 : 0;
+  data[0] = (is_scanning_from_adf(s)) ? 2 : 1;
+  /* special settings for MF6100 */
+  data[5] = is_scanning_from_adfdup(s) ? 3 : ((s->cfg->pid == MF6100_PID && s->param->source == PIXMA_SOURCE_ADF) ? 1 : 0);
   switch (s->cfg->pid)
     {
     case MF4200_PID:
@@ -263,7 +279,7 @@ send_scan_param (pixma_t * s)
   pixma_set_be32 (mf->raw_width, data + 0x10);
   pixma_set_be32 (s->param->h, data + 0x14);
   data[0x18] = (s->param->channels == 1) ? 0x04 : 0x08;
-  data[0x19] = s->param->channels * s->param->depth;	/* bits per pixel */
+  data[0x19] = s->param->channels * ((s->param->depth == 1) ? 8 : s->param->depth);	/* bits per pixel */
   data[0x1f] = 0x7f;
   data[0x20] = 0xff;
   data[0x23] = 0x81;
@@ -294,7 +310,10 @@ request_image_block (pixma_t * s, unsigned flag, uint8_t * info,
   const int hlen = 2 + 6;
 
   memset (mf->cb.buf, 0, 11);
-  pixma_set_be16 (((mf->generation >= 2) ? cmd_read_image2 : cmd_read_image), mf->cb.buf);
+  /* generation 2 scanners use cmd_read_image2.
+   * MF6100, ... are exceptions */
+  pixma_set_be16 (((mf->generation >= 2
+                    && s->cfg->pid != MF6100_PID) ? cmd_read_image2 : cmd_read_image), mf->cb.buf);
   mf->cb.buf[8] = flag;
   mf->cb.buf[10] = 0x06;
   expected_len = (mf->generation >= 2 ||
@@ -419,13 +438,46 @@ static int
 step1 (pixma_t * s)
 {
   int error;
+  int rec_tmo;
   iclass_t *mf = (iclass_t *) s->subdriver;
 
+  /* don't wait full timeout for 1st command */
+  rec_tmo = s->rec_tmo;         /* save globel timeout */
+  s->rec_tmo = 2;               /* set timeout to 2 seconds */
   error = query_status (s);
+  s->rec_tmo = rec_tmo;         /* restore global timeout */
+  if (error < 0)
+  {
+    PDBG (pixma_dbg (1, "WARNING: Resend first USB command after timeout!\n"));
+    error = query_status (s);
+  }
   if (error < 0)
     return error;
-  if (s->param->source == PIXMA_SOURCE_ADF && !has_paper (s))
+
+  /* wait for inserted paper */
+  if (s->param->adf_wait != 0 && is_scanning_from_adf(s))
+  {
+    int tmo = s->param->adf_wait;
+
+    while (!has_paper (s) && --tmo >= 0 && !s->param->frontend_cancel)
+    {
+      if ((error = query_status (s)) < 0)
+        return error;
+      pixma_sleep (1000000);
+      PDBG (pixma_dbg(2, "No paper in ADF. Timed out in %d sec.\n", tmo));
+    }
+    /* canceled from frontend */
+    if (s->param->frontend_cancel)
+    {
+      return PIXMA_ECANCELED;
+    }
+  }
+  /* no paper inserted
+   * => abort session */
+  if (is_scanning_from_adf(s) && !has_paper (s))
+  {
     return PIXMA_ENO_PAPER;
+  }
   /* activate only seen for generation 1 scanners */
   if (mf->generation == 1)
     {
@@ -484,6 +536,9 @@ iclass_open (pixma_t * s)
   mf->cb.cmd_header_len = 10;
   mf->cb.cmd_len_field_ofs = 7;
 
+  /* adf scanning */
+  mf->adf_state = state_idle;
+
   /* set generation = 2 for new multifunctionals */
   mf->generation = (s->cfg->pid >= MF8030_PID) ? 2 : 1;
   PDBG (pixma_dbg (3, "*iclass_open***** This is a generation %d scanner.  *****\n", mf->generation));
@@ -513,8 +568,34 @@ iclass_check_param (pixma_t * s, pixma_scan_param_t * sp)
 {
   UNUSED (s);
 
+  /* PDBG (pixma_dbg (4, "*iclass_check_param***** Initially: channels=%u, depth=%u, x=%u, y=%u, w=%u, line_size=%" PRIu64 " , h=%u*****\n",
+                   sp->channels, sp->depth, sp->x, sp->y, sp->w, sp->line_size, sp->h)); */
+
   sp->depth = 8;
-  sp->line_size = ALIGN_SUP (sp->w, 32) * sp->channels;
+  sp->software_lineart = 0;
+  if (sp->mode == PIXMA_SCAN_MODE_LINEART)
+  {
+    sp->software_lineart = 1;
+    sp->channels = 1;
+    sp->depth = 1;
+  }
+
+  if (sp->software_lineart == 1)
+  {
+    unsigned w_max;
+
+    /* for software lineart line_size and w must be a multiple of 8 */
+    sp->line_size = ALIGN_SUP (sp->w, 8) * sp->channels;
+    sp->w = ALIGN_SUP (sp->w, 8);
+
+    /* do not exceed the scanner capability */
+    w_max = s->cfg->width * s->cfg->xdpi / 75;
+    w_max -= w_max % 32;
+    if (sp->w > w_max)
+      sp->w = w_max;
+  }
+  else
+    sp->line_size = ALIGN_SUP (sp->w, 32) * sp->channels;
 
   /* Some exceptions here for particular devices */
   /* Those devices can scan up to Legal 14" with ADF, but A4 11.7" in flatbed */
@@ -522,6 +603,9 @@ iclass_check_param (pixma_t * s, pixma_scan_param_t * sp)
   if ((s->cfg->cap & PIXMA_CAP_ADF) && sp->source == PIXMA_SOURCE_FLATBED)
     sp->h = MIN (sp->h, 877 * sp->xdpi / 75);
 
+  /* PDBG (pixma_dbg (4, "*iclass_check_param***** Finally: channels=%u, depth=%u, x=%u, y=%u, w=%u, line_size=%" PRIu64 " , h=%u*****\n",
+                   sp->channels, sp->depth, sp->x, sp->y, sp->w, sp->line_size, sp->h)); */
+
   return 0;
 }
 
@@ -559,7 +643,8 @@ iclass_scan (pixma_t * s)
   mf->blk_len = 0;
 
   error = step1 (s);
-  if (error >= 0 && (s->param->adf_pageid == 0 || mf->generation == 1))
+  if (error >= 0
+      && (s->param->adf_pageid == 0 || mf->generation == 1 || mf->adf_state == state_idle))
     { /* single sheet or first sheet from ADF */
       PDBG (pixma_dbg (3, "*iclass_scan***** start scanning *****\n"));
       error = start_session (s);
@@ -583,6 +668,10 @@ iclass_scan (pixma_t * s)
       return error;
     }
   mf->last_block = 0;
+
+  /* ADF scanning active */
+  if (is_scanning_from_adf (s))
+    mf->adf_state = state_scanning;
   return 0;
 }
 
@@ -592,7 +681,7 @@ iclass_fill_buffer (pixma_t * s, pixma_imagebuf_t * ib)
 {
   int error, n;
   iclass_t *mf = (iclass_t *) s->subdriver;
-  unsigned block_size, lines_size, first_block_size;
+  unsigned block_size, lines_size, lineart_lines_size, first_block_size;
   uint8_t info;
 
 /*
@@ -652,10 +741,33 @@ iclass_fill_buffer (pixma_t * s, pixma_imagebuf_t * ib)
       /* add current block to remainder of previous */
       mf->blk_len += block_size;
       /* n = number of full lines (rows) we have in the buffer. */
-      n = mf->blk_len / s->param->line_size;
+      n = mf->blk_len / ((s->param->mode == PIXMA_SCAN_MODE_LINEART) ? mf->raw_width : s->param->line_size);
       if (n != 0)
         {
-          if (s->param->channels != 1 &&
+          /* PDBG (pixma_dbg (4, "*iclass_fill_buffer***** Processing with n=%d, w=%i, line_size=%" PRIu64 ", raw_width=%u ***** \n",
+                           n, s->param->w, s->param->line_size, mf->raw_width)); */
+          /* PDBG (pixma_dbg (4, "*iclass_fill_buffer*****                 scan_mode=%d, lineptr=%" PRIu64 ", blkptr=%" PRIu64 " \n",
+                           s->param->mode, (uint64_t)mf->lineptr, (uint64_t)mf->blkptr)); */
+
+          /* gray to lineart convert
+           * mf->lineptr         : image line
+           * mf->blkptr          : scanned image block as grayscale
+           * s->param->w         : image width
+           * s->param->line_size : scanned image width */
+          if (s->param->mode == PIXMA_SCAN_MODE_LINEART)
+          {
+            int i;
+            uint8_t *sptr, *dptr;
+
+            /* PDBG (pixma_dbg (4, "*iclass_fill_buffer***** Processing lineart *****\n")); */
+
+            /* process ALL lines */
+            sptr = mf->blkptr;
+            dptr = mf->lineptr;
+            for (i = 0; i < n; i++, sptr += mf->raw_width)
+              dptr = pixma_binarize_line (s->param, dptr, sptr, s->param->line_size, 1);
+          }
+          else if (s->param->channels != 1 &&
                   mf->generation == 1 &&
 	          s->cfg->pid != MF4600_PID &&
 	          s->cfg->pid != MF6500_PID &&
@@ -669,17 +781,22 @@ iclass_fill_buffer (pixma_t * s, pixma_imagebuf_t * ib)
               /* grayscale */
               memcpy (mf->lineptr, mf->blkptr, n * s->param->line_size);
             }
-          lines_size = n * s->param->line_size;
           /* cull remainder and shift left */
+          lineart_lines_size = n * s->param->line_size / 8;
+          lines_size = n * ((s->param->mode == PIXMA_SCAN_MODE_LINEART) ? mf->raw_width : s->param->line_size);
           mf->blk_len -= lines_size;
           memcpy (mf->blkptr, mf->blkptr + lines_size, mf->blk_len);
         }
     }
   while (n == 0);
 
-  /* output full lines, keep partial lines for next block */
+  /* output full lines, keep partial lines for next block
+   * ib->rptr : start of image buffer
+   * ib->rend : end of image buffer */
   ib->rptr = mf->lineptr;
-  ib->rend = mf->lineptr + lines_size;
+  ib->rend = mf->lineptr + (s->param->mode == PIXMA_SCAN_MODE_LINEART ? lineart_lines_size : lines_size);
+  /* PDBG (pixma_dbg (4, "*iclass_fill_buffer*****                 rptr=%" PRIu64 ", rend=%" PRIu64 ", diff=%ld \n",
+                   (uint64_t)ib->rptr, (uint64_t)ib->rend, ib->rend - ib->rptr)); */
   return ib->rend - ib->rptr;
 }
 
@@ -718,8 +835,17 @@ iclass_finish_scan (pixma_t * s)
           || (mf->generation == 1 && mf->last_block == 0x28)    /* generation 1 scanner last block */
           || (mf->generation >= 2 && !has_paper(s)))            /* check status: no paper in ADF */
 	{
+          /* ADFDUP scan: wait for 8sec to throw last page out of ADF feeder */
+          if (is_scanning_from_adfdup(s))
+          {
+            PDBG (pixma_dbg (4, "*iclass_finish_scan***** sleep for 8s  *****\n"));
+            pixma_sleep(8000000);       /* sleep for 8s */
+            query_status (s);
+          }
           PDBG (pixma_dbg (3, "*iclass_finish_scan***** abort session  *****\n"));
 	  abort_session (s);
+	  mf->adf_state = state_idle;
+	  mf->last_block = 0;
 	}
       else
         PDBG (pixma_dbg (3, "*iclass_finish_scan***** wait for next page from ADF  *****\n"));
@@ -777,6 +903,8 @@ static const pixma_scan_ops_t pixma_iclass_ops = {
             adftpu_max_dpi,           /* adftpu_max_dpi */ \
             0, 0,                     /* tpuir_min_dpi & tpuir_max_dpi not used in this subdriver */   \
             w, h,                     /* width, height */	\
+            PIXMA_CAP_LINEART|        /* all scanners have software lineart */ \
+            PIXMA_CAP_ADF_WAIT|       /* adf wait for all ADF and ADFDUP scanners */ \
             PIXMA_CAP_GRAY|PIXMA_CAP_EVENTS|cap             \
 }
 const pixma_config_t pixma_iclass_devices[] = {
@@ -809,9 +937,11 @@ const pixma_config_t pixma_iclass_devices[] = {
   DEV ("Canon imageRUNNER 1133", "iR1133", IR1133_PID, 600, 0, 637, 877, PIXMA_CAP_ADFDUP),
   DEV ("Canon i-SENSYS MF5900 Series", "MF5900", MF5900_PID, 600, 0, 640, 1050, PIXMA_CAP_ADFDUP),
   DEV ("Canon i-SENSYS MF8500C Series", "MF8500C", MF8500_PID, 600, 0, 640, 1050, PIXMA_CAP_ADFDUP),
-  DEV ("Canon i-SENSYS MF6100 Series", "MF6100", MF6100_PID, 600, 0, 640, 1050, PIXMA_CAP_ADFDUP),
+  DEV ("Canon i-SENSYS MF6100 Series", "MF6100", MF6100_PID, 600, 300, 640, 1050, PIXMA_CAP_ADFDUP),
   DEV ("Canon imageClass MF810/820", "MF810/820", MF820_PID, 600, 0, 640, 1050, PIXMA_CAP_ADFDUP),
   DEV ("Canon i-SENSYS MF220 Series", "MF220", MF220_PID, 600, 0, 640, 1050, PIXMA_CAP_ADFDUP),
   DEV ("Canon i-SENSYS MF210 Series", "MF210", MF210_PID, 600, 0, 640, 1050, PIXMA_CAP_ADF),
+  DEV ("Canon i-SENSYS MF230 Series", "MF230", MF230_PID, 600, 0, 640, 1050, PIXMA_CAP_ADF),
+  DEV ("Canon i-SENSYS MF240 Series", "MF240", MF240_PID, 600, 0, 640, 1050, PIXMA_CAP_ADF),
   DEV (NULL, NULL, 0, 0, 0, 0, 0, 0)
 };
diff --git a/backend/pixma_io.h b/backend/pixma_io.h
index 004e008..9dc1afb 100644
--- a/backend/pixma_io.h
+++ b/backend/pixma_io.h
@@ -57,9 +57,9 @@
  */
 
 /** Timeout for pixma_read() in milliseconds */
-#define PIXMA_BULKIN_TIMEOUT  20000
+#define PIXMA_BULKIN_TIMEOUT  1000
 /** Timeout for pixma_write() in milliseconds */
-#define PIXMA_BULKOUT_TIMEOUT 20000
+#define PIXMA_BULKOUT_TIMEOUT 1000
 
 
 struct pixma_io_t;
diff --git a/backend/pixma_io_sanei.c b/backend/pixma_io_sanei.c
index 9e4a2fa..8eec883 100644
--- a/backend/pixma_io_sanei.c
+++ b/backend/pixma_io_sanei.c
@@ -1,7 +1,7 @@
 /* SANE - Scanner Access Now Easy.
  * For limitations, see function sanei_usb_get_vendor_product().
 
-   Copyright (C) 2011-2015 Rolf Bensch <rolf at bensch hyphen online dot de>
+   Copyright (C) 2011-2016 Rolf Bensch <rolf at bensch hyphen online dot de>
    Copyright (C) 2006-2007 Wittawat Yamwong <wittawat@web.de>
 
    This file is part of the SANE package.
diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c
index 4f8b232..dca0965 100644
--- a/backend/pixma_mp150.c
+++ b/backend/pixma_mp150.c
@@ -1,6 +1,6 @@
 /* SANE - Scanner Access Now Easy.
 
-   Copyright (C) 2011-2015 Rolf Bensch <rolf at bensch hyphen online dot de>
+   Copyright (C) 2011-2016 Rolf Bensch <rolf at bensch hyphen online dot de>
    Copyright (C) 2007-2009 Nicolas Martin, <nicols-guest at alioth dot debian dot org>
    Copyright (C) 2006-2007 Wittawat Yamwong <wittawat@web.de>
 
@@ -228,7 +228,19 @@
 #define MX490_PID 0x1787
 #define E480_PID 0x1789
 #define MG3600_PID 0x178a
-
+#define MG7700_PID 0x178b
+#define MG6900_PID 0x178c
+#define MG6800_PID 0x178d
+#define MG5700_PID 0x178e
+
+/* 2016 new devices (untested) */
+#define TS9000_PID 0x179f
+#define TS8000_PID 0x1800
+#define TS6000_PID 0x1801
+#define TS5000_PID 0x1802
+#define MG3000_PID 0x180b
+#define E470_PID 0x180c
+#define G3000_PID 0x181d
 
 /* Generation 4 XML messages that encapsulates the Pixma protocol messages */
 #define XML_START_1   \
@@ -824,6 +836,7 @@ query_status (pixma_t * s)
   return error;
 }
 
+#if 0
 static int
 send_time (pixma_t * s)
 {
@@ -843,6 +856,7 @@ send_time (pixma_t * s)
   PDBG (pixma_dbg (3, "Sending time: '%s'\n", (char *) data));
   return pixma_exec (s, &mp->cb);
 }
+#endif
 
 /* TODO: Simplify this function. Read the whole data packet in one shot. */
 static int
@@ -945,11 +959,13 @@ handle_interrupt (pixma_t * s, int timeout)
    * tt: target
    * rr: scan resolution
    * poll event with 'scanimage -A' */
-  if (s->cfg->pid == MG6200_PID
+  if (s->cfg->pid == MG5400_PID
+      || s->cfg->pid == MG6200_PID
       || s->cfg->pid == MG6300_PID
       || s->cfg->pid == MX520_PID
       || s->cfg->pid == MX720_PID
-      || s->cfg->pid == MX920_PID)
+      || s->cfg->pid == MX920_PID
+      || s->cfg->pid == MB5000_PID)
   /* button no. in buf[7]
    * size in buf[10] 01=A4; 02=Letter; 08=10x15; 09=13x18; 0b=auto
    * format in buf[11] 01=JPEG; 02=TIFF; 03=PDF; 04=Kompakt-PDF
@@ -968,7 +984,10 @@ handle_interrupt (pixma_t * s, int timeout)
   {
     /* More than one event can be reported at the same time. */
     if (buf[3] & 1)
+      /* FIXME: This function makes trouble with a lot of scanners
       send_time (s);
+       */
+      PDBG (pixma_dbg (1, "WARNING:send_time() disabled!\n"));
     if (buf[9] & 2)
       query_status (s);
     if (buf[0] & 2)
@@ -1150,13 +1169,17 @@ post_process_image_data (pixma_t * s, pixma_imagebuf_t * ib)
               && s->cfg->pid != MX920_PID
               && s->cfg->pid != MG3100_PID
               && s->cfg->pid != MG3500_PID
+              && s->cfg->pid != MG3600_PID
               && s->cfg->pid != MG2100_PID
               && s->cfg->pid != MG5300_PID
+              && s->cfg->pid != MG5400_PID
               && s->cfg->pid != MG5500_PID
               && s->cfg->pid != MG6300_PID
               && s->cfg->pid != MG6400_PID
               && s->cfg->pid != MG7100_PID
-              && s->cfg->pid != MG7500_PID)
+              && s->cfg->pid != MG7500_PID
+              && s->cfg->pid != MG7700_PID
+              && s->cfg->pid != MB5000_PID)
               reorder_pixels (mp->linebuf, sptr, c, n, m, s->param->wx, line_size);
           
           /* Crop line to selected borders */
@@ -1828,6 +1851,19 @@ const pixma_config_t pixma_mp150_devices[] = {
   DEVICE ("Canon PIXMA MX490 Series", "MX490", MX490_PID, 600, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA E480 Series",  "E480",  E480_PID,  600, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA MG3600 Series", "MG3600", MG3600_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA MG7700 Series", "MG7700", MG7700_PID, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA MG6900 Series", "MG6900", MG6900_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA MG6800 Series", "MG6800", MG6800_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA MG5700 Series", "MG5700", MG5700_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+
+  /* Latest devices (2016) Generation 4 CIS */
+  DEVICE ("Canon PIXMA TS9000 Series", "TS9000", TS9000_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS8000 Series", "TS8000", TS8000_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS6000 Series", "TS6000", TS6000_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS5000 Series", "TS5000", TS5000_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA MG3000 Series", "MG3000", MG3000_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA E470 Series", "E470", E470_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA G4000 Series", "G3000", G3000_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
 
   END_OF_DEVICE_LIST
 };
diff --git a/backend/pixma_mp730.c b/backend/pixma_mp730.c
index 2184ff7..6bf3f42 100644
--- a/backend/pixma_mp730.c
+++ b/backend/pixma_mp730.c
@@ -1,6 +1,6 @@
 /* SANE - Scanner Access Now Easy.
 
-   Copyright (C) 2011-2015 Rolf Bensch <rolf at bensch hyphen online dot de>
+   Copyright (C) 2011-2016 Rolf Bensch <rolf at bensch hyphen online dot de>
    Copyright (C) 2007-2008 Nicolas Martin, <nicols-guest at alioth dot debian dot org>
    Copyright (C) 2006-2007 Wittawat Yamwong <wittawat@web.de>
 
@@ -63,13 +63,17 @@
 #define IMAGE_BLOCK_SIZE (0xc000)
 #define CMDBUF_SIZE 512
 
+#define MP10_PID 0x261f
+
 #define MP730_PID 0x262f
 #define MP700_PID 0x2630
 
+#define MP5_PID 0x2635          /* untested */
+
 #define MP360_PID 0x263c
 #define MP370_PID 0x263d
 #define MP390_PID 0x263e
-#define MP375R_PID 0x263f   /* untested */
+#define MP375R_PID 0x263f       /* untested */
 
 #define MP740_PID 0x264c	/* Untested */
 #define MP710_PID 0x264d
@@ -341,6 +345,8 @@ handle_interrupt (pixma_t * s, int timeout)
 	s->events = PIXMA_EV_BUTTON1;	/* color scan */
       break;
 
+    case MP5_PID:
+    case MP10_PID:
     case MP700_PID:
     case MP730_PID:
     case MP710_PID:
@@ -453,6 +459,10 @@ step1 (pixma_t * s)
           default:
             break;
         }
+
+      // ignore result from calibrate()
+      // don't interrupt @ PIXMA_STATUS_BUSY
+      error = 0;
     }
   if (error >= 0)
     error = activate (s, 0);
@@ -537,7 +547,9 @@ calc_raw_width (pixma_t * s, const pixma_scan_param_t * sp)
     {
       if (sp->depth == 8)   /* grayscale  */
         {
-          if (s->cfg->pid == MP700_PID ||
+          if (s->cfg->pid == MP5_PID   ||
+              s->cfg->pid == MP10_PID  ||
+              s->cfg->pid == MP700_PID ||
               s->cfg->pid == MP730_PID ||
               s->cfg->pid == MP360_PID ||
               s->cfg->pid == MP370_PID ||
@@ -566,8 +578,10 @@ mp730_check_param (pixma_t * s, pixma_scan_param_t * sp)
     {
       sp->depth=8;
     }
-  /* for MP360/370, MP700/730 in grayscale & lineart modes, max scan res is 600 dpi */
-  if (s->cfg->pid == MP700_PID ||
+  /* for MP5, MP10, MP360/370, MP700/730 in grayscale & lineart modes, max scan res is 600 dpi */
+  if (s->cfg->pid == MP5_PID   ||
+      s->cfg->pid == MP10_PID  ||
+      s->cfg->pid == MP700_PID ||
       s->cfg->pid == MP730_PID ||
       s->cfg->pid == MP360_PID ||
       s->cfg->pid == MP370_PID ||
@@ -737,19 +751,23 @@ mp730_finish_scan (pixma_t * s)
       query_status (s);
       activate (s, 0);
 
-      if (! aborted && s->cfg->pid == IR1020_PID)
-	{
-	  error = abort_session (s);
-	  if (error < 0)
-	    {
-	      PDBG (pixma_dbg
-		    (1, "WARNING:abort_session() failed %s\n",
-		     pixma_strerror (error)));
-	      query_status (s);
-	      query_status (s);
-	      activate (s, 0);
-	    }
-	}
+      // MF57x0 devices don't require abort_session() after the last page
+      if (!aborted &&
+          (s->param->source == PIXMA_SOURCE_ADF ||
+           s->param->source == PIXMA_SOURCE_ADFDUP) &&
+           has_paper (s) &&
+           (s->cfg->pid == MF5730_PID ||
+            s->cfg->pid == MF5750_PID ||
+            s->cfg->pid == MF5770_PID ||
+            s->cfg->pid == IR1020_PID))
+      {
+        error = abort_session (s);
+        if (error < 0)
+          PDBG (pixma_dbg
+                (1, "WARNING:abort_session() failed %s\n",
+                 pixma_strerror (error)));
+      }
+
       mp->buf = mp->lbuf = mp->imgbuf = NULL;
       mp->state = state_idle;
       /* fall through */
@@ -808,6 +826,8 @@ static const pixma_scan_ops_t pixma_mp730_ops = {
 }
 const pixma_config_t pixma_mp730_devices[] = {
 /* TODO: check area limits */
+  DEVICE ("PIXUS MP5/SmartBase MPC190/imageCLASS MPC190","MP5", MP5_PID, 600, 636, 868, PIXMA_CAP_LINEART),/* color scan can do 600x1200 */
+  DEVICE ("PIXUS MP10/SmartBase MPC200/imageCLASS MPC200","MP10", MP10_PID, 600, 636, 868, PIXMA_CAP_LINEART),/* color scan can do 600x1200 */
   DEVICE ("PIXMA MP360", "MP360", MP360_PID, 1200, 636, 868, PIXMA_CAP_LINEART),
   DEVICE ("PIXMA MP370", "MP370", MP370_PID, 1200, 636, 868, PIXMA_CAP_LINEART),
   DEVICE ("PIXMA MP375R", "MP375R", MP375R_PID, 1200, 636, 868, PIXMA_CAP_LINEART),
diff --git a/backend/pixma_mp750.c b/backend/pixma_mp750.c
index 8d2d94c..c5ac335 100644
--- a/backend/pixma_mp750.c
+++ b/backend/pixma_mp750.c
@@ -1,6 +1,6 @@
 /* SANE - Scanner Access Now Easy.
 
-   Copyright (C) 2011-2015 Rolf Bensch <rolf at bensch hyphen online dot de>
+   Copyright (C) 2011-2016 Rolf Bensch <rolf at bensch hyphen online dot de>
    Copyright (C) 2006-2007 Wittawat Yamwong <wittawat@web.de>
 
    This file is part of the SANE package.
diff --git a/backend/pixma_mp810.c b/backend/pixma_mp810.c
index 5f9043e..b03bebc 100644
--- a/backend/pixma_mp810.c
+++ b/backend/pixma_mp810.c
@@ -1,6 +1,6 @@
 /* SANE - Scanner Access Now Easy.
 
- Copyright (C) 2011-2015 Rolf Bensch <rolf at bensch hyphen online dot de>
+ Copyright (C) 2011-2016 Rolf Bensch <rolf at bensch hyphen online dot de>
  Copyright (C) 2007-2009 Nicolas Martin, <nicols-guest at alioth dot debian dot org>
  Copyright (C) 2006-2007 Wittawat Yamwong <wittawat@web.de>
 
@@ -1009,6 +1009,7 @@ static int query_status (pixma_t * s)
   return error;
 }
 
+#if 0
 static int send_time (pixma_t * s)
 {
   /* Why does a scanner need a time? */
@@ -1025,6 +1026,7 @@ static int send_time (pixma_t * s)
   PDBG(pixma_dbg (3, "Sending time: '%s'\n", (char *) data));
   return pixma_exec (s, &mp->cb);
 }
+#endif
 
 /* TODO: Simplify this function. Read the whole data packet in one shot. */
 static int read_image_block (pixma_t * s, uint8_t * header, uint8_t * data)
@@ -1157,7 +1159,10 @@ static int handle_interrupt (pixma_t * s, int timeout)
   {
     /* More than one event can be reported at the same time. */
     if (buf[3] & 1)
-      send_time (s);    /* FIXME: some scanners hang here */
+      /* FIXME: This function makes trouble with a lot of scanners
+      send_time (s);
+       */
+      PDBG (pixma_dbg (1, "WARNING:send_time() disabled!\n"));
     if (buf[9] & 2)
       query_status (s);
 
diff --git a/backend/pixma_sane_options.c b/backend/pixma_sane_options.c
index 890b3ff..2e4a054 100644
--- a/backend/pixma_sane_options.c
+++ b/backend/pixma_sane_options.c
@@ -7,6 +7,8 @@ static const SANE_Range constraint_threshold =
   { 0,100,1 };
 static const SANE_Range constraint_threshold_curve = 
   { 0,127,1 };
+static const SANE_Range constraint_adf_wait = 
+  { 0,3600,1 };
 
 
 static
@@ -340,6 +342,21 @@ int build_option_descriptors(struct pixma_sane_t *ss)
   sod->constraint.range = &constraint_threshold_curve;
   OPT_IN_CTX[opt_threshold_curve].info = 0;
 
+  opt = &(OPT_IN_CTX[opt_adf_wait]);
+  sod = &opt->sod;
+  sod->type = SANE_TYPE_INT;
+  sod->title = SANE_I18N("ADF Waiting Time");
+  sod->desc = SANE_I18N("When set, the scanner searches the waiting time in seconds for a new document inserted into the automatic document feeder.");
+  sod->name = "adf-wait";
+  sod->unit = SANE_UNIT_NONE;
+  sod->size = 1 * sizeof(SANE_Word);
+  sod->cap  = SANE_CAP_SOFT_SELECT|SANE_CAP_SOFT_DETECT|SANE_CAP_AUTOMATIC|SANE_CAP_INACTIVE;
+  sod->constraint_type = SANE_CONSTRAINT_RANGE;
+  sod->constraint.range = &constraint_adf_wait;
+  OPT_IN_CTX[opt_adf_wait].info = 0;
+  opt->def.w = 0;
+  opt->val.w = 0;
+
   return 0;
 
 }
diff --git a/backend/pixma_sane_options.h b/backend/pixma_sane_options.h
index ccc9e34..669a234 100644
--- a/backend/pixma_sane_options.h
+++ b/backend/pixma_sane_options.h
@@ -35,6 +35,7 @@ typedef enum {
   opt__group_5,
   opt_threshold,
   opt_threshold_curve,
+  opt_adf_wait,
   opt_last
 } option_t;
 
diff --git a/backend/plustek.c b/backend/plustek.c
index cd83c26..062df37 100644
--- a/backend/plustek.c
+++ b/backend/plustek.c
@@ -416,21 +416,21 @@ sig_chldhandler( int signo )
 
 /** signal handler to kill the child process
  */
-static RETSIGTYPE
+static void
 reader_process_sigterm_handler( int signo )
 {
 	DBG( _DBG_PROC, "(SIG) reader_process: terminated by signal %d\n", signo );
 	_exit( SANE_STATUS_GOOD );
 }
 
-static RETSIGTYPE
+static void
 usb_reader_process_sigterm_handler( int signo )
 {
 	DBG( _DBG_PROC, "(SIG) reader_process: terminated by signal %d\n", signo );
 	cancelRead = SANE_TRUE;
 }
 
-static RETSIGTYPE
+static void
 sigalarm_handler( int signo )
 {
 	_VAR_NOT_USED( signo );
@@ -572,7 +572,7 @@ do_cancel( Plustek_Scanner *scanner, SANE_Bool closepipe )
 	DBG( _DBG_PROC,"do_cancel\n" );
 	scanner->scanning = SANE_FALSE;
 
-	if( scanner->reader_pid != -1 ) {
+	if( sanei_thread_is_valid (scanner->reader_pid) ) {
 
 		DBG( _DBG_PROC, ">>>>>>>> killing reader_process <<<<<<<<\n" );
 
@@ -2629,7 +2629,7 @@ sane_start( SANE_Handle handle )
 
 	cancelRead = SANE_FALSE;
 	
-	if( s->reader_pid == -1 ) {
+	if( !sanei_thread_is_valid (s->reader_pid) ) {
 		DBG( _DBG_ERROR, "ERROR: could not start reader task\n" );
 		s->scanning = SANE_FALSE;
 		usbDev_close( dev );
diff --git a/backend/plustek_pp.c b/backend/plustek_pp.c
index bf4c0d0..f48c3dc 100644
--- a/backend/plustek_pp.c
+++ b/backend/plustek_pp.c
@@ -348,13 +348,13 @@ static void sig_chldhandler( int signo )
 
 /** signal handler to kill the child process
  */
-static RETSIGTYPE reader_process_sigterm_handler( int signo )
+static void reader_process_sigterm_handler( int signo )
 {
 	DBG( _DBG_PROC, "reader_process: terminated by signal %d\n", signo );
 	_exit( SANE_STATUS_GOOD );
 }
 
-static RETSIGTYPE sigalarm_handler( int signo )
+static void sigalarm_handler( int signo )
 {
 	_VAR_NOT_USED( signo );
 	DBG( _DBG_PROC, "ALARM!!!\n" );
@@ -471,7 +471,7 @@ static SANE_Status do_cancel( Plustek_Scanner *scanner, SANE_Bool closepipe  )
 
 	scanner->scanning = SANE_FALSE;
 
-	if( scanner->reader_pid != -1 ) {
+	if( sanei_thread_is_valid( scanner->reader_pid )) {
 
 		DBG( _DBG_PROC, ">>>>>>>> killing reader_process <<<<<<<<\n" );
 
@@ -2014,7 +2014,7 @@ SANE_Status sane_start( SANE_Handle handle )
 	s->w_pipe     = fds[1];
 	s->reader_pid = sanei_thread_begin( reader_process, s );
 
-	if( s->reader_pid == -1 ) {
+	if(!sanei_thread_is_valid( s->reader_pid )) {
 		DBG( _DBG_ERROR, "ERROR: could not create child process\n" );
 		s->scanning = SANE_FALSE;
 		s->hw->close( s->hw );
diff --git a/backend/pnm.c b/backend/pnm.c
index b8d3192..ff4e2f2 100644
--- a/backend/pnm.c
+++ b/backend/pnm.c
@@ -649,7 +649,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
   v = 75;
 
   DBG (2, "sane_control_option: handle=%p, opt=%d, act=%d, val=%p, info=%p\n",
-       handle, option, action, value, info);
+       handle, option, action, value, (void *) info);
 
   if (handle != MAGIC || !is_open)
     {
diff --git a/backend/rts8891.c b/backend/rts8891.c
index bdb4011..0eaff7b 100644
--- a/backend/rts8891.c
+++ b/backend/rts8891.c
@@ -617,7 +617,7 @@ set_automatic_value (Rts8891_Session * s, int option, SANE_Int * myinfo)
 {
   SANE_Status status = SANE_STATUS_GOOD;
   SANE_Int i, min;
-  SANE_Word *dpi_list;
+  const SANE_Word *dpi_list;
 
   switch (option)
     {
@@ -639,7 +639,7 @@ set_automatic_value (Rts8891_Session * s, int option, SANE_Int * myinfo)
       break;
     case OPT_RESOLUTION:
       /* we set up to the lowest available dpi value */
-      dpi_list = (SANE_Word *) s->opt[OPT_RESOLUTION].constraint.word_list;
+      dpi_list = s->opt[OPT_RESOLUTION].constraint.word_list;
       min = 65536;
       for (i = 1; i < dpi_list[0]; i++)
 	{
@@ -2233,11 +2233,11 @@ sane_close (SANE_Handle handle)
   if (session->dev->model->gamma != session->val[OPT_GAMMA_VECTOR_B].wa)
     free (session->val[OPT_GAMMA_VECTOR_B].wa);
   free (session->val[OPT_MODE].s);
-  free (session->opt[OPT_RESOLUTION].constraint.word_list);
+  free ((void *) session->opt[OPT_RESOLUTION].constraint.word_list);
   for (i = OPT_BUTTON_1; i <= OPT_BUTTON_11; i++)
     {
-      free (session->opt[i].name);
-      free (session->opt[i].title);
+      free ((void *) session->opt[i].name);
+      free ((void *) session->opt[i].title);
     }
 
   free (session);
@@ -7702,7 +7702,7 @@ park_head (struct Rts8891_Device *dev, SANE_Bool wait)
   sanei_rts88xx_read_reg (dev->devnum, CONTROLER_REG, &reg);
   if (reg != 0x20)
     {
-      DBG (DBG_warn, "park_head: unexpected controler value 0x%02x\n", reg);
+      DBG (DBG_warn, "park_head: unexpected controller value 0x%02x\n", reg);
     }
 
   /* head parking */
diff --git a/backend/rts88xx_lib.c b/backend/rts88xx_lib.c
index bbbc83a..8e921f2 100644
--- a/backend/rts88xx_lib.c
+++ b/backend/rts88xx_lib.c
@@ -686,7 +686,7 @@ sanei_rts88xx_setup_nvram (SANE_Int devnum, SANE_Int length,
   if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_error,
-           "sanei_rts88xx_setup_nvram : controler register write failed\n");
+           "sanei_rts88xx_setup_nvram : controller register write failed\n");
       return status;
     }
   reg = 1;
@@ -694,7 +694,7 @@ sanei_rts88xx_setup_nvram (SANE_Int devnum, SANE_Int length,
   if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_error,
-           "sanei_rts88xx_setup_nvram : controler register write failed\n");
+           "sanei_rts88xx_setup_nvram : controller register write failed\n");
       return status;
     }
   return status;
diff --git a/backend/sharp.c b/backend/sharp.c
index 1225a57..69f5000 100644
--- a/backend/sharp.c
+++ b/backend/sharp.c
@@ -370,7 +370,7 @@ sense_handler(int __sane_unused__ fd, u_char *sense_buffer, void *s)
                 DBG(10, "error: invalid field in parameter list\n");
                 return SANE_STATUS_IO_ERROR;
               case 0x29:
-                DBG(10, "note: reset occured\n");
+                DBG(10, "note: reset occurred\n");
                 return SANE_STATUS_GOOD;
               case 0x2a:
                 DBG(10, "note: mode parameter change\n");
@@ -495,7 +495,7 @@ sense_handler(int __sane_unused__ fd, u_char *sense_buffer, void *s)
                 switch (add_sense_code)
                   {
                     case 0x29:
-                      DBG(5, "unit attention: reset occured\n");
+                      DBG(5, "unit attention: reset occurred\n");
                       return SANE_STATUS_GOOD;
                     case 0x2a:
                       DBG(5, "unit attention: parameter changed by "
@@ -3299,7 +3299,7 @@ send_threshold_data(SHARP_Scanner *s)
 SANE_Status
 sane_start (SANE_Handle handle)
 {
-  char *mode, *halftone, *paper, *gamma, *edge, *lightcolor, *adf_fsu;
+  char *mode, *halftone, *gamma, *edge, *lightcolor, *adf_fsu;
   SHARP_Scanner *s = handle;
   SANE_Status status;
   size_t buf_size;
@@ -3436,7 +3436,6 @@ sane_start (SANE_Handle handle)
 
   mode = s->val[OPT_MODE].s;
   halftone = s->val[OPT_HALFTONE].s;
-  paper = s->val[OPT_PAPER].s;
   gamma = s->val[OPT_GAMMA].s;
   edge = s->val[OPT_EDGE_EMPHASIS].s;
   lightcolor = s->val[OPT_LIGHTCOLOR].s;
diff --git a/backend/sm3600.c b/backend/sm3600.c
index dd1f31f..908e8be 100644
--- a/backend/sm3600.c
+++ b/backend/sm3600.c
@@ -73,7 +73,7 @@ Start: 2.4.2001
 #include "../include/sane/saneopts.h"
 #include "../include/sane/sanei_usb.h"
 
-#undef HAVE_LIBUSB
+#undef HAVE_LIBUSB_LEGACY
 
 /* prevent inclusion of scantool.h */
 #define SCANTOOL_H
@@ -431,13 +431,11 @@ sane_exit (void)
 
 SANE_Status
 sane_get_devices (const SANE_Device *** device_list,
-		  SANE_Bool local_only)
+		  SANE_Bool __sane_unused__ local_only)
 {
   TDevice *dev;
   int i;
 
-  local_only = TRUE; /* Avoid compile warning */
-
   if (devlist) free (devlist);
 
   devlist = malloc ((num_devices + 1) * sizeof (devlist[0]));
@@ -458,7 +456,6 @@ sane_open (SANE_String_Const devicename, SANE_Handle *handle)
 {
   TDevice    *pdev;
   TInstance  *this;
-  SANE_Status rc;
   DBG(DEBUG_VERBOSE,"opening %s\n",devicename);
   if (devicename[0]) /* selected */
     {
@@ -488,8 +485,6 @@ DBG(DEBUG_VERBOSE,"%s<>%s\n",devicename, pdev->sane.name);
   if (sanei_usb_open (devicename, &this->hScanner) != SANE_STATUS_GOOD)
     return SetError (this, SANE_STATUS_IO_ERROR, "cannot open scanner device");
 
-  rc = SANE_STATUS_GOOD;
-
   this->quality=fast;
   return InitOptions(this);
 }
diff --git a/backend/sm3840.c b/backend/sm3840.c
index 41b72ec..41b72ec 100755..100644
--- a/backend/sm3840.c
+++ b/backend/sm3840.c
diff --git a/backend/sm3840.h b/backend/sm3840.h
index abcd1b7..abcd1b7 100755..100644
--- a/backend/sm3840.h
+++ b/backend/sm3840.h
diff --git a/backend/sm3840_lib.c b/backend/sm3840_lib.c
index 485003c..163b356 100755..100644
--- a/backend/sm3840_lib.c
+++ b/backend/sm3840_lib.c
@@ -191,12 +191,12 @@ find_device (unsigned int idVendor, unsigned int idProduct)
 static void
 idle_ab (p_usb_dev_handle udev)
 {
-  int len, i;
+  int i;
   unsigned char buff[8] = { 0x64, 0x65, 0x16, 0x17, 0x64, 0x65, 0x44, 0x45 };
   for (i = 0; i < 8; i++)
     {
-      len = usb_control_msg (udev, 0x40, 0x0c, 0x0090, 0x0000, buff + i,
-			     0x0001, wr_timeout);
+      usb_control_msg (udev, 0x40, 0x0c, 0x0090, 0x0000, buff + i,
+                       0x0001, wr_timeout);
     }
 }
 
@@ -208,7 +208,7 @@ write_regs (p_usb_dev_handle udev, int regs, unsigned char reg1,
 {
   unsigned char buff[512];
   va_list marker;
-  int len, i;
+  int i;
 
   va_start (marker, val1);
   buff[0] = reg1;
@@ -220,8 +220,8 @@ write_regs (p_usb_dev_handle udev, int regs, unsigned char reg1,
     }
   va_end (marker);
 
-  len = usb_control_msg (udev, 0x40, 0x04, 0x00b0, 0x0000, buff,
-			 regs * 2, wr_timeout);
+  usb_control_msg (udev, 0x40, 0x04, 0x00b0, 0x0000, buff,
+                   regs * 2, wr_timeout);
 }
 
 static int
@@ -297,7 +297,6 @@ record_line (int reset,
 	     unsigned char **save_dpi1200_remap,
 	     unsigned char **save_color_remap)
 {
-  int len;
   unsigned char *scan_line, *dpi1200_remap;
   unsigned char *color_remap;
   int i;
@@ -374,7 +373,7 @@ record_line (int reset,
 
   while (1)
     {				/* We'll exit inside the loop... */
-      len = usb_bulk_read (udev, 1, scan_line, linelen, rd_timeout);
+      usb_bulk_read (udev, 1, scan_line, linelen, rd_timeout);
       if (dpi == 1200)
 	{
 	  ptrcur = dpi1200_remap + (linelen * (i % DPI1200SHUFFLE));
@@ -886,7 +885,6 @@ download_lut8 (p_usb_dev_handle udev, int dpi, int incolor)
     4.40306800664567E-31
   };
   unsigned char *lut;
-  int len;
 
   DBG (2, "+download_lut8\n");
   switch (dpi)
@@ -904,7 +902,7 @@ download_lut8 (p_usb_dev_handle udev, int dpi, int incolor)
 	  write_regs (udev, 6, 0xb0, 0x00, 0xb1, 0x20, 0xb2, 0x07, 0xb3, 0xff,
 		      0xb4, 0x2f, 0xb5, 0x07);
 	  write_vctl (udev, 0x0c, 0x0002, 0x1000, 0x00);
-	  len = usb_bulk_write (udev, 2, lut, 4096, wr_timeout);
+	  usb_bulk_write (udev, 2, lut, 4096, wr_timeout);
 	}
       else
 	{
@@ -912,15 +910,15 @@ download_lut8 (p_usb_dev_handle udev, int dpi, int incolor)
 	  write_regs (udev, 6, 0xb0, 0x00, 0xb1, 0x10, 0xb2, 0x07, 0xb3, 0xff,
 		      0xb4, 0x1f, 0xb5, 0x07);
 	  write_vctl (udev, 0x0c, 0x0002, 0x1000, 0x00);
-	  len = usb_bulk_write (udev, 2, lut, 4096, wr_timeout);
+	  usb_bulk_write (udev, 2, lut, 4096, wr_timeout);
 	  write_regs (udev, 6, 0xb0, 0x00, 0xb1, 0x20, 0xb2, 0x07, 0xb3, 0xff,
 		      0xb4, 0x2f, 0xb5, 0x07);
 	  write_vctl (udev, 0x0c, 0x0002, 0x1000, 0x00);
-	  len = usb_bulk_write (udev, 2, lut, 4096, wr_timeout);
+	  usb_bulk_write (udev, 2, lut, 4096, wr_timeout);
 	  write_regs (udev, 6, 0xb0, 0x00, 0xb1, 0x30, 0xb2, 0x07, 0xb3, 0xff,
 		      0xb4, 0x3f, 0xb5, 0x07);
 	  write_vctl (udev, 0x0c, 0x0002, 0x1000, 0x00);
-	  len = usb_bulk_write (udev, 2, lut, 4096, wr_timeout);
+	  usb_bulk_write (udev, 2, lut, 4096, wr_timeout);
 	}
       break;
 
@@ -936,7 +934,7 @@ download_lut8 (p_usb_dev_handle udev, int dpi, int incolor)
 	  write_regs (udev, 6, 0xb0, 0x00, 0xb1, 0x40, 0xb2, 0x06, 0xb3, 0xff,
 		      0xb4, 0x5f, 0xb5, 0x06);
 	  write_vctl (udev, 0x0c, 0x0002, 0x2000, 0x00);
-	  len = usb_bulk_write (udev, 2, lut, 8192, wr_timeout);
+	  usb_bulk_write (udev, 2, lut, 8192, wr_timeout);
 	}
       else
 	{
@@ -944,15 +942,15 @@ download_lut8 (p_usb_dev_handle udev, int dpi, int incolor)
 	  write_regs (udev, 6, 0xb0, 0x00, 0xb1, 0x20, 0xb2, 0x06, 0xb3, 0xff,
 		      0xb4, 0x3f, 0xb5, 0x06);
 	  write_vctl (udev, 0x0c, 0x0002, 0x2000, 0x00);
-	  len = usb_bulk_write (udev, 2, lut, 8192, wr_timeout);
+	  usb_bulk_write (udev, 2, lut, 8192, wr_timeout);
 	  write_regs (udev, 6, 0xb0, 0x00, 0xb1, 0x40, 0xb2, 0x06, 0xb3, 0xff,
 		      0xb4, 0x5f, 0xb5, 0x06);
 	  write_vctl (udev, 0x0c, 0x0002, 0x2000, 0x00);
-	  len = usb_bulk_write (udev, 2, lut, 8192, wr_timeout);
+	  usb_bulk_write (udev, 2, lut, 8192, wr_timeout);
 	  write_regs (udev, 6, 0xb0, 0x00, 0xb1, 0x60, 0xb2, 0x06, 0xb3, 0xff,
 		      0xb4, 0x7f, 0xb5, 0x06);
 	  write_vctl (udev, 0x0c, 0x0002, 0x2000, 0x00);
-	  len = usb_bulk_write (udev, 2, lut, 8192, wr_timeout);
+	  usb_bulk_write (udev, 2, lut, 8192, wr_timeout);
 	}
       break;
     }
diff --git a/backend/sm3840_lib.h b/backend/sm3840_lib.h
index 2ca65a8..2ca65a8 100755..100644
--- a/backend/sm3840_lib.h
+++ b/backend/sm3840_lib.h
diff --git a/backend/sm3840_scan.c b/backend/sm3840_scan.c
index e9442a7..148e37b 100755..100644
--- a/backend/sm3840_scan.c
+++ b/backend/sm3840_scan.c
@@ -158,7 +158,6 @@ setup_scan (p_usb_dev_handle udev, SM3840_Params * p)
   int scanlines = p->scanlines;
   int leftpix = p->leftpix;
   int scanpix = p->scanpix;
-  int len;
   unsigned char hello[2] = { 0x55, 0xaa };
   unsigned char howdy[3];
   unsigned short *whitebalance;
@@ -182,11 +181,11 @@ setup_scan (p_usb_dev_handle udev, SM3840_Params * p)
   char fname[64];
   char head[128];
 
-  len = usb_set_configuration (udev, 1);
-  len = usb_claim_interface (udev, 0);
-  len = usb_clear_halt (udev, 1);
-  len = usb_clear_halt (udev, 2);
-  len = usb_clear_halt (udev, 3);
+  usb_set_configuration (udev, 1);
+  usb_claim_interface (udev, 0);
+  usb_clear_halt (udev, 1);
+  usb_clear_halt (udev, 2);
+  usb_clear_halt (udev, 3);
 #endif
   DBG (2, "params.gray = %d;\n", p->gray);
   DBG (2, "params.dpi = %d\n", p->dpi);
@@ -255,12 +254,12 @@ setup_scan (p_usb_dev_handle udev, SM3840_Params * p)
   write_regs (udev, 1, 0xb1, 0x00);
   write_regs (udev, 1, 0xb2, 0x00);
   write_vctl (udev, 0x0c, 0x0002, 0x0002, 0x00);
-  len = usb_bulk_write (udev, 2, hello, 2, wr_timeout);
+  usb_bulk_write (udev, 2, hello, 2, wr_timeout);
   write_regs (udev, 1, 0xb0, 0x00);
   write_regs (udev, 1, 0xb1, 0x00);
   write_regs (udev, 1, 0xb2, 0x00);
   write_vctl (udev, 0x0c, 0x0003, 0x0003, 0x00);
-  len = usb_bulk_read (udev, 1, howdy, 3, rd_timeout);
+  usb_bulk_read (udev, 1, howdy, 3, rd_timeout);
   write_regs (udev, 4, 0x83, 0x00, 0xa3, 0x00, 0xa4, 0x00, 0x97, 0x0a);
   write_vctl (udev, 0x0c, 0x0004, 0x008b, 0x00);
   read_vctl (udev, 0x0c, 0x0007, 0x0000, &rd_byte);
@@ -318,9 +317,8 @@ setup_scan (p_usb_dev_handle udev, SM3840_Params * p)
     write_regs (udev, 6, 0xb0, 0x00, 0xb1, 0x40, 0xb2, 0x07, 0xb3, 0xff, 0xb4,
 		0x7f, 0xb5, 0x07);
   write_vctl (udev, 0x0c, 0x0002, whitemapsize, 0x00);
-  len =
-    usb_bulk_write (udev, 2, (unsigned char *) whitemap, whitemapsize,
-		    wr_timeout);
+  usb_bulk_write (udev, 2, (unsigned char *) whitemap, whitemapsize,
+                  wr_timeout);
 
   set_lightmap_white (whitemap, dpi, 1);
   if (dpi == 1200)
@@ -330,9 +328,8 @@ setup_scan (p_usb_dev_handle udev, SM3840_Params * p)
     write_regs (udev, 6, 0xb0, 0x00, 0xb1, 0x80, 0xb2, 0x07, 0xb3, 0xff, 0xb4,
 		0xbf, 0xb5, 0x07);
   write_vctl (udev, 0x0c, 0x0002, whitemapsize, 0x00);
-  len =
-    usb_bulk_write (udev, 2, (unsigned char *) whitemap, whitemapsize,
-		    wr_timeout);
+  usb_bulk_write (udev, 2, (unsigned char *) whitemap, whitemapsize,
+                  wr_timeout);
 
   set_lightmap_white (whitemap, dpi, 2);
   if (dpi == 1200)
@@ -342,9 +339,8 @@ setup_scan (p_usb_dev_handle udev, SM3840_Params * p)
     write_regs (udev, 6, 0xb0, 0x00, 0xb1, 0xc0, 0xb2, 0x07, 0xb3, 0xff, 0xb4,
 		0xff, 0xb5, 0x07);
   write_vctl (udev, 0x0c, 0x0002, whitemapsize, 0x00);
-  len =
-    usb_bulk_write (udev, 2, (unsigned char *) whitemap, whitemapsize,
-		    wr_timeout);
+  usb_bulk_write (udev, 2, (unsigned char *) whitemap, whitemapsize,
+                  wr_timeout);
 
   free (whitemap);
 
@@ -391,11 +387,10 @@ setup_scan (p_usb_dev_handle udev, SM3840_Params * p)
   write_regs (udev, 1, 0xbe, 0x0d);
   write_vctl (udev, 0x0c, 0x0003, 0x0001, 0x00);
   whitebalance = (unsigned short *) malloc (whitebalancesize);
-  len = usb_bulk_read (udev, 1, &rd_byte, 1, rd_timeout);
+  usb_bulk_read (udev, 1, &rd_byte, 1, rd_timeout);
   write_vctl (udev, 0x0c, 0x0001, 0x0000, 0x00);
-  len =
-    usb_bulk_read (udev, 1, (unsigned char *) whitebalance, whitebalancesize,
-		   rd_timeout);
+  usb_bulk_read (udev, 1, (unsigned char *) whitebalance, whitebalancesize,
+                 rd_timeout);
   write_regs (udev, 2, 0xbe, 0x00, 0x84, 0x00);
   write_vctl (udev, 0x0c, 0x00c0, 0x8406, 0x00);
   write_vctl (udev, 0x0c, 0x00c0, 0x0406, 0x00);
@@ -419,11 +414,10 @@ setup_scan (p_usb_dev_handle udev, SM3840_Params * p)
 		  0xbf, 0x00, 0x90, 0x40, 0x91, 0x00, 0x83, 0x82);
       write_regs (udev, 1, 0xbe, 0x0d);
       write_vctl (udev, 0x0c, 0x0003, 0x0001, 0x00);
-      len = usb_bulk_read (udev, 1, &rd_byte, 1, rd_timeout);
+      usb_bulk_read (udev, 1, &rd_byte, 1, rd_timeout);
       write_vctl (udev, 0x0c, 0x0001, 0x0000, 0x00);
-      len =
-	usb_bulk_read (udev, 1, (unsigned char *) whitebalance,
-		       whitebalancesize, rd_timeout);
+      usb_bulk_read (udev, 1, (unsigned char *) whitebalance,
+                     whitebalancesize, rd_timeout);
       fix_endian_short (whitebalance, whitebalancesize/2);
       if (!donered)
 	{
@@ -485,11 +479,10 @@ setup_scan (p_usb_dev_handle udev, SM3840_Params * p)
 		  0xbf, 0x00, 0x90, 0x40, 0x91, 0x00, 0x83, 0x82);
       write_regs (udev, 1, 0xbe, 0x0d);
       write_vctl (udev, 0x0c, 0x0003, 0x0001, 0x00);
-      len = usb_bulk_read (udev, 1, &rd_byte, 1, rd_timeout);
+      usb_bulk_read (udev, 1, &rd_byte, 1, rd_timeout);
       write_vctl (udev, 0x0c, 0x0001, 0x0000, 0x00);
-      len =
-	usb_bulk_read (udev, 1, (unsigned char *) whitebalance,
-		       whitebalancesize, rd_timeout);
+      usb_bulk_read (udev, 1, (unsigned char *) whitebalance,
+                     whitebalancesize, rd_timeout);
       fix_endian_short (whitebalance, whitebalancesize/2);
       if (!donered)
 	{
@@ -601,7 +594,7 @@ setup_scan (p_usb_dev_handle udev, SM3840_Params * p)
 	      0x00, 0x90, 0x40, 0x91, 0x00, 0x83, 0x82);
   write_regs (udev, 1, 0xbe, 0x1d);
   write_vctl (udev, 0x0c, 0x0003, 0x0001, 0x00);
-  len = usb_bulk_read (udev, 1, &rd_byte, 1, rd_timeout);
+  usb_bulk_read (udev, 1, &rd_byte, 1, rd_timeout);
   write_vctl (udev, 0x0c, 0x0001, 0x0000, 0x00);
   record_mem (udev, (unsigned char **) (void *)&whitescan,
 	      (5632 * 2 * 3 * (dpi == 1200 ? 2 : 1)) * 4);
@@ -756,9 +749,8 @@ setup_scan (p_usb_dev_handle udev, SM3840_Params * p)
     write_regs (udev, 6, 0xb0, 0x00, 0xb1, 0x40, 0xb2, 0x07, 0xb3, 0xff, 0xb4,
 		0x7f, 0xb5, 0x07);
   write_vctl (udev, 0x0c, 0x0002, whitemapsize, 0x00);
-  len =
-    usb_bulk_write (udev, 2, (unsigned char *) lightmap, whitemapsize,
-		    wr_timeout);
+  usb_bulk_write (udev, 2, (unsigned char *) lightmap, whitemapsize,
+                  wr_timeout);
 
   calc_lightmap (whitescan, lightmap, 1, dpi, gain, offset);
   if (dpi == 1200)
@@ -772,9 +764,8 @@ setup_scan (p_usb_dev_handle udev, SM3840_Params * p)
   if (gray)
     for (i = 0; i < whitemapsize / 2; i++)
       lightmap[i] |= GRAYMASK;
-  len =
-    usb_bulk_write (udev, 2, (unsigned char *) lightmap, whitemapsize,
-		    wr_timeout);
+  usb_bulk_write (udev, 2, (unsigned char *) lightmap, whitemapsize,
+                  wr_timeout);
 
   calc_lightmap (whitescan, lightmap, 2, dpi, gain, offset);
   if (dpi == 1200)
@@ -784,9 +775,8 @@ setup_scan (p_usb_dev_handle udev, SM3840_Params * p)
     write_regs (udev, 6, 0xb0, 0x00, 0xb1, 0xc0, 0xb2, 0x07, 0xb3, 0xff, 0xb4,
 		0xff, 0xb5, 0x07);
   write_vctl (udev, 0x0c, 0x0002, whitemapsize, 0x00);
-  len =
-    usb_bulk_write (udev, 2, (unsigned char *) lightmap, whitemapsize,
-		    wr_timeout);
+  usb_bulk_write (udev, 2, (unsigned char *) lightmap, whitemapsize,
+                  wr_timeout);
 
   free (whitescan);
   free (lightmap);
@@ -922,7 +912,7 @@ setup_scan (p_usb_dev_handle udev, SM3840_Params * p)
   else
     write_regs (udev, 1, 0xbe, 0x0d);
   write_vctl (udev, 0x0c, 0x0003, 0x0001, 0x00);
-  len = usb_bulk_read (udev, 1, &rd_byte, 1, rd_timeout);
+  usb_bulk_read (udev, 1, &rd_byte, 1, rd_timeout);
   write_vctl (udev, 0x0c, 0x0001, 0x0000, 0x00);
 
 #ifndef BACKENDNAME
diff --git a/backend/snapscan-mutex.c b/backend/snapscan-mutex.c
index 0321741..ad0538a 100644
--- a/backend/snapscan-mutex.c
+++ b/backend/snapscan-mutex.c
@@ -44,7 +44,7 @@
 #include <OS.h>
 #define snapscan_mutex_t sem_id
 
-static int snapscani_mutex_open(snapscan_mutex_t* a_sem, const char* dev UNUSEDARG)
+static int snapscani_mutex_open(snapscan_mutex_t* a_sem, const char* dev __sane_unused__)
 {
     *a_sem = create_sem(1, "snapscan_mutex");
     return 1;
@@ -72,7 +72,7 @@ static void snapscani_mutex_unlock(snapscan_mutex_t* a_sem)
 #include <pthread.h>
 #define snapscan_mutex_t pthread_mutex_t
 
-static int snapscani_mutex_open(snapscan_mutex_t* sem_id, const char* dev UNUSEDARG)
+static int snapscani_mutex_open(snapscan_mutex_t* sem_id, const char* dev __sane_unused__)
 {
     pthread_mutex_init(sem_id, NULL);
     return 1;
diff --git a/backend/snapscan-sources.c b/backend/snapscan-sources.c
index 63eadb2..dc78394 100644
--- a/backend/snapscan-sources.c
+++ b/backend/snapscan-sources.c
@@ -105,10 +105,6 @@ I hope this makes sense to you (and I got the right idea of the original author'
 intention).
 ***********************************************************************************/
 
-#ifndef __FUNCTION__
-#define __FUNCTION__ "(undef)"
-#endif
-
 static SANE_Status Source_init (Source *pself,
                                 SnapScan_Scanner *pss,
                                 SourceRemaining remaining,
@@ -266,13 +262,13 @@ static SANE_Status FDSource_get (Source *pself, SANE_Byte *pbuf, SANE_Int *plen)
             }
             /* It's an IO error */
             DBG (DL_MAJOR_ERROR, "%s: read failed: %s\n",
-                     __FUNCTION__, strerror(errno));
+                     __func__, strerror(errno));
             status = SANE_STATUS_IO_ERROR;
         }
         else if (bytes_read == 0)
         {
             /* EOF of current reading */
-            DBG(DL_DATA_TRACE, "%s: EOF\n",__FUNCTION__);
+            DBG(DL_DATA_TRACE, "%s: EOF\n",__func__);
             break;
         }
         ps->bytes_remaining -= bytes_read;
@@ -623,7 +619,7 @@ static SANE_Status Expander_init (Expander *pself,
         {
             DBG (DL_MAJOR_ERROR,
                  "%s: couldn't allocate channel buffer.\n",
-                 __FUNCTION__);
+                 __func__);
             status = SANE_STATUS_NO_MEM;
         }
         else
@@ -654,7 +650,7 @@ static SANE_Status create_Expander (SnapScan_Scanner *pss,
     {
         DBG (DL_MAJOR_ERROR,
              "%s: failed to allocate Expander.\n",
-             __FUNCTION__);
+             __func__);
         status = SANE_STATUS_NO_MEM;
     }
     else
@@ -871,7 +867,7 @@ static SANE_Status Deinterlacer_init (Deinterlacer *pself,
         {
             DBG (DL_MAJOR_ERROR,
                  "%s: couldn't allocate channel buffer.\n",
-                 __FUNCTION__);
+                 __func__);
             status = SANE_STATUS_NO_MEM;
         }
         else
@@ -901,7 +897,7 @@ static SANE_Status create_Deinterlacer (SnapScan_Scanner *pss,
     {
         DBG (DL_MAJOR_ERROR,
              "%s: failed to allocate Deinterlacer.\n",
-             __FUNCTION__);
+             __func__);
         status = SANE_STATUS_NO_MEM;
     }
     else
@@ -1106,7 +1102,7 @@ static SANE_Status RGBRouter_init (RGBRouter *pself,
         {
             DBG (DL_MAJOR_ERROR,
                  "%s: failed to allocate circular buffer.\n",
-                 __FUNCTION__);
+                 __func__);
             status = SANE_STATUS_NO_MEM;
         }
         else
@@ -1141,7 +1137,7 @@ static SANE_Status create_RGBRouter (SnapScan_Scanner *pss,
     if (*pps == NULL)
     {
         DBG (DL_MAJOR_ERROR, "%s: failed to allocate RGBRouter.\n",
-             __FUNCTION__);
+             __func__);
         status = SANE_STATUS_NO_MEM;
     }
     else
@@ -1193,7 +1189,7 @@ static SANE_Status create_Inverter (SnapScan_Scanner *pss,
     if (*pps == NULL)
     {
         DBG (DL_MAJOR_ERROR, "%s: failed to allocate Inverter.\n",
-                 __FUNCTION__);
+                 __func__);
         status = SANE_STATUS_NO_MEM;
     }
     else
@@ -1256,7 +1252,7 @@ static SANE_Status create_source_chain (SnapScan_Scanner *pss,
             break;
         default:
             DBG (DL_MAJOR_ERROR, "%s: bad mode value %d (internal error)\n",
-                 __FUNCTION__, mode);
+                 __func__, mode);
             status = SANE_STATUS_INVAL;
             break;
         }
diff --git a/backend/snapscan.c b/backend/snapscan.c
index 3c0fb81..c88537b 100644
--- a/backend/snapscan.c
+++ b/backend/snapscan.c
@@ -82,12 +82,6 @@
 #define BUILD               53
 #define BACKEND_NAME snapscan
 
-#ifdef __GNUC__
-#define UNUSEDARG __attribute__ ((unused))
-#else
-#define UNUSEDARG
-#endif
-
 #include "../include/sane/sanei_backend.h"
 #include "../include/sane/saneopts.h"
 
@@ -1217,13 +1211,13 @@ static void reader (SnapScan_Scanner *pss)
 
 /** signal handler to kill the child process
  */
-static RETSIGTYPE usb_reader_process_sigterm_handler( int signo )
+static void usb_reader_process_sigterm_handler( int signo )
 {
     DBG( DL_INFO, "(SIG) reader_process: terminated by signal %d\n", signo );
     cancelRead = SANE_TRUE;
 }
 
-static RETSIGTYPE sigalarm_handler( int signo UNUSEDARG)
+static void sigalarm_handler( int signo __sane_unused__)
 {
     DBG( DL_INFO, "ALARM!!!\n" );
 }
@@ -1301,7 +1295,7 @@ static SANE_Status start_reader (SnapScan_Scanner *pss)
 
         cancelRead = SANE_FALSE;
 
-        if (pss->child == -1)
+        if (!sanei_thread_is_valid (pss->child))
         {
             /* we'll have to read in blocking mode */
             DBG (DL_MAJOR_ERROR,
@@ -1815,7 +1809,7 @@ SANE_Status sane_read (SANE_Handle h,
 
     if (pss->psrc == NULL  ||  pss->psrc->remaining(pss->psrc) == 0)
     {
-        if (pss->child != -1)
+      if (sanei_thread_is_valid (pss->child))
         {
             sanei_thread_waitpid (pss->child, 0);        /* ensure no zombies */
             pss->child = -1;
@@ -1875,7 +1869,7 @@ void sane_cancel (SANE_Handle h)
         /* signal a cancellation has occurred */
         pss->state = ST_CANCEL_INIT;
         /* signal the reader, if any */
-        if (pss->child != -1)
+        if (sanei_thread_is_valid (pss->child))
         {
             DBG( DL_INFO, ">>>>>>>> killing reader_process <<<<<<<<\n" );
 
@@ -1941,7 +1935,7 @@ SANE_Status sane_set_io_mode (SANE_Handle h, SANE_Bool m)
 
     if (m)
     {
-        if (pss->child == -1)
+      if (!sanei_thread_is_valid (pss->child))
         {
             DBG (DL_MINOR_INFO,
                  "%s: no reader child; must use blocking mode.\n",
@@ -1971,7 +1965,7 @@ SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
     if (pss->state != ST_SCAN_INIT)
         return SANE_STATUS_INVAL;
 
-    if (pss->child == -1)
+    if (!sanei_thread_is_valid (pss->child))
     {
         DBG (DL_MINOR_INFO,
              "%s: no reader child; cannot provide select file descriptor.\n",
diff --git a/backend/sp15c.c b/backend/sp15c.c
index 3937a30..0cabed8 100644
--- a/backend/sp15c.c
+++ b/backend/sp15c.c
@@ -1762,7 +1762,7 @@ do_cancel (struct sp15c *scanner)
 
   do_eof (scanner);             /* close pipe and reposition scanner */
 
-  if (scanner->reader_pid != -1)
+  if (sanei_thread_is_valid (scanner->reader_pid))
     {
       int exit_status;
       DBG (10, "do_cancel: kill reader_process\n");
diff --git a/backend/stv680.conf.in b/backend/stv680.conf.in
index eb15e7c..eb15e7c 100755..100644
--- a/backend/stv680.conf.in
+++ b/backend/stv680.conf.in
diff --git a/backend/stv680.h b/backend/stv680.h
index e08976b..e08976b 100755..100644
--- a/backend/stv680.h
+++ b/backend/stv680.h
diff --git a/backend/tamarack.c b/backend/tamarack.c
index e7073af..6fc259f 100644
--- a/backend/tamarack.c
+++ b/backend/tamarack.c
@@ -470,7 +470,7 @@ do_cancel (Tamarack_Scanner *s)
 
   do_eof (s);
 
-  if (s->reader_pid != -1)
+  if (sanei_thread_is_valid (s->reader_pid))
     {
       int exit_status;
 
@@ -1442,7 +1442,7 @@ sane_cancel (SANE_Handle handle)
 {
   Tamarack_Scanner *s = handle;
 
-  if (s->reader_pid != -1)
+  if (sanei_thread_is_valid (s->reader_pid))
     sanei_thread_kill (s->reader_pid);
   s->scanning = SANE_FALSE;
 }
diff --git a/backend/test.c b/backend/test.c
index d5b7365..2ca5b3b 100644
--- a/backend/test.c
+++ b/backend/test.c
@@ -1355,7 +1355,7 @@ finish_pass (Test_Device * test_device)
       DBG (2, "finish_pass: pipe closed\n");
       test_device->pipe = -1;
     }
-  if (test_device->reader_pid != -1)
+  if (sanei_thread_is_valid (test_device->reader_pid))
     {
       int status;
       SANE_Pid pid;
@@ -1364,7 +1364,7 @@ finish_pass (Test_Device * test_device)
 	   (long) test_device->reader_pid);
       sanei_thread_kill (test_device->reader_pid);
       pid = sanei_thread_waitpid (test_device->reader_pid, &status);
-      if (pid == -1)
+      if (!sanei_thread_is_valid (pid))
 	{
 	  DBG (1,
 	       "finish_pass: sanei_thread_waitpid failed, already terminated? (%s)\n",
@@ -2568,7 +2568,7 @@ sane_start (SANE_Handle handle)
   test_device->reader_pid =
     sanei_thread_begin (reader_task, (void *) test_device);
 
-  if (test_device->reader_pid == -1)
+  if (!sanei_thread_is_valid (test_device->reader_pid))
     {
       DBG (1, "sane_start: sanei_thread_begin failed (%s)\n",
 	   strerror (errno));
diff --git a/backend/u12-hw.c b/backend/u12-hw.c
index 89f37be..e21c78a 100644
--- a/backend/u12-hw.c
+++ b/backend/u12-hw.c
@@ -338,7 +338,6 @@ static void u12hw_SetGeneralRegister( U12_Device *dev )
 static void u12hw_SetupPreviewCondition( U12_Device *dev )
 {
 	int       i, c;
-	u_long    channel;
 	SANE_Byte rb[100];
 
 	DBG( _DBG_INFO, "u12_SetupPreviewCondition()\n" );
@@ -389,7 +388,6 @@ static void u12hw_SetupPreviewCondition( U12_Device *dev )
 	else
 		dev->scan.bFifoSelect = REG_GFIFOOFFSET;
 
-	channel = _BLUE_FULLSIZE << 16;
 	dev->regs.RD_BufFullSize = _SIZE_BLUEFIFO;
 
 	dev->regs.RD_LineControl    = _LOBYTE(dev->shade.wExposure);
diff --git a/backend/u12.c b/backend/u12.c
index 8401a9f..083d9f3 100644
--- a/backend/u12.c
+++ b/backend/u12.c
@@ -278,19 +278,19 @@ static void sig_chldhandler( int signo )
 
 /** signal handler to kill the child process
  */
-static RETSIGTYPE reader_process_sigterm_handler( int signo )
+static void reader_process_sigterm_handler( int signo )
 {
 	DBG( _DBG_PROC, "(SIG) reader_process: terminated by signal %d\n", signo );
 	_exit( SANE_STATUS_GOOD );
 }
 
-static RETSIGTYPE usb_reader_process_sigterm_handler( int signo )
+static void usb_reader_process_sigterm_handler( int signo )
 {
 	DBG( _DBG_PROC, "(SIG) reader_process: terminated by signal %d\n", signo );
 	cancelRead = SANE_TRUE;
 }
 
-static RETSIGTYPE sigalarm_handler( int signo )
+static void sigalarm_handler( int signo )
 {
 	_VAR_NOT_USED( signo );
 	DBG( _DBG_PROC, "ALARM!!!\n" );
@@ -391,7 +391,7 @@ static SANE_Status do_cancel( U12_Scanner *scanner, SANE_Bool closepipe )
 
 	scanner->scanning = SANE_FALSE;
 
-	if( scanner->reader_pid != -1 ) {
+	if( sanei_thread_is_valid (scanner->reader_pid) ) {
 
 		DBG( _DBG_PROC, ">>>>>>>> killing reader_process <<<<<<<<\n" );
 
@@ -1731,7 +1731,7 @@ SANE_Status sane_start( SANE_Handle handle )
 	
 	cancelRead = SANE_FALSE;
 	
-	if( s->reader_pid == -1 ) {
+	if( !sanei_thread_is_valid (s->reader_pid) ) {
 		DBG( _DBG_ERROR, "ERROR: could not start reader task\n" );
 		s->scanning = SANE_FALSE;
 		u12if_close( dev );
diff --git a/backend/umax.c b/backend/umax.c
index 0d8ddba..22fa2d3 100644
--- a/backend/umax.c
+++ b/backend/umax.c
@@ -399,7 +399,7 @@ static void umax_print_inquiry(Umax_Device *dev)
   DBG_inq_nz(" - relative address\n", get_inquiry_scsi_reladr(inquiry_block));
   DBG_inq_nz(" - wide bus 32 bit\n",  get_inquiry_scsi_wbus32(inquiry_block));
   DBG_inq_nz(" - wide bus 16 bit\n",  get_inquiry_scsi_wbus16(inquiry_block));
-  DBG_inq_nz(" - syncronous neg.\n",  get_inquiry_scsi_sync(inquiry_block));
+  DBG_inq_nz(" - synchronous neg.\n", get_inquiry_scsi_sync(inquiry_block));
   DBG_inq_nz(" - linked commands\n",  get_inquiry_scsi_linked(inquiry_block));
   DBG_inq_nz(" - (reserved)\n",       get_inquiry_scsi_R(inquiry_block));
   DBG_inq_nz(" - command queueing\n", get_inquiry_scsi_cmdqueue(inquiry_block));
@@ -526,7 +526,7 @@ static void umax_print_inquiry(Umax_Device *dev)
   DBG_inq_nz(" + ADF: no paper\n",			get_inquiry_ADF_no_paper(inquiry_block));
   DBG_inq_nz(" + ADF: cover open\n",			get_inquiry_ADF_cover_open(inquiry_block));
   DBG_inq_nz(" + ADF: paper jam\n",			get_inquiry_ADF_paper_jam(inquiry_block));
-  DBG_inq_nz(" - unknwon flag; 0x63 bit 3\n",		get_inquiry_0x63_bit3(inquiry_block));
+  DBG_inq_nz(" - unknown flag; 0x63 bit 3\n",		get_inquiry_0x63_bit3(inquiry_block));
   DBG_inq_nz(" - unknown lfag: 0x63 bit 4\n",		get_inquiry_0x63_bit4(inquiry_block));
   DBG_inq_nz(" - lens calib in doc pos\n",		get_inquiry_lens_cal_in_doc_pos(inquiry_block));
   DBG_inq_nz(" - manual focus\n",			get_inquiry_manual_focus(inquiry_block));
@@ -4670,14 +4670,14 @@ static SANE_Status do_cancel(Umax_Scanner *scanner)
 
   scanner->scanning = SANE_FALSE;
 
-  if (scanner->reader_pid != -1)
+  if (sanei_thread_is_valid (scanner->reader_pid))
   {
     DBG(DBG_sane_info,"killing reader_process\n");
 
     sanei_thread_kill(scanner->reader_pid);
     pid = sanei_thread_waitpid(scanner->reader_pid, &status);
 
-    if (pid == -1)
+    if (!sanei_thread_is_valid (pid))
     {
       DBG(DBG_sane_info, "do_cancel: sanei_thread_waitpid failed, already terminated ? (%s)\n", strerror(errno));
     }
@@ -4928,7 +4928,7 @@ static SANE_Status attach_scanner(const char *devicename, Umax_Device **devp, in
 /* ------------------------------------------------------------ READER PROCESS SIGTERM HANDLER  ------------ */
 
 
-static RETSIGTYPE reader_process_sigterm_handler(int signal)
+static void reader_process_sigterm_handler(int signal)
 {
   DBG(DBG_sane_info,"reader_process: terminated by signal %d\n", signal);
 
@@ -7624,7 +7624,7 @@ SANE_Status sane_start(SANE_Handle handle)
     /* of the x-origin defined by the scanner`s inquiry */
     if (scanner->device->dor != 0) /* dor mode active */
     {
-      DBG(DBG_info,"substracting DOR x-origin-offset from upper left x\n");
+      DBG(DBG_info,"subtracting DOR x-origin-offset from upper left x\n");
       scanner->device->upper_left_x -= scanner->device->inquiry_dor_x_off * scanner->device->x_coordinate_base; /* correct DOR x-origin */
 
       if (scanner->device->upper_left_x < 0) /* rounding errors may create a negative value */
@@ -7996,7 +7996,7 @@ SANE_Status sane_start(SANE_Handle handle)
   /* start reader_process, deponds on OS if fork() or threads are used */
   scanner->reader_pid = sanei_thread_begin(reader_process, (void *) scanner);
 
-  if (scanner->reader_pid == -1)
+  if (!sanei_thread_is_valid (scanner->reader_pid))
   {
     DBG(DBG_error, "ERROR: sanei_thread_begin failed (%s)\n", strerror(errno));
     scanner->scanning = SANE_FALSE;
diff --git a/backend/umax1220u.c b/backend/umax1220u.c
index e04d908..79b8c92 100644
--- a/backend/umax1220u.c
+++ b/backend/umax1220u.c
@@ -742,7 +742,6 @@ void
 sane_close (SANE_Handle handle)
 {
   Umax_Scanner *prev, *scanner;
-  SANE_Status res;
 
   DBG (3, "sane_close\n");
 
@@ -775,7 +774,7 @@ sane_close (SANE_Handle handle)
   else
     first_handle = scanner->next;
 
-  res = UMAX_close_device (&scanner->scan);
+  UMAX_close_device (&scanner->scan);
 
   free (scanner);
 }
diff --git a/backend/umax_pp.c b/backend/umax_pp.c
index 90cd486..0f7ce4e 100644
--- a/backend/umax_pp.c
+++ b/backend/umax_pp.c
@@ -388,7 +388,7 @@ umax_pp_try_ports (SANEI_Config * config, char **ports)
                      ports[i]);
               else
                 DBG (3,
-                     "umax_pp_try_ports: attach to port `%s' successfull\n",
+                     "umax_pp_try_ports: attach to port `%s' successful\n",
                      ports[i]);
             }
           free (ports[i]);
@@ -1001,9 +1001,9 @@ sane_exit (void)
   for (i = 0; i < num_devices; i++)
     {
       free (devlist[i].port);
-      free (devlist[i].sane.name);
-      free (devlist[i].sane.model);
-      free (devlist[i].sane.vendor);
+      free ((void *) devlist[i].sane.name);
+      free ((void *) devlist[i].sane.model);
+      free ((void *) devlist[i].sane.vendor);
     }
 
   if (devlist != NULL)
diff --git a/backend/umax_pp.h b/backend/umax_pp.h
index 27ee95e..dbedab8 100644
--- a/backend/umax_pp.h
+++ b/backend/umax_pp.h
@@ -193,15 +193,8 @@ enum Umax_PP_Configure_Option
   NUM_CFG_OPTIONS
 };
 
-#if (!defined __GNUC__ || __GNUC__ < 2 || \
-     __GNUC_MINOR__ < (defined __cplusplus ? 6 : 4))
-
-#define __PRETTY_FUNCTION__	"umax_pp"
-
-#endif
-
 #define DEBUG()		DBG(4, "%s(v%d.%d.%d-%s): line %d: debug exception\n", \
-			  __PRETTY_FUNCTION__, SANE_CURRENT_MAJOR, V_MINOR,	\
+			  __func__, SANE_CURRENT_MAJOR, V_MINOR,	\
 			  UMAX_PP_BUILD, UMAX_PP_STATE, __LINE__)
 
 #endif /* umax_pp_h */
diff --git a/backend/umax_pp_low.c b/backend/umax_pp_low.c
index c5f58a7..1e38aba 100644
--- a/backend/umax_pp_low.c
+++ b/backend/umax_pp_low.c
@@ -65,6 +65,7 @@
 #include <fcntl.h>
 #endif
 #include "../include/sane/sanei_debug.h"
+#include "../include/sane/sanei_backend.h"
 #include <errno.h>
 
 #ifdef HAVE_DEV_PPBUS_PPI_H
@@ -406,75 +407,51 @@ sanei_outsl (unsigned int port, const void *addr, unsigned long count)
 #ifndef ENABLE_PARPORT_DIRECTIO
 #define SANE_INB 0
 static int
-sanei_ioperm (int start, int length, int enable)
+sanei_ioperm (__sane_unused__ int start, __sane_unused__ int length,
+              __sane_unused__ int enable)
 {
-  /* make compilers happy */
-  enable = start + length;
-
   /* returns failure */
   return -1;
 }
 
 static unsigned char
-sanei_inb (unsigned int port)
+sanei_inb (__sane_unused__ unsigned int port)
 {
-  /* makes compilers happy */
-  port = 0;
   return 255;
 }
 
 static void
-sanei_outb (unsigned int port, unsigned char value)
+sanei_outb (__sane_unused__ unsigned int port,
+            __sane_unused__ unsigned char value)
 {
-  /* makes compilers happy */
-  port = 0;
-  value = 0;
 }
 
 static void
-sanei_insb (unsigned int port, unsigned char *addr, unsigned long count)
+sanei_insb (__sane_unused__ unsigned int port,
+            __sane_unused__ unsigned char *addr,
+            __sane_unused__ unsigned long count)
 {
-  /* makes compilers happy */
-  if (addr)
-    {
-      port = 0;
-      count = 0;
-    }
 }
 
 static void
-sanei_insl (unsigned int port, unsigned char *addr, unsigned long count)
+sanei_insl (__sane_unused__ unsigned int port,
+            __sane_unused__ unsigned char *addr,
+            __sane_unused__ unsigned long count)
 {
-  /* makes compilers happy */
-  if (addr)
-    {
-      port = 0;
-      count = 0;
-    }
 }
 
 static void
-sanei_outsb (unsigned int port, const unsigned char *addr,
-	     unsigned long count)
+sanei_outsb (__sane_unused__ unsigned int port,
+             __sane_unused__ const unsigned char *addr,
+	     __sane_unused__ unsigned long count)
 {
-  /* makes compilers happy */
-  if (addr)
-    {
-      port = 0;
-      count = 0;
-    }
 }
 
 static void
-sanei_outsl (unsigned int port, const unsigned char *addr,
-	     unsigned long count)
+sanei_outsl (__sane_unused__ unsigned int port,
+             __sane_unused__ const unsigned char *addr,
+	     __sane_unused__ unsigned long count)
 {
-  /* makes compilers happy */
-  if (addr)
-    {
-      port = 0;
-      count = 0;
-    }
 }
 #endif /* ENABLE_PARPORT_DIRECTIO is not defined */
 
@@ -862,7 +839,7 @@ sanei_parport_find_device (void)
   i = 0;
   while (devices[i] != NULL)
     {
-      DBG (16, "Controling %s: ", devices[i]);
+      DBG (16, "Controlling %s: ", devices[i]);
       file = open (devices[i], O_RDWR);
       if (file < 0)
 	{
@@ -950,7 +927,7 @@ int
 sanei_umax_pp_initPort (int port, char *name)
 {
   int fd, ectr;
-  int found = 0, ecp = 1;
+  int found = 0;
 #if ((defined HAVE_IOPERM)||(defined HAVE_MACHINE_CPUFUNC_H)||(defined HAVE_LINUX_PPDEV_H))
   int mode, modes, rc;
 #endif
@@ -1095,7 +1072,7 @@ sanei_umax_pp_initPort (int port, char *name)
 		  if (rc)
 		    {
 		      DBG (16,
-			   "umax_pp: ppdev couldn't negociate mode IEEE1284_MODE_EPP for '%s' (ignored)\n",
+			   "umax_pp: ppdev couldn't negotiate mode IEEE1284_MODE_EPP for '%s' (ignored)\n",
 			   name);
 		    }
 		  if (ioctl (fd, PPSETMODE, &mode))
@@ -1121,7 +1098,7 @@ sanei_umax_pp_initPort (int port, char *name)
 		  if (rc)
 		    {
 		      DBG (16,
-			   "umax_pp: ppdev couldn't negociate mode IEEE1284_MODE_ECP for '%s' (ignored)\n",
+			   "umax_pp: ppdev couldn't negotiate mode IEEE1284_MODE_ECP for '%s' (ignored)\n",
 			   name);
 		    }
 		  if (ioctl (fd, PPSETMODE, &mode))
@@ -1234,7 +1211,6 @@ sanei_umax_pp_initPort (int port, char *name)
     {
       DBG (1, "iopl could not raise IO permission to level 3\n");
       DBG (1, "*NO* ECP support\n");
-      ecp = 0;
 
     }
   else
@@ -1247,8 +1223,6 @@ sanei_umax_pp_initPort (int port, char *name)
 
 	}
     }
-#else
-  ecp = 0;
 #endif
 
 
@@ -2126,8 +2100,6 @@ sendCommand (int cmd)
   int tmp;
   int val;
   int i;
-  int gbufferRead[256];		/* read buffer for command 0x10 */
-
 
   if (g674 != 0)
     {
@@ -2216,7 +2188,7 @@ sendCommand (int cmd)
 	      tmp = (tmp & 0x1E) | 0x1;
 	      Outb (CONTROL, tmp);
 	      Outb (CONTROL, tmp);
-	      gbufferRead[i] = Inb (STATUS);
+	      Inb (STATUS);
 	      tmp = tmp & 0x1E;
 	      Outb (CONTROL, tmp);
 	      Outb (CONTROL, tmp);
@@ -2721,7 +2693,7 @@ init002 (int arg)
 static int
 ECPconnect (void)
 {
-  int ret, control, data;
+  int ret, control;
 
   /* these 3 lines set to 'inital mode' */
   byteMode ();			/*Outb (ECR, 0x20); */
@@ -2735,7 +2707,7 @@ ECPconnect (void)
   gData = Inb (DATA);
   gControl = Inb (CONTROL);
 
-  data = Inb (DATA);
+  Inb (DATA);
   control = Inb (CONTROL);
   Outb (CONTROL, control & 0x1F);
   control = Inb (CONTROL);
@@ -3224,7 +3196,6 @@ static void
 ECPSetBuffer (int size)
 {
   static int last = 0;
-  unsigned char breg;
 
   /* routine XX */
   compatMode ();
@@ -3244,7 +3215,7 @@ ECPSetBuffer (int size)
 	   __FILE__, __LINE__);
       return;
     }
-  breg = Inb (ECR);
+  Inb (ECR);
 
   Outb (DATA, 0x0E);
   if (waitFifoEmpty () == 0)
@@ -3253,7 +3224,7 @@ ECPSetBuffer (int size)
 	   __FILE__, __LINE__);
       return;
     }
-  breg = Inb (ECR);
+  Inb (ECR);
 
   Outb (ECPDATA, 0x0B);		/* R0E=0x0B */
   if (waitFifoEmpty () == 0)
@@ -3262,7 +3233,7 @@ ECPSetBuffer (int size)
 	   __FILE__, __LINE__);
       return;
     }
-  breg = Inb (ECR);
+  Inb (ECR);
 
   Outb (DATA, 0x0F);		/* R0F=size MSB */
   if (waitFifoEmpty () == 0)
@@ -3271,7 +3242,7 @@ ECPSetBuffer (int size)
 	   __FILE__, __LINE__);
       return;
     }
-  breg = Inb (ECR);
+  Inb (ECR);
 
   Outb (ECPDATA, size / 256);
   if (waitFifoEmpty () == 0)
@@ -3280,7 +3251,7 @@ ECPSetBuffer (int size)
 	   __FILE__, __LINE__);
       return;
     }
-  breg = Inb (ECR);
+  Inb (ECR);
 
   Outb (DATA, 0x0B);		/* R0B=size LSB */
   if (waitFifoEmpty () == 0)
@@ -3289,7 +3260,7 @@ ECPSetBuffer (int size)
 	   __FILE__, __LINE__);
       return;
     }
-  breg = Inb (ECR);
+  Inb (ECR);
 
   Outb (ECPDATA, size % 256);
   if (waitFifoEmpty () == 0)
@@ -3298,7 +3269,7 @@ ECPSetBuffer (int size)
 	   __FILE__, __LINE__);
       return;
     }
-  breg = Inb (ECR);
+  Inb (ECR);
   DBG (16, "ECPSetBuffer(%d) passed ...\n", size);
 }
 
@@ -3307,14 +3278,14 @@ ECPSetBuffer (int size)
 static int
 ECPbufferRead (int size, unsigned char *dest)
 {
-  int breg, n, idx, remain;
+  int n, idx, remain;
 
   idx = 0;
   n = size / 16;
   remain = size - 16 * n;
 
   /* block transfer */
-  breg = Inb (ECR);		/* 0x15,0x75 expected: fifo empty */
+  Inb (ECR);			/* 0x15,0x75 expected: fifo empty */
 
   byteMode ();			/*Outb (ECR, 0x20);            byte mode */
   Outb (CONTROL, 0x04);
@@ -3326,7 +3297,7 @@ ECPbufferRead (int size, unsigned char *dest)
 	   __FILE__, __LINE__);
       return idx;
     }
-  breg = Inb (ECR);
+  Inb (ECR);
 
   Outb (DATA, 0x80);
   if (waitFifoEmpty () == 0)
@@ -3335,7 +3306,7 @@ ECPbufferRead (int size, unsigned char *dest)
 	   __FILE__, __LINE__);
       return idx;
     }
-  breg = Inb (ECR);		/* 0x75 expected */
+  Inb (ECR);			/* 0x75 expected */
 
   byteMode ();			/*Outb (ECR, 0x20);            byte mode */
   Outb (CONTROL, 0x20);		/* data reverse */
@@ -4066,13 +4037,12 @@ static int
 EPPconnect (void)
 {
   int control;
-  int data;
 
   /* initial values, don't hardcode */
   Outb (DATA, 0x04);
   Outb (CONTROL, 0x0C);
 
-  data = Inb (DATA);
+  Inb (DATA);
   control = Inb (CONTROL);
   Outb (CONTROL, control & 0x1F);
   control = Inb (CONTROL);
@@ -8968,7 +8938,7 @@ cmdGetBuffer610p (int cmd, int len, unsigned char *buffer)
 static int
 cmdGetBuffer (int cmd, int len, unsigned char *buffer)
 {
-  int reg, tmp, i;
+  int reg, tmp;
   int word[5], read;
   int needed;
 
@@ -8995,7 +8965,6 @@ cmdGetBuffer (int cmd, int len, unsigned char *buffer)
   REGISTERWRITE (0x0E, 0x0D);
   REGISTERWRITE (0x0F, 0x00);
 
-  i = 0;
   reg = registerRead (0x19) & 0xF8;
 
   /* wait if busy */
@@ -9108,7 +9077,7 @@ cmdGetBuffer (int cmd, int len, unsigned char *buffer)
 static int
 cmdGetBuffer32 (int cmd, int len, unsigned char *buffer)
 {
-  int reg, tmp, i;
+  int reg, tmp;
   int word[5], read;
 
   /* compute word */
@@ -9138,7 +9107,6 @@ cmdGetBuffer32 (int cmd, int len, unsigned char *buffer)
   REGISTERWRITE (0x0E, 0x0D);
   REGISTERWRITE (0x0F, 0x00);
 
-  i = 0;
   reg = registerRead (0x19) & 0xF8;
 
   /* wait if busy */
@@ -9255,7 +9223,7 @@ cmdGetBlockBuffer (int cmd, int len, int window, unsigned char *buffer)
   struct timeval td, tf;
   float elapsed;
 #endif
-  int reg, i;
+  int reg;
   int word[5], read;
 
   /* compute word */
@@ -9292,8 +9260,6 @@ cmdGetBlockBuffer (int cmd, int len, int window, unsigned char *buffer)
   REGISTERWRITE (0x0E, 0x0D);
   REGISTERWRITE (0x0F, 0x00);
 
-  i = 0;
-
   /* init counter */
   read = 0;
 
@@ -10975,7 +10941,6 @@ sanei_umax_pp_startScan (int x, int y, int width, int height, int dpi,
 			 int *rtw, int *rth)
 {
   unsigned char *buffer;
-  int *dest = NULL;
   int rc = 0;
   int calibration[3 * 5100 + 768 + 2 + 1];
   int xdpi, ydpi, h;
@@ -11107,8 +11072,6 @@ sanei_umax_pp_startScan (int x, int y, int width, int height, int dpi,
     }
   DBG (16, "inquire() passed ... (%s:%d)\n", __FILE__, __LINE__);
 
-  dest = (int *) malloc (65536 * sizeof (int));
-
   rc = loadDefaultTables ();
   if (rc == 0)
     {
@@ -11936,7 +11899,6 @@ offsetCalibration1220p (int color, int *offRed, int *offGreen, int *offBlue)
   int i, val;
   int commit[9] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, -1 };
   int opsc04[9] = { 0x06, 0xF4, 0xFF, 0x81, 0x1B, 0x00, 0x00, 0x00, -1 };
-  int opsc10[9] = { 0x06, 0xF4, 0xFF, 0x81, 0x1B, 0x00, 0x08, 0x00, -1 };
   int opsc38[37] =
     { 0x00, 0x00, 0x04, 0x00, 0x02, 0x00, 0x00, 0x0C, 0x00, 0x04, 0x40, 0x01,
     0x00, 0x00, 0x04, 0x00, 0x6E, 0x18, 0x10, 0x03, 0x06, 0x00, 0x00, 0x00,
@@ -11963,11 +11925,6 @@ offsetCalibration1220p (int color, int *offRed, int *offGreen, int *offBlue)
       opsc04[4] = 0x1B;
       opsc04[7] = 0x20;
 
-      opsc10[0] = 0x19;
-      opsc10[1] = 0xD5;
-      opsc10[4] = 0x1B;
-      opsc10[7] = 0x20;
-
       opsc48[8] = 0x2B;
       opsc48[11] = 0x20;
       opsc48[12] = 0x08;
diff --git a/backend/v4l.c b/backend/v4l.c
index 519bf01..1e032c7 100644
--- a/backend/v4l.c
+++ b/backend/v4l.c
@@ -495,13 +495,12 @@ sane_exit (void)
 }
 
 SANE_Status
-sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
+sane_get_devices (const SANE_Device *** device_list, SANE_Bool __sane_unused__ local_only)
 {
   V4L_Device *dev;
   int i;
 
   DBG (5, "sane_get_devices\n");
-  local_only = SANE_TRUE;	/* Avoid compile warning */
 
   if (devlist)
     free (devlist);
@@ -962,7 +961,7 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters * params)
 SANE_Status
 sane_start (SANE_Handle handle)
 {
-  int len, loop;
+  int len;
   V4L_Scanner *s;
   char data;
 
@@ -998,6 +997,7 @@ sane_start (SANE_Handle handle)
     }
   else
     {
+      int loop;
       s->is_mmap = SANE_TRUE;
       DBG (3,
 	   "sane_start: mmap frame, buffersize: %d bytes, buffers: %d, offset 0 %d\n",
@@ -1046,6 +1046,7 @@ sane_start (SANE_Handle handle)
   /* v4l1 actually returns BGR when we ask for RGB, so convert it */
   if (s->pict.palette == VIDEO_PALETTE_RGB24)
     {
+      __u32 loop;
       DBG (3, "sane_start: converting from BGR to RGB\n");
       for (loop = 0; loop < (s->window.width * s->window.height * 3); loop += 3)
         {
@@ -1130,22 +1131,15 @@ sane_cancel (SANE_Handle handle)
 
 
 SANE_Status
-sane_set_io_mode (SANE_Handle handle, SANE_Bool non_blocking)
+sane_set_io_mode (SANE_Handle __sane_unused__ handle, SANE_Bool non_blocking)
 {
-  /* Avoid compile warning */
-  handle = 0;
-
   if (non_blocking == SANE_FALSE)
     return SANE_STATUS_GOOD;
   return SANE_STATUS_UNSUPPORTED;
 }
 
 SANE_Status
-sane_get_select_fd (SANE_Handle handle, SANE_Int * fd)
+sane_get_select_fd (SANE_Handle __sane_unused__ handle, SANE_Int __sane_unused__ * fd)
 {
-  /* Avoid compile warning */
-  handle = 0;
-  fd = 0;
-
   return SANE_STATUS_UNSUPPORTED;
 }
diff --git a/backend/xerox_mfp-tcp.c b/backend/xerox_mfp-tcp.c
index 2addb0d..845ab7e 100644
--- a/backend/xerox_mfp-tcp.c
+++ b/backend/xerox_mfp-tcp.c
@@ -47,9 +47,9 @@
 #define	RECV_TIMEOUT	1	/*	seconds		*/
 extern int sanei_debug_xerox_mfp;
 
-int	tcp_dev_request (struct device *dev,
-	    SANE_Byte *cmd, size_t cmdlen,
-	    SANE_Byte *resp, size_t *resplen)
+int	tcp_dev_request(struct device *dev,
+                    SANE_Byte *cmd, size_t cmdlen,
+                    SANE_Byte *resp, size_t *resplen)
 {
     size_t	bytes_recv = 0;
     ssize_t	rc = 1;
@@ -58,46 +58,46 @@ int	tcp_dev_request (struct device *dev,
 
     /* Send request, if any */
     if (cmd && cmdlen) {
-	len = (size_t)sanei_tcp_write(dev->dn, cmd, cmdlen);
-	if (len != cmdlen) {
-	    DBG (1, "%s: sent only %lu bytes of %lu\n",
-		__FUNCTION__, (u_long)len, (u_long)cmdlen);
-    	    return SANE_STATUS_IO_ERROR;
-	}
+        len = (size_t)sanei_tcp_write(dev->dn, cmd, cmdlen);
+        if (len != cmdlen) {
+            DBG(1, "%s: sent only %lu bytes of %lu\n",
+                __func__, (u_long)len, (u_long)cmdlen);
+            return SANE_STATUS_IO_ERROR;
+        }
     }
 
     /* Receive response, if expected */
     if (resp && resplen) {
-	DBG (3, "%s: wait for %i bytes\n", __FUNCTION__, (int)*resplen);
-
-	while (bytes_recv < *resplen && rc > 0) {
-	    rc = recv(dev->dn, resp+bytes_recv, *resplen-bytes_recv, 0);
-
-	    if (rc > 0)	bytes_recv += rc;
-	    else {
-		DBG(1, "%s: error %s, bytes requested: %i, bytes read: %i\n",
-		    __FUNCTION__, strerror(errno), (int)*resplen, (int)bytes_recv);
-		*resplen = bytes_recv;
-/*
-    TODO:
-	do something smarter than that!
-*/
-		return SANE_STATUS_GOOD;
-		return SANE_STATUS_IO_ERROR;
-	    }
-	}
+        DBG(3, "%s: wait for %i bytes\n", __func__, (int)*resplen);
+
+        while (bytes_recv < *resplen && rc > 0) {
+            rc = recv(dev->dn, resp+bytes_recv, *resplen-bytes_recv, 0);
+
+            if (rc > 0)	bytes_recv += rc;
+            else {
+                DBG(1, "%s: error %s, bytes requested: %i, bytes read: %i\n",
+                    __func__, strerror(errno), (int)*resplen, (int)bytes_recv);
+                *resplen = bytes_recv;
+                /*
+                    TODO:
+                	do something smarter than that!
+                */
+                return SANE_STATUS_GOOD;
+                return SANE_STATUS_IO_ERROR;
+            }
+        }
     }
 
     *resplen = bytes_recv;
 
-  return SANE_STATUS_GOOD;
+    return SANE_STATUS_GOOD;
 }
 
-SANE_Status	tcp_dev_open (struct device *dev)
+SANE_Status	tcp_dev_open(struct device *dev)
 {
     SANE_Status 	status;
-    char*		strhost;
-    char*		strport;
+    char		*strhost;
+    char		*strport;
     int			port;
     struct		servent *sp;
     struct		timeval tv;
@@ -105,60 +105,60 @@ SANE_Status	tcp_dev_open (struct device *dev)
 
 
     devname = dev->sane.name;
-    DBG (3, "%s: open %s\n", __FUNCTION__, devname);
+    DBG(3, "%s: open %s\n", __func__, devname);
 
-    if (strncmp (devname, "tcp", 3) != 0)	return SANE_STATUS_INVAL;
+    if (strncmp(devname, "tcp", 3) != 0)	return SANE_STATUS_INVAL;
     devname += 3;
-    devname = sanei_config_skip_whitespace (devname);
+    devname = sanei_config_skip_whitespace(devname);
     if (!*devname)	return SANE_STATUS_INVAL;
 
-    devname = sanei_config_get_string (devname, &strhost);
-    devname = sanei_config_skip_whitespace (devname);
+    devname = sanei_config_get_string(devname, &strhost);
+    devname = sanei_config_skip_whitespace(devname);
 
     if (*devname)
-	devname = sanei_config_get_string (devname, &strport);
+        devname = sanei_config_get_string(devname, &strport);
     else
-	strport = "9400";
+        strport = "9400";
 
 
     if (isdigit(*strport)) {
-	port = atoi(strport);
+        port = atoi(strport);
     } else {
-	if ((sp = getservbyname(strport, "tcp"))) {
-	    port = ntohs(sp->s_port);
-	} else {
-	    DBG (1, "%s: unknown TCP service %s\n", __FUNCTION__, strport);
-	    return SANE_STATUS_IO_ERROR;
-	}
+        if ((sp = getservbyname(strport, "tcp"))) {
+            port = ntohs(sp->s_port);
+        } else {
+            DBG(1, "%s: unknown TCP service %s\n", __func__, strport);
+            return SANE_STATUS_IO_ERROR;
+        }
     }
 
     status = sanei_tcp_open(strhost, port, &dev->dn);
     if (status == SANE_STATUS_GOOD) {
-	tv.tv_sec  = RECV_TIMEOUT;
-	tv.tv_usec = 0;
-	if (setsockopt (dev->dn, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof tv) < 0) {
-	    DBG(1, "%s: setsockopts %s", __FUNCTION__, strerror(errno));
-	}
+        tv.tv_sec  = RECV_TIMEOUT;
+        tv.tv_usec = 0;
+        if (setsockopt(dev->dn, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof tv) < 0) {
+            DBG(1, "%s: setsockopts %s", __func__, strerror(errno));
+        }
     }
 
     return status;
 }
 
 void
-tcp_dev_close (struct device *dev)
+tcp_dev_close(struct device *dev)
 {
     if (!dev)	return;
 
-    DBG (3, "%s: closing dev %p\n", __FUNCTION__, (void *)dev);
+    DBG(3, "%s: closing dev %p\n", __func__, (void *)dev);
 
     /* finish all operations */
     if (dev->scanning) {
-	dev->cancel = 1;
-	/* flush READ_IMAGE data */
-	if (dev->reading)	sane_read(dev, NULL, 1, NULL);
-    /* send cancel if not sent before */
-	if (dev->state != SANE_STATUS_CANCELLED)
-	    ret_cancel(dev, 0);
+        dev->cancel = 1;
+        /* flush READ_IMAGE data */
+        if (dev->reading)	sane_read(dev, NULL, 1, NULL);
+        /* send cancel if not sent before */
+        if (dev->state != SANE_STATUS_CANCELLED)
+            ret_cancel(dev, 0);
     }
 
     sanei_tcp_close(dev->dn);
@@ -167,15 +167,15 @@ tcp_dev_close (struct device *dev)
 
 
 SANE_Status
-tcp_configure_device (const char *devname, SANE_Status (*list_one)(SANE_String_Const devname))
+tcp_configure_device(const char *devname, SANE_Status(*list_one)(SANE_String_Const devname))
 {
-/*
-    TODO:	LAN scanners multicast discovery.
-		devname would contain "tcp auto"
-		
-		We find new devnames and feed them to
-		`list_one_device' one by one
-*/
+    /*
+        TODO:	LAN scanners multicast discovery.
+    		devname would contain "tcp auto"
+
+    		We find new devnames and feed them to
+    		`list_one_device' one by one
+    */
     return list_one(devname);
 }
 
diff --git a/backend/xerox_mfp-usb.c b/backend/xerox_mfp-usb.c
index b9b56d8..6ef1eea 100644
--- a/backend/xerox_mfp-usb.c
+++ b/backend/xerox_mfp-usb.c
@@ -22,90 +22,90 @@
 extern int sanei_debug_xerox_mfp;
 
 int
-usb_dev_request (struct device *dev,
-	     SANE_Byte *cmd, size_t cmdlen,
-	     SANE_Byte *resp, size_t *resplen)
+usb_dev_request(struct device *dev,
+                SANE_Byte *cmd, size_t cmdlen,
+                SANE_Byte *resp, size_t *resplen)
 {
-  SANE_Status status;
-  size_t len = cmdlen;
-
-  if (cmd && cmdlen) {
-    status = sanei_usb_write_bulk (dev->dn, cmd, &cmdlen);
-    if (status != SANE_STATUS_GOOD) {
-      DBG (1, "%s: sanei_usb_write_bulk: %s\n", __FUNCTION__,
-	   sane_strstatus (status));
-      return SANE_STATUS_IO_ERROR;
+    SANE_Status status;
+    size_t len = cmdlen;
+
+    if (cmd && cmdlen) {
+        status = sanei_usb_write_bulk(dev->dn, cmd, &cmdlen);
+        if (status != SANE_STATUS_GOOD) {
+            DBG(1, "%s: sanei_usb_write_bulk: %s\n", __func__,
+                sane_strstatus(status));
+            return SANE_STATUS_IO_ERROR;
+        }
+
+        if (cmdlen != len) {
+            DBG(1, "%s: sanei_usb_write_bulk: wanted %lu bytes, wrote %lu bytes\n",
+                __func__, (size_t)len, (size_t)cmdlen);
+            return SANE_STATUS_IO_ERROR;
+        }
     }
 
-    if (cmdlen != len) {
-      DBG (1, "%s: sanei_usb_write_bulk: wanted %lu bytes, wrote %lu bytes\n",
-	   __FUNCTION__, (size_t)len, (size_t)cmdlen);
-      return SANE_STATUS_IO_ERROR;
-    }
-  }
-
-  if (resp && resplen) {
-    status = sanei_usb_read_bulk (dev->dn, resp, resplen);
-    if (status != SANE_STATUS_GOOD) {
-      DBG (1, "%s: sanei_usb_read_bulk: %s\n", __FUNCTION__,
-	   sane_strstatus (status));
-      return SANE_STATUS_IO_ERROR;
+    if (resp && resplen) {
+        status = sanei_usb_read_bulk(dev->dn, resp, resplen);
+        if (status != SANE_STATUS_GOOD) {
+            DBG(1, "%s: sanei_usb_read_bulk: %s\n", __func__,
+                sane_strstatus(status));
+            return SANE_STATUS_IO_ERROR;
+        }
     }
-  }
 
-  return SANE_STATUS_GOOD;
+    return SANE_STATUS_GOOD;
 }
 
 
 SANE_Status
-usb_dev_open (struct device *dev)
+usb_dev_open(struct device *dev)
 {
-  SANE_Status status;
-
-  DBG (3, "%s: open %p\n", __FUNCTION__, (void *)dev);
-  status = sanei_usb_open (dev->sane.name, &dev->dn);
-  if (status != SANE_STATUS_GOOD) {
-      DBG (1, "%s: sanei_usb_open(%s): %s\n", __FUNCTION__,
-	   dev->sane.name, sane_strstatus (status));
-      dev->dn = -1;
-      return status;
+    SANE_Status status;
+
+    DBG(3, "%s: open %p\n", __func__, (void *)dev);
+    status = sanei_usb_open(dev->sane.name, &dev->dn);
+    if (status != SANE_STATUS_GOOD) {
+        DBG(1, "%s: sanei_usb_open(%s): %s\n", __func__,
+            dev->sane.name, sane_strstatus(status));
+        dev->dn = -1;
+        return status;
     }
-  sanei_usb_clear_halt (dev->dn);
-  return SANE_STATUS_GOOD;
+    sanei_usb_clear_halt(dev->dn);
+    return SANE_STATUS_GOOD;
 }
 
 void
-usb_dev_close (struct device *dev)
+usb_dev_close(struct device *dev)
 {
-  if (!dev)
-    return;
-  DBG (3, "%s: closing dev %p\n", __FUNCTION__, (void *)dev);
-
-  /* finish all operations */
-  if (dev->scanning) {
-    dev->cancel = 1;
-    /* flush READ_IMAGE data */
-    if (dev->reading)
-      sane_read(dev, NULL, 1, NULL);
-    /* send cancel if not sent before */
-    if (dev->state != SANE_STATUS_CANCELLED)
-      ret_cancel(dev, 0);
-  }
-
-  sanei_usb_clear_halt (dev->dn);	/* unstall for next users */
-  sanei_usb_close (dev->dn);
-  dev->dn = -1;
+    if (!dev)
+        return;
+    DBG(3, "%s: closing dev %p\n", __func__, (void *)dev);
+
+    /* finish all operations */
+    if (dev->scanning) {
+        dev->cancel = 1;
+        /* flush READ_IMAGE data */
+        if (dev->reading)
+            sane_read(dev, NULL, 1, NULL);
+        /* send cancel if not sent before */
+        if (dev->state != SANE_STATUS_CANCELLED)
+            ret_cancel(dev, 0);
+    }
+
+    sanei_usb_clear_halt(dev->dn);	/* unstall for next users */
+    sanei_usb_close(dev->dn);
+    dev->dn = -1;
 }
 
 
 /* SANE API ignores return code of this callback */
 SANE_Status
-usb_configure_device (const char *devname, SANE_Status (*attach) (const char *dev))
+usb_configure_device(const char *devname, SANE_Status(*attach)(const char *dev))
 {
-  sanei_usb_set_timeout (1000);
-  sanei_usb_attach_matching_devices (devname, attach);
-  sanei_usb_set_timeout (30000);
-  return SANE_STATUS_GOOD;
+    sanei_usb_set_timeout(1000);
+    sanei_usb_attach_matching_devices(devname, attach);
+    sanei_usb_set_timeout(30000);
+    return SANE_STATUS_GOOD;
 }
 
 
diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
index 2ef7078..8b8c895 100644
--- a/backend/xerox_mfp.c
+++ b/backend/xerox_mfp.c
@@ -1,9 +1,12 @@
 /*
- * SANE backend for Xerox Phaser 3200MFP
- * Copyright 2008 ABC <abc@telekom.ru>
+ * SANE backend for Xerox Phaser 3200MFP et al.
+ * Copyright 2008-2016 ABC <abc@telekom.ru>
  *
- *	Network Scanners Support
- *	Copyright 2010 Alexander Kuznetsov <acca(at)cpan.org>
+ * Network Scanners Support
+ * Copyright 2010 Alexander Kuznetsov <acca(at)cpan.org>
+ *
+ * Color scanning on Samsung M2870 model and Xerox Cognac 3215 & 3225
+ * models by Laxmeesh Onkar Markod <m.laxmeesh@samsung.com>
  *
  * This program is licensed under GPL + SANE exception.
  * More info at http://www.sane-project.org/license.html
@@ -30,6 +33,9 @@
 #include "../include/sane/sanei_usb.h"
 #include "../include/sane/sanei_config.h"
 #include "../include/sane/sanei_backend.h"
+#ifdef HAVE_LIBJPEG
+#include <jpeglib.h>
+#endif
 #include "xerox_mfp.h"
 
 #define BACKEND_BUILD 13
@@ -46,34 +52,34 @@ transport available_transports[TRANSPORTS_MAX] = {
 
 static int resolv_state(int state)
 {
-  if (state & STATE_DOCUMENT_JAM)
-    return SANE_STATUS_JAMMED;
-  if (state & STATE_NO_DOCUMENT)
-    return SANE_STATUS_NO_DOCS;
-  if (state & STATE_COVER_OPEN)
-    return SANE_STATUS_COVER_OPEN;
-  if (state & STATE_INVALID_AREA)
-    return SANE_STATUS_INVAL; /* sane_start: implies SANE_INFO_RELOAD_OPTIONS */
-  if (state & STATE_WARMING)
+    if (state & STATE_DOCUMENT_JAM)
+        return SANE_STATUS_JAMMED;
+    if (state & STATE_NO_DOCUMENT)
+        return SANE_STATUS_NO_DOCS;
+    if (state & STATE_COVER_OPEN)
+        return SANE_STATUS_COVER_OPEN;
+    if (state & STATE_INVALID_AREA)
+        return SANE_STATUS_INVAL; /* sane_start: implies SANE_INFO_RELOAD_OPTIONS */
+    if (state & STATE_WARMING)
 #ifdef SANE_STATUS_WARMING_UP
-    return SANE_STATUS_WARMING_UP;
+        return SANE_STATUS_WARMING_UP;
 #else
-    return SANE_STATUS_DEVICE_BUSY;
+        return SANE_STATUS_DEVICE_BUSY;
 #endif
-  if (state & STATE_LOCKING)
+    if (state & STATE_LOCKING)
 #ifdef SANE_STATUS_HW_LOCKED
-    return SANE_STATUS_HW_LOCKED;
+        return SANE_STATUS_HW_LOCKED;
 #else
-    return SANE_STATUS_JAMMED;
+        return SANE_STATUS_JAMMED;
 #endif
-  if (state & ~STATE_NO_ERROR)
-    return SANE_STATUS_DEVICE_BUSY;
-  return 0;
+    if (state & ~STATE_NO_ERROR)
+        return SANE_STATUS_DEVICE_BUSY;
+    return 0;
 }
 
 static char *str_cmd(int cmd)
 {
-  switch (cmd) {
+    switch (cmd) {
     case CMD_ABORT:		return "ABORT";
     case CMD_INQUIRY:		return "INQUIRY";
     case CMD_RESERVE_UNIT:	return "RESERVE_UNIT";
@@ -82,1262 +88,1442 @@ static char *str_cmd(int cmd)
     case CMD_READ:		return "READ";
     case CMD_READ_IMAGE:	return "READ_IMAGE";
     case CMD_OBJECT_POSITION:	return "OBJECT_POSITION";
-  }
-  return "unknown";
+    }
+    return "unknown";
 }
 
 #define MAX_DUMP 70
+const char *encTmpFileName = "/tmp/stmp_enc.tmp";
+
+static int decompress(struct device __sane_unused__ *dev,
+                      const char __sane_unused__ *infilename)
+{
+#ifdef HAVE_LIBJPEG
+    int rc;
+    int row_stride, width, height, pixel_size;
+    struct jpeg_decompress_struct cinfo;
+    struct jpeg_error_mgr jerr;
+    unsigned long bmp_size = 0;
+    FILE *pInfile = NULL;
+    JSAMPARRAY buffer;
+
+    if ((pInfile = fopen(infilename, "rb")) == NULL) {
+        fprintf(stderr, "can't open %s\n", infilename);
+        return -1;
+    }
+
+    cinfo.err = jpeg_std_error(&jerr);
+
+    jpeg_create_decompress(&cinfo);
+
+    jpeg_stdio_src(&cinfo, pInfile);
+
+    rc = jpeg_read_header(&cinfo, TRUE);
+    if (rc != 1) {
+        jpeg_destroy_decompress(&cinfo);
+        fclose(pInfile);
+        return -1;
+    }
+
+    jpeg_start_decompress(&cinfo);
+
+    width = cinfo.output_width;
+    height = cinfo.output_height;
+    pixel_size = cinfo.output_components;
+    bmp_size = width * height * pixel_size;
+    dev->decDataSize = bmp_size;
+
+    row_stride = width * pixel_size;
+
+    buffer = (*cinfo.mem->alloc_sarray)
+             ((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
+
+    while (cinfo.output_scanline < cinfo.output_height) {
+        buffer[0] = dev->decData + \
+                    (cinfo.output_scanline) * row_stride;
+        jpeg_read_scanlines(&cinfo, buffer, 1);
+    }
+    jpeg_finish_decompress(&cinfo);
+    jpeg_destroy_decompress(&cinfo);
+    fclose(pInfile);
+    return 0;
+#else
+    return -1;
+#endif
+}
+
+static int copy_decompress_data(struct device *dev, unsigned char *pDest, int maxlen, int *destLen)
+{
+    int data_size = 0;
+    size_t result = 0, retVal = 0;
+
+
+    if (0 == dev->decDataSize) {
+        *destLen = 0;
+        return retVal;
+    }
+    data_size = dev->decDataSize - dev->currentDecDataIndex;
+    if (data_size > maxlen) {
+        data_size = maxlen;
+    }
+    memcpy(pDest, dev->decData+dev->currentDecDataIndex, data_size);
+    result = data_size;
+    *destLen = result;
+    dev->currentDecDataIndex += result;
+    retVal = result;
+
+    if (dev->decDataSize == dev->currentDecDataIndex) {
+        dev->currentDecDataIndex = 0;
+        dev->decDataSize = 0;
+    }
+
+    return retVal;
+}
+
+static int decompress_tempfile(struct device *dev)
+{
+    decompress(dev, encTmpFileName);
+    remove(encTmpFileName);
+    return 0;
+}
+
+static int dump_to_tmp_file(struct device *dev)
+{
+    unsigned char *pSrc = dev->data;
+    int srcLen = dev->datalen;
+    FILE *pInfile;
+    if ((pInfile = fopen(encTmpFileName, "a")) == NULL) {
+        fprintf(stderr, "can't open %s\n", encTmpFileName);
+        return 0;
+    }
+
+    fwrite(pSrc, 1, srcLen, pInfile);
+    fclose(pInfile);
+    return srcLen;
+}
+
+static int isSupportedDevice(struct device __sane_unused__ *dev)
+{
+#ifdef HAVE_LIBJPEG
+    /* Checking device which supports JPEG Lossy compression for color scanning*/
+    if (dev->compressionTypes & (1 << 6))
+        return 1;
+    else
+        return 0;
+#else
+    return 0;
+#endif
+}
+
 static void dbg_dump(struct device *dev)
 {
-  int i;
-  char dbuf[MAX_DUMP * 3 + 1], *dptr = dbuf;
-  int nzlen = dev->reslen;
-  int dlen = MIN(dev->reslen, MAX_DUMP);
+    int i;
+    char dbuf[MAX_DUMP * 3 + 1], *dptr = dbuf;
+    int nzlen = dev->reslen;
+    int dlen = MIN(dev->reslen, MAX_DUMP);
 
-  for (i = dev->reslen - 1; i >= 0; i--, nzlen--)
-    if (dev->res[i] != 0)
-      break;
+    for (i = dev->reslen - 1; i >= 0; i--, nzlen--)
+        if (dev->res[i] != 0)
+            break;
 
-  dlen = MIN(dlen, nzlen + 1);
+    dlen = MIN(dlen, nzlen + 1);
 
-  for (i = 0; i < dlen; i++, dptr += 3)
-    sprintf(dptr, " %02x", dev->res[i]);
+    for (i = 0; i < dlen; i++, dptr += 3)
+        sprintf(dptr, " %02x", dev->res[i]);
 
-  DBG (5, "[%lu]%s%s\n", (u_long)dev->reslen, dbuf,
-       (dlen < (int)dev->reslen)? "..." : "");
+    DBG(5, "[%lu]%s%s\n", (u_long)dev->reslen, dbuf,
+        (dlen < (int)dev->reslen)? "..." : "");
 }
 
 /* one command to device */
 /* return 0: on error, 1: success */
-static int dev_command (struct device *dev, SANE_Byte * cmd, size_t reqlen)
+static int dev_command(struct device *dev, SANE_Byte *cmd, size_t reqlen)
 {
-  SANE_Status status;
-  size_t sendlen = cmd[3] + 4;
-  SANE_Byte *res = dev->res;
-
-
-  assert (reqlen <= sizeof (dev->res));	/* requested len */
-  dev->reslen = sizeof (dev->res);	/* doing full buffer to flush stalled commands */
-
-  if (cmd[2] == CMD_SET_WINDOW) {
-    /* Set Window have wrong packet length, huh. */
-    sendlen = 25;
-  }
-
-  if (cmd[2] == CMD_READ_IMAGE) {
-    /* Read Image is raw data, don't need to read response */
-    res = NULL;
-  }
-
-  dev->state = 0;
-  DBG (4, ":: dev_command(%s[%#x], %lu)\n", str_cmd(cmd[2]), cmd[2],
-       (u_long)reqlen);
-  status = dev->io->dev_request(dev, cmd, sendlen, res, &dev->reslen);
-  if (status != SANE_STATUS_GOOD) {
-    DBG (1, "%s: dev_request: %s\n", __FUNCTION__, sane_strstatus (status));
-    dev->state = SANE_STATUS_IO_ERROR;
-    return 0;
-  }
+    SANE_Status status;
+    size_t sendlen = cmd[3] + 4;
+    SANE_Byte *res = dev->res;
 
-  if (!res) {
-    /* if not need response just return success */
-    return 1;
-  }
 
-  /* normal command reply, some sanity checking */
-  if (dev->reslen < reqlen) {
-    DBG (1, "%s: illegal response len %lu, need %lu\n",
-	 __FUNCTION__, (u_long)dev->reslen, (u_long)reqlen);
-    dev->state = SANE_STATUS_IO_ERROR;
-    return 0;
-  } else {
-    size_t pktlen;		/* len specified in packet */
+    assert(reqlen <= sizeof(dev->res));	/* requested len */
+    dev->reslen = sizeof(dev->res);	/* doing full buffer to flush stalled commands */
 
-    if (DBG_LEVEL > 3)
-      dbg_dump(dev);
+    if (cmd[2] == CMD_SET_WINDOW) {
+        /* Set Window have wrong packet length, huh. */
+        sendlen = 25;
+    }
 
-    if (dev->res[0] != RES_CODE) {
-      DBG (2, "%s: illegal data header %02x\n", __FUNCTION__, dev->res[0]);
-      dev->state = SANE_STATUS_IO_ERROR;
-      return 0;
+    if (cmd[2] == CMD_READ_IMAGE) {
+        /* Read Image is raw data, don't need to read response */
+        res = NULL;
     }
-    pktlen = dev->res[2] + 3;
-    if (dev->reslen != pktlen) {
-      DBG (2, "%s: illegal response len %lu, should be %lu\n",
-	   __FUNCTION__, (u_long)pktlen, (u_long)dev->reslen);
-      dev->state = SANE_STATUS_IO_ERROR;
-      return 0;
+
+    dev->state = 0;
+    DBG(4, ":: dev_command(%s[%#x], %lu)\n", str_cmd(cmd[2]), cmd[2],
+        (u_long)reqlen);
+    status = dev->io->dev_request(dev, cmd, sendlen, res, &dev->reslen);
+    if (status != SANE_STATUS_GOOD) {
+        DBG(1, "%s: dev_request: %s\n", __func__, sane_strstatus(status));
+        dev->state = SANE_STATUS_IO_ERROR;
+        return 0;
     }
-    if (dev->reslen > reqlen)
-      DBG (2, "%s: too big packet len %lu, need %lu\n",
-	   __FUNCTION__, (u_long)dev->reslen, (u_long)reqlen);
-  }
-
-  dev->state = 0;
-  if (cmd[2] == CMD_SET_WINDOW ||
-      cmd[2] == CMD_OBJECT_POSITION ||
-      cmd[2] == CMD_READ ||
-      cmd[2] == CMD_RESERVE_UNIT) {
-    if (dev->res[1] == STATUS_BUSY)
-      dev->state = SANE_STATUS_DEVICE_BUSY;
-    else if (dev->res[1] == STATUS_CANCEL)
-      dev->state = SANE_STATUS_CANCELLED;
-    else if (dev->res[1] == STATUS_CHECK)
-      dev->state = resolv_state((cmd[2] == CMD_READ)?
-				(dev->res[12] << 8 | dev->res[13]) :
-				(dev->res[4] << 8 | dev->res[5]));
-
-    if (dev->state)
-      DBG (3, "%s(%s[%#x]): => %d: %s\n",
-	   __FUNCTION__, str_cmd(cmd[2]), cmd[2],
-	   dev->state, sane_strstatus(dev->state));
-  }
-
-  return 1;
+
+    if (!res) {
+        /* if not need response just return success */
+        return 1;
+    }
+
+    /* normal command reply, some sanity checking */
+    if (dev->reslen < reqlen) {
+        DBG(1, "%s: illegal response len %lu, need %lu\n",
+            __func__, (u_long)dev->reslen, (u_long)reqlen);
+        dev->state = SANE_STATUS_IO_ERROR;
+        return 0;
+    } else {
+        size_t pktlen;		/* len specified in packet */
+
+        if (DBG_LEVEL > 3)
+            dbg_dump(dev);
+
+        if (dev->res[0] != RES_CODE) {
+            DBG(2, "%s: illegal data header %02x\n", __func__, dev->res[0]);
+            dev->state = SANE_STATUS_IO_ERROR;
+            return 0;
+        }
+        pktlen = dev->res[2] + 3;
+        if (dev->reslen != pktlen) {
+            DBG(2, "%s: illegal response len %lu, should be %lu\n",
+                __func__, (u_long)pktlen, (u_long)dev->reslen);
+            dev->state = SANE_STATUS_IO_ERROR;
+            return 0;
+        }
+        if (dev->reslen > reqlen)
+            DBG(2, "%s: too big packet len %lu, need %lu\n",
+                __func__, (u_long)dev->reslen, (u_long)reqlen);
+    }
+
+    dev->state = 0;
+    if (cmd[2] == CMD_SET_WINDOW ||
+        cmd[2] == CMD_OBJECT_POSITION ||
+        cmd[2] == CMD_READ ||
+        cmd[2] == CMD_RESERVE_UNIT) {
+        if (dev->res[1] == STATUS_BUSY)
+            dev->state = SANE_STATUS_DEVICE_BUSY;
+        else if (dev->res[1] == STATUS_CANCEL)
+            dev->state = SANE_STATUS_CANCELLED;
+        else if (dev->res[1] == STATUS_CHECK)
+            dev->state = resolv_state((cmd[2] == CMD_READ)?
+                                      (dev->res[12] << 8 | dev->res[13]) :
+                                      (dev->res[4] << 8 | dev->res[5]));
+
+        if (dev->state)
+            DBG(3, "%s(%s[%#x]): => %d: %s\n",
+                __func__, str_cmd(cmd[2]), cmd[2],
+                dev->state, sane_strstatus(dev->state));
+    }
+
+    return 1;
 }
 
 /* one short command to device */
-static int dev_cmd (struct device *dev, SANE_Byte command)
+static int dev_cmd(struct device *dev, SANE_Byte command)
 {
-  SANE_Byte cmd[4] = { REQ_CODE_A, REQ_CODE_B };
-  cmd[2] = command;
-  return dev_command (dev, cmd, (command == CMD_INQUIRY)? 70 : 32);
+    SANE_Byte cmd[4] = { REQ_CODE_A, REQ_CODE_B };
+    cmd[2] = command;
+    return dev_command(dev, cmd, (command == CMD_INQUIRY)? 70 : 32);
 }
 
 /* stop scanning operation. return previous status */
 static SANE_Status dev_stop(struct device *dev)
 {
-  int state = dev->state;
-
-  DBG (3, "%s: %p, scanning %d, reserved %d\n", __FUNCTION__,
-       (void *)dev, dev->scanning, dev->reserved);
-  dev->scanning = 0;
-
-  /* release */
-  if (!dev->reserved)
-   return state;
-  dev->reserved = 0;
-  dev_cmd(dev, CMD_RELEASE_UNIT);
-  DBG (3, "total image %d*%d size %d (win %d*%d), %d*%d %d data: %d, out %d bytes\n",
-       dev->para.pixels_per_line, dev->para.lines,
-       dev->total_img_size,
-       dev->win_width, dev->win_len,
-       dev->pixels_per_line, dev->ulines, dev->blocks,
-       dev->total_data_size, dev->total_out_size);
-  dev->state = state;
-  return state;
+    int state = dev->state;
+
+    DBG(3, "%s: %p, scanning %d, reserved %d\n", __func__,
+        (void *)dev, dev->scanning, dev->reserved);
+    dev->scanning = 0;
+
+    /* release */
+    if (!dev->reserved)
+        return state;
+    dev->reserved = 0;
+    dev_cmd(dev, CMD_RELEASE_UNIT);
+    DBG(3, "total image %d*%d size %d (win %d*%d), %d*%d %d data: %d, out %d bytes\n",
+        dev->para.pixels_per_line, dev->para.lines,
+        dev->total_img_size,
+        dev->win_width, dev->win_len,
+        dev->pixels_per_line, dev->ulines, dev->blocks,
+        dev->total_data_size, dev->total_out_size);
+    dev->state = state;
+    return state;
 }
 
 SANE_Status ret_cancel(struct device *dev, SANE_Status ret)
 {
-  dev_cmd(dev, CMD_ABORT);
-  if (dev->scanning) {
-    dev_stop(dev);
-    dev->state = SANE_STATUS_CANCELLED;
-  }
-  return ret;
+    dev_cmd(dev, CMD_ABORT);
+    if (dev->scanning) {
+        dev_stop(dev);
+        dev->state = SANE_STATUS_CANCELLED;
+    }
+    return ret;
 }
 
 static int cancelled(struct device *dev)
 {
-  if (dev->cancel)
-    return ret_cancel(dev, 1);
-  return 0;
+    if (dev->cancel)
+        return ret_cancel(dev, 1);
+    return 0;
 }
 
 /* issue command and wait until scanner is not busy */
 /* return 0 on error/blocking, 1 is ok and ready */
 static int dev_cmd_wait(struct device *dev, int cmd)
 {
-  int sleeptime = 10;
-
-  do {
-    if (cancelled(dev))
-      return 0;
-    if (!dev_cmd(dev, cmd)) {
-      dev->state = SANE_STATUS_IO_ERROR;
-      return 0;
-    } else if (dev->state) {
-      if (dev->state != SANE_STATUS_DEVICE_BUSY)
-	return 0;
-      else {
-	if (dev->non_blocking) {
-	  dev->state = SANE_STATUS_GOOD;
-	  return 0;
-	} else {
-	  if (sleeptime > 1000)
-	    sleeptime = 1000;
-	  DBG (4, "(%s) sleeping(%d ms).. [%x %x]\n",
-	       str_cmd(cmd), sleeptime, dev->res[4], dev->res[5]);
-	  usleep(sleeptime * 1000);
-	  if (sleeptime < 1000)
-	    sleeptime *= (sleeptime < 100)? 10 : 2;
-	}
-      } /* BUSY */
-    }
-  } while (dev->state == SANE_STATUS_DEVICE_BUSY);
+    int sleeptime = 10;
+
+    do {
+        if (cancelled(dev))
+            return 0;
+        if (!dev_cmd(dev, cmd)) {
+            dev->state = SANE_STATUS_IO_ERROR;
+            return 0;
+        } else if (dev->state) {
+            if (dev->state != SANE_STATUS_DEVICE_BUSY)
+                return 0;
+            else {
+                if (dev->non_blocking) {
+                    dev->state = SANE_STATUS_GOOD;
+                    return 0;
+                } else {
+                    if (sleeptime > 1000)
+                        sleeptime = 1000;
+                    DBG(4, "(%s) sleeping(%d ms).. [%x %x]\n",
+                        str_cmd(cmd), sleeptime, dev->res[4], dev->res[5]);
+                    usleep(sleeptime * 1000);
+                    if (sleeptime < 1000)
+                        sleeptime *= (sleeptime < 100)? 10 : 2;
+                }
+            } /* BUSY */
+        }
+    } while (dev->state == SANE_STATUS_DEVICE_BUSY);
 
-  return 1;
+    return 1;
 }
 
 static int inq_dpi_bits[] = {
-  75, 150, 0, 0,
-  200, 300, 0, 0, 
-  600, 0, 0, 1200,
-  100, 0, 0, 2400,
-  0, 4800, 0, 9600
+    75, 150, 0, 0,
+    200, 300, 0, 0,
+    600, 0, 0, 1200,
+    100, 0, 0, 2400,
+    0, 4800, 0, 9600
 };
 
 static int res_dpi_codes[] = {
-  75, 0, 150, 0,
-  0, 300, 0, 600,
-  1200, 200, 100, 2400,
-  4800, 9600
+    75, 0, 150, 0,
+    0, 300, 0, 600,
+    1200, 200, 100, 2400,
+    4800, 9600
 };
 
-static int SANE_Word_sort(const void * a, const void * b)
+static int SANE_Word_sort(const void *a, const void *b)
 {
-  return *(const SANE_Word *)a - *(const SANE_Word *)b;
+    return *(const SANE_Word *)a - *(const SANE_Word *)b;
 }
 
 /* resolve inquired dpi list to dpi_list array */
 static void resolv_inq_dpi(struct device *dev)
 {
-  unsigned int i;
-  int res = dev->resolutions;
-
-  assert(sizeof(inq_dpi_bits) < sizeof(dev->dpi_list));
-  for (i = 0; i < sizeof(inq_dpi_bits) / sizeof(int); i++)
-    if (inq_dpi_bits[i] && (res & (1 << i)))
-      dev->dpi_list[++dev->dpi_list[0]] = inq_dpi_bits[i];
-  qsort(&dev->dpi_list[1], dev->dpi_list[0], sizeof(SANE_Word), SANE_Word_sort);
+    unsigned int i;
+    int res = dev->resolutions;
+
+    assert(sizeof(inq_dpi_bits) < sizeof(dev->dpi_list));
+    for (i = 0; i < sizeof(inq_dpi_bits) / sizeof(int); i++)
+        if (inq_dpi_bits[i] && (res & (1 << i)))
+            dev->dpi_list[++dev->dpi_list[0]] = inq_dpi_bits[i];
+    qsort(&dev->dpi_list[1], dev->dpi_list[0], sizeof(SANE_Word), SANE_Word_sort);
 }
 
 static unsigned int dpi_to_code(int dpi)
 {
-  unsigned int i;
+    unsigned int i;
 
-  for (i = 0; i < sizeof(res_dpi_codes) / sizeof(int); i++) {
-    if (dpi == res_dpi_codes[i])
-      return i;
-  }
-  return 0;
+    for (i = 0; i < sizeof(res_dpi_codes) / sizeof(int); i++) {
+        if (dpi == res_dpi_codes[i])
+            return i;
+    }
+    return 0;
 }
 
 static int string_match_index(const SANE_String_Const s[], SANE_String m)
 {
-  int i;
-
-  for (i = 0; *s; i++) {
-    SANE_String_Const x = *s++;
-    if (strcasecmp(x, m) == 0)
-      return i;
-  }
-  return 0;
+    int i;
+
+    for (i = 0; *s; i++) {
+        SANE_String_Const x = *s++;
+        if (strcasecmp(x, m) == 0)
+            return i;
+    }
+    return 0;
 }
 
 static SANE_String string_match(const SANE_String_Const s[], SANE_String m)
 {
-  return UNCONST(s[string_match_index(s, m)]);
+    return UNCONST(s[string_match_index(s, m)]);
 }
 
-static size_t max_string_size (SANE_String_Const s[])
+static size_t max_string_size(SANE_String_Const s[])
 {
-  size_t max = 0;
-
-  while (*s) {
-    size_t size = strlen(*s++) + 1;
-    if (size > max)
-      max = size;
-  }
-  return max;
+    size_t max = 0;
+
+    while (*s) {
+        size_t size = strlen(*s++) + 1;
+        if (size > max)
+            max = size;
+    }
+    return max;
 }
 
 static SANE_String_Const doc_sources[] = {
-  "Flatbed", "ADF", "Auto", NULL
+    "Flatbed", "ADF", "Auto", NULL
 };
 
 static int doc_source_to_code[] = {
-  0x40, 0x20, 0x80
+    0x40, 0x20, 0x80
 };
 
 static SANE_String_Const scan_modes[] = {
-  SANE_VALUE_SCAN_MODE_LINEART,
-  SANE_VALUE_SCAN_MODE_HALFTONE,
-  SANE_VALUE_SCAN_MODE_GRAY,
-  SANE_VALUE_SCAN_MODE_COLOR,
-  NULL
+    SANE_VALUE_SCAN_MODE_LINEART,
+    SANE_VALUE_SCAN_MODE_HALFTONE,
+    SANE_VALUE_SCAN_MODE_GRAY,
+    SANE_VALUE_SCAN_MODE_COLOR,
+    NULL
 };
 
 static int scan_mode_to_code[] = {
-  0x00, 0x01, 0x03, 0x05
+    0x00, 0x01, 0x03, 0x05
 };
 
 static SANE_Range threshold = {
-  SANE_FIX(30), SANE_FIX(70), SANE_FIX(10)
+    SANE_FIX(30), SANE_FIX(70), SANE_FIX(10)
 };
 
 static void reset_options(struct device *dev)
 {
-  dev->val[OPT_RESOLUTION].w = 150;
-  dev->val[OPT_MODE].s = string_match(scan_modes, SANE_VALUE_SCAN_MODE_COLOR);
-
-  /* if docs loaded in adf use it as default source, flatbed oterwise */
-  dev->val[OPT_SOURCE].s = UNCONST(doc_sources[(dev->doc_loaded)? 1 : 0]);
-
-  dev->val[OPT_THRESHOLD].w = SANE_FIX(50);
-
-  /* this is reported maximum window size, will be fixed later */
-  dev->win_x_range.min = SANE_FIX(0);
-  dev->win_x_range.max = SANE_FIX((double)dev->max_win_width / PNT_PER_MM);
-  dev->win_x_range.quant = SANE_FIX(1);
-  dev->win_y_range.min = SANE_FIX(0);
-  dev->win_y_range.max = SANE_FIX((double)dev->max_win_len / PNT_PER_MM);
-  dev->win_y_range.quant = SANE_FIX(1);
-  dev->val[OPT_SCAN_TL_X].w = dev->win_x_range.min;
-  dev->val[OPT_SCAN_TL_Y].w = dev->win_y_range.min;
-  dev->val[OPT_SCAN_BR_X].w = dev->win_x_range.max;
-  dev->val[OPT_SCAN_BR_Y].w = dev->win_y_range.max;
+    dev->val[OPT_RESOLUTION].w = 150;
+    dev->val[OPT_MODE].s = string_match(scan_modes, SANE_VALUE_SCAN_MODE_COLOR);
+
+    /* if docs loaded in adf use it as default source, flatbed oterwise */
+    dev->val[OPT_SOURCE].s = UNCONST(doc_sources[(dev->doc_loaded)? 1 : 0]);
+
+    dev->val[OPT_THRESHOLD].w = SANE_FIX(50);
+
+    /* this is reported maximum window size, will be fixed later */
+    dev->win_x_range.min = SANE_FIX(0);
+    dev->win_x_range.max = SANE_FIX((double)dev->max_win_width / PNT_PER_MM);
+    dev->win_x_range.quant = SANE_FIX(1);
+    dev->win_y_range.min = SANE_FIX(0);
+    dev->win_y_range.max = SANE_FIX((double)dev->max_win_len / PNT_PER_MM);
+    dev->win_y_range.quant = SANE_FIX(1);
+    dev->val[OPT_SCAN_TL_X].w = dev->win_x_range.min;
+    dev->val[OPT_SCAN_TL_Y].w = dev->win_y_range.min;
+    dev->val[OPT_SCAN_BR_X].w = dev->win_x_range.max;
+    dev->val[OPT_SCAN_BR_Y].w = dev->win_y_range.max;
 }
 
 static void init_options(struct device *dev)
 {
-  int i;
-
-  for (i = 0; i < NUM_OPTIONS; i++) {
-    dev->opt[i].cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
-    dev->opt[i].size = sizeof(SANE_Word);
-    dev->opt[i].type = SANE_TYPE_FIXED;
-    dev->val[i].s = NULL;
-  }
-
-  dev->opt[OPT_NUMOPTIONS].name = SANE_NAME_NUM_OPTIONS;
-  dev->opt[OPT_NUMOPTIONS].title = SANE_TITLE_NUM_OPTIONS;
-  dev->opt[OPT_NUMOPTIONS].desc = SANE_DESC_NUM_OPTIONS;
-  dev->opt[OPT_NUMOPTIONS].type = SANE_TYPE_INT;
-  dev->opt[OPT_NUMOPTIONS].cap = SANE_CAP_SOFT_DETECT;
-  dev->val[OPT_NUMOPTIONS].w = NUM_OPTIONS;
-
-  dev->opt[OPT_GROUP_STD].name = SANE_NAME_STANDARD;
-  dev->opt[OPT_GROUP_STD].title = SANE_TITLE_STANDARD;
-  dev->opt[OPT_GROUP_STD].desc = SANE_DESC_STANDARD;
-  dev->opt[OPT_GROUP_STD].type = SANE_TYPE_GROUP;
-  dev->opt[OPT_GROUP_STD].cap = 0;
-
-  dev->opt[OPT_RESOLUTION].name = SANE_NAME_SCAN_RESOLUTION;
-  dev->opt[OPT_RESOLUTION].title = SANE_TITLE_SCAN_RESOLUTION;
-  dev->opt[OPT_RESOLUTION].desc = SANE_DESC_SCAN_RESOLUTION;
-  dev->opt[OPT_RESOLUTION].type = SANE_TYPE_INT;
-  dev->opt[OPT_RESOLUTION].cap = SANE_CAP_SOFT_SELECT|SANE_CAP_SOFT_DETECT;
-  dev->opt[OPT_RESOLUTION].unit = SANE_UNIT_DPI;
-  dev->opt[OPT_RESOLUTION].constraint_type = SANE_CONSTRAINT_WORD_LIST;
-  dev->opt[OPT_RESOLUTION].constraint.word_list = dev->dpi_list;
-
-  dev->opt[OPT_MODE].name = SANE_NAME_SCAN_MODE;
-  dev->opt[OPT_MODE].title = SANE_TITLE_SCAN_MODE;
-  dev->opt[OPT_MODE].desc = SANE_DESC_SCAN_MODE;
-  dev->opt[OPT_MODE].type = SANE_TYPE_STRING;
-  dev->opt[OPT_MODE].size = max_string_size(scan_modes);
-  dev->opt[OPT_MODE].cap = SANE_CAP_SOFT_SELECT|SANE_CAP_SOFT_DETECT;
-  dev->opt[OPT_MODE].constraint_type = SANE_CONSTRAINT_STRING_LIST;
-  dev->opt[OPT_MODE].constraint.string_list = scan_modes;
-
-  dev->opt[OPT_THRESHOLD].name = SANE_NAME_HIGHLIGHT;
-  dev->opt[OPT_THRESHOLD].title = SANE_TITLE_THRESHOLD;
-  dev->opt[OPT_THRESHOLD].desc = SANE_DESC_THRESHOLD;
-  dev->opt[OPT_THRESHOLD].unit = SANE_UNIT_PERCENT;
-  dev->opt[OPT_THRESHOLD].cap = SANE_CAP_SOFT_SELECT|SANE_CAP_SOFT_DETECT;
-  dev->opt[OPT_THRESHOLD].constraint_type = SANE_CONSTRAINT_RANGE;
-  dev->opt[OPT_THRESHOLD].constraint.range = &threshold;
-
-  dev->opt[OPT_SOURCE].name = SANE_NAME_SCAN_SOURCE;
-  dev->opt[OPT_SOURCE].title = SANE_TITLE_SCAN_SOURCE;
-  dev->opt[OPT_SOURCE].desc = SANE_DESC_SCAN_SOURCE;
-  dev->opt[OPT_SOURCE].type = SANE_TYPE_STRING;
-  dev->opt[OPT_SOURCE].size = max_string_size(doc_sources);
-  dev->opt[OPT_SOURCE].cap = SANE_CAP_SOFT_SELECT|SANE_CAP_SOFT_DETECT;
-  dev->opt[OPT_SOURCE].constraint_type = SANE_CONSTRAINT_STRING_LIST;
-  dev->opt[OPT_SOURCE].constraint.string_list = doc_sources;
-
-  dev->opt[OPT_GROUP_GEO].name = SANE_NAME_GEOMETRY;
-  dev->opt[OPT_GROUP_GEO].title = SANE_TITLE_GEOMETRY;
-  dev->opt[OPT_GROUP_GEO].desc = SANE_DESC_GEOMETRY;
-  dev->opt[OPT_GROUP_GEO].type = SANE_TYPE_GROUP;
-  dev->opt[OPT_GROUP_GEO].cap = 0;
-
-  dev->opt[OPT_SCAN_TL_X].name = SANE_NAME_SCAN_TL_X;
-  dev->opt[OPT_SCAN_TL_X].title = SANE_TITLE_SCAN_TL_X;
-  dev->opt[OPT_SCAN_TL_X].desc = SANE_DESC_SCAN_TL_X;
-  dev->opt[OPT_SCAN_TL_X].unit = SANE_UNIT_MM;
-  dev->opt[OPT_SCAN_TL_X].constraint_type = SANE_CONSTRAINT_RANGE;
-  dev->opt[OPT_SCAN_TL_X].constraint.range = &dev->win_x_range;
-
-  dev->opt[OPT_SCAN_TL_Y].name = SANE_NAME_SCAN_TL_Y;
-  dev->opt[OPT_SCAN_TL_Y].title = SANE_TITLE_SCAN_TL_Y;
-  dev->opt[OPT_SCAN_TL_Y].desc = SANE_DESC_SCAN_TL_Y;
-  dev->opt[OPT_SCAN_TL_Y].unit = SANE_UNIT_MM;
-  dev->opt[OPT_SCAN_TL_Y].constraint_type = SANE_CONSTRAINT_RANGE;
-  dev->opt[OPT_SCAN_TL_Y].constraint.range = &dev->win_y_range;
-
-  dev->opt[OPT_SCAN_BR_X].name = SANE_NAME_SCAN_BR_X;
-  dev->opt[OPT_SCAN_BR_X].title = SANE_TITLE_SCAN_BR_X;
-  dev->opt[OPT_SCAN_BR_X].desc = SANE_DESC_SCAN_BR_X;
-  dev->opt[OPT_SCAN_BR_X].unit = SANE_UNIT_MM;
-  dev->opt[OPT_SCAN_BR_X].constraint_type = SANE_CONSTRAINT_RANGE;
-  dev->opt[OPT_SCAN_BR_X].constraint.range = &dev->win_x_range;
-
-  dev->opt[OPT_SCAN_BR_Y].name = SANE_NAME_SCAN_BR_Y;
-  dev->opt[OPT_SCAN_BR_Y].title = SANE_TITLE_SCAN_BR_Y;
-  dev->opt[OPT_SCAN_BR_Y].desc = SANE_DESC_SCAN_BR_Y;
-  dev->opt[OPT_SCAN_BR_Y].unit = SANE_UNIT_MM;
-  dev->opt[OPT_SCAN_BR_Y].constraint_type = SANE_CONSTRAINT_RANGE;
-  dev->opt[OPT_SCAN_BR_Y].constraint.range = &dev->win_y_range;
+    int i;
+
+    for (i = 0; i < NUM_OPTIONS; i++) {
+        dev->opt[i].cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
+        dev->opt[i].size = sizeof(SANE_Word);
+        dev->opt[i].type = SANE_TYPE_FIXED;
+        dev->val[i].s = NULL;
+    }
+
+    dev->opt[OPT_NUMOPTIONS].name = SANE_NAME_NUM_OPTIONS;
+    dev->opt[OPT_NUMOPTIONS].title = SANE_TITLE_NUM_OPTIONS;
+    dev->opt[OPT_NUMOPTIONS].desc = SANE_DESC_NUM_OPTIONS;
+    dev->opt[OPT_NUMOPTIONS].type = SANE_TYPE_INT;
+    dev->opt[OPT_NUMOPTIONS].cap = SANE_CAP_SOFT_DETECT;
+    dev->val[OPT_NUMOPTIONS].w = NUM_OPTIONS;
+
+    dev->opt[OPT_GROUP_STD].name = SANE_NAME_STANDARD;
+    dev->opt[OPT_GROUP_STD].title = SANE_TITLE_STANDARD;
+    dev->opt[OPT_GROUP_STD].desc = SANE_DESC_STANDARD;
+    dev->opt[OPT_GROUP_STD].type = SANE_TYPE_GROUP;
+    dev->opt[OPT_GROUP_STD].cap = 0;
+
+    dev->opt[OPT_RESOLUTION].name = SANE_NAME_SCAN_RESOLUTION;
+    dev->opt[OPT_RESOLUTION].title = SANE_TITLE_SCAN_RESOLUTION;
+    dev->opt[OPT_RESOLUTION].desc = SANE_DESC_SCAN_RESOLUTION;
+    dev->opt[OPT_RESOLUTION].type = SANE_TYPE_INT;
+    dev->opt[OPT_RESOLUTION].cap = SANE_CAP_SOFT_SELECT|SANE_CAP_SOFT_DETECT;
+    dev->opt[OPT_RESOLUTION].unit = SANE_UNIT_DPI;
+    dev->opt[OPT_RESOLUTION].constraint_type = SANE_CONSTRAINT_WORD_LIST;
+    dev->opt[OPT_RESOLUTION].constraint.word_list = dev->dpi_list;
+
+    dev->opt[OPT_MODE].name = SANE_NAME_SCAN_MODE;
+    dev->opt[OPT_MODE].title = SANE_TITLE_SCAN_MODE;
+    dev->opt[OPT_MODE].desc = SANE_DESC_SCAN_MODE;
+    dev->opt[OPT_MODE].type = SANE_TYPE_STRING;
+    dev->opt[OPT_MODE].size = max_string_size(scan_modes);
+    dev->opt[OPT_MODE].cap = SANE_CAP_SOFT_SELECT|SANE_CAP_SOFT_DETECT;
+    dev->opt[OPT_MODE].constraint_type = SANE_CONSTRAINT_STRING_LIST;
+    dev->opt[OPT_MODE].constraint.string_list = scan_modes;
+
+    dev->opt[OPT_THRESHOLD].name = SANE_NAME_HIGHLIGHT;
+    dev->opt[OPT_THRESHOLD].title = SANE_TITLE_THRESHOLD;
+    dev->opt[OPT_THRESHOLD].desc = SANE_DESC_THRESHOLD;
+    dev->opt[OPT_THRESHOLD].unit = SANE_UNIT_PERCENT;
+    dev->opt[OPT_THRESHOLD].cap = SANE_CAP_SOFT_SELECT|SANE_CAP_SOFT_DETECT;
+    dev->opt[OPT_THRESHOLD].constraint_type = SANE_CONSTRAINT_RANGE;
+    dev->opt[OPT_THRESHOLD].constraint.range = &threshold;
+
+    dev->opt[OPT_SOURCE].name = SANE_NAME_SCAN_SOURCE;
+    dev->opt[OPT_SOURCE].title = SANE_TITLE_SCAN_SOURCE;
+    dev->opt[OPT_SOURCE].desc = SANE_DESC_SCAN_SOURCE;
+    dev->opt[OPT_SOURCE].type = SANE_TYPE_STRING;
+    dev->opt[OPT_SOURCE].size = max_string_size(doc_sources);
+    dev->opt[OPT_SOURCE].cap = SANE_CAP_SOFT_SELECT|SANE_CAP_SOFT_DETECT;
+    dev->opt[OPT_SOURCE].constraint_type = SANE_CONSTRAINT_STRING_LIST;
+    dev->opt[OPT_SOURCE].constraint.string_list = doc_sources;
+
+    dev->opt[OPT_GROUP_GEO].name = SANE_NAME_GEOMETRY;
+    dev->opt[OPT_GROUP_GEO].title = SANE_TITLE_GEOMETRY;
+    dev->opt[OPT_GROUP_GEO].desc = SANE_DESC_GEOMETRY;
+    dev->opt[OPT_GROUP_GEO].type = SANE_TYPE_GROUP;
+    dev->opt[OPT_GROUP_GEO].cap = 0;
+
+    dev->opt[OPT_SCAN_TL_X].name = SANE_NAME_SCAN_TL_X;
+    dev->opt[OPT_SCAN_TL_X].title = SANE_TITLE_SCAN_TL_X;
+    dev->opt[OPT_SCAN_TL_X].desc = SANE_DESC_SCAN_TL_X;
+    dev->opt[OPT_SCAN_TL_X].unit = SANE_UNIT_MM;
+    dev->opt[OPT_SCAN_TL_X].constraint_type = SANE_CONSTRAINT_RANGE;
+    dev->opt[OPT_SCAN_TL_X].constraint.range = &dev->win_x_range;
+
+    dev->opt[OPT_SCAN_TL_Y].name = SANE_NAME_SCAN_TL_Y;
+    dev->opt[OPT_SCAN_TL_Y].title = SANE_TITLE_SCAN_TL_Y;
+    dev->opt[OPT_SCAN_TL_Y].desc = SANE_DESC_SCAN_TL_Y;
+    dev->opt[OPT_SCAN_TL_Y].unit = SANE_UNIT_MM;
+    dev->opt[OPT_SCAN_TL_Y].constraint_type = SANE_CONSTRAINT_RANGE;
+    dev->opt[OPT_SCAN_TL_Y].constraint.range = &dev->win_y_range;
+
+    dev->opt[OPT_SCAN_BR_X].name = SANE_NAME_SCAN_BR_X;
+    dev->opt[OPT_SCAN_BR_X].title = SANE_TITLE_SCAN_BR_X;
+    dev->opt[OPT_SCAN_BR_X].desc = SANE_DESC_SCAN_BR_X;
+    dev->opt[OPT_SCAN_BR_X].unit = SANE_UNIT_MM;
+    dev->opt[OPT_SCAN_BR_X].constraint_type = SANE_CONSTRAINT_RANGE;
+    dev->opt[OPT_SCAN_BR_X].constraint.range = &dev->win_x_range;
+
+    dev->opt[OPT_SCAN_BR_Y].name = SANE_NAME_SCAN_BR_Y;
+    dev->opt[OPT_SCAN_BR_Y].title = SANE_TITLE_SCAN_BR_Y;
+    dev->opt[OPT_SCAN_BR_Y].desc = SANE_DESC_SCAN_BR_Y;
+    dev->opt[OPT_SCAN_BR_Y].unit = SANE_UNIT_MM;
+    dev->opt[OPT_SCAN_BR_Y].constraint_type = SANE_CONSTRAINT_RANGE;
+    dev->opt[OPT_SCAN_BR_Y].constraint.range = &dev->win_y_range;
 }
 
 /* fill parameters from options */
 static void set_parameters(struct device *dev)
 {
-  double px_to_len;
+    double px_to_len;
 
-  dev->para.last_frame = SANE_TRUE;
-  dev->para.lines = -1;
-  px_to_len = 1200.0 / dev->val[OPT_RESOLUTION].w;
+    dev->para.last_frame = SANE_TRUE;
+    dev->para.lines = -1;
+    px_to_len = 1200.0 / dev->val[OPT_RESOLUTION].w;
 #define BETTER_BASEDPI 1
-  /* tests prove that 1200dpi base is very inexact
-   * so I calculated better values for each axis */
-#if BETTER_BASEDPI 
-  px_to_len = 1180.0 / dev->val[OPT_RESOLUTION].w;
-#endif
-  dev->para.pixels_per_line = dev->win_width / px_to_len;
-  dev->para.bytes_per_line = dev->para.pixels_per_line;
+    /* tests prove that 1200dpi base is very inexact
+     * so I calculated better values for each axis */
 #if BETTER_BASEDPI
-  px_to_len = 1213.9 / dev->val[OPT_RESOLUTION].w;
+    px_to_len = 1180.0 / dev->val[OPT_RESOLUTION].w;
 #endif
-  dev->para.lines = dev->win_len / px_to_len;
-  if (dev->composition == MODE_LINEART ||
-      dev->composition == MODE_HALFTONE) {
-    dev->para.format = SANE_FRAME_GRAY;
-    dev->para.depth = 1;
-    dev->para.bytes_per_line = (dev->para.pixels_per_line + 7) / 8;
-  } else if (dev->composition == MODE_GRAY8) {
-    dev->para.format = SANE_FRAME_GRAY;
-    dev->para.depth = 8;
+    dev->para.pixels_per_line = dev->win_width / px_to_len;
     dev->para.bytes_per_line = dev->para.pixels_per_line;
-  } else if (dev->composition == MODE_RGB24) {
-    dev->para.format = SANE_FRAME_RGB;
-    dev->para.depth = 8;
-    dev->para.bytes_per_line *= 3;
-  } else {
-    /* this will never happen */
-    DBG (1, "%s: impossible image composition %d\n",
-	 __FUNCTION__, dev->composition);
-    dev->para.format = SANE_FRAME_GRAY;
-    dev->para.depth = 8;
-  }
+
+    if (!isSupportedDevice(dev)) {
+#if BETTER_BASEDPI
+        px_to_len = 1213.9 / dev->val[OPT_RESOLUTION].w;
+#endif
+    }
+    dev->para.lines = dev->win_len / px_to_len;
+    if (dev->composition == MODE_LINEART ||
+        dev->composition == MODE_HALFTONE) {
+        dev->para.format = SANE_FRAME_GRAY;
+        dev->para.depth = 1;
+        dev->para.bytes_per_line = (dev->para.pixels_per_line + 7) / 8;
+    } else if (dev->composition == MODE_GRAY8) {
+        dev->para.format = SANE_FRAME_GRAY;
+        dev->para.depth = 8;
+        dev->para.bytes_per_line = dev->para.pixels_per_line;
+    } else if (dev->composition == MODE_RGB24) {
+        dev->para.format = SANE_FRAME_RGB;
+        dev->para.depth = 8;
+        dev->para.bytes_per_line *= 3;
+    } else {
+        /* this will never happen */
+        DBG(1, "%s: impossible image composition %d\n",
+            __func__, dev->composition);
+        dev->para.format = SANE_FRAME_GRAY;
+        dev->para.depth = 8;
+    }
 }
 
 /* resolve all options related to scan window */
 /* called after option changed and in set_window */
 static int fix_window(struct device *dev)
 {
-  double win_width_mm, win_len_mm;
-  int i;
-  int threshold = SANE_UNFIX(dev->val[OPT_THRESHOLD].w);
-
-  dev->resolution = dpi_to_code(dev->val[OPT_RESOLUTION].w);
-  dev->composition = scan_mode_to_code[string_match_index(scan_modes, dev->val[OPT_MODE].s)];
-
-  if (dev->composition == MODE_LINEART ||
-      dev->composition == MODE_HALFTONE) {
-    dev->opt[OPT_THRESHOLD].cap &= ~SANE_CAP_INACTIVE;
-  } else {
-    dev->opt[OPT_THRESHOLD].cap |= SANE_CAP_INACTIVE;
-  }
-  if (threshold < 30) {
-    dev->val[OPT_THRESHOLD].w = SANE_FIX(30);
-  } else if (threshold > 70) {
-    dev->val[OPT_THRESHOLD].w = SANE_FIX(70);
-  }
-  threshold = SANE_UNFIX(dev->val[OPT_THRESHOLD].w);
-  dev->threshold = (threshold - 30) / 10;
-  dev->val[OPT_THRESHOLD].w = SANE_FIX(dev->threshold * 10 + 30);
-
-  dev->doc_source = doc_source_to_code[string_match_index(doc_sources, dev->val[OPT_SOURCE].s)];
-
-  /* max window len is dependent of document source */
-  if (dev->doc_source == DOC_FLATBED ||
-      (dev->doc_source == DOC_AUTO && !dev->doc_loaded))
-    dev->max_len = dev->max_len_fb;
-  else
-    dev->max_len = dev->max_len_adf;
-
-  /* parameters */
-  dev->win_y_range.max = SANE_FIX((double)dev->max_len / PNT_PER_MM);
-
-  /* window sanity checking */
-  for (i = OPT_SCAN_TL_X; i <= OPT_SCAN_BR_Y; i++) {
-    if (dev->val[i].w < dev->opt[i].constraint.range->min)
-      dev->val[i].w = dev->opt[i].constraint.range->min;
-    if (dev->val[i].w > dev->opt[i].constraint.range->max)
-      dev->val[i].w = dev->opt[i].constraint.range->max;
-  }
-
-  if (dev->val[OPT_SCAN_TL_X].w > dev->val[OPT_SCAN_BR_X].w)
-    SWAP_Word(dev->val[OPT_SCAN_TL_X].w, dev->val[OPT_SCAN_BR_X].w);
-  if (dev->val[OPT_SCAN_TL_Y].w > dev->val[OPT_SCAN_BR_Y].w)
-    SWAP_Word(dev->val[OPT_SCAN_TL_Y].w, dev->val[OPT_SCAN_BR_Y].w);
-
-  /* recalculate millimeters to inches */
-  dev->win_off_x = SANE_UNFIX(dev->val[OPT_SCAN_TL_X].w) / MM_PER_INCH;
-  dev->win_off_y = SANE_UNFIX(dev->val[OPT_SCAN_TL_Y].w) / MM_PER_INCH;
-
-  /* calc win size in mm */
-  win_width_mm = SANE_UNFIX(dev->val[OPT_SCAN_BR_X].w) -
-		    SANE_UNFIX(dev->val[OPT_SCAN_TL_X].w);
-  win_len_mm = SANE_UNFIX(dev->val[OPT_SCAN_BR_Y].w) -
-		  SANE_UNFIX(dev->val[OPT_SCAN_TL_Y].w);
-  /* convert mm to 1200 dpi points */
-  dev->win_width = (int)(win_width_mm * PNT_PER_MM);
-  dev->win_len = (int)(win_len_mm * PNT_PER_MM);
-
-  /* don't scan if window is zero size */
-  if (!dev->win_width || !dev->win_len) {
-    /* "The scan cannot be started with the current set of options." */
-    dev->state = SANE_STATUS_INVAL;
-    return 0;
-  }
+    double win_width_mm, win_len_mm;
+    int i;
+    int threshold = SANE_UNFIX(dev->val[OPT_THRESHOLD].w);
 
-  return 1;
-}
+    dev->resolution = dpi_to_code(dev->val[OPT_RESOLUTION].w);
+    dev->composition = scan_mode_to_code[string_match_index(scan_modes, dev->val[OPT_MODE].s)];
 
-static int dev_set_window (struct device *dev)
-{
-  SANE_Byte cmd[0x19] = {
-    REQ_CODE_A, REQ_CODE_B, CMD_SET_WINDOW, 0x13, MSG_SCANNING_PARAM
-  };
+    if (dev->composition == MODE_LINEART ||
+        dev->composition == MODE_HALFTONE) {
+        dev->opt[OPT_THRESHOLD].cap &= ~SANE_CAP_INACTIVE;
+    } else {
+        dev->opt[OPT_THRESHOLD].cap |= SANE_CAP_INACTIVE;
+    }
+    if (threshold < 30) {
+        dev->val[OPT_THRESHOLD].w = SANE_FIX(30);
+    } else if (threshold > 70) {
+        dev->val[OPT_THRESHOLD].w = SANE_FIX(70);
+    }
+    threshold = SANE_UNFIX(dev->val[OPT_THRESHOLD].w);
+    dev->threshold = (threshold - 30) / 10;
+    dev->val[OPT_THRESHOLD].w = SANE_FIX(dev->threshold * 10 + 30);
 
-  if (!fix_window(dev))
-    return 0;
+    dev->doc_source = doc_source_to_code[string_match_index(doc_sources, dev->val[OPT_SOURCE].s)];
+
+    /* max window len is dependent of document source */
+    if (dev->doc_source == DOC_FLATBED ||
+        (dev->doc_source == DOC_AUTO && !dev->doc_loaded))
+        dev->max_len = dev->max_len_fb;
+    else
+        dev->max_len = dev->max_len_adf;
+
+    /* parameters */
+    dev->win_y_range.max = SANE_FIX((double)dev->max_len / PNT_PER_MM);
+
+    /* window sanity checking */
+    for (i = OPT_SCAN_TL_X; i <= OPT_SCAN_BR_Y; i++) {
+        if (dev->val[i].w < dev->opt[i].constraint.range->min)
+            dev->val[i].w = dev->opt[i].constraint.range->min;
+        if (dev->val[i].w > dev->opt[i].constraint.range->max)
+            dev->val[i].w = dev->opt[i].constraint.range->max;
+    }
+
+    if (dev->val[OPT_SCAN_TL_X].w > dev->val[OPT_SCAN_BR_X].w)
+        SWAP_Word(dev->val[OPT_SCAN_TL_X].w, dev->val[OPT_SCAN_BR_X].w);
+    if (dev->val[OPT_SCAN_TL_Y].w > dev->val[OPT_SCAN_BR_Y].w)
+        SWAP_Word(dev->val[OPT_SCAN_TL_Y].w, dev->val[OPT_SCAN_BR_Y].w);
+
+    /* recalculate millimeters to inches */
+    dev->win_off_x = SANE_UNFIX(dev->val[OPT_SCAN_TL_X].w) / MM_PER_INCH;
+    dev->win_off_y = SANE_UNFIX(dev->val[OPT_SCAN_TL_Y].w) / MM_PER_INCH;
+
+    /* calc win size in mm */
+    win_width_mm = SANE_UNFIX(dev->val[OPT_SCAN_BR_X].w) -
+                   SANE_UNFIX(dev->val[OPT_SCAN_TL_X].w);
+    win_len_mm = SANE_UNFIX(dev->val[OPT_SCAN_BR_Y].w) -
+                 SANE_UNFIX(dev->val[OPT_SCAN_TL_Y].w);
+    /* convert mm to 1200 dpi points */
+    dev->win_width = (int)(win_width_mm * PNT_PER_MM);
+    dev->win_len = (int)(win_len_mm * PNT_PER_MM);
+
+    /* don't scan if window is zero size */
+    if (!dev->win_width || !dev->win_len) {
+        /* "The scan cannot be started with the current set of options." */
+        dev->state = SANE_STATUS_INVAL;
+        return 0;
+    }
 
-  cmd[0x05] = dev->win_width >> 24;
-  cmd[0x06] = dev->win_width >> 16;
-  cmd[0x07] = dev->win_width >> 8;
-  cmd[0x08] = dev->win_width;
-  cmd[0x09] = dev->win_len >> 24;
-  cmd[0x0a] = dev->win_len >> 16;
-  cmd[0x0b] = dev->win_len >> 8;
-  cmd[0x0c] = dev->win_len;
-  cmd[0x0d] = dev->resolution;		/* x */
-  cmd[0x0e] = dev->resolution;		/* y */
-  cmd[0x0f] = (SANE_Byte)floor(dev->win_off_x);
-  cmd[0x10] = (SANE_Byte)((dev->win_off_x - floor(dev->win_off_x)) * 100);
-  cmd[0x11] = (SANE_Byte)floor(dev->win_off_y);
-  cmd[0x12] = (SANE_Byte)((dev->win_off_y - floor(dev->win_off_y)) * 100);
-  cmd[0x13] = dev->composition;
-  cmd[0x16] = dev->threshold;
-  cmd[0x17] = dev->doc_source;
-
-  DBG (5, "OFF xi: %02x%02x yi: %02x%02x,"
-       " WIN xp: %02x%02x%02x%02x yp %02x%02x%02x%02x,"
-       " MAX %08x %08x\n",
-       cmd[0x0f], cmd[0x10], cmd[0x11], cmd[0x12],
-       cmd[0x05], cmd[0x06], cmd[0x07], cmd[0x08],
-       cmd[0x09], cmd[0x0a], cmd[0x0b], cmd[0x0c],
-       dev->max_win_width, dev->max_win_len);
-
-  return dev_command (dev, cmd, 32);
+    return 1;
+}
+
+static int dev_set_window(struct device *dev)
+{
+    SANE_Byte cmd[0x19] = {
+        REQ_CODE_A, REQ_CODE_B, CMD_SET_WINDOW, 0x13, MSG_SCANNING_PARAM
+    };
+
+    if (!fix_window(dev))
+        return 0;
+
+    cmd[0x05] = dev->win_width >> 24;
+    cmd[0x06] = dev->win_width >> 16;
+    cmd[0x07] = dev->win_width >> 8;
+    cmd[0x08] = dev->win_width;
+    cmd[0x09] = dev->win_len >> 24;
+    cmd[0x0a] = dev->win_len >> 16;
+    cmd[0x0b] = dev->win_len >> 8;
+    cmd[0x0c] = dev->win_len;
+    cmd[0x0d] = dev->resolution;		/* x */
+    cmd[0x0e] = dev->resolution;		/* y */
+    cmd[0x0f] = (SANE_Byte)floor(dev->win_off_x);
+    cmd[0x10] = (SANE_Byte)((dev->win_off_x - floor(dev->win_off_x)) * 100);
+    cmd[0x11] = (SANE_Byte)floor(dev->win_off_y);
+    cmd[0x12] = (SANE_Byte)((dev->win_off_y - floor(dev->win_off_y)) * 100);
+    cmd[0x13] = dev->composition;
+    /* Set to JPEG Lossy Compression, if mode is color (only for supported model)...
+     * else go with Uncompressed (For backard compatibility with old models )*/
+    if (dev->composition == MODE_RGB24) {
+        if (isSupportedDevice(dev)) {
+            cmd[0x14] = 0x6;
+        }
+    }
+    cmd[0x16] = dev->threshold;
+    cmd[0x17] = dev->doc_source;
+
+    DBG(5, "OFF xi: %02x%02x yi: %02x%02x,"
+        " WIN xp: %02x%02x%02x%02x yp %02x%02x%02x%02x,"
+        " MAX %08x %08x\n",
+        cmd[0x0f], cmd[0x10], cmd[0x11], cmd[0x12],
+        cmd[0x05], cmd[0x06], cmd[0x07], cmd[0x08],
+        cmd[0x09], cmd[0x0a], cmd[0x0b], cmd[0x0c],
+        dev->max_win_width, dev->max_win_len);
+
+    return dev_command(dev, cmd, 32);
 }
 
 static SANE_Status
-dev_inquiry (struct device *dev)
+dev_inquiry(struct device *dev)
 {
-  SANE_Byte *ptr;
-  SANE_Char *optr, *xptr;
-
-  if (!dev_cmd (dev, CMD_INQUIRY))
-    return SANE_STATUS_IO_ERROR;
-  ptr = dev->res;
-  if (ptr[3] != MSG_PRODUCT_INFO) {
-    DBG (1, "%s: illegal INQUIRY response %02x\n", __FUNCTION__, ptr[3]);
-    return SANE_STATUS_IO_ERROR;
-  }
-
-  /* parse reported manufacturer/product names */
-  dev->sane.vendor = optr = (SANE_Char *) malloc (33);
-  for (ptr += 4; ptr < &dev->res[0x24] && *ptr && *ptr != ' ';)
-    *optr++ = *ptr++;
-  *optr++ = 0;
-
-  for (; ptr < &dev->res[0x24] && (!*ptr || *ptr == ' '); ptr++)
-    /* skip spaces */;
-
-  dev->sane.model = optr = (SANE_Char *) malloc (33);
-  xptr = optr;			/* is last non space character + 1 */
-  for (; ptr < &dev->res[0x24] && *ptr;) {
-    if (*ptr != ' ')
-      xptr = optr + 1;
-    *optr++ = *ptr++;
-  }
-  *optr++ = 0;
-  *xptr = 0;
-
-  DBG (1, "%s: found %s/%s\n", __FUNCTION__, dev->sane.vendor, dev->sane.model);
-  dev->sane.type = strdup ("multi-function peripheral");
-
-  dev->resolutions = dev->res[0x37] << 16 |
-    dev->res[0x24] << 8 |
-    dev->res[0x25];
-  dev->compositions = dev->res[0x27];
-  dev->max_win_width = dev->res[0x28] << 24 |
-    dev->res[0x29] << 16 |
-    dev->res[0x2a] << 8 |
-    dev->res[0x2b];
-  dev->max_win_len = dev->res[0x2c] << 24 |
-    dev->res[0x2d] << 16 |
-    dev->res[0x2e] << 8 |
-    dev->res[0x2f];
-  dev->max_len_adf = dev->res[0x38] << 24 |
-    dev->res[0x39] << 16 |
-    dev->res[0x3a] << 8 |
-    dev->res[0x3b];
-  dev->max_len_fb = dev->res[0x3c] << 24 |
-    dev->res[0x3d] << 16 |
-    dev->res[0x3e] << 8 |
-    dev->res[0x3f];
-  dev->line_order = dev->res[0x31];
-  dev->doc_loaded = (dev->res[0x35] == 0x02) &&
-    (dev->res[0x26] & 0x03);
-
-  init_options(dev);
-  reset_options(dev);
-  fix_window(dev);
-  set_parameters(dev);
-  resolv_inq_dpi(dev);
-
-  return SANE_STATUS_GOOD;
+    SANE_Byte *ptr;
+    SANE_Char *optr, *xptr;
+
+    if (!dev_cmd(dev, CMD_INQUIRY))
+        return SANE_STATUS_IO_ERROR;
+    ptr = dev->res;
+    if (ptr[3] != MSG_PRODUCT_INFO) {
+        DBG(1, "%s: illegal INQUIRY response %02x\n", __func__, ptr[3]);
+        return SANE_STATUS_IO_ERROR;
+    }
+
+    /* parse reported manufacturer/product names */
+    dev->sane.vendor = optr = (SANE_Char *) malloc(33);
+    for (ptr += 4; ptr < &dev->res[0x24] && *ptr && *ptr != ' ';)
+        *optr++ = *ptr++;
+    *optr++ = 0;
+
+    for (; ptr < &dev->res[0x24] && (!*ptr || *ptr == ' '); ptr++)
+        /* skip spaces */;
+
+    dev->sane.model = optr = (SANE_Char *) malloc(33);
+    xptr = optr;			/* is last non space character + 1 */
+    for (; ptr < &dev->res[0x24] && *ptr;) {
+        if (*ptr != ' ')
+            xptr = optr + 1;
+        *optr++ = *ptr++;
+    }
+    *optr++ = 0;
+    *xptr = 0;
+
+    DBG(1, "%s: found %s/%s\n", __func__, dev->sane.vendor, dev->sane.model);
+    dev->sane.type = strdup("multi-function peripheral");
+
+    dev->resolutions = dev->res[0x37] << 16 |
+                       dev->res[0x24] << 8 |
+                       dev->res[0x25];
+    dev->compositions = dev->res[0x27];
+    dev->max_win_width = dev->res[0x28] << 24 |
+                         dev->res[0x29] << 16 |
+                         dev->res[0x2a] << 8 |
+                         dev->res[0x2b];
+    dev->max_win_len = dev->res[0x2c] << 24 |
+                       dev->res[0x2d] << 16 |
+                       dev->res[0x2e] << 8 |
+                       dev->res[0x2f];
+    dev->max_len_adf = dev->res[0x38] << 24 |
+                       dev->res[0x39] << 16 |
+                       dev->res[0x3a] << 8 |
+                       dev->res[0x3b];
+    dev->max_len_fb = dev->res[0x3c] << 24 |
+                      dev->res[0x3d] << 16 |
+                      dev->res[0x3e] << 8 |
+                      dev->res[0x3f];
+    dev->line_order = dev->res[0x31];
+    dev->compressionTypes = dev->res[0x32];
+    dev->doc_loaded = (dev->res[0x35] == 0x02) &&
+                      (dev->res[0x26] & 0x03);
+
+    init_options(dev);
+    reset_options(dev);
+    fix_window(dev);
+    set_parameters(dev);
+    resolv_inq_dpi(dev);
+
+    return SANE_STATUS_GOOD;
 }
 
 const SANE_Option_Descriptor *
-sane_get_option_descriptor (SANE_Handle h, SANE_Int opt)
+sane_get_option_descriptor(SANE_Handle h, SANE_Int opt)
 {
-  struct device *dev = h;
+    struct device *dev = h;
 
-  DBG (3, "%s: %p, %d\n", __FUNCTION__, h, opt);
-  if (opt >= NUM_OPTIONS || opt < 0)
-    return NULL;
-  return &dev->opt[opt];
+    DBG(3, "%s: %p, %d\n", __func__, h, opt);
+    if (opt >= NUM_OPTIONS || opt < 0)
+        return NULL;
+    return &dev->opt[opt];
 }
 
 SANE_Status
-sane_control_option (SANE_Handle h, SANE_Int opt, SANE_Action act,
-		     void *val, SANE_Word * info)
+sane_control_option(SANE_Handle h, SANE_Int opt, SANE_Action act,
+                    void *val, SANE_Word *info)
 {
-  struct device *dev = h;
-
-  DBG (3, "%s: %p, %d, <%d>, %p, %p\n", __FUNCTION__, h, opt, act, val, (void *)info);
-  if (!dev || opt >= NUM_OPTIONS || opt < 0)
-    return SANE_STATUS_INVAL;
-
-  if (info)
-    *info = 0;
-
-  if (act == SANE_ACTION_GET_VALUE) { /* GET */
-    if (dev->opt[opt].type == SANE_TYPE_STRING)
-      strcpy(val, dev->val[opt].s);
-    else
-      *(SANE_Word *)val = dev->val[opt].w;
-  } else if (act == SANE_ACTION_SET_VALUE) { /* SET */
-    SANE_Parameters xpara = dev->para;
-    SANE_Option_Descriptor xopt[NUM_OPTIONS];
-    Option_Value xval[NUM_OPTIONS];
-    int i;
-
-    if (dev->opt[opt].constraint_type == SANE_CONSTRAINT_STRING_LIST) {
-      dev->val[opt].s = string_match(dev->opt[opt].constraint.string_list, val);
-      if (info && strcasecmp(dev->val[opt].s, val))
-	*info |= SANE_INFO_INEXACT;
-    } else if (opt == OPT_RESOLUTION)
-      dev->val[opt].w = res_dpi_codes[dpi_to_code(*(SANE_Word *)val)];
-    else
-      dev->val[opt].w = *(SANE_Word *)val;
-
-    memcpy(&xopt, &dev->opt, sizeof(xopt));
-    memcpy(&xval, &dev->val, sizeof(xval));
-    fix_window(dev);
-    set_parameters(dev);
-
-    /* check for side effects */
-    if (info) {
-      if (memcmp(&xpara, &dev->para, sizeof(xpara)))
-	*info |= SANE_INFO_RELOAD_PARAMS;
-      if (memcmp(&xopt, &dev->opt, sizeof(xopt)))
-	*info |= SANE_INFO_RELOAD_OPTIONS;
-      for (i = 0; i < NUM_OPTIONS; i++)
-	if (xval[i].w != dev->val[i].w) {
-	  if (i == opt)
-	    *info |= SANE_INFO_INEXACT;
-	  else
-	    *info |= SANE_INFO_RELOAD_OPTIONS;
-	}
+    struct device *dev = h;
+
+    DBG(3, "%s: %p, %d, <%d>, %p, %p\n", __func__, h, opt, act, val, (void *)info);
+    if (!dev || opt >= NUM_OPTIONS || opt < 0)
+        return SANE_STATUS_INVAL;
+
+    if (info)
+        *info = 0;
+
+    if (act == SANE_ACTION_GET_VALUE) { /* GET */
+        if (dev->opt[opt].type == SANE_TYPE_STRING)
+            strcpy(val, dev->val[opt].s);
+        else
+            *(SANE_Word *)val = dev->val[opt].w;
+    } else if (act == SANE_ACTION_SET_VALUE) { /* SET */
+        SANE_Parameters xpara = dev->para;
+        SANE_Option_Descriptor xopt[NUM_OPTIONS];
+        Option_Value xval[NUM_OPTIONS];
+        int i;
+
+        if (dev->opt[opt].constraint_type == SANE_CONSTRAINT_STRING_LIST) {
+            dev->val[opt].s = string_match(dev->opt[opt].constraint.string_list, val);
+            if (info && strcasecmp(dev->val[opt].s, val))
+                *info |= SANE_INFO_INEXACT;
+        } else if (opt == OPT_RESOLUTION)
+            dev->val[opt].w = res_dpi_codes[dpi_to_code(*(SANE_Word *)val)];
+        else
+            dev->val[opt].w = *(SANE_Word *)val;
+
+        memcpy(&xopt, &dev->opt, sizeof(xopt));
+        memcpy(&xval, &dev->val, sizeof(xval));
+        fix_window(dev);
+        set_parameters(dev);
+
+        /* check for side effects */
+        if (info) {
+            if (memcmp(&xpara, &dev->para, sizeof(xpara)))
+                *info |= SANE_INFO_RELOAD_PARAMS;
+            if (memcmp(&xopt, &dev->opt, sizeof(xopt)))
+                *info |= SANE_INFO_RELOAD_OPTIONS;
+            for (i = 0; i < NUM_OPTIONS; i++)
+                if (xval[i].w != dev->val[i].w) {
+                    if (i == opt)
+                        *info |= SANE_INFO_INEXACT;
+                    else
+                        *info |= SANE_INFO_RELOAD_OPTIONS;
+                }
+        }
     }
-  }
 
-  DBG (4, "%s: %d, <%d> => %08x, %x\n", __FUNCTION__, opt, act,
-       val? *(SANE_Word *)val : 0, info? *info : 0);
-  return SANE_STATUS_GOOD;
+    DBG(4, "%s: %d, <%d> => %08x, %x\n", __func__, opt, act,
+        val? *(SANE_Word *)val : 0, info? *info : 0);
+    return SANE_STATUS_GOOD;
 }
 
 static void
-dev_free (struct device *dev)
+dev_free(struct device *dev)
 {
-  if (!dev)
-    return;
-
-  if (dev->sane.name)
-    free (UNCONST(dev->sane.name));
-  if (dev->sane.vendor)
-    free (UNCONST(dev->sane.vendor));
-  if (dev->sane.model)
-    free (UNCONST(dev->sane.model));
-  if (dev->sane.type)
-    free (UNCONST(dev->sane.type));
-  if (dev->data)
-    free(dev->data);
-  memset (dev, 0, sizeof (*dev));
-  free (dev);
+    if (!dev)
+        return;
+
+    if (dev->sane.name)
+        free(UNCONST(dev->sane.name));
+    if (dev->sane.vendor)
+        free(UNCONST(dev->sane.vendor));
+    if (dev->sane.model)
+        free(UNCONST(dev->sane.model));
+    if (dev->sane.type)
+        free(UNCONST(dev->sane.type));
+    if (dev->data)
+        free(dev->data);
+    if (dev->decData) {
+        free(dev->decData);
+        dev->decData = NULL;
+    }
+    memset(dev, 0, sizeof(*dev));
+    free(dev);
 }
 
 static void
-free_devices (void)
+free_devices(void)
 {
-  int i;
-  struct device *next;
-  struct device *dev;
-
-  if (devlist) {
-    free (devlist);
-    devlist = NULL;
-  }
-  for (i = 0, dev = devices_head; dev; dev = next) {
-    next = dev->next;
-    dev_free (dev);
-  }
-  devices_head = NULL;
+    struct device *next;
+    struct device *dev;
+
+    if (devlist) {
+        free(devlist);
+        devlist = NULL;
+    }
+    for (dev = devices_head; dev; dev = next) {
+        next = dev->next;
+        dev_free(dev);
+    }
+    devices_head = NULL;
 }
 
 static transport *tr_from_devname(SANE_String_Const devname)
 {
-  if (strncmp("tcp", devname, 3) == 0)
-    return &available_transports[TRANSPORT_TCP];
-  return &available_transports[TRANSPORT_USB];
+    if (strncmp("tcp", devname, 3) == 0)
+        return &available_transports[TRANSPORT_TCP];
+    return &available_transports[TRANSPORT_USB];
 }
 
 static SANE_Status
-list_one_device (SANE_String_Const devname)
+list_one_device(SANE_String_Const devname)
 {
-  struct device *dev;
-  SANE_Status status;
-  transport *tr;
-
-  DBG (4, "%s: %s\n", __FUNCTION__, devname);
-
-  for (dev = devices_head; dev; dev = dev->next) {
-    if (strcmp (dev->sane.name, devname) == 0)
-      return SANE_STATUS_GOOD;
-  }
-
-  tr = tr_from_devname(devname);
-
-  dev = calloc (1, sizeof (struct device));
-  if (dev == NULL)
-    return SANE_STATUS_NO_MEM;
-
-  dev->sane.name = strdup (devname);
-  dev->io = tr;
-  status = tr->dev_open (dev);
-  if (status != SANE_STATUS_GOOD) {
-    dev_free (dev);
-    return status;
-  }
-
-/*  status = dev_cmd (dev, CMD_ABORT);*/
-  status = dev_inquiry (dev);
-  tr->dev_close (dev);
-  if (status != SANE_STATUS_GOOD) {
-    DBG (1, "%s: dev_inquiry(%s): %s\n", __FUNCTION__,
-	 dev->sane.name, sane_strstatus (status));
-    dev_free (dev);
-    return status;
-  }
-
-  /* good device, add it to list */
-  dev->next = devices_head;
-  devices_head = dev;
-  return SANE_STATUS_GOOD;
+    struct device *dev;
+    SANE_Status status;
+    transport *tr;
+
+    DBG(4, "%s: %s\n", __func__, devname);
+
+    for (dev = devices_head; dev; dev = dev->next) {
+        if (strcmp(dev->sane.name, devname) == 0)
+            return SANE_STATUS_GOOD;
+    }
+
+    tr = tr_from_devname(devname);
+
+    dev = calloc(1, sizeof(struct device));
+    if (dev == NULL)
+        return SANE_STATUS_NO_MEM;
+
+    dev->sane.name = strdup(devname);
+    dev->io = tr;
+    status = tr->dev_open(dev);
+    if (status != SANE_STATUS_GOOD) {
+        dev_free(dev);
+        return status;
+    }
+
+    /*  status = dev_cmd (dev, CMD_ABORT);*/
+    status = dev_inquiry(dev);
+    tr->dev_close(dev);
+    if (status != SANE_STATUS_GOOD) {
+        DBG(1, "%s: dev_inquiry(%s): %s\n", __func__,
+            dev->sane.name, sane_strstatus(status));
+        dev_free(dev);
+        return status;
+    }
+
+    /* good device, add it to list */
+    dev->next = devices_head;
+    devices_head = dev;
+    return SANE_STATUS_GOOD;
 }
 
 /* SANE API ignores return code of this callback */
 static SANE_Status
-list_conf_devices (UNUSED (SANEI_Config * config), const char *devname)
+list_conf_devices(UNUSED(SANEI_Config *config), const char *devname)
 {
-  return tr_from_devname(devname)->configure_device(devname, list_one_device);
+    return tr_from_devname(devname)->configure_device(devname, list_one_device);
 }
 
 SANE_Status
-sane_init (SANE_Int * version_code, SANE_Auth_Callback cb)
+sane_init(SANE_Int *version_code, SANE_Auth_Callback cb)
 {
-  DBG_INIT ();
-  DBG (2, "sane_init: Xerox backend (build %d), version %s null, authorize %s null\n", BACKEND_BUILD,
-       (version_code) ? "!=" : "==", (cb) ? "!=" : "==");
+    DBG_INIT();
+    DBG(2, "sane_init: Xerox backend (build %d), version %s null, authorize %s null\n", BACKEND_BUILD,
+        (version_code) ? "!=" : "==", (cb) ? "!=" : "==");
 
-  if (version_code)
-    *version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BACKEND_BUILD);
+    if (version_code)
+        *version_code = SANE_VERSION_CODE(V_MAJOR, V_MINOR, BACKEND_BUILD);
 
-  sanei_usb_init ();
-  return SANE_STATUS_GOOD;
+    sanei_usb_init();
+    return SANE_STATUS_GOOD;
 }
 
 void
-sane_exit (void)
+sane_exit(void)
 {
-  struct device *dev;
+    struct device *dev;
+
+    for (dev = devices_head; dev; dev = dev->next)
+        if (dev->dn != -1)
+            sane_close(dev); /* implies flush */
 
-  for (dev = devices_head; dev; dev = dev->next)
-    if (dev->dn != -1)
-      sane_close(dev); /* implies flush */
-  
-  free_devices ();
+    free_devices();
 }
 
 SANE_Status
-sane_get_devices (const SANE_Device *** device_list, SANE_Bool local)
+sane_get_devices(const SANE_Device *** device_list, SANE_Bool local)
 {
-  SANEI_Config config;
-  struct device *dev;
-  int dev_count;
-  int i;
+    SANEI_Config config;
+    struct device *dev;
+    int dev_count;
+    int i;
 
-  DBG (3, "%s: %p, %d\n", __FUNCTION__, (const void *)device_list, local);
+    DBG(3, "%s: %p, %d\n", __func__, (const void *)device_list, local);
 
-  if (devlist) {
-    if (device_list)
-      *device_list = devlist;
-    return SANE_STATUS_GOOD;
-  }
+    if (devlist) {
+        if (device_list)
+            *device_list = devlist;
+        return SANE_STATUS_GOOD;
+    }
 
-  free_devices ();
+    free_devices();
 
-  config.count = 0;
-  config.descriptors = NULL;
-  config.values = NULL;
-  sanei_configure_attach (XEROX_CONFIG_FILE, &config, list_conf_devices);
+    config.count = 0;
+    config.descriptors = NULL;
+    config.values = NULL;
+    sanei_configure_attach(XEROX_CONFIG_FILE, &config, list_conf_devices);
 
-  for (dev_count = 0, dev = devices_head; dev; dev = dev->next)
-    dev_count++;
+    for (dev_count = 0, dev = devices_head; dev; dev = dev->next)
+        dev_count++;
 
-  devlist = malloc ((dev_count + 1) * sizeof (*devlist));
-  if (!devlist)
-    {
-      DBG (1, "%s: malloc: no memory\n", __FUNCTION__);
-      return SANE_STATUS_NO_MEM;
+    devlist = malloc((dev_count + 1) * sizeof(*devlist));
+    if (!devlist) {
+        DBG(1, "%s: malloc: no memory\n", __func__);
+        return SANE_STATUS_NO_MEM;
     }
 
-  for (i = 0, dev = devices_head; dev; dev = dev->next)
-    devlist[i++] = &dev->sane;
-  devlist[i++] = NULL;
+    for (i = 0, dev = devices_head; dev; dev = dev->next)
+        devlist[i++] = &dev->sane;
+    devlist[i++] = NULL;
 
-  if (device_list)
-    *device_list = devlist;
-  return SANE_STATUS_GOOD;
+    if (device_list)
+        *device_list = devlist;
+    return SANE_STATUS_GOOD;
 }
 
 void
-sane_close (SANE_Handle h)
+sane_close(SANE_Handle h)
 {
-  struct device *dev = h;
+    struct device *dev = h;
 
-  if (!dev)
-    return;
+    if (!dev)
+        return;
 
-  DBG (3, "%s: %p (%s)\n", __FUNCTION__, (void *)dev, dev->sane.name);
-  dev->io->dev_close(dev);
+    DBG(3, "%s: %p (%s)\n", __func__, (void *)dev, dev->sane.name);
+    dev->io->dev_close(dev);
 }
 
 SANE_Status
-sane_open (SANE_String_Const name, SANE_Handle * h)
+sane_open(SANE_String_Const name, SANE_Handle *h)
 {
-  struct device *dev;
-
-  DBG (3, "%s: '%s'\n", __FUNCTION__, name);
-
-  if (!devlist)
-    sane_get_devices (NULL, SANE_TRUE);
-
-  if (!name || !*name) {
-    /* special case of empty name: open first available device */
-    for (dev = devices_head; dev; dev = dev->next) {
-      if (dev->dn != -1) {
-	if (sane_open (dev->sane.name, h) == SANE_STATUS_GOOD)
-	  return SANE_STATUS_GOOD;
-      }
+    struct device *dev;
+
+    DBG(3, "%s: '%s'\n", __func__, name);
+
+    if (!devlist)
+        sane_get_devices(NULL, SANE_TRUE);
+
+    if (!name || !*name) {
+        /* special case of empty name: open first available device */
+        for (dev = devices_head; dev; dev = dev->next) {
+            if (dev->dn != -1) {
+                if (sane_open(dev->sane.name, h) == SANE_STATUS_GOOD)
+                    return SANE_STATUS_GOOD;
+            }
+        }
+    } else {
+        for (dev = devices_head; dev; dev = dev->next) {
+            if (strcmp(name, dev->sane.name) == 0) {
+                *h = dev;
+                return dev->io->dev_open(dev);
+            }
+        }
     }
-  } else {
-    for (dev = devices_head; dev; dev = dev->next) {
-      if (strcmp(name, dev->sane.name) == 0) {
-	*h = dev;
-	return dev->io->dev_open(dev);
-      }
-    }
-  }
 
-  return SANE_STATUS_INVAL;
+    return SANE_STATUS_INVAL;
 }
 
 SANE_Status
-sane_get_parameters (SANE_Handle h, SANE_Parameters * para)
+sane_get_parameters(SANE_Handle h, SANE_Parameters *para)
 {
-  struct device *dev = h;
+    struct device *dev = h;
 
-  DBG (3, "%s: %p, %p\n", __FUNCTION__, h, (void *)para);
-  if (!para)
-    return SANE_STATUS_INVAL;
+    DBG(3, "%s: %p, %p\n", __func__, h, (void *)para);
+    if (!para)
+        return SANE_STATUS_INVAL;
 
-  *para = dev->para;
-  return SANE_STATUS_GOOD;
+    *para = dev->para;
+    return SANE_STATUS_GOOD;
 }
 
 /* check if image data is ready, and wait if not */
 /* 1: image is acquired, 0: error or non_blocking mode */
 static int dev_acquire(struct device *dev)
 {
-  if (!dev_cmd_wait(dev, CMD_READ))
-    return dev->state;
-
-  dev->state = SANE_STATUS_GOOD;
-  dev->vertical = dev->res[0x08] << 8 | dev->res[0x09];
-  dev->horizontal = dev->res[0x0a] << 8 | dev->res[0x0b];
-  dev->blocklen = dev->res[4] << 24 |
-    dev->res[5] << 16 |
-    dev->res[6] << 8 |
-    dev->res[7];
-  dev->final_block = (dev->res[3] == MSG_END_BLOCK)? 1 : 0;
-
-  dev->pixels_per_line = dev->horizontal;
-  dev->bytes_per_line = dev->horizontal;
-
-  if (dev->composition == MODE_RGB24)
-    dev->bytes_per_line *= 3;
-  else if (dev->composition == MODE_LINEART ||
-	   dev->composition == MODE_HALFTONE)
-    dev->pixels_per_line *= 8;
-
-  DBG (4, "acquiring, size per band v: %d, h: %d, %sblock: %d, slack: %d\n",
-       dev->vertical, dev->horizontal, dev->final_block? "last " : "",
-       dev->blocklen, dev->blocklen - (dev->vertical * dev->bytes_per_line));
-
-  if (dev->bytes_per_line > DATASIZE) {
-    DBG (1, "%s: unsupported line size: %d bytes > %d\n",
-	 __FUNCTION__, dev->bytes_per_line, DATASIZE);
-    return ret_cancel(dev, SANE_STATUS_NO_MEM);
-  }
-
-  dev->reading = 0; /* need to issue READ_IMAGE */
-
-  dev->dataindex = 0;
-  dev->datalen = 0;
-  dev->dataoff = 0;
-
-  return 1;
+    if (!dev_cmd_wait(dev, CMD_READ))
+        return dev->state;
+
+    dev->state = SANE_STATUS_GOOD;
+    dev->vertical = dev->res[0x08] << 8 | dev->res[0x09];
+    dev->horizontal = dev->res[0x0a] << 8 | dev->res[0x0b];
+    dev->blocklen = dev->res[4] << 24 |
+                    dev->res[5] << 16 |
+                    dev->res[6] << 8 |
+                    dev->res[7];
+    dev->final_block = (dev->res[3] == MSG_END_BLOCK)? 1 : 0;
+
+    dev->pixels_per_line = dev->horizontal;
+    dev->bytes_per_line = dev->horizontal;
+
+    if (dev->composition == MODE_RGB24)
+        dev->bytes_per_line *= 3;
+    else if (dev->composition == MODE_LINEART ||
+             dev->composition == MODE_HALFTONE)
+        dev->pixels_per_line *= 8;
+
+    DBG(4, "acquiring, size per band v: %d, h: %d, %sblock: %d, slack: %d\n",
+        dev->vertical, dev->horizontal, dev->final_block? "last " : "",
+        dev->blocklen, dev->blocklen - (dev->vertical * dev->bytes_per_line));
+
+    if (dev->bytes_per_line > DATASIZE) {
+        DBG(1, "%s: unsupported line size: %d bytes > %d\n",
+            __func__, dev->bytes_per_line, DATASIZE);
+        return ret_cancel(dev, SANE_STATUS_NO_MEM);
+    }
+
+    dev->reading = 0; /* need to issue READ_IMAGE */
+
+    dev->dataindex = 0;
+    dev->datalen = 0;
+    dev->dataoff = 0;
+
+    return 1;
 }
 
 static int fill_slack(struct device *dev, SANE_Byte *buf, int maxlen)
 {
-  const int slack = dev->total_img_size - dev->total_out_size;
-  const int havelen = MIN(slack, maxlen);
-  int j;
-
-  if (havelen <= 0)
-    return 0;
-  for (j = 0; j < havelen; j++)
-    buf[j] = 255;
-  return havelen;
+    const int slack = dev->total_img_size - dev->total_out_size;
+    const int havelen = MIN(slack, maxlen);
+    int j;
+
+    if (havelen <= 0)
+        return 0;
+    for (j = 0; j < havelen; j++)
+        buf[j] = 255;
+    return havelen;
 }
 
 static int copy_plain_trim(struct device *dev, SANE_Byte *buf, int maxlen, int *olenp)
 {
-  int j;
-  const int linesize = dev->bytes_per_line;
-  int k = dev->dataindex;
-  *olenp = 0;
-  for (j = 0; j < dev->datalen && *olenp < maxlen; j++, k++) {
-    const int x = k % linesize;
-    const int y = k / linesize;
-    if (y >= dev->vertical)
-      break; /* slack */
-    if (x < dev->para.bytes_per_line &&
-	(y + dev->y_off) < dev->para.lines) {
-      *buf++ = dev->data[(dev->dataoff + j) & DATAMASK];
-      (*olenp)++;
+    int j;
+    const int linesize = dev->bytes_per_line;
+    int k = dev->dataindex;
+    *olenp = 0;
+    for (j = 0; j < dev->datalen && *olenp < maxlen; j++, k++) {
+        const int x = k % linesize;
+        const int y = k / linesize;
+        if (y >= dev->vertical)
+            break; /* slack */
+        if (x < dev->para.bytes_per_line &&
+            (y + dev->y_off) < dev->para.lines) {
+            *buf++ = dev->data[(dev->dataoff + j) & DATAMASK];
+            (*olenp)++;
+        }
     }
-  }
-  dev->dataindex = k;
-  return j;
+    dev->dataindex = k;
+    return j;
 }
 
 /* return: how much data could be freed from cyclic buffer */
 /* convert from RRGGBB to RGBRGB */
-static int copy_mix_bands_trim(struct device *dev, SANE_Byte *buf, int maxlen, int *olenp) {
-  int j;
+static int copy_mix_bands_trim(struct device *dev, SANE_Byte *buf, int maxlen, int *olenp)
+{
+    int j;
 
-  const int linesize = dev->bytes_per_line; /* caching real line size */
+    const int linesize = dev->bytes_per_line; /* caching real line size */
 
-  /* line number of the head of input buffer,
-   * input buffer is always aligned to whole line */
-  const int y_off = dev->dataindex / linesize;
+    /* line number of the head of input buffer,
+     * input buffer is always aligned to whole line */
+    const int y_off = dev->dataindex / linesize;
 
-  int k = dev->dataindex; /* caching current index of input buffer */
+    int k = dev->dataindex; /* caching current index of input buffer */
 
-  /* can only copy as much as full lines we have */
-  int havelen = dev->datalen / linesize * linesize - k % linesize;
+    /* can only copy as much as full lines we have */
+    int havelen = dev->datalen / linesize * linesize - k % linesize;
 
-  const int bands = 3;
-  *olenp = 0;
+    const int bands = 3;
+    *olenp = 0;
 
-  /* while we have data && they can receive */
-  for (j = 0; j < havelen && *olenp < maxlen; j++, k++) {
-    const int band = (k % bands) * dev->horizontal;
-    const int x = k % linesize / bands;
-    const int y = k / linesize - y_off; /* y relative to buffer head */
-    const int y_rly = y + y_off + dev->y_off; /* global y */
+    /* while we have data && they can receive */
+    for (j = 0; j < havelen && *olenp < maxlen; j++, k++) {
+        const int band = (k % bands) * dev->horizontal;
+        const int x = k % linesize / bands;
+        const int y = k / linesize - y_off; /* y relative to buffer head */
+        const int y_rly = y + y_off + dev->y_off; /* global y */
 
-    if (x < dev->para.pixels_per_line &&
-	y_rly < dev->para.lines) {
-      *buf++ = dev->data[(dev->dataoff + band + x + y * linesize) & DATAMASK];
-      (*olenp)++;
+        if (x < dev->para.pixels_per_line &&
+            y_rly < dev->para.lines) {
+            *buf++ = dev->data[(dev->dataoff + band + x + y * linesize) & DATAMASK];
+            (*olenp)++;
+        }
     }
-  }
-  dev->dataindex = k;
+    dev->dataindex = k;
 
-  /* how much full lines are finished */
-  return (k / linesize - y_off) * linesize;
+    /* how much full lines are finished */
+    return (k / linesize - y_off) * linesize;
 }
 
 SANE_Status
-sane_read (SANE_Handle h, SANE_Byte * buf, SANE_Int maxlen, SANE_Int * lenp)
+sane_read(SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
 {
-  SANE_Status status;
-  struct device *dev = h;
+    SANE_Status status;
+    struct device *dev = h;
+
+    DBG(3, "%s: %p, %p, %d, %p\n", __func__, h, buf, maxlen, (void *)lenp);
+
+    if (lenp)
+        *lenp = 0;
+    if (!dev)
+        return SANE_STATUS_INVAL;
+
+    if (!dev->scanning)
+        return SANE_STATUS_EOF;
+
+    /* if there is no data to read or output from buffer */
+    if (!dev->blocklen && dev->datalen <= PADDING_SIZE) {
+
+        /* copying uncompressed data */
+        if (dev->composition == MODE_RGB24 &&
+            isSupportedDevice(dev) &&
+            dev->decDataSize > 0) {
+            int diff = dev->total_img_size - dev->total_out_size;
+            int bufLen = (diff < maxlen) ? diff : maxlen;
+            if (0 < diff &&
+                0 < copy_decompress_data(dev, buf, bufLen, lenp)) {
+                dev->total_out_size += *lenp;
+                return SANE_STATUS_GOOD;
+            }
+        }
+
+        /* and we don't need to acquire next block */
+        if (dev->final_block) {
+            int slack = dev->total_img_size - dev->total_out_size;
+
+            /* but we may need to fill slack */
+            if (buf && lenp && slack > 0) {
+                *lenp = fill_slack(dev, buf, maxlen);
+                dev->total_out_size += *lenp;
+                DBG(9, "<> slack: %d, filled: %d, maxlen %d\n",
+                    slack, *lenp, maxlen);
+                return SANE_STATUS_GOOD;
+            } else if (slack < 0) {
+                /* this will never happen */
+                DBG(1, "image overflow %d bytes\n", dev->total_img_size - dev->total_out_size);
+            }
+            if (isSupportedDevice(dev) &&
+                dev->composition == MODE_RGB24) {
+                remove(encTmpFileName);
+            }
+            /* that's all */
+            dev_stop(dev);
+            return SANE_STATUS_EOF;
+        }
+
+        /* queue next image block */
+        if (!dev_acquire(dev))
+            return dev->state;
+    }
+
+    if (!dev->reading) {
+        if (cancelled(dev))
+            return dev->state;
+        DBG(5, "READ_IMAGE\n");
+        if (!dev_cmd(dev, CMD_READ_IMAGE))
+            return SANE_STATUS_IO_ERROR;
+        dev->reading++;
+        dev->ulines += dev->vertical;
+        dev->y_off = dev->ulines - dev->vertical;
+        dev->total_data_size += dev->blocklen;
+        dev->blocks++;
+    }
 
-  DBG (3, "%s: %p, %p, %d, %p\n", __FUNCTION__, h, buf, maxlen, (void *)lenp);
+    do {
+        size_t datalen;
+        int clrlen; /* cleared lines len */
+        int olen; /* output len */
+
+        /* read as much data into the buffer */
+        datalen = DATAROOM(dev) & USB_BLOCK_MASK;
+        while (datalen && dev->blocklen) {
+            SANE_Byte *rbuf = dev->data + DATATAIL(dev);
+
+            DBG(9, "<> request len: %lu, [%d, %d; %d]\n",
+                (u_long)datalen, dev->dataoff, DATATAIL(dev), dev->datalen);
+            if ((status = dev->io->dev_request(dev, NULL, 0, rbuf, &datalen)) !=
+                SANE_STATUS_GOOD)
+                return status;
+            dev->datalen += datalen;
+            dev->blocklen -= datalen;
+            DBG(9, "<> got %lu, [%d, %d; %d]\n",
+                (u_long)datalen, dev->dataoff, DATATAIL(dev), dev->datalen);
+            if (dev->blocklen < 0)
+                return ret_cancel(dev, SANE_STATUS_IO_ERROR);
+
+            datalen = DATAROOM(dev) & USB_BLOCK_MASK;
+        }
+
+        if (buf && lenp) { /* read mode */
+            /* copy will do minimal of valid data */
+            if (dev->para.format == SANE_FRAME_RGB && dev->line_order) {
+                if (isSupportedDevice(dev)) {
+                    clrlen = dump_to_tmp_file(dev);
+                    /* decompress after reading entire block data*/
+                    if (0 == dev->blocklen) {
+                        decompress_tempfile(dev);
+                    }
+                    copy_decompress_data(dev, buf, maxlen, &olen);
+                } else {
+                    clrlen = copy_mix_bands_trim(dev, buf, maxlen, &olen);
+                }
+            } else
+                clrlen = copy_plain_trim(dev, buf, maxlen, &olen);
+
+            dev->datalen -= clrlen;
+            dev->dataoff = (dev->dataoff + clrlen) & DATAMASK;
+            buf += olen;
+            maxlen -= olen;
+            *lenp += olen;
+            dev->total_out_size += olen;
+
+            DBG(9, "<> olen: %d, clrlen: %d, blocklen: %d/%d, maxlen %d (%d %d %d)\n",
+                olen, clrlen, dev->blocklen, dev->datalen, maxlen,
+                dev->dataindex / dev->bytes_per_line + dev->y_off,
+                dev->y_off, dev->para.lines);
+
+            /* slack beyond last line */
+            if (dev->dataindex / dev->bytes_per_line + dev->y_off >= dev->para.lines) {
+                dev->datalen = 0;
+                dev->dataoff = 0;
+            }
+
+            if (!clrlen || maxlen <= 0)
+                break;
+        } else { /* flush mode */
+            dev->datalen = 0;
+            dev->dataoff = 0;
+        }
+
+    } while (dev->blocklen);
+
+    if (lenp)
+        DBG(9, " ==> %d\n", *lenp);
 
-  if (lenp)
-    *lenp = 0;
-  if (!dev)
-    return SANE_STATUS_INVAL;
+    return SANE_STATUS_GOOD;
+}
 
-  if (!dev->scanning)
-    return SANE_STATUS_EOF;
-
-  /* if there is no data to read or output from buffer */
-  if (!dev->blocklen && dev->datalen <= PADDING_SIZE) {
-
-    /* and we don't need to acquire next block */
-    if (dev->final_block) {
-      int slack = dev->total_img_size - dev->total_out_size;
-
-      /* but we may need to fill slack */
-      if (buf && lenp && slack > 0) {
-	*lenp = fill_slack(dev, buf, maxlen);
-	dev->total_out_size += *lenp;
-	DBG (9, "<> slack: %d, filled: %d, maxlen %d\n",
-	     slack, *lenp, maxlen);
-	return SANE_STATUS_GOOD;
-      } else if (slack < 0) {
-	/* this will never happen */
-	DBG(1, "image overflow %d bytes\n", dev->total_img_size - dev->total_out_size);
-      }
-
-      /* that's all */
-      dev_stop(dev);
-      return SANE_STATUS_EOF;
+SANE_Status
+sane_start(SANE_Handle h)
+{
+    struct device *dev = h;
+
+    DBG(3, "%s: %p\n", __func__, h);
+
+    dev->cancel = 0;
+    dev->scanning = 0;
+    dev->total_img_size = 0;
+    dev->total_out_size = 0;
+    dev->total_data_size = 0;
+    dev->blocks = 0;
+
+    if (!dev->reserved) {
+        if (!dev_cmd_wait(dev, CMD_RESERVE_UNIT))
+            return dev->state;
+        dev->reserved++;
     }
 
-    /* queue next image block */
+    if (!dev_set_window(dev) ||
+        (dev->state && dev->state != SANE_STATUS_DEVICE_BUSY))
+        return dev_stop(dev);
+
+    if (!dev_cmd_wait(dev, CMD_OBJECT_POSITION))
+        return dev_stop(dev);
+
+    if (!dev_cmd(dev, CMD_READ) ||
+        (dev->state && dev->state != SANE_STATUS_DEVICE_BUSY))
+        return dev_stop(dev);
+
+    dev->scanning = 1;
+    dev->final_block = 0;
+    dev->blocklen = 0;
+    dev->pixels_per_line = 0;
+    dev->bytes_per_line = 0;
+    dev->ulines = 0;
+
+    set_parameters(dev);
+
+    if (!dev->data && !(dev->data = malloc(DATASIZE)))
+        return ret_cancel(dev, SANE_STATUS_NO_MEM);
+
+    if (!dev->decData && !(dev->decData = malloc(POST_DATASIZE)))
+        return ret_cancel(dev, SANE_STATUS_NO_MEM);
+
     if (!dev_acquire(dev))
-      return dev->state;
-  }
-
-  if (!dev->reading) {
-    if (cancelled(dev))
-      return dev->state;
-    DBG (5, "READ_IMAGE\n");
-    if (!dev_cmd(dev, CMD_READ_IMAGE))
-      return SANE_STATUS_IO_ERROR;
-    dev->reading++;
-    dev->ulines += dev->vertical;
-    dev->y_off = dev->ulines - dev->vertical;
-    dev->total_data_size += dev->blocklen;
-    dev->blocks++;
-  }
-
-  do {
-    size_t datalen;
-    int clrlen; /* cleared lines len */
-    int olen; /* output len */
-
-    /* read as much data into the buffer */
-    datalen = DATAROOM(dev) & USB_BLOCK_MASK;
-    while (datalen && dev->blocklen) {
-      SANE_Byte *rbuf = dev->data + DATATAIL(dev);
-
-      DBG (9, "<> request len: %lu, [%d, %d; %d]\n",
-	   (u_long)datalen, dev->dataoff, DATATAIL(dev), dev->datalen);
-      if ((status = dev->io->dev_request(dev, NULL, 0, rbuf, &datalen)) !=
-	  SANE_STATUS_GOOD)
-	return status;
-      dev->datalen += datalen;
-      dev->blocklen -= datalen;
-      DBG (9, "<> got %lu, [%d, %d; %d]\n",
-	   (u_long)datalen, dev->dataoff, DATATAIL(dev), dev->datalen);
-      if (dev->blocklen < 0)
-	return ret_cancel(dev, SANE_STATUS_IO_ERROR);
-
-      datalen = DATAROOM(dev) & USB_BLOCK_MASK;
-    }
+        return dev->state;
 
-    if (buf && lenp) { /* read mode */
-      /* copy will do minimal of valid data */
-      if (dev->para.format == SANE_FRAME_RGB && dev->line_order)
-	clrlen = copy_mix_bands_trim(dev, buf, maxlen, &olen);
-      else
-	clrlen = copy_plain_trim(dev, buf, maxlen, &olen);
-
-      dev->datalen -= clrlen;
-      dev->dataoff = (dev->dataoff + clrlen) & DATAMASK;
-      buf += olen;
-      maxlen -= olen;
-      *lenp += olen;
-      dev->total_out_size += olen;
-
-      DBG (9, "<> olen: %d, clrlen: %d, blocklen: %d/%d, maxlen %d (%d %d %d)\n",
-	   olen, clrlen, dev->blocklen, dev->datalen, maxlen,
-	   dev->dataindex / dev->bytes_per_line + dev->y_off,
-	   dev->y_off, dev->para.lines);
-
-      /* slack beyond last line */
-      if (dev->dataindex / dev->bytes_per_line + dev->y_off >= dev->para.lines) {
-	dev->datalen = 0;
-	dev->dataoff = 0;
-      }
-
-      if (!clrlen || maxlen <= 0)
-	break;
-    } else { /* flush mode */
-      dev->datalen = 0;
-      dev->dataoff = 0;
+    /* make sure to have dev->para <= of real size */
+    if (dev->para.pixels_per_line > dev->pixels_per_line) {
+        dev->para.pixels_per_line = dev->pixels_per_line;
+        dev->para.bytes_per_line = dev->pixels_per_line;
     }
 
-  } while (dev->blocklen);
-
-  if (lenp)
-    DBG (9, " ==> %d\n", *lenp);
+    if (dev->composition == MODE_RGB24)
+        dev->para.bytes_per_line = dev->para.pixels_per_line * 3;
+    else if (dev->composition == MODE_LINEART ||
+             dev->composition == MODE_HALFTONE) {
+        dev->para.bytes_per_line = (dev->para.pixels_per_line + 7) / 8;
+        dev->para.pixels_per_line = dev->para.bytes_per_line * 8;
+    } else {
+        dev->para.bytes_per_line = dev->para.pixels_per_line;
+    }
 
-  return SANE_STATUS_GOOD;
-}
+    dev->total_img_size = dev->para.bytes_per_line * dev->para.lines;
 
-SANE_Status
-sane_start (SANE_Handle h)
-{
-  struct device *dev = h;
-
-  DBG (3, "%s: %p\n", __FUNCTION__, h);
-
-  dev->cancel = 0;
-  dev->scanning = 0;
-  dev->total_img_size = 0;
-  dev->total_out_size = 0;
-  dev->total_data_size = 0;
-  dev->blocks = 0;
-
-  if (!dev->reserved) {
-    if (!dev_cmd_wait(dev, CMD_RESERVE_UNIT))
-      return dev->state;
-    dev->reserved++;
-  }
-
-  if (!dev_set_window(dev) ||
-      (dev->state && dev->state != SANE_STATUS_DEVICE_BUSY))
-    return dev_stop(dev);
-
-  if (!dev_cmd_wait(dev, CMD_OBJECT_POSITION))
-    return dev_stop(dev);
-
-  if (!dev_cmd(dev, CMD_READ) ||
-      (dev->state && dev->state != SANE_STATUS_DEVICE_BUSY))
-    return dev_stop(dev);
-
-  dev->scanning = 1;
-  dev->final_block = 0;
-  dev->blocklen = 0;
-  dev->pixels_per_line = 0;
-  dev->bytes_per_line = 0;
-  dev->ulines = 0;
-
-  set_parameters(dev);
-
-  if (!dev->data && !(dev->data = malloc(DATASIZE)))
-    return ret_cancel(dev, SANE_STATUS_NO_MEM);
-
-  if (!dev_acquire(dev))
-    return dev->state;
-
-  /* make sure to have dev->para <= of real size */
-  if (dev->para.pixels_per_line > dev->pixels_per_line) {
-    dev->para.pixels_per_line = dev->pixels_per_line;
-    dev->para.bytes_per_line = dev->pixels_per_line;
-  }
-
-  if (dev->composition == MODE_RGB24)
-    dev->para.bytes_per_line = dev->para.pixels_per_line * 3;
-  else if (dev->composition == MODE_LINEART ||
-	   dev->composition == MODE_HALFTONE) {
-    dev->para.bytes_per_line = (dev->para.pixels_per_line + 7) / 8;
-    dev->para.pixels_per_line = dev->para.bytes_per_line * 8;
-  } else {
-    dev->para.bytes_per_line = dev->para.pixels_per_line;
-  }
+    if (isSupportedDevice(dev) &&
+        dev->composition == MODE_RGB24) {
+	int fd;
+        remove(encTmpFileName);
 
-  dev->total_img_size = dev->para.bytes_per_line * dev->para.lines;
+	/* Precreate temporary file in exclusive mode. */
+	fd = open(encTmpFileName, O_CREAT|O_EXCL, 0600);
+	if (fd == -1) {
+	    DBG(3, "%s: %p, can't create temporary file %s: %s\n", __func__,
+		(void *)dev, encTmpFileName, strerror(errno));
+	    return ret_cancel(dev, SANE_STATUS_ACCESS_DENIED);
+	}
+	close(fd);
+    }
+    dev->currentDecDataIndex = 0;
 
-  return SANE_STATUS_GOOD;
+    return SANE_STATUS_GOOD;
 }
 
-SANE_Status sane_set_io_mode (SANE_Handle h, SANE_Bool non_blocking)
+SANE_Status sane_set_io_mode(SANE_Handle h, SANE_Bool non_blocking)
 {
-  struct device *dev = h;
+    struct device *dev = h;
 
-  DBG (3, "%s: %p, %d\n", __FUNCTION__, h, non_blocking);
+    DBG(3, "%s: %p, %d\n", __func__, h, non_blocking);
 
-  if (non_blocking)
-    return SANE_STATUS_UNSUPPORTED;
+    if (non_blocking)
+        return SANE_STATUS_UNSUPPORTED;
 
-  dev->non_blocking = non_blocking;
-  return SANE_STATUS_GOOD;
+    dev->non_blocking = non_blocking;
+    return SANE_STATUS_GOOD;
 }
 
-SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fdp)
+SANE_Status sane_get_select_fd(SANE_Handle h, SANE_Int *fdp)
 {
-  DBG (3, "%s: %p, %p\n", __FUNCTION__, h, (void *)fdp);
-  /* supporting of this will require thread creation */
-  return SANE_STATUS_UNSUPPORTED;
+    DBG(3, "%s: %p, %p\n", __func__, h, (void *)fdp);
+    /* supporting of this will require thread creation */
+    return SANE_STATUS_UNSUPPORTED;
 }
 
-void sane_cancel (SANE_Handle h)
+void sane_cancel(SANE_Handle h)
 {
-  struct device *dev = h;
+    struct device *dev = h;
 
-  DBG (3, "%s: %p\n", __FUNCTION__, h);
-  dev->cancel = 1;
+    DBG(3, "%s: %p\n", __func__, h);
+    dev->cancel = 1;
 }
 
 /* xerox_mfp.c */
diff --git a/backend/xerox_mfp.conf.in b/backend/xerox_mfp.conf.in
index e0f78ea..b17c7d7 100644
--- a/backend/xerox_mfp.conf.in
+++ b/backend/xerox_mfp.conf.in
@@ -5,6 +5,24 @@
 ### Samsung Models ###
 ######################
 
+#Samsung X4300 Series
+usb 0x04e8 0x3324
+
+#Samsung K4350 Series
+usb 0x04e8 0x3325
+
+#Samsung X7600 Series
+usb 0x04e8 0x3326
+
+#Samsung K7600 Series
+usb 0x04e8 0x3327
+
+#Samsung K703 Series
+usb 0x04e8 0x3331
+
+#Samsung X703 Series
+usb 0x04e8 0x3332
+
 #Samsung SCX-4x16 Series
 usb 0x04e8 0x3409
 
@@ -178,6 +196,24 @@ usb 0x04e8 0x3466
 #Samsung C460 Series
 usb 0x04e8 0x3468
 
+#Samsung M458x Series
+usb 0x04e8 0x346f
+
+#Samsung M4370 5370 Series
+usb 0x04e8 0x3471
+
+#Samsung X401 Series
+usb 0x04e8 0x3477
+
+#Samsung K401 Series
+usb 0x04e8 0x3478
+
+#Samsung K3250 Series
+usb 0x04e8 0x3481
+
+#Samsung X3220 Series
+usb 0x04e8 0x3482
+
 ####################
 ### Xerox Models ###
 ####################
diff --git a/backend/xerox_mfp.h b/backend/xerox_mfp.h
index 500dd26..3d93f06 100644
--- a/backend/xerox_mfp.h
+++ b/backend/xerox_mfp.h
@@ -1,9 +1,12 @@
 /*
- * SANE backend for Xerox Phaser 3200MFP
- * Copyright 2008 ABC <abc@telekom.ru>
+ * SANE backend for Xerox Phaser 3200MFP et al.
+ * Copyright 2008-2016 ABC <abc@telekom.ru>
  *
- *	Network scanners support
- *	Copyright 2010 Alexander Kuznetsov <acca(at)cpan.org>
+ * Network Scanners Support
+ * Copyright 2010 Alexander Kuznetsov <acca(at)cpan.org>
+ *
+ * Color scanning on Samsung M2870 model and Xerox Cognac 3215 & 3225
+ * models by Laxmeesh Onkar Markod <m.laxmeesh@samsung.com>
  *
  * This program is licensed under GPL + SANE exception.
  * More info at http://www.sane-project.org/license.html
@@ -29,130 +32,136 @@
 #define SWAP_Word(x, y) { SANE_Word z = x; x = y; y = z; }
 
 enum options {
-  OPT_NUMOPTIONS,
-  OPT_GROUP_STD,
-  OPT_RESOLUTION,	/* dpi*/
-  OPT_MODE,		/* color */
-  OPT_THRESHOLD,	/* brightness */
-  OPT_SOURCE,		/* affects max window size */
-  OPT_GROUP_GEO,
-  OPT_SCAN_TL_X,	/* for (OPT_SCAN_TL_X to OPT_SCAN_BR_Y) */
-  OPT_SCAN_TL_Y,
-  OPT_SCAN_BR_X,
-  OPT_SCAN_BR_Y,
-  NUM_OPTIONS
+    OPT_NUMOPTIONS,
+    OPT_GROUP_STD,
+    OPT_RESOLUTION,	/* dpi*/
+    OPT_MODE,		/* color */
+    OPT_THRESHOLD,	/* brightness */
+    OPT_SOURCE,		/* affects max window size */
+    OPT_GROUP_GEO,
+    OPT_SCAN_TL_X,	/* for (OPT_SCAN_TL_X to OPT_SCAN_BR_Y) */
+    OPT_SCAN_TL_Y,
+    OPT_SCAN_BR_X,
+    OPT_SCAN_BR_Y,
+    NUM_OPTIONS
 };
 
 typedef struct transport transport;
 
 struct device {
-  struct device *next;
-  SANE_Device sane;
-  int dn;			/* usb file descriptor */
-  SANE_Byte res[1024];		/* buffer for responses */
-  size_t reslen;		/* response len */
-  SANE_Option_Descriptor opt[NUM_OPTIONS];
-  Option_Value val[NUM_OPTIONS];
-  SANE_Parameters para;
-  SANE_Bool non_blocking;
-  int scanning;			/* scanning is started */
-  int cancel;			/* cancel flag */
-  int state;			/* current state */
-  int reserved;			/* CMD_RESERVE_UNIT */
-  int reading;			/* READ_IMAGE is sent */
-
-  SANE_Byte *data;		/* postprocessing cyclic buffer 64k */
-  int datalen;			/* how data in buffer */
-  int dataoff;			/* offset of data */
-  int dataindex;		/* sequental number */
+    struct device *next;
+    SANE_Device sane;
+    int dn;			/* usb file descriptor */
+    SANE_Byte res[1024];		/* buffer for responses */
+    size_t reslen;		/* response len */
+    SANE_Option_Descriptor opt[NUM_OPTIONS];
+    Option_Value val[NUM_OPTIONS];
+    SANE_Parameters para;
+    SANE_Bool non_blocking;
+    int scanning;			/* scanning is started */
+    int cancel;			/* cancel flag */
+    int state;			/* current state */
+    int reserved;			/* CMD_RESERVE_UNIT */
+    int reading;			/* READ_IMAGE is sent */
+
+    SANE_Byte *data;		/* postprocessing cyclic buffer 64k */
+    int datalen;			/* how data in buffer */
+    int dataoff;			/* offset of data */
+    int dataindex;		/* sequental number */
 #define DATAMASK 0xffff		/* mask of data buffer */
 #define DATASIZE (DATAMASK + 1)	/* size of data buffer */
-  /* 64K will be enough to hold whole line of 2400 dpi of 23cm */
+    /* 64K will be enough to hold whole line of 2400 dpi of 23cm */
 #define DATATAIL(dev) ((dev->dataoff + dev->datalen) & DATAMASK)
 #define DATAROOM(dev) dataroom(dev)
 
-  /* data from CMD_INQUIRY: */
-  int resolutions;		/* supported resolution bitmask */
-  int compositions;		/* supported image compositions bitmask */
-  int max_len;			/* effective max len for current doc source */
-  int max_win_width;
-  int max_win_len;
-  int max_len_adf;
-  int max_len_fb;
-  int line_order;		/* if need post processing */
-  SANE_Word dpi_list[30];	/* allowed resolutions */
-  int doc_loaded;
-
-  SANE_Range win_x_range;
-  SANE_Range win_y_range;
-
-  /* CMD_SET_WINDOW parameters we set: */
-  int win_width;		/* in 1200dpi points */
-  int win_len;
-  double win_off_x;		/* in inches (byte.byte) */
-  double win_off_y;
-  int resolution;		/* dpi indexed values */
-  int composition;		/* MODE_ */
-  int doc_source;		/* document source */
-  int threshold;		/* brightness */
-
-  /* CMD_READ data. It is per block only, image could be in many blocks */
-  int blocklen;			/* image data block len (padding incl.) */
-  int vertical;			/* lines in block (padded) */
-  int horizontal;		/* b/w: bytes, gray/color: pixels (padded) */
-  int final_block;
-  int pixels_per_line;
-  int bytes_per_line;
-  int ulines;			/* up to this block including */
-  int y_off;			/* up to this block excluding*/
-  int blocks;
-
-  /* stat */
-  int total_img_size;		/* predicted image size */
-  int total_out_size;		/* total we sent to user */
-  int total_data_size;		/* total of what scanner sent us */
-
-  /* transport to use */
-  transport *io;
+#define POST_DATASIZE 0xFFFFFF
+    SANE_Byte *decData;
+    int decDataSize;
+    int currentDecDataIndex;
+    /* data from CMD_INQUIRY: */
+    int resolutions;		/* supported resolution bitmask */
+    int compositions;		/* supported image compositions bitmask */
+    int max_len;			/* effective max len for current doc source */
+    int max_win_width;
+    int max_win_len;
+    int max_len_adf;
+    int max_len_fb;
+    int line_order;		/* if need post processing */
+    SANE_Word dpi_list[30];	/* allowed resolutions */
+    int doc_loaded;
+
+    SANE_Range win_x_range;
+    SANE_Range win_y_range;
+
+    /* CMD_SET_WINDOW parameters we set: */
+    int win_width;		/* in 1200dpi points */
+    int win_len;
+    double win_off_x;		/* in inches (byte.byte) */
+    double win_off_y;
+    int resolution;		/* dpi indexed values */
+    int composition;		/* MODE_ */
+    int doc_source;		/* document source */
+    int threshold;		/* brightness */
+    int compressionTypes;
+
+    /* CMD_READ data. It is per block only, image could be in many blocks */
+    int blocklen;			/* image data block len (padding incl.) */
+    int vertical;			/* lines in block (padded) */
+    int horizontal;		/* b/w: bytes, gray/color: pixels (padded) */
+    int final_block;
+    int pixels_per_line;
+    int bytes_per_line;
+    int ulines;			/* up to this block including */
+    int y_off;			/* up to this block excluding*/
+    int blocks;
+
+    /* stat */
+    int total_img_size;		/* predicted image size */
+    int total_out_size;		/* total we sent to user */
+    int total_data_size;		/* total of what scanner sent us */
+
+    /* transport to use */
+    transport *io;
 };
 
 
 /*	Transport abstract layer	*/
 struct transport {
-    char* ttype;
-
-    int (*dev_request) (struct device *dev,
-		SANE_Byte *cmd, size_t cmdlen,
-		SANE_Byte *resp, size_t *resplen);
-    SANE_Status (*dev_open) (struct device *dev);
-    void (*dev_close) (struct device *dev);
-    SANE_Status (*configure_device) (const char *devname, SANE_Status (*cb)(SANE_String_Const devname));
+    char *ttype;
+
+    int (*dev_request)(struct device *dev,
+                       SANE_Byte *cmd, size_t cmdlen,
+                       SANE_Byte *resp, size_t *resplen);
+    SANE_Status(*dev_open)(struct device *dev);
+    void (*dev_close)(struct device *dev);
+    SANE_Status(*configure_device)(const char *devname, SANE_Status(*cb)(SANE_String_Const devname));
 };
 
 /*	USB transport	*/
-int		usb_dev_request	(struct device *dev, SANE_Byte *cmd, size_t cmdlen, SANE_Byte *resp, size_t *resplen);
-SANE_Status	usb_dev_open	(struct device *dev);
-void		usb_dev_close	(struct device *dev);
-SANE_Status	usb_configure_device (const char *devname, SANE_Status (*cb)(SANE_String_Const devname));
+int		usb_dev_request(struct device *dev, SANE_Byte *cmd, size_t cmdlen, SANE_Byte *resp, size_t *resplen);
+SANE_Status	usb_dev_open(struct device *dev);
+void		usb_dev_close(struct device *dev);
+SANE_Status	usb_configure_device(const char *devname, SANE_Status(*cb)(SANE_String_Const devname));
 
 /*	TCP unicast	*/
-int		tcp_dev_request	(struct device *dev, SANE_Byte *cmd, size_t cmdlen, SANE_Byte *resp, size_t *resplen);
-SANE_Status	tcp_dev_open	(struct device *dev);
-void		tcp_dev_close	(struct device *dev);
-SANE_Status	tcp_configure_device (const char *devname, SANE_Status (*cb)(SANE_String_Const devname));
+int		tcp_dev_request(struct device *dev, SANE_Byte *cmd, size_t cmdlen, SANE_Byte *resp, size_t *resplen);
+SANE_Status	tcp_dev_open(struct device *dev);
+void		tcp_dev_close(struct device *dev);
+SANE_Status	tcp_configure_device(const char *devname, SANE_Status(*cb)(SANE_String_Const devname));
 
 /* device wants transfer buffer to be multiple of 512 */
 #define USB_BLOCK_SIZE 512
 #define USB_BLOCK_MASK ~(USB_BLOCK_SIZE - 1)
 
-static inline int dataroom(struct device *dev) {
-  int tail = DATATAIL(dev);
-  if (tail < dev->dataoff)
-    return dev->dataoff - tail;
-  else if (dev->datalen == DATASIZE) {
-    return 0;
-  } else
-    return DATASIZE - tail;
+static inline int dataroom(struct device *dev)
+{
+    int tail = DATATAIL(dev);
+    if (tail < dev->dataoff)
+        return dev->dataoff - tail;
+    else if (dev->datalen == DATASIZE) {
+        return 0;
+    } else
+        return DATASIZE - tail;
 }
 
 /*	Functions from original xerox_mfp.c, used in -usb.c and -tcp.c	*/
diff --git a/config.guess b/config.guess
index 3c022c5..faa63aa 100644..100755
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2015-09-14'
+timestamp='2017-05-11'
 
 # 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
@@ -27,7 +27,7 @@ timestamp='2015-09-14'
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
 
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2017 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."
@@ -186,9 +186,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
+	# to ELF recently (or will in the future) and ABI.
 	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
+	    earm*)
+		os=netbsdelf
+		;;
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
@@ -237,6 +240,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
@@ -268,42 +275,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 	case "$ALPHA_CPU_TYPE" in
 	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
+		UNAME_MACHINE=alphaev5 ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
+		UNAME_MACHINE=alphaev56 ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
+		UNAME_MACHINE=alphapca56 ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
+		UNAME_MACHINE=alphapca57 ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
+		UNAME_MACHINE=alphaev6 ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
+		UNAME_MACHINE=alphaev67 ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
+		UNAME_MACHINE=alphaev69 ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
+		UNAME_MACHINE=alphaev7 ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
+		UNAME_MACHINE=alphaev79 ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 	exitcode=$?
 	trap '' 0
@@ -376,16 +383,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
-	SUN_ARCH="i386"
+	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
-		SUN_ARCH="x86_64"
+		SUN_ARCH=x86_64
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -410,7 +417,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
 		echo m68k-sun-sunos${UNAME_RELEASE}
@@ -635,13 +642,13 @@ EOF
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
 			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			  32) HP_ARCH=hppa2.0n ;;
+			  64) HP_ARCH=hppa2.0w ;;
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
@@ -680,11 +687,11 @@ EOF
 		    exit (0);
 		}
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
+	if [ ${HP_ARCH} = hppa2.0w ]
 	then
 	    eval $set_cc_for_build
 
@@ -697,12 +704,12 @@ EOF
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23
 
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	    then
-		HP_ARCH="hppa2.0w"
+		HP_ARCH=hppa2.0w
 	    else
-		HP_ARCH="hppa64"
+		HP_ARCH=hppa64
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -807,14 +814,14 @@ EOF
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
 	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -830,10 +837,11 @@ EOF
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	case ${UNAME_PROCESSOR} in
 	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		UNAME_PROCESSOR=x86_64 ;;
+	    i386)
+		UNAME_PROCESSOR=i586 ;;
 	esac
+	echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -896,7 +904,7 @@ EOF
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
@@ -919,7 +927,7 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arc:Linux:*:* | arceb:Linux:*:*)
@@ -993,6 +1001,9 @@ EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    mips64el:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     openrisc*:Linux:*:*)
 	echo or1k-unknown-linux-${LIBC}
 	exit ;;
@@ -1025,6 +1036,9 @@ EOF
     ppcle:Linux:*:*)
 	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
@@ -1123,7 +1137,7 @@ EOF
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
+	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
 	exit ;;
@@ -1272,6 +1286,9 @@ EOF
     SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-ACE:SUPER-UX:*:*)
+	echo sxace-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1285,9 +1302,9 @@ EOF
 	    UNAME_PROCESSOR=powerpc
 	fi
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		    grep IS_64BIT_ARCH >/dev/null
 		then
 		    case $UNAME_PROCESSOR in
@@ -1309,7 +1326,7 @@ EOF
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
+	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
@@ -1318,15 +1335,18 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
+    NEO-*:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
+    NSR-*:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit ;;
+    NSX-*:NONSTOP_KERNEL:*:*)
+	echo nsx-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
 	exit ;;
@@ -1340,7 +1360,7 @@ EOF
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = "386"; then
+	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
 	    UNAME_MACHINE="$cputype"
@@ -1382,7 +1402,7 @@ EOF
 	echo i386-pc-xenix
 	exit ;;
     i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
 	exit ;;
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
@@ -1393,23 +1413,25 @@ EOF
     x86_64:VMkernel:*:*)
 	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
+    amd64:Isilon\ OneFS:*:*)
+	echo x86_64-unknown-onefs
+	exit ;;
 esac
 
 cat >&2 <<EOF
 $0: unable to guess system type
 
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite
+config.guess and config.sub with the latest versions from:
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
 
 config.guess timestamp = $timestamp
 
diff --git a/config.rpath b/config.rpath
new file mode 100755
index 0000000..17298f2
--- /dev/null
+++ b/config.rpath
@@ -0,0 +1,672 @@
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
+# run time search path of shared libraries in an executable.
+#
+#   Copyright 1996-2010 Free Software Foundation, Inc.
+#   Taken from GNU libtool, 2001
+#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+#   This file is free software; the Free Software Foundation gives
+#   unlimited permission to copy and/or distribute it, with or without
+#   modifications, as long as this notice is preserved.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
+# should be set by the caller.
+#
+# The set of defined variables is at the end of this script.
+
+# 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
+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 _LT_COMPILER_PIC.
+
+wl=
+if test "$GCC" = yes; then
+  wl='-Wl,'
+else
+  case "$host_os" in
+    aix*)
+      wl='-Wl,'
+      ;;
+    darwin*)
+      case $cc_basename in
+        xlc*)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      ;;
+    hpux9* | hpux10* | hpux11*)
+      wl='-Wl,'
+      ;;
+    irix5* | irix6* | nonstopux*)
+      wl='-Wl,'
+      ;;
+    newsos6)
+      ;;
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+        ecc*)
+          wl='-Wl,'
+          ;;
+        icc* | ifort*)
+          wl='-Wl,'
+          ;;
+        lf95*)
+          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,'
+      ;;
+    rdos*)
+      ;;
+    solaris*)
+      wl='-Wl,'
+      ;;
+    sunos4*)
+      wl='-Qoption ld '
+      ;;
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      wl='-Wl,'
+      ;;
+    sysv4*MP*)
+      ;;
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      wl='-Wl,'
+      ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
+    uts4*)
+      ;;
+  esac
+fi
+
+# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
+
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+
+case "$host_os" in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+esac
+
+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
+    aix[3-9]*)
+      # 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'
+      hardcode_minus_L=yes
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we cannot use
+      # them.
+      ld_shlibs=no
+      ;;
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    cygwin* | mingw* | pw32* | cegcc*)
+      # 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
+      ;;
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      ;;
+    gnu* | linux* | k*bsd*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd*)
+      ;;
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+        ld_shlibs=no
+      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 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+  esac
+  if test "$ld_shlibs" = no; then
+    hardcode_libdir_flag_spec=
+  fi
+else
+  case "$host_os" in
+    aix3*)
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes; then
+        # Neither direct hardcoding nor static linking is supported with a
+        # broken collect2.
+        hardcode_direct=unsupported
+      fi
+      ;;
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+        # On IA64, the linker does run time linking by default, so we don't
+        # have to do anything special.
+        aix_use_runtimelinking=no
+      else
+        aix_use_runtimelinking=no
+        # Test if we are trying to use run time linking or normal
+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+        # need to do runtime linking.
+        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+          for ld_flag in $LDFLAGS; do
+            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+              aix_use_runtimelinking=yes
+              break
+            fi
+          done
+          ;;
+        esac
+      fi
+      hardcode_direct=yes
+      hardcode_libdir_separator=':'
+      if test "$GCC" = yes; then
+        case $host_os in aix4.[012]|aix4.[012].*)
+          collect2name=`${CC} -print-prog-name=collect2`
+          if test -f "$collect2name" && \
+            strings "$collect2name" | grep resolve_lib_name >/dev/null
+          then
+            # We have reworked collect2
+            :
+          else
+            # We have old collect2
+            hardcode_direct=unsupported
+            hardcode_minus_L=yes
+            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:'"$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}-blibpath:$libdir:'"$aix_libpath"
+        fi
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs=no
+      ;;
+    bsdi[45]*)
+      ;;
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      libext=lib
+      ;;
+    darwin* | rhapsody*)
+      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
+      ;;
+    freebsd2.2*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    freebsd2*)
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    freebsd* | dragonfly*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    hpux9*)
+      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
+      ;;
+    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* | nonstopux*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    netbsd*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    newsos6)
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+        hardcode_direct=yes
+        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+        else
+          case "$host_os" in
+            openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+              hardcode_libdir_flag_spec='-R$libdir'
+              ;;
+            *)
+              hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+              ;;
+          esac
+        fi
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      ;;
+    osf3*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    osf4* | osf5*)
+      if test "$GCC" = yes; then
+        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+        # Both cc and cxx compiler support -rpath directly
+        hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      hardcode_libdir_separator=:
+      ;;
+    solaris*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      ;;
+    sunos4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    sysv4)
+      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*)
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        ld_shlibs=yes
+      fi
+      ;;
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      ;;
+    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
+      ;;
+  esac
+fi
+
+# Check dynamic linker characteristics
+# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
+# Unlike libtool.m4, here we don't care about _all_ names of the library, but
+# only about the one the linker finds when passed -lNAME. This is the last
+# element of library_names_spec in libtool.m4, or possibly two of them if the
+# linker has special search rules.
+library_names_spec=      # the last element of library_names_spec in libtool.m4
+libname_spec='lib$name'
+case "$host_os" in
+  aix3*)
+    library_names_spec='$libname.a'
+    ;;
+  aix[4-9]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  amigaos*)
+    library_names_spec='$libname.a'
+    ;;
+  beos*)
+    library_names_spec='$libname$shrext'
+    ;;
+  bsdi[45]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  cygwin* | mingw* | pw32* | cegcc*)
+    shrext=.dll
+    library_names_spec='$libname.dll.a $libname.lib'
+    ;;
+  darwin* | rhapsody*)
+    shrext=.dylib
+    library_names_spec='$libname$shrext'
+    ;;
+  dgux*)
+    library_names_spec='$libname$shrext'
+    ;;
+  freebsd1*)
+    ;;
+  freebsd* | dragonfly*)
+    case "$host_os" in
+      freebsd[123]*)
+        library_names_spec='$libname$shrext$versuffix' ;;
+      *)
+        library_names_spec='$libname$shrext' ;;
+    esac
+    ;;
+  gnu*)
+    library_names_spec='$libname$shrext'
+    ;;
+  hpux9* | hpux10* | hpux11*)
+    case $host_cpu in
+      ia64*)
+        shrext=.so
+        ;;
+      hppa*64*)
+        shrext=.sl
+        ;;
+      *)
+        shrext=.sl
+        ;;
+    esac
+    library_names_spec='$libname$shrext'
+    ;;
+  interix[3-9]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  irix5* | irix6* | nonstopux*)
+    library_names_spec='$libname$shrext'
+    case "$host_os" in
+      irix5* | nonstopux*)
+        libsuff= shlibsuff=
+        ;;
+      *)
+        case $LD in
+          *-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
+    ;;
+  linux*oldld* | linux*aout* | linux*coff*)
+    ;;
+  linux* | k*bsd*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  knetbsd*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  netbsd*)
+    library_names_spec='$libname$shrext'
+    ;;
+  newsos6)
+    library_names_spec='$libname$shrext'
+    ;;
+  nto-qnx*)
+    library_names_spec='$libname$shrext'
+    ;;
+  openbsd*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  os2*)
+    libname_spec='$name'
+    shrext=.dll
+    library_names_spec='$libname.a'
+    ;;
+  osf3* | osf4* | osf5*)
+    library_names_spec='$libname$shrext'
+    ;;
+  rdos*)
+    ;;
+  solaris*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sunos4*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  sysv4 | sysv4.3*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv4*MP*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+    library_names_spec='$libname$shrext'
+    ;;
+  uts4*)
+    library_names_spec='$libname$shrext'
+    ;;
+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_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+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"
+
+# Static library suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally "so").
+shlibext="$shlibext"
+
+# Format of library name prefix.
+libname_spec="$escaped_libname_spec"
+
+# Library names that the linker finds when passed -lNAME.
+library_names_spec="$escaped_library_names_spec"
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator="$hardcode_libdir_separator"
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct="$hardcode_direct"
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L="$hardcode_minus_L"
+
+EOF
diff --git a/config.sub b/config.sub
index 1acc966..40ea5df 100644..100755
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2015-08-20'
+timestamp='2017-04-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ timestamp='2015-08-20'
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -53,8 +53,7 @@ timestamp='2015-08-20'
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 
 Canonicalize a configuration name.
 
@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2017 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."
@@ -118,7 +117,7 @@ case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -264,7 +263,7 @@ case $basic_machine in
 	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
-	| i370 | i860 | i960 | ia64 \
+	| i370 | i860 | i960 | ia16 | ia64 \
 	| ip2k | iq2000 \
 	| k1om \
 	| le32 | le64 \
@@ -302,6 +301,7 @@ case $basic_machine in
 	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pru \
 	| pyramid \
 	| riscv32 | riscv64 \
 	| rl78 | rx \
@@ -315,6 +315,7 @@ case $basic_machine in
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| visium \
+	| wasm32 \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -388,7 +389,7 @@ case $basic_machine in
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
+	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
 	| ip2k-* | iq2000-* \
 	| k1om-* \
 	| le32-* | le64-* \
@@ -429,6 +430,7 @@ case $basic_machine in
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pru-* \
 	| pyramid-* \
 	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
@@ -445,6 +447,7 @@ case $basic_machine in
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
 	| visium-* \
+	| wasm32-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -521,7 +524,7 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-aros
 		;;
-        asmjs)
+	asmjs)
 		basic_machine=asmjs-unknown
 		;;
 	aux)
@@ -644,6 +647,14 @@ case $basic_machine in
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
+	e500v[12])
+		basic_machine=powerpc-unknown
+		os=$os"spe"
+		;;
+	e500v[12]-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=$os"spe"
+		;;
 	ebmon29k)
 		basic_machine=a29k-amd
 		os=-ebmon
@@ -939,6 +950,9 @@ case $basic_machine in
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
+	nsx-tandem)
+		basic_machine=nsx-tandem
+		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
@@ -1023,7 +1037,7 @@ case $basic_machine in
 	ppc-* | ppcbe-*)
 		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
+	ppcle | powerpclittle)
 		basic_machine=powerpcle-unknown
 		;;
 	ppcle-* | powerpclittle-*)
@@ -1033,7 +1047,7 @@ case $basic_machine in
 		;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+	ppc64le | powerpc64little)
 		basic_machine=powerpc64le-unknown
 		;;
 	ppc64le-* | powerpc64little-*)
@@ -1234,6 +1248,9 @@ case $basic_machine in
 		basic_machine=a29k-wrs
 		os=-vxworks
 		;;
+	wasm32)
+		basic_machine=wasm32-unknown
+		;;
 	w65*)
 		basic_machine=w65-wdc
 		os=-none
@@ -1383,14 +1400,14 @@ case $os in
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
@@ -1399,7 +1416,8 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1531,6 +1549,8 @@ case $os in
 		;;
 	-nacl*)
 		;;
+	-ios)
+		;;
 	-none)
 		;;
 	*)
@@ -1626,6 +1646,9 @@ case $basic_machine in
 	sparc-* | *-sun)
 		os=-sunos4.1.1
 		;;
+	pru-*)
+		os=-elf
+		;;
 	*-be)
 		os=-beos
 		;;
diff --git a/configure b/configure
index 5f58b62..216aaea 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sane-backends 1.0.25.
+# Generated by GNU Autoconf 2.69 for sane-backends 1.0.27.
 #
 # Report bugs to <sane-devel@lists.alioth.debian.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sane-backends'
 PACKAGE_TARNAME='sane-backends'
-PACKAGE_VERSION='1.0.25'
-PACKAGE_STRING='sane-backends 1.0.25'
+PACKAGE_VERSION='1.0.27'
+PACKAGE_STRING='sane-backends 1.0.27'
 PACKAGE_BUGREPORT='sane-devel@lists.alioth.debian.org'
 PACKAGE_URL=''
 
@@ -631,15 +631,29 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
+gt_needs=
+ac_config_libobj_dir=lib
 ac_header_list=
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
-DISTCLEAN_FILES
-USE_LATEX_FALSE
-USE_LATEX_TRUE
-ENABLE_TRANSLATIONS_FALSE
-ENABLE_TRANSLATIONS_TRUE
+AM_LDFLAGS
+AM_CFLAGS
+AM_CPPFLAGS
+WITH_API_HTML_FALSE
+WITH_API_HTML_TRUE
+WITH_API_PDF_FALSE
+WITH_API_PDF_TRUE
+WITH_API_PS_FALSE
+WITH_API_PS_TRUE
+PPMTOGIF
+DLH
+GS
+FIG2DEV
+PDFLATEX
+LATEX
+DVIPS
+MAKEINDEX
 BACKEND_MANS_ENABLED
 BACKEND_CONFS_ENABLED
 PRELOADABLE_BACKENDS_ENABLED
@@ -655,35 +669,17 @@ COMPILE_SANED_FALSE
 COMPILE_SANED_TRUE
 configdir
 locksanedir
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-MANIFEST_TOOL
-RANLIB
-ac_ct_AR
-AR
-LN_S
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LD
-FGREP
-SED
-LIBTOOL
-OBJDUMP
-DLLTOOL
-AS
 SCSI_LIBS
+have_usblib_FALSE
+have_usblib_TRUE
 USB_LIBS
-LIBUSB_1_0_LIBS
-LIBUSB_1_0_CFLAGS
+USB_CFLAGS
 SYSTEMD_LIBS
 SYSTEMD_CFLAGS
-ALLOCA
-LIBOBJS
 SOCKET_LIBS
+LTALLOCA
+LIBOBJS
+ALLOCA
 RESMGR_LIBS
 SNMP_CFLAGS
 SNMP_LIBS
@@ -708,21 +704,58 @@ MATH_LIB
 DYNAMIC_FLAG
 DL_LIBS
 effective_target
-LINKER_RPATH
 STRICT_LDFLAGS
-INCLUDES
 CROSS_COMPILING_FALSE
 CROSS_COMPILING_TRUE
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
-MAKEINDEX
-DVIPS
-LATEX
+SANE_CONFIG_PATH
+POSUB
+LTLIBINTL
+LIBINTL
+INTLLIBS
+LTLIBICONV
+LIBICONV
+INTL_MACOSX_LIBS
+XGETTEXT_EXTRA_OPTIONS
 MSGMERGE
+XGETTEXT_015
 XGETTEXT
+GMSGFMT_015
+MSGFMT_015
+GMSGFMT
 MSGFMT
-SANE_CONFIG_PATH
+GETTEXT_MACRO_VERSION
+USE_NLS
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+MANIFEST_TOOL
+RANLIB
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+SED
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+LIBTOOL
+OBJDUMP
+DLLTOOL
+AS
+ac_ct_AR
+AR
 EGREP
 GREP
 CPP
@@ -743,15 +776,6 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-NUMBER_VERSION
 V_REV
 V_MINOR
 V_MAJOR
@@ -828,10 +852,19 @@ ac_user_opts='
 enable_option_checking
 enable_silent_rules
 enable_maintainer_mode
-with_docdir
 enable_dependency_tracking
-enable_warnings
+enable_static
+enable_shared
+with_pic
+enable_fast_install
+with_gnu_ld
+with_sysroot
+enable_libtool_lock
+enable_nls
 enable_rpath
+with_libiconv_prefix
+with_libintl_prefix
+enable_warnings
 enable_dynamic
 enable_pthread
 enable_locking
@@ -841,25 +874,16 @@ with_v4l
 enable_avahi
 with_snmp
 with_systemd
-enable_libusb_1_0
-enable_libusb
+with_usb
 enable_scsibuffersize
 enable_scsi_directio
 enable_ipv6
 enable_preload
-enable_static
-enable_shared
-with_pic
-enable_fast_install
-with_gnu_ld
-with_sysroot
-enable_libtool_lock
 with_lockdir
 enable_local_backends
 enable_pnm_backend
 enable_parport_directio
-enable_translations
-enable_latex
+with_api_spec
 '
       ac_precious_vars='build_alias
 host_alias
@@ -879,8 +903,8 @@ AVAHI_CFLAGS
 AVAHI_LIBS
 SYSTEMD_CFLAGS
 SYSTEMD_LIBS
-LIBUSB_1_0_CFLAGS
-LIBUSB_1_0_LIBS
+USB_CFLAGS
+USB_LIBS
 BACKENDS
 PRELOADABLE_BACKENDS'
 
@@ -1423,7 +1447,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 sane-backends 1.0.25 to adapt to many kinds of systems.
+\`configure' configures sane-backends 1.0.27 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1493,7 +1517,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sane-backends 1.0.25:";;
+     short | recursive ) echo "Configuration of sane-backends 1.0.27:";;
    esac
   cat <<\_ACEOF
 
@@ -1510,28 +1534,27 @@ Optional Features:
                           do not reject slow dependency extractors
   --disable-dependency-tracking
                           speeds up one-time build
+  --enable-static[=PKGS]  build static libraries [default=no]
+  --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --disable-nls           do not use Native Language Support
+  --disable-rpath         do not hardcode runtime library paths
   --enable-warnings       turn on tons of compiler warnings (GCC only)
-  --enable-rpath          use runtime library search path [default=yes]
   --disable-dynamic       Disable dynamic loading of backends
   --enable-pthread        use pthread instead of fork (default=yes for
                           Linux/MacOS X/MINGW, no for everything else)
   --enable-locking        activate device locking (default=yes, but only used
                           by some backends)
   --enable-avahi          enable Avahi support for saned and the net backend
-  --enable-libusb_1_0     enable libusb-1.0 support if available
-  --disable-libusb        disable support for USB in SANE
   --enable-scsibuffersize=N
                           specify the default size in bytes of the buffer for
-                          SCSI commands [[default=131072]]
+                          SCSI commands [default=131072]
   --enable-scsi-directio  enable SCSI direct IO (Linux only, dangerous, see
                           README.linux)
   --disable-ipv6          disable IPv6 support
   --disable-preload       Disable preloading of backends
-  --enable-static[=PKGS]  build static libraries [default=no]
-  --enable-shared[=PKGS]  build shared libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-local-backends
                           turn off compilation of all backends but net
   --enable-pnm-backend    enable the pnm backend for testing frontends
@@ -1539,25 +1562,29 @@ Optional Features:
   --enable-parport-directio
                           enable direct hardware access to the parallel port,
                           so frontends will require special permission level
-  --disable-translations  don't install translations of backend options
-  --disable-latex         disable use of latex, et.al., to generate
-                          documentation
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-docdir=DIR       documentation [PREFIX/doc/sane-VERSION]
-  --with-group            use the specified group for lock dir [default=uucp]
-  --with-gphoto2          include the gphoto2 backend [default=yes]
-  --with-v4l              include the v4l backend [default=yes]
-  --with-snmp             enable SNMP support [default=yes]
-  --with-systemd          enable systemd support [default=yes]
   --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
                         (or the compiler's sysroot if not specified).
+  --with-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-group            use the specified group for lock dir [default=uucp]
+  --with-gphoto2          include the gphoto2 backend [default=yes]
+  --with-v4l              include the v4l backend [default=yes]
+  --with-snmp             enable SNMP support [default=yes]
+  --with-systemd          enable systemd support [default=yes]
+  --with-usb              enable USB support [default=check]
   --with-lockdir=DIR      set SANE lockdir [localstatedir/lock/sane]
+  --with-api-spec         convert API spec to supported output formats
+                          [default=check]
 
 Some influential environment variables:
   CC          C compiler command
@@ -1583,10 +1610,8 @@ Some influential environment variables:
               C compiler flags for SYSTEMD, overriding pkg-config
   SYSTEMD_LIBS
               linker flags for SYSTEMD, overriding pkg-config
-  LIBUSB_1_0_CFLAGS
-              C compiler flags for LIBUSB_1_0, overriding pkg-config
-  LIBUSB_1_0_LIBS
-              linker flags for LIBUSB_1_0, overriding pkg-config
+  USB_CFLAGS  C compiler flags for USB, overriding pkg-config
+  USB_LIBS    linker flags for USB, overriding pkg-config
   BACKENDS    list of backends to compile
   PRELOADABLE_BACKENDS
               list of backends to preload into single DLL
@@ -1657,7 +1682,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sane-backends configure 1.0.25
+sane-backends configure 1.0.27
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1956,6 +1981,73 @@ fi
 
 } # ac_fn_c_try_link
 
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
 # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
 # -------------------------------------------
 # Tests whether TYPE exists after having included INCLUDES, setting cache
@@ -2192,78 +2284,11 @@ rm -f conftest.val
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
 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 sane-backends $as_me 1.0.25, which was
+It was created by sane-backends $as_me 1.0.27, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2543,6 +2568,7 @@ $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+gt_needs="$gt_needs "
 as_fn_append ac_header_list " stdlib.h"
 as_fn_append ac_header_list " unistd.h"
 as_fn_append ac_header_list " sys/param.h"
@@ -2614,11 +2640,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-V_MAJOR=1
-V_MINOR=0
-V_REV=25
-is_release=yes
 
+ac_config_headers="$ac_config_headers include/sane/config.h"
 
 
 am__api_version='1.14'
@@ -3136,7 +3159,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sane-backends'
- VERSION='1.0.25'
+ VERSION='1.0.27'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3228,6 +3251,45 @@ END
     as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
   fi
 fi
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
@@ -3252,21 +3314,58 @@ fi
 
 
 
-ac_config_headers="$ac_config_headers include/sane/config.h"
-
+if test x = "x$AWK"; then :
+  for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-PACKAGE=sane-backends
-VERSION=1.0.25
-NUMBER_VERSION=${V_MAJOR}.${V_MINOR}.${V_REV}
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
 
+  test -n "$AWK" && break
+done
 
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
+fi
+if test x = "x`echo $VERSION | sed 's/[.0-9]//g'`"; then :
+  is_release=yes
+else
+  is_release=no
+fi
+V_MAJOR=`echo $VERSION | $AWK -F. '{print $1}'`
+V_MINOR=`echo $VERSION | $AWK -F. '{print $2}'`
+V_REV=`echo $VERSION | $AWK -F. '{print $3}' | sed 's/[^0-9]//g'`;
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3287,93 +3386,6 @@ _ACEOF
 
 
 
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-
-
-# Check whether --with-docdir was given.
-if test "${with_docdir+set}" = set; then :
-  withval=$with_docdir;
-  docdir="${withval}"
-
-else
-
-  docdir='${prefix}/doc/sane-${VERSION}'
-
-fi
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4414,36 +4426,203 @@ fi
 
 
 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+sane_save_CC=$CC
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
+$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
+if ${ac_cv_prog_cc_c99+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdio.h>
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+#define debug(...) fprintf (stderr, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  your preprocessor is broken;
+#endif
+#if BIG_OK
+#else
+  your preprocessor is broken;
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static void
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str;
+  int number;
+  float fnumber;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case 's': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case 'd': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case 'f': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+}
+
+int
+main ()
+{
+
+  // Check bool.
+  _Bool success = false;
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  test_varargs ("s, d' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[ni.number - 1] = 543;
+
+  // work around unused variable warnings
+  return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
+	  || dynamic_array[ni.number - 1] != 543);
+
+  ;
+  return 0;
+}
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
+    CC="$CC $ac_cv_prog_cc_c99"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
 esac
-rm -f conftest.make
+if test "x$ac_cv_prog_cc_c99" != xno; then :
+
 fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
+
+                  if test xno != "x$ac_cv_prog_cc_c99"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sane_save_CC option for ISO C99 w/o extensions" >&5
+$as_echo_n "checking for $sane_save_CC option for ISO C99 w/o extensions... " >&6; }
+       case $ac_cv_prog_cc_c99 in #(
+  -std=gnu99) :
+    sane_prog_cc_c99="-std=c99" ;; #(
+  -qlanglvl=extc99) :
+    sane_prog_cc_c99="-qlanglvl=stdc99" ;; #(
+  *) :
+     ;;
+esac
+       if test "x$ac_cv_prog_cc_c99" = "x$sane_prog_cc_c99"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_99" >&5
+$as_echo "$ac_cv_prog_cc_99" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sane_prog_cc_c99" >&5
+$as_echo "$sane_prog_cc_c99" >&6; }
+              CC="$sane_save_CC $sane_prog_cc_c99"
+fi
+
 fi
 
 ac_ext=c
@@ -4584,7 +4763,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if ${ac_cv_path_GREP+:} false; then :
@@ -4757,579 +4935,6 @@ $as_echo "$ac_cv_prog_gcc_traditional" >&6; }
   fi
 fi
 
-# Extract the first word of "sane-config", so it can be a program name with args.
-set dummy sane-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SANE_CONFIG_PATH+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $SANE_CONFIG_PATH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_SANE_CONFIG_PATH="$SANE_CONFIG_PATH" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_SANE_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_SANE_CONFIG_PATH" && ac_cv_path_SANE_CONFIG_PATH="no"
-  ;;
-esac
-fi
-SANE_CONFIG_PATH=$ac_cv_path_SANE_CONFIG_PATH
-if test -n "$SANE_CONFIG_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SANE_CONFIG_PATH" >&5
-$as_echo "$SANE_CONFIG_PATH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "msgfmt$EXEEXT", so it can be a program name with args.
-set dummy msgfmt$EXEEXT; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGFMT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MSGFMT="$MSGFMT" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
-  ;;
-esac
-fi
-MSGFMT=$ac_cv_path_MSGFMT
-if test -n "$MSGFMT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-$as_echo "$MSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "xgettext$EXEEXT", so it can be a program name with args.
-set dummy xgettext$EXEEXT; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XGETTEXT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $XGETTEXT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT="no"
-  ;;
-esac
-fi
-XGETTEXT=$ac_cv_path_XGETTEXT
-if test -n "$XGETTEXT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-$as_echo "$XGETTEXT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "msgmerge$EXEEXT", so it can be a program name with args.
-set dummy msgmerge$EXEEXT; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGMERGE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MSGMERGE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MSGMERGE="$MSGMERGE" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE="no"
-  ;;
-esac
-fi
-MSGMERGE=$ac_cv_path_MSGMERGE
-if test -n "$MSGMERGE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-$as_echo "$MSGMERGE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "latex$EXEEXT", so it can be a program name with args.
-set dummy latex$EXEEXT; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_LATEX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $LATEX in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_LATEX="$LATEX" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_LATEX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_LATEX" && ac_cv_path_LATEX="no"
-  ;;
-esac
-fi
-LATEX=$ac_cv_path_LATEX
-if test -n "$LATEX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LATEX" >&5
-$as_echo "$LATEX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "dvips$EXEEXT", so it can be a program name with args.
-set dummy dvips$EXEEXT; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DVIPS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $DVIPS in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_DVIPS="$DVIPS" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_DVIPS="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_DVIPS" && ac_cv_path_DVIPS="no"
-  ;;
-esac
-fi
-DVIPS=$ac_cv_path_DVIPS
-if test -n "$DVIPS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DVIPS" >&5
-$as_echo "$DVIPS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "makeindex$EXEEXT", so it can be a program name with args.
-set dummy makeindex$EXEEXT; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MAKEINDEX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAKEINDEX in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MAKEINDEX="$MAKEINDEX" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_MAKEINDEX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_MAKEINDEX" && ac_cv_path_MAKEINDEX="no"
-  ;;
-esac
-fi
-MAKEINDEX=$ac_cv_path_MAKEINDEX
-if test -n "$MAKEINDEX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEINDEX" >&5
-$as_echo "$MAKEINDEX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-fi
-
- if test x$cross_compiling = xyes; then
-  CROSS_COMPILING_TRUE=
-  CROSS_COMPILING_FALSE='#'
-else
-  CROSS_COMPILING_TRUE='#'
-  CROSS_COMPILING_FALSE=
-fi
-
-
-
-
-if test "${ac_cv_c_compiler_gnu}" = "yes"; then
-  NORMAL_CFLAGS="\
-      -W \
-      -Wall"
-  WARN_CFLAGS="\
-      -W \
-      -Wall \
-      -Wcast-align \
-      -Wcast-qual \
-      -Wmissing-declarations \
-      -Wmissing-prototypes \
-      -Wpointer-arith \
-      -Wreturn-type \
-      -Wstrict-prototypes \
-      -pedantic"
-
-  # Some platforms are overly strict with -ansi enabled.  Exclude those.
-  ANSI_FLAG=-ansi
-  case "${host_os}" in
-    solaris* | hpux* | os2* | darwin* | cygwin* | mingw*)
-      ANSI_FLAG=
-      ;;
-  esac
-  NORMAL_CFLAGS="${NORMAL_CFLAGS} ${ANSI_FLAG}"
-  WARN_CFLAGS="${WARN_CFLAGS} ${ANSI_FLAG}"
-
-  # Check whether --enable-warnings was given.
-if test "${enable_warnings+set}" = set; then :
-  enableval=$enable_warnings;
-      if eval "test x$enable_warnings = xyes"; then
-        for flag in $WARN_CFLAGS; do
-          case "$CFLAGS" in
-"$flag" | "$flag "* | *" $flag" | *" $flag "* )
-  :
-  ;;
-*)
-   CFLAGS="$CFLAGS $flag"
-  ;;
-esac
-
-        done
-      else
-        for flag in $NORMAL_CFLAGS; do
-          case "$CFLAGS" in
-"$flag" | "$flag "* | *" $flag" | *" $flag "* )
-  :
-  ;;
-*)
-   CFLAGS="$CFLAGS $flag"
-  ;;
-esac
-
-        done
-      fi
-
-else
-  if test x$is_release = xno; then
-       # Warnings enabled by default (development)
-       for flag in $WARN_CFLAGS; do
-         case "$CFLAGS" in
-"$flag" | "$flag "* | *" $flag" | *" $flag "* )
-  :
-  ;;
-*)
-   CFLAGS="$CFLAGS $flag"
-  ;;
-esac
-
-       done
-    else
-       # Warnings disabled by default (release)
-       for flag in $NORMAL_CFLAGS; do
-         case "$CFLAGS" in
-"$flag" | "$flag "* | *" $flag" | *" $flag "* )
-  :
-  ;;
-*)
-   CFLAGS="$CFLAGS $flag"
-  ;;
-esac
-
-       done
-    fi
-fi
-
-fi # ac_cv_c_compiler_gnu
-
-
-  # Define stricter linking policy on GNU systems.  This is not
-  # added to global LDFLAGS because we may want to create convenience
-  # libraries that don't require such strick linking.
-  if test "$GCC" = yes; then
-    case ${host_os} in
-    linux* | solaris*)
-      STRICT_LDFLAGS="-Wl,-z,defs"
-      ;;
-    esac
-  fi
-
-  case "${host_os}" in
-    aix*) #enable .so libraries, disable archives
-      LDFLAGS="$LDFLAGS -Wl,-brtl"
-      ;;
-    darwin*) #include frameworks
-      LIBS="$LIBS -framework CoreFoundation -framework IOKit"
-      ;;
-  esac
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether runtime link path should be used" >&5
-$as_echo_n "checking whether runtime link path should be used... " >&6; }
-  # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then :
-  enableval=$enable_rpath;
-fi
-
-
-  LINKER_RPATH=
-  if test "x$enable_rpath" != xno; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker parameter to set runtime link path" >&5
-$as_echo_n "checking linker parameter to set runtime link path... " >&6; }
-if ${my_cv_LINKER_RPATH+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  my_cv_LINKER_RPATH=
-      case "$host_os" in
-      linux* | freebsd* | netbsd* | openbsd* | irix*)
-        # I believe this only works with GNU ld [pere 2001-04-16]
-        my_cv_LINKER_RPATH="-Wl,-rpath,"
-        ;;
-      solaris*)
-        my_cv_LINKER_RPATH="-R "
-        ;;
-      esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $my_cv_LINKER_RPATH" >&5
-$as_echo "$my_cv_LINKER_RPATH" >&6; }
-      LINKER_RPATH="$my_cv_LINKER_RPATH"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      LINKER_RPATH=
-fi
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
 if ${ac_cv_header_stdc+:} false; then :
@@ -5520,2038 +5125,18 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
   $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
 
 
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
-$as_echo_n "checking for library containing strerror... " >&6; }
-if ${ac_cv_search_strerror+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strerror ();
-int
-main ()
-{
-return strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' cposix; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_strerror=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_strerror+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_strerror+:} false; then :
-
-else
-  ac_cv_search_strerror=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
-$as_echo "$ac_cv_search_strerror" >&6; }
-ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-
-
-ac_byteorder_h=`echo include/byteorder.h`
-ac_dir=`echo $ac_byteorder_h|sed 's%/[^/][^/]*$%%'`
-if test "$ac_dir" != "$ac_byteorder" && test "$ac_dir" != .; then
-  # The file is in a subdirectory.
-  test ! -d "$ac_dir" && mkdir "$ac_dir"
-fi
-
-# We're only interested in the target CPU, but it's not always set
-effective_target="$target"
-if test "x$effective_target" = xNONE -o "x$effective_target" = x ; then
-	effective_target="$host"
-fi
-
-
-ac_byteorder=_byteorder.tmp
-cat > "$ac_byteorder" << EOF
-/* This file is generated automatically by configure */
-/* It is valid only for the system type ${effective_target} */
-
-#ifndef __BYTEORDER_H
-#define __BYTEORDER_H
-
-EOF
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_bigendian=unknown
-    # See if we're dealing with a universal compiler.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __APPLE_CC__
-	       not a universal capable compiler
-	     #endif
-	     typedef int dummy;
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-	# Check for potential -arch flags.  It is not universal unless
-	# there are at least two -arch flags with different values.
-	ac_arch=
-	ac_prev=
-	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-	 if test -n "$ac_prev"; then
-	   case $ac_word in
-	     i?86 | x86_64 | ppc | ppc64)
-	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-		 ac_arch=$ac_word
-	       else
-		 ac_cv_c_bigendian=universal
-		 break
-	       fi
-	       ;;
-	   esac
-	   ac_prev=
-	 elif test "x$ac_word" = "x-arch"; then
-	   ac_prev=arch
-	 fi
-       done
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if sys/param.h defines the BYTE_ORDER macro.
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-	     #include <sys/param.h>
-
-int
-main ()
-{
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-		     && LITTLE_ENDIAN)
-	      bogus endian macros
-	     #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-		#include <sys/param.h>
-
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
-		 not big endian
-		#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-	      bogus endian macros
-	     #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-
-int
-main ()
-{
-#ifndef _BIG_ENDIAN
-		 not big endian
-		#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # Compile a test program.
-      if test "$cross_compiling" = yes; then :
-  # Try to guess by grepping values from an object file.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-short int ascii_mm[] =
-		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii[] =
-		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-		int use_ascii (int i) {
-		  return ascii_mm[i] + ascii_ii[i];
-		}
-		short int ebcdic_ii[] =
-		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm[] =
-		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-		int use_ebcdic (int i) {
-		  return ebcdic_mm[i] + ebcdic_ii[i];
-		}
-		extern int foo;
-
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-	      ac_cv_c_bigendian=yes
-	    fi
-	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-	      if test "$ac_cv_c_bigendian" = unknown; then
-		ac_cv_c_bigendian=no
-	      else
-		# finding both strings is unlikely to happen, but who knows?
-		ac_cv_c_bigendian=unknown
-	      fi
-	    fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-
-	     /* Are we little or big endian?  From Harbison&Steele.  */
-	     union
-	     {
-	       long int l;
-	       char c[sizeof (long int)];
-	     } u;
-	     u.l = 1;
-	     return u.c[sizeof (long int) - 1] == 1;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_c_bigendian=no
-else
-  ac_cv_c_bigendian=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-    fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
-   yes)
-     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
-;; #(
-   no)
-      ;; #(
-   universal)
-
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-
-     ;; #(
-   *)
-     as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
- esac
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for le32toh in machine/endian.h" >&5
-$as_echo_n "checking for le32toh in machine/endian.h... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <machine/endian.h>
-#ifdef le32toh
- 	symbol is present
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "symbol is present|\<le32toh\>" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-HAVE_LE32TOH=1
- cat >> "$ac_byteorder" << EOF
-/* extended byte swapping macros are already available */
-#include <machine/endian.h>
-
-EOF
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ntohl in arpa/inet.h" >&5
-$as_echo_n "checking for ntohl in arpa/inet.h... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <arpa/inet.h>
-#ifdef ntohl
- 	symbol is present
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "symbol is present|\<ntohl\>" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-cat >> "$ac_byteorder" << EOF
-/* ntohl and relatives live here */
-#include <arpa/inet.h>
-
-EOF
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ntohl in netinet/in.h" >&5
-$as_echo_n "checking for ntohl in netinet/in.h... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <netinet/in.h>
-#ifdef ntohl
- 	symbol is present
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "symbol is present|\<ntohl\>" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-cat >> "$ac_byteorder" << EOF
-/* ntohl and relatives live here */
-#include <netinet/in.h>
-
-EOF
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-true
-
-fi
-rm -f conftest*
-
-
-fi
-rm -f conftest*
-
-
-
-fi
-rm -f conftest*
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for swap32 in machine/endian.h" >&5
-$as_echo_n "checking for swap32 in machine/endian.h... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <machine/endian.h>
-#ifdef swap32
- 	symbol is present
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "symbol is present|\<swap32\>" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-cat >> "$ac_byteorder" << EOF
-/* swap32 and swap16 are defined in machine/endian.h */
-
-EOF
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap_32 in byteswap.h" >&5
-$as_echo_n "checking for bswap_32 in byteswap.h... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <byteswap.h>
-#ifdef bswap_32
- 	symbol is present
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "symbol is present|\<bswap_32\>" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-cat >> "$ac_byteorder" << EOF
-/* Define generic byte swapping functions */
-#include <byteswap.h>
-#define swap16(x) bswap_16(x)
-#define swap32(x) bswap_32(x)
-#define swap64(x) bswap_64(x)
-
-EOF
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap32 in machine/endian.h" >&5
-$as_echo_n "checking for bswap32 in machine/endian.h... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <machine/endian.h>
-#ifdef bswap32
- 	symbol is present
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "symbol is present|\<bswap32\>" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  	 cat >> "$ac_byteorder" << EOF
-/* Define generic byte swapping functions */
-EOF
-	if test "$HAVE_LE32TOH" != "1"; then
-		echo '#include <machine/endian.h>'>> "$ac_byteorder"
-	fi
-cat >> "$ac_byteorder" << EOF
-#define swap16(x) bswap16(x)
-#define swap32(x) bswap32(x)
-#define swap64(x) bswap64(x)
-
-EOF
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __byte_swap_long in sys/types.h" >&5
-$as_echo_n "checking for __byte_swap_long in sys/types.h... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#ifdef __byte_swap_long
- 	symbol is present
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "symbol is present|\<__byte_swap_long\>" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-cat >> "$ac_byteorder" << EOF
-/* Define generic byte swapping functions */
-#include <sys/types.h>
-#define swap16(x) __byte_swap_word(x)
-#define swap32(x) __byte_swap_long(x)
-/* No optimized 64 bit byte swapping macro is available */
-#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\
-			      ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\
-			      ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\
-			      ((uint64_t)(x) << 8)  & 0x000000ff00000000ULL | \\
-			      ((x) >> 8)  & 0x00000000ff000000ULL | \\
-			      ((x) >> 24) & 0x0000000000ff0000ULL | \\
-			      ((x) >> 40) & 0x000000000000ff00ULL | \\
-			      ((x) >> 56) & 0x00000000000000ffULL))
-
-EOF
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NXSwapLong in machine/byte_order.h" >&5
-$as_echo_n "checking for NXSwapLong in machine/byte_order.h... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <machine/byte_order.h>
-#ifdef NXSwapLong
- 	symbol is present
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "symbol is present|\<NXSwapLong\>" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-cat >> "$ac_byteorder" << EOF
-/* Define generic byte swapping functions */
-#include <machine/byte_order.h>
-#define swap16(x) NXSwapShort(x)
-#define swap32(x) NXSwapLong(x)
-#define swap64(x) NXSwapLongLong(x)
-
-EOF
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-	if test $ac_cv_c_bigendian = yes; then
-		cat >> "$ac_byteorder" << EOF
-/* No other byte swapping functions are available on this big-endian system */
-#define swap16(x)	((uint16_t)(((x) << 8) | ((uint16_t)(x) >> 8)))
-#define swap32(x)	((uint32_t)(((uint32_t)(x) << 24) & 0xff000000UL | \\
-				    ((uint32_t)(x) << 8)  & 0x00ff0000UL | \\
-				    ((x) >> 8)  & 0x0000ff00UL | \\
-				    ((x) >> 24) & 0x000000ffUL))
-#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\
-			      ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\
-			      ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\
-			      ((uint64_t)(x) << 8)  & 0x000000ff00000000ULL | \\
-			      ((x) >> 8)  & 0x00000000ff000000ULL | \\
-			      ((x) >> 24) & 0x0000000000ff0000ULL | \\
-			      ((x) >> 40) & 0x000000000000ff00ULL | \\
-			      ((x) >> 56) & 0x00000000000000ffULL))
-
-EOF
-	else
- cat >> "$ac_byteorder" << EOF
-/* Use these as generic byteswapping macros on this little endian system */
-#define swap16(x)		ntohs(x)
-#define swap32(x)		ntohl(x)
-/* No optimized 64 bit byte swapping macro is available */
-#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\
-			      ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\
-			      ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\
-			      ((uint64_t)(x) << 8)  & 0x000000ff00000000ULL | \\
-			      ((x) >> 8)  & 0x00000000ff000000ULL | \\
-			      ((x) >> 24) & 0x0000000000ff0000ULL | \\
-			      ((x) >> 40) & 0x000000000000ff00ULL | \\
-			      ((x) >> 56) & 0x00000000000000ffULL))
-
-EOF
-	fi
-
-
-fi
-rm -f conftest*
-
-
-
-fi
-rm -f conftest*
-
-
-
-fi
-rm -f conftest*
-
-
-
-fi
-rm -f conftest*
-
-
-
-fi
-rm -f conftest*
-
-
-
-
-if test "$HAVE_LE32TOH" != "1"; then
- cat >> "$ac_byteorder" << EOF
-/* The byte swapping macros have the form: */
-/*   EENN[a]toh or htoEENN[a] where EE is be (big endian) or */
-/* le (little-endian), NN is 16 or 32 (number of bits) and a, */
-/* if present, indicates that the endian side is a pointer to an */
-/* array of uint8_t bytes instead of an integer of the specified length. */
-/* h refers to the host's ordering method. */
-
-/* So, to convert a 32-bit integer stored in a buffer in little-endian */
-/* format into a uint32_t usable on this machine, you could use: */
-/*   uint32_t value = le32atoh(&buf[3]); */
-/* To put that value back into the buffer, you could use: */
-/*   htole32a(&buf[3], value); */
-
-/* Define aliases for the standard byte swapping macros */
-/* Arguments to these macros must be properly aligned on natural word */
-/* boundaries in order to work properly on all architectures */
-#ifndef htobe16
-#define htobe16(x) htons(x)
-#endif
-#ifndef htobe32
-#define htobe32(x) htonl(x)
-#endif
-#ifndef be16toh
-#define be16toh(x) ntohs(x)
-#endif
-#ifndef be32toh
-#define be32toh(x) ntohl(x)
-#endif
-
-#define HTOBE16(x) (x) = htobe16(x)
-#define HTOBE32(x) (x) = htobe32(x)
-#define BE32TOH(x) (x) = be32toh(x)
-#define BE16TOH(x) (x) = be16toh(x)
-
-EOF
-
- if test $ac_cv_c_bigendian = yes; then
-  cat >> "$ac_byteorder" << EOF
-/* Define our own extended byte swapping macros for big-endian machines */
-#ifndef htole16
-#define htole16(x)      swap16(x)
-#endif
-#ifndef htole32
-#define htole32(x)      swap32(x)
-#endif
-#ifndef le16toh
-#define le16toh(x)      swap16(x)
-#endif
-#ifndef le32toh
-#define le32toh(x)      swap32(x)
-#endif
-
-#ifndef htobe64
-#define htobe64(x)      (x)
-#endif
-#ifndef be64toh
-#define be64toh(x)      (x)
-#endif
-
-#define HTOLE16(x)      (x) = htole16(x)
-#define HTOLE32(x)      (x) = htole32(x)
-#define LE16TOH(x)      (x) = le16toh(x)
-#define LE32TOH(x)      (x) = le32toh(x)
-
-#define HTOBE64(x)      (void) (x)
-#define BE64TOH(x)      (void) (x)
-
-EOF
- else
-  cat >> "$ac_byteorder" << EOF
-/* On little endian machines, these macros are null */
-#ifndef htole16
-#define htole16(x)      (x)
-#endif
-#ifndef htole32
-#define htole32(x)      (x)
-#endif
-#ifndef htole64
-#define htole64(x)      (x)
-#endif
-#ifndef le16toh
-#define le16toh(x)      (x)
-#endif
-#ifndef le32toh
-#define le32toh(x)      (x)
-#endif
-#ifndef le64toh
-#define le64toh(x)      (x)
-#endif
-
-#define HTOLE16(x)      (void) (x)
-#define HTOLE32(x)      (void) (x)
-#define HTOLE64(x)      (void) (x)
-#define LE16TOH(x)      (void) (x)
-#define LE32TOH(x)      (void) (x)
-#define LE64TOH(x)      (void) (x)
-
-/* These don't have standard aliases */
-#ifndef htobe64
-#define htobe64(x)      swap64(x)
-#endif
-#ifndef be64toh
-#define be64toh(x)      swap64(x)
-#endif
-
-#define HTOBE64(x)      (x) = htobe64(x)
-#define BE64TOH(x)      (x) = be64toh(x)
-
-EOF
- fi
-fi
-
-cat >> "$ac_byteorder" << EOF
-/* Define the C99 standard length-specific integer types */
-#include <_stdint.h>
-
-EOF
-
-case "${effective_target}" in
- i[3456]86-*)
-  cat >> "$ac_byteorder" << EOF
-/* Here are some macros to create integers from a byte array */
-/* These are used to get and put integers from/into a uint8_t array */
-/* with a specific endianness.  This is the most portable way to generate */
-/* and read messages to a network or serial device.  Each member of a */
-/* packet structure must be handled separately. */
-
-/* The i386 and compatibles can handle unaligned memory access, */
-/* so use the optimized macros above to do this job */
-#define be16atoh(x)     be16toh(*(uint16_t*)(x))
-#define be32atoh(x)     be32toh(*(uint32_t*)(x))
-#define be64atoh(x)     be64toh(*(uint64_t*)(x))
-#define le16atoh(x)     le16toh(*(uint16_t*)(x))
-#define le32atoh(x)     le32toh(*(uint32_t*)(x))
-#define le64atoh(x)     le64toh(*(uint64_t*)(x))
-
-#define htobe16a(a,x)   *(uint16_t*)(a) = htobe16(x)
-#define htobe32a(a,x)   *(uint32_t*)(a) = htobe32(x)
-#define htobe64a(a,x)   *(uint64_t*)(a) = htobe64(x)
-#define htole16a(a,x)   *(uint16_t*)(a) = htole16(x)
-#define htole32a(a,x)   *(uint32_t*)(a) = htole32(x)
-#define htole64a(a,x)   *(uint64_t*)(a) = htole64(x)
-
-EOF
-  ;;
-
- *)
-  cat >> "$ac_byteorder" << EOF
-/* Here are some macros to create integers from a byte array */
-/* These are used to get and put integers from/into a uint8_t array */
-/* with a specific endianness.  This is the most portable way to generate */
-/* and read messages to a network or serial device.  Each member of a */
-/* packet structure must be handled separately. */
-
-/* Non-optimized but portable macros */
-#define be16atoh(x)     ((uint16_t)(((x)[0]<<8)|(x)[1]))
-#define be32atoh(x)     ((uint32_t)(((x)[0]<<24)|((x)[1]<<16)|((x)[2]<<8)|(x)[3]))
-#define be64atoh(x)     ((uint64_t)(((x)[0]<<56)|((x)[1]<<48)|((x)[2]<<40)| \\
-        ((x)[3]<<32)|((x)[4]<<24)|((x)[5]<<16)|((x)[6]<<8)|(x)[7]))
-#define le16atoh(x)     ((uint16_t)(((x)[1]<<8)|(x)[0]))
-#define le32atoh(x)     ((uint32_t)(((x)[3]<<24)|((x)[2]<<16)|((x)[1]<<8)|(x)[0]))
-#define le64atoh(x)     ((uint64_t)(((x)[7]<<56)|((x)[6]<<48)|((x)[5]<<40)| \\
-        ((x)[4]<<32)|((x)[3]<<24)|((x)[2]<<16)|((x)[1]<<8)|(x)[0]))
-
-#define htobe16a(a,x)   (a)[0]=(uint8_t)((x)>>8), (a)[1]=(uint8_t)(x)
-#define htobe32a(a,x)   (a)[0]=(uint8_t)((x)>>24), (a)[1]=(uint8_t)((x)>>16), \\
-        (a)[2]=(uint8_t)((x)>>8), (a)[3]=(uint8_t)(x)
-#define htobe64a(a,x)   (a)[0]=(uint8_t)((x)>>56), (a)[1]=(uint8_t)((x)>>48), \\
-        (a)[2]=(uint8_t)((x)>>40), (a)[3]=(uint8_t)((x)>>32), \\
-        (a)[4]=(uint8_t)((x)>>24), (a)[5]=(uint8_t)((x)>>16), \\
-        (a)[6]=(uint8_t)((x)>>8), (a)[7]=(uint8_t)(x)
-#define htole16a(a,x)   (a)[1]=(uint8_t)((x)>>8), (a)[0]=(uint8_t)(x)
-#define htole32a(a,x)   (a)[3]=(uint8_t)((x)>>24), (a)[2]=(uint8_t)((x)>>16), \\
-        (a)[1]=(uint8_t)((x)>>8), (a)[0]=(uint8_t)(x)
-#define htole64a(a,x)   (a)[7]=(uint8_t)((x)>>56), (a)[6]=(uint8_t)((x)>>48), \\
-        (a)[5]=(uint8_t)((x)>>40), (a)[4]=(uint8_t)((x)>>32), \\
-        (a)[3]=(uint8_t)((x)>>24), (a)[2]=(uint8_t)((x)>>16), \\
-        (a)[1]=(uint8_t)((x)>>8), (a)[0]=(uint8_t)(x)
-
-EOF
-  ;;
-esac
-
-
-cat >> "$ac_byteorder" << EOF
-#endif /*__BYTEORDER_H*/
-EOF
-
-if cmp -s $ac_byteorder_h $ac_byteorder 2>/dev/null; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_byteorder_h is unchanged" >&5
-$as_echo "$as_me: $ac_byteorder_h is unchanged" >&6;}
-  rm $ac_byteorder
-else
-  rm -f $ac_byteorder_h
-  mv $ac_byteorder $ac_byteorder_h
-fi
-
-# ------ AX CREATE STDINT H -------------------------------------
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint types" >&5
-$as_echo_n "checking for stdint types... " >&6; }
-ac_stdint_h=`echo include/_stdint.h`
-# try to shortcircuit - if the default include path of the compiler
-# can find a "stdint.h" header then we assume that all compilers can.
-if ${ac_cv_header_stdint_t+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS=""
-old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS=""
-old_CFLAGS="$CFLAGS"     ; CFLAGS=""
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdint.h>
-int
-main ()
-{
-int_least32_t v = 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_stdint_result="(assuming C99 compatible system)"
- ac_cv_header_stdint_t="stdint.h";
-else
-  ac_cv_header_stdint_t=""
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-if test "$GCC" = "yes" && test ".$ac_cv_header_stdint_t" = "."; then
-CFLAGS="-std=c99"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdint.h>
-int
-main ()
-{
-int_least32_t v = 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: your GCC compiler has a defunct stdint.h for its default-mode" >&5
-$as_echo "$as_me: WARNING: your GCC compiler has a defunct stdint.h for its default-mode" >&2;}
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-CXXFLAGS="$old_CXXFLAGS"
-CPPFLAGS="$old_CPPFLAGS"
-CFLAGS="$old_CFLAGS"
-fi
-
-
-v="... $ac_cv_header_stdint_h"
-if test "$ac_stdint_h" = "stdint.h" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: (are you sure you want them in ./stdint.h?)" >&5
-$as_echo "(are you sure you want them in ./stdint.h?)" >&6; }
-elif test "$ac_stdint_h" = "inttypes.h" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: (are you sure you want them in ./inttypes.h?)" >&5
-$as_echo "(are you sure you want them in ./inttypes.h?)" >&6; }
-elif test "_$ac_cv_header_stdint_t" = "_" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: (putting them into $ac_stdint_h)$v" >&5
-$as_echo "(putting them into $ac_stdint_h)$v" >&6; }
-else
- ac_cv_header_stdint="$ac_cv_header_stdint_t"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint (shortcircuit)" >&5
-$as_echo "$ac_cv_header_stdint (shortcircuit)" >&6; }
-fi
-
-if test "_$ac_cv_header_stdint_t" = "_" ; then # can not shortcircuit..
-
-
-inttype_headers=`echo  | sed -e 's/,/ /g'`
-
-ac_cv_stdint_result="(no helpful system typedefs seen)"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uintptr_t" >&5
-$as_echo_n "checking for stdint uintptr_t... " >&6; }
-if ${ac_cv_header_stdint_x+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
- ac_cv_header_stdint_x="" # the 1997 typedefs (inttypes.h)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5
-$as_echo "(..)" >&6; }
-  for i in    stdint.h inttypes.h sys/inttypes.h $inttype_headers
-  do
-   unset ac_cv_type_uintptr_t
-   unset ac_cv_type_uint64_t
-   ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "#include <$i>
-"
-if test "x$ac_cv_type_uintptr_t" = xyes; then :
-  ac_cv_header_stdint_x=$i
-else
-  continue
-fi
-
-   ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include<$i>
-"
-if test "x$ac_cv_type_uint64_t" = xyes; then :
-  and64="/uint64_t"
-else
-  and64=""
-fi
-
-      stdint.h inttypes.h sys/inttypes.h $inttype_headers
- break
-  done
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uintptr_t" >&5
-$as_echo_n "checking for stdint uintptr_t... " >&6; }
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint_x" >&5
-$as_echo "$ac_cv_header_stdint_x" >&6; }
-
-
-if test "_$ac_cv_header_stdint_x" = "_" ; then
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uint32_t" >&5
-$as_echo_n "checking for stdint uint32_t... " >&6; }
-if ${ac_cv_header_stdint_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
- ac_cv_header_stdint_o="" # the 1995 typedefs (sys/inttypes.h)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5
-$as_echo "(..)" >&6; }
-  for i in    inttypes.h sys/inttypes.h stdint.h $inttype_headers
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar lib "link -lib"
   do
-   unset ac_cv_type_uint32_t
-   unset ac_cv_type_uint64_t
-   ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "#include <$i>
-"
-if test "x$ac_cv_type_uint32_t" = xyes; then :
-  ac_cv_header_stdint_o=$i
-else
-  continue
-fi
-
-   ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include<$i>
-"
-if test "x$ac_cv_type_uint64_t" = xyes; then :
-  and64="/uint64_t"
-else
-  and64=""
-fi
-
-      inttypes.h sys/inttypes.h stdint.h $inttype_headers
- break
-   break;
-  done
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uint32_t" >&5
-$as_echo_n "checking for stdint uint32_t... " >&6; }
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint_o" >&5
-$as_echo "$ac_cv_header_stdint_o" >&6; }
-
-fi
-
-if test "_$ac_cv_header_stdint_x" = "_" ; then
-if test "_$ac_cv_header_stdint_o" = "_" ; then
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint u_int32_t" >&5
-$as_echo_n "checking for stdint u_int32_t... " >&6; }
-if ${ac_cv_header_stdint_u+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
- ac_cv_header_stdint_u="" # the BSD typedefs (sys/types.h)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5
-$as_echo "(..)" >&6; }
-  for i in    sys/types.h inttypes.h sys/inttypes.h $inttype_headers ; do
-   unset ac_cv_type_u_int32_t
-   unset ac_cv_type_u_int64_t
-   ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "#include <$i>
-"
-if test "x$ac_cv_type_u_int32_t" = xyes; then :
-  ac_cv_header_stdint_u=$i
-else
-  continue
-fi
-
-   ac_fn_c_check_type "$LINENO" "u_int64_t" "ac_cv_type_u_int64_t" "#include<$i>
-"
-if test "x$ac_cv_type_u_int64_t" = xyes; then :
-  and64="/u_int64_t"
-else
-  and64=""
-fi
-
-      sys/types.h inttypes.h sys/inttypes.h $inttype_headers
- break
-   break;
-  done
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint u_int32_t" >&5
-$as_echo_n "checking for stdint u_int32_t... " >&6; }
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint_u" >&5
-$as_echo "$ac_cv_header_stdint_u" >&6; }
-
-fi fi
-
-if test "_$ac_cv_header_stdint_x" = "_" ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint datatype model" >&5
-$as_echo_n "checking for stdint datatype model... " >&6; }
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5
-$as_echo "(..)" >&6; }
-
-   # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5
-$as_echo_n "checking size of char... " >&6; }
-if ${ac_cv_sizeof_char+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_char" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (char)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_char=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char" >&5
-$as_echo "$ac_cv_sizeof_char" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_CHAR $ac_cv_sizeof_char
-_ACEOF
-
-
-   # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
-$as_echo_n "checking size of short... " >&6; }
-if ${ac_cv_sizeof_short+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_short" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (short)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_short=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
-$as_echo "$ac_cv_sizeof_short" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
-_ACEOF
-
-
-   # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
-$as_echo_n "checking size of int... " >&6; }
-if ${ac_cv_sizeof_int+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_int" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (int)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_int=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-$as_echo "$ac_cv_sizeof_int" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
-
-
-   # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-$as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_long" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_long=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-$as_echo "$ac_cv_sizeof_long" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-
-   # The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void*" >&5
-$as_echo_n "checking size of void*... " >&6; }
-if ${ac_cv_sizeof_voidp+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void*))" "ac_cv_sizeof_voidp"        "$ac_includes_default"; then :
-
-else
-  if test "$ac_cv_type_voidp" = yes; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (void*)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_voidp=0
-   fi
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_voidp" >&5
-$as_echo "$ac_cv_sizeof_voidp" >&6; }
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_VOIDP $ac_cv_sizeof_voidp
-_ACEOF
-
-
-   ac_cv_char_data_model=""
-   ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_char"
-   ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_short"
-   ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_int"
-   ac_cv_long_data_model=""
-   ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_int"
-   ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_long"
-   ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_voidp"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking data model" >&5
-$as_echo_n "checking data model... " >&6; }
-   case "$ac_cv_char_data_model/$ac_cv_long_data_model" in
-    122/242)     ac_cv_data_model="IP16"  ; n="standard 16bit machine" ;;
-    122/244)     ac_cv_data_model="LP32"  ; n="standard 32bit machine" ;;
-    122/*)       ac_cv_data_model="i16"   ; n="unusual int16 model" ;;
-    124/444)     ac_cv_data_model="ILP32" ; n="standard 32bit unixish" ;;
-    124/488)     ac_cv_data_model="LP64"  ; n="standard 64bit unixish" ;;
-    124/448)     ac_cv_data_model="LLP64" ; n="unusual 64bit unixish" ;;
-    124/*)       ac_cv_data_model="i32"   ; n="unusual int32 model" ;;
-    128/888)     ac_cv_data_model="ILP64" ; n="unusual 64bit numeric" ;;
-    128/*)       ac_cv_data_model="i64"   ; n="unusual int64 model" ;;
-    222/*2)      ac_cv_data_model="DSP16" ; n="strict 16bit dsptype" ;;
-    333/*3)      ac_cv_data_model="DSP24" ; n="strict 24bit dsptype" ;;
-    444/*4)      ac_cv_data_model="DSP32" ; n="strict 32bit dsptype" ;;
-    666/*6)      ac_cv_data_model="DSP48" ; n="strict 48bit dsptype" ;;
-    888/*8)      ac_cv_data_model="DSP64" ; n="strict 64bit dsptype" ;;
-    222/*|333/*|444/*|666/*|888/*) :
-                 ac_cv_data_model="iDSP"  ; n="unusual dsptype" ;;
-     *)          ac_cv_data_model="none"  ; n="very unusual model" ;;
-   esac
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_data_model ($ac_cv_long_data_model, $n)" >&5
-$as_echo "$ac_cv_data_model ($ac_cv_long_data_model, $n)" >&6; }
-
-fi
-
-if test "_$ac_cv_header_stdint_x" != "_" ; then
-   ac_cv_header_stdint="$ac_cv_header_stdint_x"
-elif  test "_$ac_cv_header_stdint_o" != "_" ; then
-   ac_cv_header_stdint="$ac_cv_header_stdint_o"
-elif  test "_$ac_cv_header_stdint_u" != "_" ; then
-   ac_cv_header_stdint="$ac_cv_header_stdint_u"
-else
-   ac_cv_header_stdint="stddef.h"
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra inttypes in chosen header" >&5
-$as_echo_n "checking for extra inttypes in chosen header... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ($ac_cv_header_stdint)" >&5
-$as_echo "($ac_cv_header_stdint)" >&6; }
-unset ac_cv_type_int_least32_t
-unset ac_cv_type_int_fast32_t
-ac_fn_c_check_type "$LINENO" "int_least32_t" "ac_cv_type_int_least32_t" "#include <$ac_cv_header_stdint>
-"
-if test "x$ac_cv_type_int_least32_t" = xyes; then :
-
-fi
-
-ac_fn_c_check_type "$LINENO" "int_fast32_t" "ac_cv_type_int_fast32_t" "#include<$ac_cv_header_stdint>
-"
-if test "x$ac_cv_type_int_fast32_t" = xyes; then :
-
-fi
-
-ac_fn_c_check_type "$LINENO" "intmax_t" "ac_cv_type_intmax_t" "#include <$ac_cv_header_stdint>
-"
-if test "x$ac_cv_type_intmax_t" = xyes; then :
-
-fi
-
-
-fi # shortcircut to system "stdint.h"
-# ------------------ PREPARE VARIABLES ------------------------------
-if test "$GCC" = "yes" ; then
-ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1`
-else
-ac_cv_stdint_message="using $CC"
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&5
-$as_echo "make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&6; }
-
-# ----------------- DONE inttypes.h checks START header -------------
-ac_config_commands="$ac_config_commands $ac_stdint_h"
-
-
-
-# Check whether --enable-dynamic was given.
-if test "${enable_dynamic+set}" = set; then :
-  enableval=$enable_dynamic; enable_dynamic=$enableval
-else
-  enable_dynamic=auto
-fi
-
-
-    DL_LIBS=""
-  if test "${enable_dynamic}" = "auto"; then
-      # default to disabled unless library found.
-      enable_dynamic=no
-      # dlopen
-      for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  DL_LIBS=-ldl
-fi
-
-       saved_LIBS="${LIBS}"
-       LIBS="${LIBS} ${DL_LIBS}"
-       for ac_func in dlopen
-do :
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLOPEN 1
-_ACEOF
- enable_dynamic=yes
-fi
-done
-
-       LIBS="${saved_LIBS}"
-
-fi
-
-done
-
-      # HP/UX DLL handling
-      for ac_header in dl.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
-if test "x$ac_cv_header_dl_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DL_H 1
-_ACEOF
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_shl_load=yes
-else
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-  DL_LIBS=-ldld
-fi
-
-       saved_LIBS="${LIBS}"
-       LIBS="${LIBS} ${DL_LIBS}"
-       for ac_func in shl_load
-do :
-  ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SHL_LOAD 1
-_ACEOF
- enable_dynamic=yes
-fi
-done
-
-       LIBS="${saved_LIBS}"
-
-fi
-
-done
-
-      if test -z "$DL_LIBS" ; then
-      # old Mac OS X/Darwin (without dlopen)
-      for ac_header in mach-o/dyld.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "mach-o/dyld.h" "ac_cv_header_mach_o_dyld_h" "$ac_includes_default"
-if test "x$ac_cv_header_mach_o_dyld_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_MACH_O_DYLD_H 1
-_ACEOF
- for ac_func in NSLinkModule
-do :
-  ac_fn_c_check_func "$LINENO" "NSLinkModule" "ac_cv_func_NSLinkModule"
-if test "x$ac_cv_func_NSLinkModule" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_NSLINKMODULE 1
-_ACEOF
- enable_dynamic=yes
-fi
-done
-
-
-fi
-
-done
-
-      fi
-  fi
-
-
-  DYNAMIC_FLAG=
-  if test "${enable_dynamic}" = yes ; then
-    DYNAMIC_FLAG=-module
-  fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5
-$as_echo_n "checking for sqrt in -lm... " >&6; }
-if ${ac_cv_lib_m_sqrt+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sqrt ();
-int
-main ()
-{
-return sqrt ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_sqrt=yes
-else
-  ac_cv_lib_m_sqrt=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5
-$as_echo "$ac_cv_lib_m_sqrt" >&6; }
-if test "x$ac_cv_lib_m_sqrt" = xyes; then :
-  MATH_LIB="-lm"
-fi
-
-
-case ${host_os} in
-  os2*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sylog in -lsyslog" >&5
-$as_echo_n "checking for sylog in -lsyslog... " >&6; }
-if ${ac_cv_lib_syslog_sylog+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsyslog  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sylog ();
-int
-main ()
-{
-return sylog ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_syslog_sylog=yes
-else
-  ac_cv_lib_syslog_sylog=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_syslog_sylog" >&5
-$as_echo "$ac_cv_lib_syslog_sylog" >&6; }
-if test "x$ac_cv_lib_syslog_sylog" = xyes; then :
-  SYSLOG_LIBS="-lsyslog"
-fi
-
-  ;;
-  beos*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for syslog in -lbe" >&5
-$as_echo_n "checking for syslog in -lbe... " >&6; }
-if ${ac_cv_lib_be_syslog+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbe  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char syslog ();
-int
-main ()
-{
-return syslog ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_be_syslog=yes
-else
-  ac_cv_lib_be_syslog=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_be_syslog" >&5
-$as_echo "$ac_cv_lib_be_syslog" >&6; }
-if test "x$ac_cv_lib_be_syslog" = xyes; then :
-  SYSLOG_LIBS="-lbe"
-fi
-
-  ;;
-esac
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_start_decompress in -ljpeg" >&5
-$as_echo_n "checking for jpeg_start_decompress in -ljpeg... " >&6; }
-if ${ac_cv_lib_jpeg_jpeg_start_decompress+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ljpeg  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char jpeg_start_decompress ();
-int
-main ()
-{
-return jpeg_start_decompress ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_jpeg_jpeg_start_decompress=yes
-else
-  ac_cv_lib_jpeg_jpeg_start_decompress=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_start_decompress" >&5
-$as_echo "$ac_cv_lib_jpeg_jpeg_start_decompress" >&6; }
-if test "x$ac_cv_lib_jpeg_jpeg_start_decompress" = xyes; then :
-
-    ac_fn_c_check_header_mongrel "$LINENO" "jconfig.h" "ac_cv_header_jconfig_h" "$ac_includes_default"
-if test "x$ac_cv_header_jconfig_h" = xyes; then :
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeglib - version >= 61 (6a)" >&5
-$as_echo_n "checking for jpeglib - version >= 61 (6a)... " >&6; }
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-        #include <jpeglib.h>
-        #if JPEG_LIB_VERSION >= 61
-          sane_correct_jpeg_lib_version_found
-        #endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "sane_correct_jpeg_lib_version_found" >/dev/null 2>&1; then :
-  sane_cv_use_libjpeg="yes"; JPEG_LIBS="-ljpeg";
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f conftest*
-
-
-fi
-
-
-
-fi
-
-  if test "$sane_cv_use_libjpeg" = "yes" ; then
-
-$as_echo "#define HAVE_LIBJPEG 1" >>confdefs.h
-
-  fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFFdOpen in -ltiff" >&5
-$as_echo_n "checking for TIFFFdOpen in -ltiff... " >&6; }
-if ${ac_cv_lib_tiff_TIFFFdOpen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltiff  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char TIFFFdOpen ();
-int
-main ()
-{
-return TIFFFdOpen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_tiff_TIFFFdOpen=yes
-else
-  ac_cv_lib_tiff_TIFFFdOpen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFFdOpen" >&5
-$as_echo "$ac_cv_lib_tiff_TIFFFdOpen" >&6; }
-if test "x$ac_cv_lib_tiff_TIFFFdOpen" = xyes; then :
-
-    ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
-if test "x$ac_cv_header_tiffio_h" = xyes; then :
-  sane_cv_use_libtiff="yes"; TIFF_LIBS="-ltiff"
-fi
-
-
-
-fi
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_init_io in -lpng" >&5
-$as_echo_n "checking for png_init_io in -lpng... " >&6; }
-if ${ac_cv_lib_png_png_init_io+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpng  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char png_init_io ();
-int
-main ()
-{
-return png_init_io ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_png_png_init_io=yes
-else
-  ac_cv_lib_png_png_init_io=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_init_io" >&5
-$as_echo "$ac_cv_lib_png_png_init_io" >&6; }
-if test "x$ac_cv_lib_png_png_init_io" = xyes; then :
-
-    ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
-if test "x$ac_cv_header_png_h" = xyes; then :
-  sane_cv_use_libpng="yes"; PNG_LIBS="-lpng"
-fi
-
-
-
-fi
-
-  if test "$sane_cv_use_libpng" = "yes" ; then
-
-$as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
-
-  fi
-
-
-
-  ac_fn_c_check_header_mongrel "$LINENO" "ieee1284.h" "ac_cv_header_ieee1284_h" "$ac_includes_default"
-if test "x$ac_cv_header_ieee1284_h" = xyes; then :
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libieee1284 >= 0.1.5" >&5
-$as_echo_n "checking for libieee1284 >= 0.1.5... " >&6; }
-if ${sane_cv_use_libieee1284+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ieee1284.h>
-int
-main ()
-{
-
-	struct parport p; char *buf;
-	ieee1284_nibble_read(&p, 0, buf, 1);
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  sane_cv_use_libieee1284="yes"; IEEE1284_LIBS="-lieee1284"
-
-else
-  sane_cv_use_libieee1284="no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sane_cv_use_libieee1284" >&5
-$as_echo "$sane_cv_use_libieee1284" >&6; }
-
-fi
-
-
-  if test "$sane_cv_use_libieee1284" = "yes" ; then
-
-$as_echo "#define HAVE_LIBIEEE1284 1" >>confdefs.h
-
-  fi
-
-
-
-
-  case "${host_os}" in
-  linux* | darwin* | mingw*) # enabled by default on Linux, MacOS X and MINGW
-    use_pthread=yes
-    ;;
-  *)
-    use_pthread=no
-  esac
-  have_pthread=no
-
-  #
-  # now that we have the systems preferences, we check
-  # the user
-
-  # Check whether --enable-pthread was given.
-if test "${enable_pthread+set}" = set; then :
-  enableval=$enable_pthread;
-      if test $enableval = yes ; then
-        use_pthread=yes
-      else
-        use_pthread=no
-      fi
-
-fi
-
-
-  if test $use_pthread = yes ; then
-  for ac_header in pthread.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_H 1
-_ACEOF
-
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_create+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_create ();
-int
-main ()
-{
-return pthread_create ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pthread_pthread_create=yes
-else
-  ac_cv_lib_pthread_pthread_create=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
-  PTHREAD_LIBS="-lpthread"
-fi
-
-       have_pthread=yes
-       save_LIBS="$LIBS"
-       LIBS="$LIBS $PTHREAD_LIBS"
-       for ac_func in pthread_create pthread_kill pthread_join pthread_detach pthread_cancel pthread_testcancel
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-   have_pthread=no; use_pthread=no
-fi
-done
-
-       LIBS="$save_LIBS"
-
-fi
-
-done
-
-  fi
-
-  if test $use_pthread = yes ; then
-
-cat >>confdefs.h <<_ACEOF
-#define USE_PTHREAD "$use_pthread"
-_ACEOF
-
-  else
-        PTHREAD_LIBS=""
-  fi
-  if test "$have_pthread" = "yes" ; then
-    CPPFLAGS="${CPPFLAGS} -D_REENTRANT"
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable pthread support" >&5
-$as_echo_n "checking whether to enable pthread support... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_pthread" >&5
-$as_echo "$have_pthread" >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use pthread instead of fork" >&5
-$as_echo_n "checking whether to use pthread instead of fork... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_pthread" >&5
-$as_echo "$use_pthread" >&6; }
-
-
-  LOCKPATH_GROUP=uucp
-  use_locking=yes
-  case "${host_os}" in
-    os2* )
-      use_locking=no
-      ;;
-  esac
-
-  #
-  # we check the user
-  # Check whether --enable-locking was given.
-if test "${enable_locking+set}" = set; then :
-  enableval=$enable_locking;
-      if test $enableval = yes ; then
-        use_locking=yes
-      else
-        use_locking=no
-      fi
-
-fi
-
-  if test $use_locking = yes ; then
-
-# Check whether --with-group was given.
-if test "${with_group+set}" = set; then :
-  withval=$with_group; LOCKPATH_GROUP="$withval"
-
-fi
-
-    # check if the group does exist
-    lasterror=""
-    touch sanetest.file
-    chgrp $LOCKPATH_GROUP sanetest.file 2>/dev/null || lasterror=$?
-    rm -f sanetest.file
-    if test ! -z "$lasterror"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Group $LOCKPATH_GROUP does not exist on this system." >&5
-$as_echo "$as_me: WARNING: Group $LOCKPATH_GROUP does not exist on this system." >&2;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Locking feature will be disabled." >&5
-$as_echo "$as_me: WARNING: Locking feature will be disabled." >&2;}
-      use_locking=no
-    fi
-  fi
-  if test $use_locking = yes ; then
-    INSTALL_LOCKPATH=install-lockpath
-
-$as_echo "#define ENABLE_LOCKING 1" >>confdefs.h
-
-  else
-    INSTALL_LOCKPATH=
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable device locking" >&5
-$as_echo_n "checking whether to enable device locking... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_locking" >&5
-$as_echo "$use_locking" >&6; }
-  if test $use_locking = yes ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Setting lockdir group to $LOCKPATH_GROUP" >&5
-$as_echo "$as_me: Setting lockdir group to $LOCKPATH_GROUP" >&6;}
-  fi
-
-
-
-
-
-# Check whether --with-gphoto2 was given.
-if test "${with_gphoto2+set}" = set; then :
-  withval=$with_gphoto2; # If --with-gphoto2=no or --without-gphoto2, disable backend
-               # as "$with_gphoto2" will be set to "no"
-fi
-
-
-  # If --with-gphoto2=yes (or not supplied), first check if
-  # pkg-config exists, then use it to check if libgphoto2 is
-  # present.  If all that works, then see if we can actually link
-  # a program.   And, if that works, then add the -l flags to
-  # GPHOTO2_LIBS and any other flags to GPHOTO2_LDFLAGS to pass to
-  # sane-config.
-  if test "$with_gphoto2" != "no" ; then
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_HAVE_GPHOTO2+:} false; then :
+if ${ac_cv_prog_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$HAVE_GPHOTO2"; then
-  ac_cv_prog_HAVE_GPHOTO2="$HAVE_GPHOTO2" # Let the user override the test.
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7560,7 +5145,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_HAVE_GPHOTO2="${ac_tool_prefix}pkg-config"
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7570,28 +5155,32 @@ IFS=$as_save_IFS
 
 fi
 fi
-HAVE_GPHOTO2=$ac_cv_prog_HAVE_GPHOTO2
-if test -n "$HAVE_GPHOTO2"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_GPHOTO2" >&5
-$as_echo "$HAVE_GPHOTO2" >&6; }
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
+    test -n "$AR" && break
+  done
 fi
-if test -z "$ac_cv_prog_HAVE_GPHOTO2"; then
-  ac_ct_HAVE_GPHOTO2=$HAVE_GPHOTO2
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar lib "link -lib"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_HAVE_GPHOTO2+:} false; then :
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_HAVE_GPHOTO2"; then
-  ac_cv_prog_ac_ct_HAVE_GPHOTO2="$ac_ct_HAVE_GPHOTO2" # Let the user override the test.
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -7600,7 +5189,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_HAVE_GPHOTO2="pkg-config"
+    ac_cv_prog_ac_ct_AR="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7610,17 +5199,21 @@ IFS=$as_save_IFS
 
 fi
 fi
-ac_ct_HAVE_GPHOTO2=$ac_cv_prog_ac_ct_HAVE_GPHOTO2
-if test -n "$ac_ct_HAVE_GPHOTO2"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_HAVE_GPHOTO2" >&5
-$as_echo "$ac_ct_HAVE_GPHOTO2" >&6; }
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_HAVE_GPHOTO2" = x; then
-    HAVE_GPHOTO2="false"
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -7628,3347 +5221,177 @@ yes:)
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    HAVE_GPHOTO2=$ac_ct_HAVE_GPHOTO2
-  fi
-else
-  HAVE_GPHOTO2="$ac_cv_prog_HAVE_GPHOTO2"
-fi
-
-
-    if test ${HAVE_GPHOTO2} != "false" ; then
-      if pkg-config --exists libgphoto2 ; then
-        with_gphoto2="`pkg-config --modversion libgphoto2`"
-	GPHOTO2_CPPFLAGS="`pkg-config --cflags libgphoto2`"
-        GPHOTO2_LIBS="`pkg-config --libs libgphoto2`"
-
-        saved_CPPFLAGS="${CPPFLAGS}"
-        CPPFLAGS="${GPHOTO2_CPPFLAGS}"
-	saved_LIBS="${LIBS}"
-	LIBS="${LIBS} ${GPHOTO2_LIBS}"
- 	# Make sure we an really use the library
-        for ac_func in gp_camera_init
-do :
-  ac_fn_c_check_func "$LINENO" "gp_camera_init" "ac_cv_func_gp_camera_init"
-if test "x$ac_cv_func_gp_camera_init" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GP_CAMERA_INIT 1
-_ACEOF
- HAVE_GPHOTO2=true
-else
-  HAVE_GPHOTO2=false
-fi
-done
-
-	if test "${HAVE_GPHOTO2}" = "true"; then
-	  for ac_func in gp_port_info_get_path
-do :
-  ac_fn_c_check_func "$LINENO" "gp_port_info_get_path" "ac_cv_func_gp_port_info_get_path"
-if test "x$ac_cv_func_gp_port_info_get_path" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GP_PORT_INFO_GET_PATH 1
-_ACEOF
-
-fi
-done
-
-	fi
-	CPPFLAGS="${saved_CPPFLAGS}"
-        LIBS="${saved_LIBS}"
-      else
-        HAVE_GPHOTO2=false
-      fi
-      if test "${HAVE_GPHOTO2}" = "false"; then
-        GPHOTO2_CPPFLAGS=""
-        GPHOTO2_LIBS=""
-      else
-
-    tmp_LIBS=""
-    for param in ${GPHOTO2_LIBS}; do
-        case "${param}" in
-	-l*)
-         tmp_LIBS="${tmp_LIBS} ${param}"
-	 ;;
-	 *)
-         GPHOTO2_LDFLAGS="${GPHOTO2_LDFLAGS} ${param}"
-	 ;;
-	 esac
-     done
-     GPHOTO2_LIBS="${tmp_LIBS}"
-     unset tmp_LIBS
-     unset param
-
-      fi
-    fi
-  fi
-
-
-
-
-
-
-
-# Check whether --with-v4l was given.
-if test "${with_v4l+set}" = set; then :
-  withval=$with_v4l; # If --with-v4l=no or --without-v4l, disable backend
-             # as "$with_v4l" will be set to "no"
-fi
-
-
-if test "$with_v4l" != "no" ; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBV4L" >&5
-$as_echo_n "checking for LIBV4L... " >&6; }
-
-if test -n "$LIBV4L_CFLAGS"; then
-    pkg_cv_LIBV4L_CFLAGS="$LIBV4L_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4l1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libv4l1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBV4L_CFLAGS=`$PKG_CONFIG --cflags "libv4l1" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$LIBV4L_LIBS"; then
-    pkg_cv_LIBV4L_LIBS="$LIBV4L_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4l1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libv4l1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBV4L_LIBS=`$PKG_CONFIG --libs "libv4l1" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LIBV4L_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libv4l1" 2>&1`
-        else
-	        LIBV4L_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libv4l1" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBV4L_PKG_ERRORS" >&5
-
-	have_libv4l1=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	have_libv4l1=no
-else
-	LIBV4L_CFLAGS=$pkg_cv_LIBV4L_CFLAGS
-	LIBV4L_LIBS=$pkg_cv_LIBV4L_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_libv4l1=yes
-fi
-fi
-
-# Check whether --enable-avahi was given.
-if test "${enable_avahi+set}" = set; then :
-  enableval=$enable_avahi; enable_avahi=$enableval
-else
-  enable_avahi=no
-fi
-
-
-if test "$enable_avahi" = "yes"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVAHI" >&5
-$as_echo_n "checking for AVAHI... " >&6; }
-
-if test -n "$AVAHI_CFLAGS"; then
-    pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6.24 \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6.24 ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags " avahi-client >= 0.6.24 " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$AVAHI_LIBS"; then
-    pkg_cv_AVAHI_LIBS="$AVAHI_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6.24 \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6.24 ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs " avahi-client >= 0.6.24 " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " avahi-client >= 0.6.24 " 2>&1`
-        else
-	        AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " avahi-client >= 0.6.24 " 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$AVAHI_PKG_ERRORS" >&5
-
-	enable_avahi=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	enable_avahi=no
-else
-	AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS
-	AVAHI_LIBS=$pkg_cv_AVAHI_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define WITH_AVAHI 1" >>confdefs.h
-
-fi
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sane_init in -lsane" >&5
-$as_echo_n "checking for sane_init in -lsane... " >&6; }
-if ${ac_cv_lib_sane_sane_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsane  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sane_init ();
-int
-main ()
-{
-return sane_init ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_sane_sane_init=yes
-else
-  ac_cv_lib_sane_sane_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sane_sane_init" >&5
-$as_echo "$ac_cv_lib_sane_sane_init" >&6; }
-if test "x$ac_cv_lib_sane_sane_init" = xyes; then :
-  LIBSANE_EXISTS="yes"
-fi
-
-
-
-
-
-# Check whether --with-snmp was given.
-if test "${with_snmp+set}" = set; then :
-  withval=$with_snmp;
-fi
-
-
-if test "$with_snmp" = "no"; then
-	echo "Not including SNMP support"
-else
-	# Extract the first word of "net-snmp-config", so it can be a program name with args.
-set dummy net-snmp-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_SNMP_CONFIG_PATH+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $SNMP_CONFIG_PATH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_SNMP_CONFIG_PATH="$SNMP_CONFIG_PATH" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_SNMP_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_SNMP_CONFIG_PATH" && ac_cv_path_SNMP_CONFIG_PATH=""no""
-  ;;
-esac
-fi
-SNMP_CONFIG_PATH=$ac_cv_path_SNMP_CONFIG_PATH
-if test -n "$SNMP_CONFIG_PATH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SNMP_CONFIG_PATH" >&5
-$as_echo "$SNMP_CONFIG_PATH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for snmp_timeout in -lnetsnmp" >&5
-$as_echo_n "checking for snmp_timeout in -lnetsnmp... " >&6; }
-if ${ac_cv_lib_netsnmp_snmp_timeout+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnetsnmp  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char snmp_timeout ();
-int
-main ()
-{
-return snmp_timeout ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_netsnmp_snmp_timeout=yes
-else
-  ac_cv_lib_netsnmp_snmp_timeout=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_netsnmp_snmp_timeout" >&5
-$as_echo "$ac_cv_lib_netsnmp_snmp_timeout" >&6; }
-if test "x$ac_cv_lib_netsnmp_snmp_timeout" = xyes; then :
-  LIBSNMP_EXISTS="yes"
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for proper SNMP version" >&5
-$as_echo_n "checking for proper SNMP version... " >&6; }
-	if test "$SNMP_CONFIG_PATH" != "no" ; then
-		snmp_version=`$SNMP_CONFIG_PATH --version 2>/dev/null`
-		vers=`echo $snmp_version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2);}'`
-		if test -n "$vers" && test "$vers" -ge 5006; then
-			SNMP_LIBS=`$SNMP_CONFIG_PATH --libs`
-			SNMP_CFLAGS=`$SNMP_CONFIG_PATH --cflags`
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-			with_snmp="yes"
-		else
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You need at least net-snmp 5.6, your version is $snmp_version" >&5
-$as_echo "$as_me: WARNING: You need at least net-snmp 5.6, your version is $snmp_version" >&2;}
-			with_snmp="no"
-		fi
-	else
-		with_snmp="no"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	fi
-fi
-
-if test "$with_snmp" = "yes" -a "${LIBSNMP_EXISTS}x" = "yesx"; then
-
-
-
-$as_echo "#define HAVE_LIBSNMP 1" >>confdefs.h
-
-else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Warning: net-snmp library disabled, autodetecting network scanners will not be supported." >&5
-$as_echo "$as_me: WARNING: *** Warning: net-snmp library disabled, autodetecting network scanners will not be supported." >&2;}
-fi
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-for ac_header in fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \
-    sys/time.h sys/shm.h sys/ipc.h sys/signal.h sys/scanio.h os2.h \
-    sys/socket.h sys/io.h sys/hw.h sys/types.h linux/ppdev.h \
-    dev/ppbus/ppi.h machine/cpufunc.h sys/bitypes.h sys/sem.h sys/poll.h \
-    windows.h be/kernel/OS.h limits.h sys/ioctl.h asm/types.h\
-    netinet/in.h tiffio.h ifaddrs.h pwd.h getopt.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-for ac_header in asm/io.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "asm/io.h" "ac_cv_header_asm_io_h" "#include <sys/types.h>
-"
-if test "x$ac_cv_header_asm_io_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ASM_IO_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-  MISSING_HEADERS=
-  if test "${ac_cv_header_fcntl_h}" != "yes" ; then
-    MISSING_HEADERS="${MISSING_HEADERS}\"fcntl.h\" "
-  fi
-  if test "${ac_cv_header_sys_time_h}" != "yes" ; then
-    MISSING_HEADERS="${MISSING_HEADERS}\"sys/time.h\" "
-  fi
-  if test "${ac_cv_header_unistd_h}" != "yes" ; then
-    MISSING_HEADERS="${MISSING_HEADERS}\"unistd.h\" "
-  fi
-  if test "${ac_cv_header_stdc}" != "yes" ; then
-    MISSING_HEADERS="${MISSING_HEADERS}\"ANSI C headers\" "
-  fi
-  if test "${MISSING_HEADERS}" != "" ; then
-    echo "*** The following essential header files couldn't be found:"
-    echo "*** ${MISSING_HEADERS}"
-    echo "*** Maybe the compiler isn't ANSI C compliant or not properly installed?"
-    echo "*** For details on what went wrong see config.log."
-    as_fn_error $? "Exiting now." "$LINENO" 5
+    AR=$ac_ct_AR
   fi
-
-
-for ac_header in winsock2.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
-if test "x$ac_cv_header_winsock2_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_WINSOCK2_H 1
-_ACEOF
- SOCKET_LIB="-lws2_32"
-fi
-
-done
-
-
-ac_fn_c_check_header_mongrel "$LINENO" "resmgr.h" "ac_cv_header_resmgr_h" "$ac_includes_default"
-if test "x$ac_cv_header_resmgr_h" = xyes; then :
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rsm_open_device in -lresmgr" >&5
-$as_echo_n "checking for rsm_open_device in -lresmgr... " >&6; }
-if ${ac_cv_lib_resmgr_rsm_open_device+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresmgr  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char rsm_open_device ();
-int
-main ()
-{
-return rsm_open_device ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_resmgr_rsm_open_device=yes
-else
-  ac_cv_lib_resmgr_rsm_open_device=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resmgr_rsm_open_device" >&5
-$as_echo "$ac_cv_lib_resmgr_rsm_open_device" >&6; }
-if test "x$ac_cv_lib_resmgr_rsm_open_device" = xyes; then :
-
-
-$as_echo "#define HAVE_RESMGR 1" >>confdefs.h
-
-			RESMGR_LIBS="-lresmgr"
-
-
-fi
-
-
-fi
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-$as_echo_n "checking return type of signal handlers... " >&6; }
-if ${ac_cv_type_signal+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <signal.h>
-
-int
-main ()
-{
-return *(signal (0, 0)) (0) == 1;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_type_signal=int
-else
-  ac_cv_type_signal=void
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-$as_echo "$ac_cv_type_signal" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
-ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
-_ACEOF
-
-fi
-
-ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-if test "x$ac_cv_type_ssize_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define ssize_t long
-_ACEOF
-
-fi
-
-
-ac_fn_c_check_type "$LINENO" "u_char" "ac_cv_type_u_char" "$ac_includes_default"
-if test "x$ac_cv_type_u_char" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_U_CHAR 1
-_ACEOF
-
-
-fi
-ac_fn_c_check_type "$LINENO" "u_short" "ac_cv_type_u_short" "$ac_includes_default"
-if test "x$ac_cv_type_u_short" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_U_SHORT 1
-_ACEOF
-
-
-fi
-ac_fn_c_check_type "$LINENO" "u_int" "ac_cv_type_u_int" "$ac_includes_default"
-if test "x$ac_cv_type_u_int" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_U_INT 1
-_ACEOF
-
-
-fi
-ac_fn_c_check_type "$LINENO" "u_long" "ac_cv_type_u_long" "$ac_includes_default"
-if test "x$ac_cv_type_u_long" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_U_LONG 1
-_ACEOF
-
-
-fi
-
-
-
-# from Python, check for "long long" type
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long support" >&5
-$as_echo_n "checking for long long support... " >&6; }
-have_long_long=no
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-long long x; x = (long long)0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-$as_echo "#define HAVE_LONG_LONG 1" >>confdefs.h
- have_long_long=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_long_long" >&5
-$as_echo "$have_long_long" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t in <sys/socket.h>" >&5
-$as_echo_n "checking for socklen_t in <sys/socket.h>... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/socket.h>
-
-int
-main ()
-{
-socklen_t len
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; };
-$as_echo "#define socklen_t int" >>confdefs.h
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for union semun in <sys/sem.h>" >&5
-$as_echo_n "checking for union semun in <sys/sem.h>... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-
-int
-main ()
-{
-union semun test_semun
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };
-
-$as_echo "#define HAVE_UNION_SEMUN 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct flock in fcntl.h" >&5
-$as_echo_n "checking for struct flock in fcntl.h... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <fcntl.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "struct flock" >/dev/null 2>&1; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; } ;
-
-$as_echo "#define HAVE_STRUCT_FLOCK 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f conftest*
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux ioctl defines" >&5
-$as_echo_n "checking for Linux ioctl defines... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/ioctl.h>
-#include <asm/types.h>
-
-int
-main ()
-{
-
-__u32 houba = _IOR('v',14, unsigned long);
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };
-have_linux_ioctl_defines="yes";
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_bigendian=unknown
-    # See if we're dealing with a universal compiler.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __APPLE_CC__
-	       not a universal capable compiler
-	     #endif
-	     typedef int dummy;
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-	# Check for potential -arch flags.  It is not universal unless
-	# there are at least two -arch flags with different values.
-	ac_arch=
-	ac_prev=
-	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-	 if test -n "$ac_prev"; then
-	   case $ac_word in
-	     i?86 | x86_64 | ppc | ppc64)
-	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-		 ac_arch=$ac_word
-	       else
-		 ac_cv_c_bigendian=universal
-		 break
-	       fi
-	       ;;
-	   esac
-	   ac_prev=
-	 elif test "x$ac_word" = "x-arch"; then
-	   ac_prev=arch
-	 fi
-       done
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if sys/param.h defines the BYTE_ORDER macro.
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-	     #include <sys/param.h>
-
-int
-main ()
-{
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-		     && LITTLE_ENDIAN)
-	      bogus endian macros
-	     #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
-		#include <sys/param.h>
-
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
-		 not big endian
-		#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-	      bogus endian macros
-	     #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
-
-int
-main ()
-{
-#ifndef _BIG_ENDIAN
-		 not big endian
-		#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # Compile a test program.
-      if test "$cross_compiling" = yes; then :
-  # Try to guess by grepping values from an object file.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-short int ascii_mm[] =
-		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii[] =
-		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-		int use_ascii (int i) {
-		  return ascii_mm[i] + ascii_ii[i];
-		}
-		short int ebcdic_ii[] =
-		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm[] =
-		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-		int use_ebcdic (int i) {
-		  return ebcdic_mm[i] + ebcdic_ii[i];
-		}
-		extern int foo;
-
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-	      ac_cv_c_bigendian=yes
-	    fi
-	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-	      if test "$ac_cv_c_bigendian" = unknown; then
-		ac_cv_c_bigendian=no
-	      else
-		# finding both strings is unlikely to happen, but who knows?
-		ac_cv_c_bigendian=unknown
-	      fi
-	    fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
 
-	     /* Are we little or big endian?  From Harbison&Steele.  */
-	     union
-	     {
-	       long int l;
-	       char c[sizeof (long int)];
-	     } u;
-	     u.l = 1;
-	     return u.c[sizeof (long int) - 1] == 1;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_c_bigendian=no
-else
-  ac_cv_c_bigendian=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-    fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
-   yes)
-     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
-;; #(
-   no)
-      ;; #(
-   universal)
-
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-
-     ;; #(
-   *)
-     as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
- esac
+: ${AR=ar}
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
+$as_echo_n "checking the archiver ($AR) interface... " >&6; }
+if ${am_cv_ar_interface+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this sort of thing.  */
-  typedef int charset[2];
-  const charset cs = { 0, 0 };
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *pcpcc;
-  char **ppc;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  pcpcc = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++pcpcc;
-  ppc = (char**) pcpcc;
-  pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this sort of thing.  */
-    char tx;
-    char *t = &tx;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-    *t++ = 0;
-    if (s) return 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; } bx;
-    struct s *b = &bx; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-    if (!foo) return 0;
-  }
-  return !cs[0] && !zero.x;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_const=yes
-else
-  ac_cv_c_const=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
-
-$as_echo "#define const /**/" >>confdefs.h
-
-fi
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+   am_cv_ar_interface=ar
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
+int some_variable = 0;
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_inline=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  test "$ac_cv_c_inline" != no && break
-done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
-
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
-    ;;
-esac
-
-
-
-ac_fn_c_check_func "$LINENO" "gethostbyaddr" "ac_cv_func_gethostbyaddr"
-if test "x$ac_cv_func_gethostbyaddr" = xyes; then :
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lbind" >&5
-$as_echo_n "checking for gethostbyaddr in -lbind... " >&6; }
-if ${ac_cv_lib_bind_gethostbyaddr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbind  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyaddr ();
-int
-main ()
-{
-return gethostbyaddr ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_bind_gethostbyaddr=yes
-else
-  ac_cv_lib_bind_gethostbyaddr=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_gethostbyaddr" >&5
-$as_echo "$ac_cv_lib_bind_gethostbyaddr" >&6; }
-if test "x$ac_cv_lib_bind_gethostbyaddr" = xyes; then :
-  BIND_LIB="-lbind"
-fi
-
-fi
-
-ac_fn_c_check_func "$LINENO" "gethostbyaddr" "ac_cv_func_gethostbyaddr"
-if test "x$ac_cv_func_gethostbyaddr" = xyes; then :
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lnsl" >&5
-$as_echo_n "checking for gethostbyaddr in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_gethostbyaddr+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyaddr ();
-int
-main ()
-{
-return gethostbyaddr ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_nsl_gethostbyaddr=yes
-else
-  ac_cv_lib_nsl_gethostbyaddr=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyaddr" >&5
-$as_echo "$ac_cv_lib_nsl_gethostbyaddr" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyaddr" = xyes; then :
-  NSL_LIB="-lnsl"
-fi
-
-fi
-
-ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
-if test "x$ac_cv_func_socket" = xyes; then :
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
-$as_echo_n "checking for socket in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_socket+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char socket ();
-int
-main ()
-{
-return socket ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_socket_socket=yes
-else
-  ac_cv_lib_socket_socket=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
-$as_echo "$ac_cv_lib_socket_socket" >&6; }
-if test "x$ac_cv_lib_socket_socket" = xyes; then :
-  SOCKET_LIB="-lsocket"
-fi
-
-fi
-
-ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
-if test "x$ac_cv_func_inet_aton" = xyes; then :
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5
-$as_echo_n "checking for inet_aton in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_inet_aton+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char inet_aton ();
-int
-main ()
-{
-return inet_aton ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_resolv_inet_aton=yes
-else
-  ac_cv_lib_resolv_inet_aton=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5
-$as_echo "$ac_cv_lib_resolv_inet_aton" >&6; }
-if test "x$ac_cv_lib_resolv_inet_aton" = xyes; then :
-  RESOLV_LIB="-lresolv"
-fi
-
-fi
-
-
-SOCKET_LIBS="$SOCKET_LIB $NSL_LIB $BIND_LIB $RESOLV_LIB"
-
-
-save_LIBS="$LIBS"
-LIBS="$LIBS $SOCKET_LIBS"
-for ac_func in inet_addr inet_aton inet_ntoa
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop"
-if test "x$ac_cv_func_inet_ntop" = xyes; then :
-  $as_echo "#define HAVE_INET_NTOP 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" inet_ntop.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS inet_ntop.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton"
-if test "x$ac_cv_func_inet_pton" = xyes; then :
-  $as_echo "#define HAVE_INET_PTON 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" inet_pton.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS inet_pton.$ac_objext"
- ;;
-esac
-
-fi
-
-
-LIBS="$save_LIBS"
-
-if test "$ac_cv_header_be_kernel_OS_h" = "yes" ; then
-        ac_cv_func_getaddrinfo=no
-    ac_cv_func_getnameinfo=no
-fi
-
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments.  Useless!
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-$as_echo_n "checking for working alloca.h... " >&6; }
-if ${ac_cv_working_alloca_h+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <alloca.h>
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
-			  if (p) return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_working_alloca_h=yes
-else
-  ac_cv_working_alloca_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-$as_echo "$ac_cv_working_alloca_h" >&6; }
-if test $ac_cv_working_alloca_h = yes; then
-
-$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-$as_echo_n "checking for alloca... " >&6; }
-if ${ac_cv_func_alloca_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  ifdef HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca (size_t);
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-int
-main ()
-{
-char *p = (char *) alloca (1);
-				    if (p) return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_func_alloca_works=yes
-else
-  ac_cv_func_alloca_works=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-$as_echo "$ac_cv_func_alloca_works" >&6; }
-
-if test $ac_cv_func_alloca_works = yes; then
-
-$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
-
-else
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble.  Some versions do not even contain alloca or
-# contain a buggy version.  If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
-
-ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-
-$as_echo "#define C_ALLOCA 1" >>confdefs.h
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
-$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if ${ac_cv_os_cray+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined CRAY && ! defined CRAY2
-webecray
-#else
-wenotbecray
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then :
-  ac_cv_os_cray=yes
-else
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
-$as_echo "$ac_cv_os_cray" >&6; }
-if test $ac_cv_os_cray = yes; then
-  for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-
-cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
-_ACEOF
-
-    break
-fi
-
-  done
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-$as_echo_n "checking stack direction for C alloca... " >&6; }
-if ${ac_cv_c_stack_direction+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_c_stack_direction=0
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-int
-find_stack_direction (int *addr, int depth)
-{
-  int dir, dummy = 0;
-  if (! addr)
-    addr = &dummy;
-  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
-  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
-  return dir + dummy;
-}
-
-int
-main (int argc, char **argv)
-{
-  return find_stack_direction (0, argc + !argv + 20) < 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_c_stack_direction=1
-else
-  ac_cv_c_stack_direction=-1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-$as_echo "$ac_cv_c_stack_direction" >&6; }
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
-
-
-fi
-
-
-
-
-  for ac_header in $ac_header_list
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-
-
-
-for ac_func in getpagesize
-do :
-  ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
-if test "x$ac_cv_func_getpagesize" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETPAGESIZE 1
-_ACEOF
-
-fi
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
-$as_echo_n "checking for working mmap... " >&6; }
-if ${ac_cv_func_mmap_fixed_mapped+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_mmap_fixed_mapped=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_includes_default
-/* malloc might have been renamed as rpl_malloc. */
-#undef malloc
-
-/* Thanks to Mike Haertel and Jim Avera for this test.
-   Here is a matrix of mmap possibilities:
-	mmap private not fixed
-	mmap private fixed at somewhere currently unmapped
-	mmap private fixed at somewhere already mapped
-	mmap shared not fixed
-	mmap shared fixed at somewhere currently unmapped
-	mmap shared fixed at somewhere already mapped
-   For private mappings, we should verify that changes cannot be read()
-   back from the file, nor mmap's back from the file at a different
-   address.  (There have been systems where private was not correctly
-   implemented like the infamous i386 svr4.0, and systems where the
-   VM page cache was not coherent with the file system buffer cache
-   like early versions of FreeBSD and possibly contemporary NetBSD.)
-   For shared mappings, we should conversely verify that changes get
-   propagated back to all the places they're supposed to be.
-
-   Grep wants private fixed already mapped.
-   The main things grep needs to know about mmap are:
-   * does it exist and is it safe to write into the mmap'd area
-   * how to use it (BSD variants)  */
-
-#include <fcntl.h>
-#include <sys/mman.h>
-
-#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
-char *malloc ();
-#endif
-
-/* This mess was copied from the GNU getpagesize.h.  */
-#ifndef HAVE_GETPAGESIZE
-# ifdef _SC_PAGESIZE
-#  define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
-#  ifdef HAVE_SYS_PARAM_H
-#   include <sys/param.h>
-#   ifdef EXEC_PAGESIZE
-#    define getpagesize() EXEC_PAGESIZE
-#   else /* no EXEC_PAGESIZE */
-#    ifdef NBPG
-#     define getpagesize() NBPG * CLSIZE
-#     ifndef CLSIZE
-#      define CLSIZE 1
-#     endif /* no CLSIZE */
-#    else /* no NBPG */
-#     ifdef NBPC
-#      define getpagesize() NBPC
-#     else /* no NBPC */
-#      ifdef PAGESIZE
-#       define getpagesize() PAGESIZE
-#      endif /* PAGESIZE */
-#     endif /* no NBPC */
-#    endif /* no NBPG */
-#   endif /* no EXEC_PAGESIZE */
-#  else /* no HAVE_SYS_PARAM_H */
-#   define getpagesize() 8192	/* punt totally */
-#  endif /* no HAVE_SYS_PARAM_H */
-# endif /* no _SC_PAGESIZE */
-
-#endif /* no HAVE_GETPAGESIZE */
-
-int
-main ()
-{
-  char *data, *data2, *data3;
-  const char *cdata2;
-  int i, pagesize;
-  int fd, fd2;
-
-  pagesize = getpagesize ();
-
-  /* First, make a file with some known garbage in it. */
-  data = (char *) malloc (pagesize);
-  if (!data)
-    return 1;
-  for (i = 0; i < pagesize; ++i)
-    *(data + i) = rand ();
-  umask (0);
-  fd = creat ("conftest.mmap", 0600);
-  if (fd < 0)
-    return 2;
-  if (write (fd, data, pagesize) != pagesize)
-    return 3;
-  close (fd);
-
-  /* Next, check that the tail of a page is zero-filled.  File must have
-     non-zero length, otherwise we risk SIGBUS for entire page.  */
-  fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
-  if (fd2 < 0)
-    return 4;
-  cdata2 = "";
-  if (write (fd2, cdata2, 1) != 1)
-    return 5;
-  data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
-  if (data2 == MAP_FAILED)
-    return 6;
-  for (i = 0; i < pagesize; ++i)
-    if (*(data2 + i))
-      return 7;
-  close (fd2);
-  if (munmap (data2, pagesize))
-    return 8;
-
-  /* Next, try to mmap the file at a fixed address which already has
-     something else allocated at it.  If we can, also make sure that
-     we see the same garbage.  */
-  fd = open ("conftest.mmap", O_RDWR);
-  if (fd < 0)
-    return 9;
-  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
-		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
-    return 10;
-  for (i = 0; i < pagesize; ++i)
-    if (*(data + i) != *(data2 + i))
-      return 11;
-
-  /* Finally, make sure that changes to the mapped area do not
-     percolate back to the file as seen by read().  (This is a bug on
-     some variants of i386 svr4.0.)  */
-  for (i = 0; i < pagesize; ++i)
-    *(data2 + i) = *(data2 + i) + 1;
-  data3 = (char *) malloc (pagesize);
-  if (!data3)
-    return 12;
-  if (read (fd, data3, pagesize) != pagesize)
-    return 13;
-  for (i = 0; i < pagesize; ++i)
-    if (*(data + i) != *(data3 + i))
-      return 14;
-  close (fd);
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_mmap_fixed_mapped=yes
-else
-  ac_cv_func_mmap_fixed_mapped=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
-$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
-
-$as_echo "#define HAVE_MMAP 1" >>confdefs.h
-
-fi
-rm -f conftest.mmap conftest.txt
-
-for ac_func in atexit ioperm i386_set_ioperm \
-    mkdir strftime strstr strtod  \
-    cfmakeraw tcsendbreak strcasecmp strncasecmp _portaccess \
-    getaddrinfo getnameinfo poll setitimer iopl getuid getpass
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-ac_fn_c_check_func "$LINENO" "getenv" "ac_cv_func_getenv"
-if test "x$ac_cv_func_getenv" = xyes; then :
-  $as_echo "#define HAVE_GETENV 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" getenv.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS getenv.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "isfdtype" "ac_cv_func_isfdtype"
-if test "x$ac_cv_func_isfdtype" = xyes; then :
-  $as_echo "#define HAVE_ISFDTYPE 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" isfdtype.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS isfdtype.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask"
-if test "x$ac_cv_func_sigprocmask" = xyes; then :
-  $as_echo "#define HAVE_SIGPROCMASK 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" sigprocmask.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS sigprocmask.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf"
-if test "x$ac_cv_func_snprintf" = xyes; then :
-  $as_echo "#define HAVE_SNPRINTF 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" snprintf.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS snprintf.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "strcasestr" "ac_cv_func_strcasestr"
-if test "x$ac_cv_func_strcasestr" = xyes; then :
-  $as_echo "#define HAVE_STRCASESTR 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" strcasestr.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS strcasestr.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
-if test "x$ac_cv_func_strdup" = xyes; then :
-  $as_echo "#define HAVE_STRDUP 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" strdup.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS strdup.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "strndup" "ac_cv_func_strndup"
-if test "x$ac_cv_func_strndup" = xyes; then :
-  $as_echo "#define HAVE_STRNDUP 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" strndup.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS strndup.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "strsep" "ac_cv_func_strsep"
-if test "x$ac_cv_func_strsep" = xyes; then :
-  $as_echo "#define HAVE_STRSEP 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" strsep.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS strsep.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "usleep" "ac_cv_func_usleep"
-if test "x$ac_cv_func_usleep" = xyes; then :
-  $as_echo "#define HAVE_USLEEP 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" usleep.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS usleep.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "sleep" "ac_cv_func_sleep"
-if test "x$ac_cv_func_sleep" = xyes; then :
-  $as_echo "#define HAVE_SLEEP 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" sleep.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS sleep.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "syslog" "ac_cv_func_syslog"
-if test "x$ac_cv_func_syslog" = xyes; then :
-  $as_echo "#define HAVE_SYSLOG 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" syslog.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS syslog.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "vsyslog" "ac_cv_func_vsyslog"
-if test "x$ac_cv_func_vsyslog" = xyes; then :
-  $as_echo "#define HAVE_VSYSLOG 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" vsyslog.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS vsyslog.$ac_objext"
- ;;
-esac
-
-fi
-
-
-
-if test "${ac_cv_header_sys_io_h}" = "yes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inb,outb (provided by sys/io.h)" >&5
-$as_echo_n "checking for inb,outb (provided by sys/io.h)... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/io.h>
-int
-main ()
-{
-inb(0);outb(0,0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-      sane_cv_have_sys_io_h_with_inb_outb="yes"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      sane_cv_have_sys_io_h_with_inb_outb="no"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sys/io.h does not provide inb,outb (non i386/x32/x86_64 arch?)" >&5
-$as_echo "$as_me: WARNING: sys/io.h does not provide inb,outb (non i386/x32/x86_64 arch?)" >&2;}
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test "$sane_cv_have_sys_io_h_with_inb_outb" = "yes"; then
-
-$as_echo "#define SANE_HAVE_SYS_IO_H_WITH_INB_OUTB 1" >>confdefs.h
-
-  fi
-else
-  sane_cv_have_sys_io_h_with_inb_outb="no"
-fi
-
-
-
-
-
-if test "$ac_cv_header_os2_h" = "yes" ; then
-
-$as_echo "#define strncasecmp strnicmp" >>confdefs.h
-
-
-$as_echo "#define strcasecmp stricmp" >>confdefs.h
-
-fi
-
-if test "$ac_cv_header_getopt_h" = "yes" ; then
-  for ac_func in getopt_long
-do :
-  ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long"
-if test "x$ac_cv_func_getopt_long" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GETOPT_LONG 1
-_ACEOF
-
-fi
-done
-
-fi
-
-if test -c /dev/urandom ; then
-
-$as_echo "#define HAVE_DEV_URANDOM 1" >>confdefs.h
-
-fi
-
-
-
-# Check whether --with-systemd was given.
-if test "${with_systemd+set}" = set; then :
-  withval=$with_systemd;
-fi
-
-if test "x$with_systemd" != xno ; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
-$as_echo_n "checking for SYSTEMD... " >&6; }
-
-if test -n "$SYSTEMD_CFLAGS"; then
-    pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$SYSTEMD_LIBS"; then
-    pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1`
-        else
-	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SYSTEMD_PKG_ERRORS" >&5
-
-	have_systemd=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	have_systemd=no
-else
-	SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
-	SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_systemd=yes
-fi
-  if test "x$have_systemd" = xno; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
-$as_echo_n "checking for SYSTEMD... " >&6; }
-
-if test -n "$SYSTEMD_CFLAGS"; then
-    pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$SYSTEMD_LIBS"; then
-    pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
-        else
-	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SYSTEMD_PKG_ERRORS" >&5
-
-	have_systemd=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	have_systemd=no
-else
-	SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
-	SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_systemd=yes
-fi
-  fi
-  if test "x$have_systemd" = xyes; then
-
-$as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h
-
-
-  else
-    if test "x$with_systemd" = xyes; then
-      as_fn_error $? "Systemd support was requested but systemd was not found" "$LINENO" 5
-    fi
-  fi
-fi
-
-
-# Check whether --enable-libusb_1_0 was given.
-if test "${enable_libusb_1_0+set}" = set; then :
-  enableval=$enable_libusb_1_0; enable_libusb_1_0=$enableval
-else
-  enable_libusb_1_0=no
-fi
-
-
-# Check whether --enable-libusb was given.
-if test "${enable_libusb+set}" = set; then :
-  enableval=$enable_libusb;
-else
-  enable_libusb=auto
-fi
-
-HAVE_USB=no
-if test "$enable_libusb" != "no"; then
-  case ${host_os} in
-  beos*)
-  for ac_header in be/drivers/USB_scanner.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "be/drivers/USB_scanner.h" "ac_cv_header_be_drivers_USB_scanner_h" "$ac_includes_default"
-if test "x$ac_cv_header_be_drivers_USB_scanner_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_BE_DRIVERS_USB_SCANNER_H 1
-_ACEOF
- HAVE_USB=yes
-else
-  as_fn_error $? "USB_scanner.h is required on BeOS" "$LINENO" 5
-fi
-
-done
-
-  ;;
-  os2*)
-  ac_fn_c_check_header_compile "$LINENO" "usbcalls.h" "ac_cv_header_usbcalls_h" "#include <usb.h>
-#include <os2.h>
-
-"
-if test "x$ac_cv_header_usbcalls_h" = xyes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UsbQueryNumberDevices in -lusbcall" >&5
-$as_echo_n "checking for UsbQueryNumberDevices in -lusbcall... " >&6; }
-if ${ac_cv_lib_usbcall_UsbQueryNumberDevices+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lusbcall  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char UsbQueryNumberDevices ();
-int
-main ()
-{
-return UsbQueryNumberDevices ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_usbcall_UsbQueryNumberDevices=yes
-else
-  ac_cv_lib_usbcall_UsbQueryNumberDevices=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usbcall_UsbQueryNumberDevices" >&5
-$as_echo "$ac_cv_lib_usbcall_UsbQueryNumberDevices" >&6; }
-if test "x$ac_cv_lib_usbcall_UsbQueryNumberDevices" = xyes; then :
-  USB_LIBS="$USB_LIBS -lusbcall"
-				HAVE_USB=yes
-fi
-
-fi
-
-
-  ;;
-  *)
-    have_libusb_1_0=no
-  if test "$enable_libusb_1_0" = "yes"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBUSB_1_0" >&5
-$as_echo_n "checking for LIBUSB_1_0... " >&6; }
-
-if test -n "$LIBUSB_1_0_CFLAGS"; then
-    pkg_cv_LIBUSB_1_0_CFLAGS="$LIBUSB_1_0_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libusb-1.0 >= 1.0.0 \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " libusb-1.0 >= 1.0.0 ") 2>&5
+  am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
+  (eval $am_ar_try) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBUSB_1_0_CFLAGS=`$PKG_CONFIG --cflags " libusb-1.0 >= 1.0.0 " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$LIBUSB_1_0_LIBS"; then
-    pkg_cv_LIBUSB_1_0_LIBS="$LIBUSB_1_0_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libusb-1.0 >= 1.0.0 \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " libusb-1.0 >= 1.0.0 ") 2>&5
+  test $ac_status = 0; }
+      if test "$ac_status" -eq 0; then
+        am_cv_ar_interface=ar
+      else
+        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
+        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
+  (eval $am_ar_try) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBUSB_1_0_LIBS=`$PKG_CONFIG --libs " libusb-1.0 >= 1.0.0 " 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LIBUSB_1_0_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " libusb-1.0 >= 1.0.0 " 2>&1`
+  test $ac_status = 0; }
+        if test "$ac_status" -eq 0; then
+          am_cv_ar_interface=lib
         else
-	        LIBUSB_1_0_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " libusb-1.0 >= 1.0.0 " 2>&1`
+          am_cv_ar_interface=unknown
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBUSB_1_0_PKG_ERRORS" >&5
-
-	have_libusb_1_0=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	have_libusb_1_0=no
-else
-	LIBUSB_1_0_CFLAGS=$pkg_cv_LIBUSB_1_0_CFLAGS
-	LIBUSB_1_0_LIBS=$pkg_cv_LIBUSB_1_0_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_libusb_1_0=yes
-fi
-    if test "$have_libusb_1_0" = "yes"; then
-      CFLAGS="$CFLAGS $LIBUSB_1_0_CFLAGS"
-      USB_LIBS="$USB_LIBS $LIBUSB_1_0_LIBS"
-      HAVE_USB=yes
-    fi
-  fi
-
-  if test "$have_libusb_1_0" = "no"; then
-            ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default"
-if test "x$ac_cv_header_usb_h" = xyes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_interrupt_read in -lusb" >&5
-$as_echo_n "checking for usb_interrupt_read in -lusb... " >&6; }
-if ${ac_cv_lib_usb_usb_interrupt_read+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lusb  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char usb_interrupt_read ();
-int
-main ()
-{
-return usb_interrupt_read ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_usb_usb_interrupt_read=yes
-else
-  ac_cv_lib_usb_usb_interrupt_read=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
-$as_echo "$ac_cv_lib_usb_usb_interrupt_read" >&6; }
-if test "x$ac_cv_lib_usb_usb_interrupt_read" = xyes; then :
-  USB_LIBS="$USB_LIBS -lusb"
-                                  HAVE_USB=yes
-fi
-
-fi
-
-
-    for ac_header in lusb0_usb.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "lusb0_usb.h" "ac_cv_header_lusb0_usb_h" "$ac_includes_default"
-if test "x$ac_cv_header_lusb0_usb_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LUSB0_USB_H 1
-_ACEOF
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_interrupt_read in -lusb" >&5
-$as_echo_n "checking for usb_interrupt_read in -lusb... " >&6; }
-if ${ac_cv_lib_usb_usb_interrupt_read+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lusb  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+      fi
+      rm -f conftest.lib libconftest.a
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char usb_interrupt_read ();
-int
-main ()
-{
-return usb_interrupt_read ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_usb_usb_interrupt_read=yes
-else
-  ac_cv_lib_usb_usb_interrupt_read=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
-$as_echo "$ac_cv_lib_usb_usb_interrupt_read" >&6; }
-if test "x$ac_cv_lib_usb_usb_interrupt_read" = xyes; then :
-  USB_LIBS="$USB_LIBS -lusb"
-				   HAVE_USB=yes
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
+$as_echo "$am_cv_ar_interface" >&6; }
 
-done
-
-  fi
+case $am_cv_ar_interface in
+ar)
   ;;
-  esac
-fi
-if test "$enable_libusb" = "yes" && test "$HAVE_USB" = "no"; then
-  as_fn_error $? "USB support requested but required libraries not found." "$LINENO" 5
-fi
-if test "$HAVE_USB" = "yes"; then
-  case ${host_os} in
-  os2*)
-
-$as_echo "#define HAVE_USBCALLS 1" >>confdefs.h
-
+lib)
+  # Microsoft lib, so override with the ar-lib wrapper script.
+  # FIXME: It is wrong to rewrite AR.
+  # But if we don't then we get into trouble of one sort or another.
+  # A longer-term fix would be to have automake use am__AR in this case,
+  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
+  # similar.
+  AR="$am_aux_dir/ar-lib $AR"
   ;;
-  *)
-  if test "$have_libusb_1_0" = "yes"; then
-
-$as_echo "#define HAVE_LIBUSB_1_0 1" >>confdefs.h
-
-  else
-
-$as_echo "#define HAVE_LIBUSB 1" >>confdefs.h
-
-  fi
+unknown)
+  as_fn_error $? "could not determine $AR interface" "$LINENO" 5
   ;;
-  esac
-fi
-
-
-
-
-# Unset VERSION during the SCSI header check
-sed "s!^#define VERSION .*!/* & */!" confdefs.h > confdefs.h.tmp
-mv confdefs.h.tmp confdefs.h
-
-for ac_header in IOKit/scsi/SCSITaskLib.h IOKit/cdb/IOSCSILib.h \
-  IOKit/scsi/SCSICommandOperationCodes.h \
-  IOKit/scsi-commands/SCSICommandOperationCodes.h scsi.h sys/scsi.h \
-  sys/scsicmd.h sys/scsiio.h bsd/dev/scsireg.h scsi/sg.h \
-  camlib.h scdds.h sys/scsi/scsi.h sys/scsi/sgdefs.h \
-  sys/scsi/targets/scgio.h apollo/scsi.h sys/sdi_comm.h \
-  sys/passthrudef.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-# Restore VERSION
-sed "s!/\* \(#define VERSION .*\) \*/!\1!" confdefs.h > confdefs.h.tmp
-mv confdefs.h.tmp confdefs.h
-
-for ac_header in io/cam/cam.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "io/cam/cam.h" "ac_cv_header_io_cam_cam_h" "#include <io/common/iotypes.h>
-"
-if test "x$ac_cv_header_io_cam_cam_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_IO_CAM_CAM_H 1
-_ACEOF
-
-fi
-
-done
-
-for ac_header in ntddscsi.h ddk/ntddscsi.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <windows.h>
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-if test "$ac_cv_header_sys_scsiio_h" = "yes" \
-  -a "$ac_cv_header_scsi_h" = "yes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if 'scsireq_t' needs to be defined as 'struct scsireq'" >&5
-$as_echo_n "checking if 'scsireq_t' needs to be defined as 'struct scsireq'... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/scsiio.h>
-#include <scsi.h>
-
-int
-main ()
-{
-scsireq_t req
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };
-
-$as_echo "#define scsireq_t struct scsireq_t" >>confdefs.h
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for scsireq_enter in -lscsi" >&5
-$as_echo_n "checking for scsireq_enter in -lscsi... " >&6; }
-if ${ac_cv_lib_scsi_scsireq_enter+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lscsi  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char scsireq_enter ();
-int
-main ()
-{
-return scsireq_enter ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_scsi_scsireq_enter=yes
-else
-  ac_cv_lib_scsi_scsireq_enter=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_scsi_scsireq_enter" >&5
-$as_echo "$ac_cv_lib_scsi_scsireq_enter" >&6; }
-if test "x$ac_cv_lib_scsi_scsireq_enter" = xyes; then :
-  SCSI_LIBS="-lscsi"
-fi
- # FreeBSD needs this
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cam_open_device in -lcam" >&5
-$as_echo_n "checking for cam_open_device in -lcam... " >&6; }
-if ${ac_cv_lib_cam_cam_open_device+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcam  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char cam_open_device ();
-int
-main ()
-{
-return cam_open_device ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_cam_cam_open_device=yes
-else
-  ac_cv_lib_cam_cam_open_device=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cam_cam_open_device" >&5
-$as_echo "$ac_cv_lib_cam_cam_open_device" >&6; }
-if test "x$ac_cv_lib_cam_cam_open_device" = xyes; then :
-  SCSI_LIBS="-lcam"
-fi
-  # FreeBSD 3+ needs this
-
-for ac_func in scsireq_enter
-do :
-  ac_fn_c_check_func "$LINENO" "scsireq_enter" "ac_cv_func_scsireq_enter"
-if test "x$ac_cv_func_scsireq_enter" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SCSIREQ_ENTER 1
-_ACEOF
-
-fi
-done
-
-
-if test "$ac_cv_header_scsi_sg_h" = "yes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sg_header.target_status in <scsi/sg.h>" >&5
-$as_echo_n "checking for sg_header.target_status in <scsi/sg.h>... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <scsi/sg.h>
-
-int
-main ()
-{
-
-struct sg_header hdr;
-hdr.target_status = 1;
-return 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };
-
-$as_echo "#define HAVE_SG_TARGET_STATUS 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-if test "$ac_cv_header_IOKit_scsi_SCSITaskLib_h" = "yes"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCSITaskSGElement in IOKit/scsi/SCSITaskLib.h" >&5
-$as_echo_n "checking for SCSITaskSGElement in IOKit/scsi/SCSITaskLib.h... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#undef VERSION
-#include <IOKit/scsi/SCSITaskLib.h>
-
-int
-main ()
-{
-
-SCSITaskSGElement range;
-return 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };
-
-$as_echo "#define HAVE_SCSITASKSGELEMENT 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-if sparc64 -q > /dev/null 2>&1 ; then
-
-$as_echo "#define DISABLE_LINUX_SG_IO 1" >>confdefs.h
-
-fi
-
-# Multiple platforms can set SCSI_LIBS so do substitution at end.
-
-
-# Check whether --enable-scsibuffersize was given.
-if test "${enable_scsibuffersize+set}" = set; then :
-  enableval=$enable_scsibuffersize; set_scsibuffersize="$enableval"
-else
-  set_scsibuffersize=131072
-fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define SCSIBUFFERSIZE $set_scsibuffersize
-_ACEOF
-
-echo "scsi buffersize: $set_scsibuffersize"
-
-# Check whether --enable-scsi-directio was given.
-if test "${enable_scsi_directio+set}" = set; then :
-  enableval=$enable_scsi_directio;
-    if eval "test x$enable_scsi_directio = xyes"; then
-      CFLAGS="$CFLAGS -DENABLE_SCSI_DIRECTIO"
-    fi
-
-fi
-
-
-
-if test "$ac_cv_func_getnameinfo" = "yes" \
-  && test "$ac_cv_func_getaddrinfo" = "yes" ; then
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable IPv6" >&5
-$as_echo_n "checking whether to enable IPv6... " >&6; }
-  # Check whether --enable-ipv6 was given.
-if test "${enable_ipv6+set}" = set; then :
-  enableval=$enable_ipv6;   if test "$enableval" = "no" ; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, manually disabled" >&5
-$as_echo "no, manually disabled" >&6; }
-         ipv6=no
-         fi
-
-fi
-
-
-  if test "$ipv6" != "no" ; then
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-	#define INET6
-	#include <sys/types.h>
-	#include <sys/socket.h>
-int
-main ()
-{
-
-	 /* AF_INET6 available check */
- 	if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
-   	  exit(1);
- 	else
-   	  exit(0);
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define ENABLE_IPV6 1" >>confdefs.h
-
-        ipv6=yes
-
-else
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (couldn't compile test program)" >&5
-$as_echo "no (couldn't compile test program)" >&6; }
-        ipv6=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  fi
-
-  if test "$ipv6" != "no" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct sockaddr_storage has an ss_family member" >&5
-$as_echo_n "checking whether struct sockaddr_storage has an ss_family member... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-	#define INET6
-	#include <sys/types.h>
-	#include <sys/socket.h>
-int
-main ()
-{
-
-	/* test if the ss_family member exists in struct sockaddr_storage */
-	struct sockaddr_storage ss;
-	ss.ss_family = AF_INET;
-	exit (0);
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAS_SS_FAMILY 1" >>confdefs.h
-
-
-else
-
-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+esac
 
-		#define INET6
-		#include <sys/types.h>
-		#include <sys/socket.h>
-int
-main ()
-{
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
 
-		/* test if the __ss_family member exists in struct sockaddr_storage */
-		struct sockaddr_storage ss;
-		ss.__ss_family = AF_INET;
-		exit (0);
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, but __ss_family exists" >&5
-$as_echo "no, but __ss_family exists" >&6; }
+macro_version='2.4.2'
+macro_revision='1.3337'
 
-$as_echo "#define HAS___SS_FAMILY 1" >>confdefs.h
 
 
-else
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		ipv6=no
 
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  fi
 
-else
-  ipv6="no"
-fi
 
-# Check whether --enable-preload was given.
-if test "${enable_preload+set}" = set; then :
-  enableval=$enable_preload; enable_preload=$enableval
-else
-  enable_preload=auto
-fi
 
 
-enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AS="${ac_tool_prefix}as"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AS=$ac_cv_prog_AS
-if test -n "$AS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-$as_echo "$AS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AS"; then
-  ac_ct_AS=$AS
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AS"; then
-  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AS="as"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AS=$ac_cv_prog_ac_ct_AS
-if test -n "$ac_ct_AS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-$as_echo "$ac_ct_AS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
-  if test "x$ac_ct_AS" = x; then
-    AS="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AS=$ac_ct_AS
-  fi
-else
-  AS="$ac_cv_prog_AS"
-fi
 
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
 
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+ltmain="$ac_aux_dir/ltmain.sh"
 
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
 else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
-  ;;
-esac
-
-test -z "$AS" && AS=as
-
-
-
-
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=no
 fi
-
-
-
-
-
-
-
-
-
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-
-macro_version='2.4.2'
-macro_revision='1.3337'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
 # Backslashify metacharacters that are still active within
 # double-quoted strings.
 sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
@@ -11628,7 +6051,8 @@ else
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
@@ -12026,10 +6450,6 @@ freebsd* | dragonfly*)
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -12068,11 +6488,11 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -13146,7 +7566,7 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -13162,9 +7582,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*)
+	    LD="${LD-ld} -m elf32lppclinux"
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+	  powerpc64-*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -13183,7 +7613,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+	  powerpcle-*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
@@ -14048,6 +8481,335 @@ done
 
 
 # Set options
+# Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_static=no
+fi
+
+
+
+
+
+
+
+enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AS="${ac_tool_prefix}as"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+$as_echo "$AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AS"; then
+  ac_ct_AS=$AS
+  # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AS"; then
+  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AS="as"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+$as_echo "$ac_ct_AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AS" = x; then
+    AS="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AS=$ac_ct_AS
+  fi
+else
+  AS="$ac_cv_prog_AS"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+  ;;
+esac
+
+test -z "$AS" && AS=as
+
+
+
+
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
 
 
 
@@ -14692,7 +9454,7 @@ lt_prog_compiler_static=
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -15170,6 +9932,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   openbsd*)
     with_gnu_ld=no
     ;;
+  linux* | k*bsd*-gnu | gnu*)
+    link_all_deplibs=no
+    ;;
   esac
 
   ld_shlibs=yes
@@ -15391,7 +10156,7 @@ _LT_EOF
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -15568,6 +10333,7 @@ _LT_EOF
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
+	link_all_deplibs=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -16021,7 +10787,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
       link_all_deplibs=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -16858,17 +11624,6 @@ freebsd* | dragonfly*)
   esac
   ;;
 
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@ -16985,7 +11740,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
@@ -17034,14 +11789,10 @@ fi
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Add ABI-specific directories to the system library path.
-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -17053,6 +11804,18 @@ fi
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -18024,9 +12787,7787 @@ CC="$lt_save_CC"
 
 
 
+
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
+    # Check whether --enable-nls was given.
+if test "${enable_nls+set}" = set; then :
+  enableval=$enable_nls; USE_NLS=$enableval
+else
+  USE_NLS=yes
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
+
+
+
+
+      GETTEXT_MACRO_VERSION=0.18
+
+
+
+
+# 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MSGFMT+:} false; then :
+  $as_echo_n "(cached) " >&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
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GMSGFMT+:} false; then :
+  $as_echo_n "(cached) " >&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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XGETTEXT+:} false; then :
+  $as_echo_n "(cached) " >&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
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MSGMERGE+:} false; then :
+  $as_echo_n "(cached) " >&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
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+$as_echo "$MSGMERGE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        test -n "$localedir" || localedir='${datadir}/locale'
+
+
+    test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+
+
+  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.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
+$as_echo_n "checking for ld used by GCC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    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
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${acl_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&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
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${acl_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+$as_echo "$acl_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$acl_cv_prog_gnu_ld
+
+
+
+
+                                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+$as_echo_n "checking for shared library run path origin... " >&6; }
+if ${acl_cv_rpath+:} false; then :
+  $as_echo_n "(cached) " >&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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+$as_echo "$acl_cv_rpath" >&6; }
+  wl="$acl_cv_wl"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_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
+  acl_libdirstem2=
+  case "$host_os" in
+    solaris*)
+                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
+$as_echo_n "checking for 64-bit host... " >&6; }
+if ${gl_cv_solaris_64bit+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifdef _LP64
+sixtyfour bits
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
+  gl_cv_solaris_64bit=yes
+else
+  gl_cv_solaris_64bit=no
+fi
+rm -f conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
+$as_echo "$gl_cv_solaris_64bit" >&6; }
+      if test $gl_cv_solaris_64bit = yes; then
+        acl_libdirstem=lib/64
+        case "$host_cpu" in
+          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
+          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+        esac
+      fi
+      ;;
+    *)
+      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 ;;
+              */../ | */.. )
+                # Better ignore directories of this form. They are misleading.
+                ;;
+              *) searchdir=`cd "$searchdir" && pwd`
+                 case "$searchdir" in
+                   */lib64 ) acl_libdirstem=lib64 ;;
+                 esac ;;
+            esac
+          fi
+        done
+        IFS="$acl_save_IFS"
+      fi
+      ;;
+  esac
+  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+
+
+
+
+
+
+
+
+
+
+
+
+    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"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
+      fi
+    fi
+
+fi
+
+      LIBICONV=
+  LTLIBICONV=
+  INCICONV=
+  LIBICONV_PREFIX=
+      HAVE_LIBICONV=
+  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=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            dir="$additional_libdir"
+                                    if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
+              fi
+            fi
+                        if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              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 "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    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" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; 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 "$acl_hardcode_direct" = yes; then
+                                                      LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_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 "$acl_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/"'*$,,'`
+                if test "$name" = 'iconv'; then
+                  LIBICONV_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = 'iconv'; then
+                  LIBICONV_PREFIX="$basedir"
+                fi
+                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" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; 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 "$acl_hardcode_libdir_separator"; then
+                        alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+            acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_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=\"$acl_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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
+if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <CoreFoundation/CFPreferences.h>
+int
+main ()
+{
+CFPreferencesCopyAppValue(NULL, NULL)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gt_cv_func_CFPreferencesCopyAppValue=yes
+else
+  gt_cv_func_CFPreferencesCopyAppValue=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     LIBS="$gt_save_LIBS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+
+$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+
+  fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
+$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
+if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <CoreFoundation/CFLocale.h>
+int
+main ()
+{
+CFLocaleCopyCurrent();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gt_cv_func_CFLocaleCopyCurrent=yes
+else
+  gt_cv_func_CFLocaleCopyCurrent=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+     LIBS="$gt_save_LIBS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+
+$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
+
+  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
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+$as_echo_n "checking for GNU gettext in libc... " >&6; }
+if eval \${$gt_func_gnugettext_libc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$gt_func_gnugettext_libc=yes"
+else
+  eval "$gt_func_gnugettext_libc=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$gt_func_gnugettext_libc
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$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
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
+if ${am_cv_func_iconv+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+if ac_fn_c_try_link "$LINENO"; then :
+  am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS $LIBICONV"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+if ac_fn_c_try_link "$LINENO"; then :
+  am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+      LIBS="$am_save_LIBS"
+    fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+$as_echo "$am_cv_func_iconv" >&6; }
+  if test "$am_cv_func_iconv" = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+$as_echo_n "checking for working iconv... " >&6; }
+if ${am_cv_func_iconv_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+            am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      if test "$cross_compiling" = yes; then :
+  case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+  /* Test against Solaris 10 bug: Failures are not distinguishable from
+     successful returns.  */
+  {
+    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+    if (cd_ascii_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\263";
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_ascii_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          return 1;
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    return 1;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  am_cv_func_iconv_works=yes
+else
+  am_cv_func_iconv_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+      LIBS="$am_save_LIBS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+$as_echo "$am_cv_func_iconv_works" >&6; }
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+$as_echo "$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"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
+      fi
+    fi
+
+fi
+
+      LIBINTL=
+  LTLIBINTL=
+  INCINTL=
+  LIBINTL_PREFIX=
+      HAVE_LIBINTL=
+  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=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            dir="$additional_libdir"
+                                    if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
+              fi
+            fi
+                        if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              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 "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    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" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; 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 "$acl_hardcode_direct" = yes; then
+                                                      LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_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 "$acl_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/"'*$,,'`
+                if test "$name" = 'intl'; then
+                  LIBINTL_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = 'intl'; then
+                  LIBINTL_PREFIX="$basedir"
+                fi
+                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" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; 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 "$acl_hardcode_libdir_separator"; then
+                        alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+            acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_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=\"$acl_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
+
+
+
+
+
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+$as_echo_n "checking for GNU gettext in libintl... " >&6; }
+if eval \${$gt_func_gnugettext_libintl+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  gt_save_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $INCINTL"
+            gt_save_LIBS="$LIBS"
+            LIBS="$LIBS $LIBINTL"
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$gt_func_gnugettext_libintl=yes"
+else
+  eval "$gt_func_gnugettext_libintl=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* 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
+if ac_fn_c_try_link "$LINENO"; then :
+  LIBINTL="$LIBINTL $LIBICONV"
+                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                eval "$gt_func_gnugettext_libintl=yes"
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+            fi
+            CPPFLAGS="$gt_save_CPPFLAGS"
+            LIBS="$gt_save_LIBS"
+fi
+eval ac_res=\$$gt_func_gnugettext_libintl
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$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
+
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+
+    else
+      USE_NLS=no
+    fi
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
+$as_echo_n "checking whether to use NLS... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
+  if test "$USE_NLS" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
+$as_echo_n "checking where the gettext function comes from... " >&6; }
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        gt_source="external libintl"
+      else
+        gt_source="libc"
+      fi
+    else
+      gt_source="included intl directory"
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
+$as_echo "$gt_source" >&6; }
+  fi
+
+  if test "$USE_NLS" = "yes"; then
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+$as_echo_n "checking how to link with libintl... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+$as_echo "$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
+
+
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+
+
+$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+
+    fi
+
+        POSUB=po
+  fi
+
+
+
+    INTLLIBS="$LIBINTL"
+
+
+
+
+
+
+
+
+# Extract the first word of "sane-config", so it can be a program name with args.
+set dummy sane-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_SANE_CONFIG_PATH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $SANE_CONFIG_PATH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_SANE_CONFIG_PATH="$SANE_CONFIG_PATH" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_SANE_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_SANE_CONFIG_PATH" && ac_cv_path_SANE_CONFIG_PATH="no"
+  ;;
+esac
+fi
+SANE_CONFIG_PATH=$ac_cv_path_SANE_CONFIG_PATH
+if test -n "$SANE_CONFIG_PATH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SANE_CONFIG_PATH" >&5
+$as_echo "$SANE_CONFIG_PATH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+ if test x$cross_compiling = xyes; then
+  CROSS_COMPILING_TRUE=
+  CROSS_COMPILING_FALSE='#'
+else
+  CROSS_COMPILING_TRUE='#'
+  CROSS_COMPILING_FALSE=
+fi
+
+
+
+if test "${ac_cv_c_compiler_gnu}" = "yes"; then
+  DEFAULT_CFLAGS="\
+      -Wall"
+  EXTRA_WARNINGS="\
+      -Wextra \
+      -pedantic"
+
+  for flag in $DEFAULT_CFLAGS; do
+    case "$AM_CFLAGS" in
+"$flag" | "$flag "* | *" $flag" | *" $flag "* )
+  :
+  ;;
+*)
+   AM_CFLAGS="$AM_CFLAGS $flag"
+  ;;
+esac
+
+  done
+
+  # Check whether --enable-warnings was given.
+if test "${enable_warnings+set}" = set; then :
+  enableval=$enable_warnings;
+      if eval "test x$enable_warnings = xyes"; then
+        for flag in $EXTRA_WARNINGS; do
+          case "$AM_CFLAGS" in
+"$flag" | "$flag "* | *" $flag" | *" $flag "* )
+  :
+  ;;
+*)
+   AM_CFLAGS="$AM_CFLAGS $flag"
+  ;;
+esac
+
+        done
+      fi
+
+else
+  if test x$is_release = xno; then
+       # Warnings enabled by default (development)
+       for flag in $EXTRA_WARNINGS; do
+         case "$AM_CFLAGS" in
+"$flag" | "$flag "* | *" $flag" | *" $flag "* )
+  :
+  ;;
+*)
+   AM_CFLAGS="$AM_CFLAGS $flag"
+  ;;
+esac
+
+       done
+    fi
+fi
+
+fi # ac_cv_c_compiler_gnu
+
+
+  # Define stricter linking policy on GNU systems.  This is not
+  # added to global LDFLAGS because we may want to create convenience
+  # libraries that don't require such strick linking.
+  if test "$GCC" = yes; then
+    case ${host_os} in
+    linux* | solaris*)
+      STRICT_LDFLAGS="-Wl,-z,defs"
+      ;;
+    esac
+  fi
+
+  case "${host_os}" in
+    aix*) #enable .so libraries, disable archives
+      AM_LDFLAGS="$AM_LDFLAGS -Wl,-brtl"
+      ;;
+    darwin*) #include frameworks
+      LIBS="$LIBS -framework CoreFoundation -framework IOKit"
+      ;;
+  esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
+$as_echo_n "checking for library containing strerror... " >&6; }
+if ${ac_cv_search_strerror+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char strerror ();
+int
+main ()
+{
+return strerror ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' cposix; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_strerror=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_strerror+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_strerror+:} false; then :
+
+else
+  ac_cv_search_strerror=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
+$as_echo "$ac_cv_search_strerror" >&6; }
+ac_res=$ac_cv_search_strerror
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+
+
+ac_byteorder_h=`echo include/byteorder.h`
+ac_dir=`echo $ac_byteorder_h|sed 's%/[^/][^/]*$%%'`
+if test "$ac_dir" != "$ac_byteorder" && test "$ac_dir" != .; then
+  # The file is in a subdirectory.
+  test ! -d "$ac_dir" && mkdir "$ac_dir"
+fi
+
+# We're only interested in the target CPU, but it's not always set
+effective_target="$target"
+if test "x$effective_target" = xNONE -o "x$effective_target" = x ; then
+	effective_target="$host"
+fi
+
+
+ac_byteorder=_byteorder.tmp
+cat > "$ac_byteorder" << EOF
+/* This file is generated automatically by configure */
+/* It is valid only for the system type ${effective_target} */
+
+#ifndef __BYTEORDER_H
+#define __BYTEORDER_H
+
+EOF
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are at least two -arch flags with different values.
+	ac_arch=
+	ac_prev=
+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+	 if test -n "$ac_prev"; then
+	   case $ac_word in
+	     i?86 | x86_64 | ppc | ppc64)
+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 ac_arch=$ac_word
+	       else
+		 ac_cv_c_bigendian=universal
+		 break
+	       fi
+	       ;;
+	   esac
+	   ac_prev=
+	 elif test "x$ac_word" = "x-arch"; then
+	   ac_prev=arch
+	 fi
+       done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+	     #include <sys/param.h>
+
+int
+main ()
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+		#include <sys/param.h>
+
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then :
+  # Try to guess by grepping values from an object file.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_c_bigendian=no
+else
+  ac_cv_c_bigendian=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+   no)
+      ;; #(
+   universal)
+
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+     ;; #(
+   *)
+     as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for le32toh in machine/endian.h" >&5
+$as_echo_n "checking for le32toh in machine/endian.h... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <machine/endian.h>
+#ifdef le32toh
+ 	symbol is present
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "symbol is present|\<le32toh\>" >/dev/null 2>&1; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+HAVE_LE32TOH=1
+ cat >> "$ac_byteorder" << EOF
+/* extended byte swapping macros are already available */
+#include <machine/endian.h>
+
+EOF
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ntohl in arpa/inet.h" >&5
+$as_echo_n "checking for ntohl in arpa/inet.h... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <arpa/inet.h>
+#ifdef ntohl
+ 	symbol is present
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "symbol is present|\<ntohl\>" >/dev/null 2>&1; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+cat >> "$ac_byteorder" << EOF
+/* ntohl and relatives live here */
+#include <arpa/inet.h>
+
+EOF
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ntohl in netinet/in.h" >&5
+$as_echo_n "checking for ntohl in netinet/in.h... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <netinet/in.h>
+#ifdef ntohl
+ 	symbol is present
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "symbol is present|\<ntohl\>" >/dev/null 2>&1; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+cat >> "$ac_byteorder" << EOF
+/* ntohl and relatives live here */
+#include <netinet/in.h>
+
+EOF
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+true
+
+fi
+rm -f conftest*
+
+
+fi
+rm -f conftest*
+
+
+
+fi
+rm -f conftest*
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for swap32 in machine/endian.h" >&5
+$as_echo_n "checking for swap32 in machine/endian.h... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <machine/endian.h>
+#ifdef swap32
+ 	symbol is present
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "symbol is present|\<swap32\>" >/dev/null 2>&1; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+cat >> "$ac_byteorder" << EOF
+/* swap32 and swap16 are defined in machine/endian.h */
+
+EOF
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap_32 in byteswap.h" >&5
+$as_echo_n "checking for bswap_32 in byteswap.h... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <byteswap.h>
+#ifdef bswap_32
+ 	symbol is present
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "symbol is present|\<bswap_32\>" >/dev/null 2>&1; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+cat >> "$ac_byteorder" << EOF
+/* Define generic byte swapping functions */
+#include <byteswap.h>
+#define swap16(x) bswap_16(x)
+#define swap32(x) bswap_32(x)
+#define swap64(x) bswap_64(x)
+
+EOF
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap32 in machine/endian.h" >&5
+$as_echo_n "checking for bswap32 in machine/endian.h... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <machine/endian.h>
+#ifdef bswap32
+ 	symbol is present
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "symbol is present|\<bswap32\>" >/dev/null 2>&1; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  	 cat >> "$ac_byteorder" << EOF
+/* Define generic byte swapping functions */
+EOF
+	if test "$HAVE_LE32TOH" != "1"; then
+		echo '#include <machine/endian.h>'>> "$ac_byteorder"
+	fi
+cat >> "$ac_byteorder" << EOF
+#define swap16(x) bswap16(x)
+#define swap32(x) bswap32(x)
+#define swap64(x) bswap64(x)
+
+EOF
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __byte_swap_long in sys/types.h" >&5
+$as_echo_n "checking for __byte_swap_long in sys/types.h... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#ifdef __byte_swap_long
+ 	symbol is present
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "symbol is present|\<__byte_swap_long\>" >/dev/null 2>&1; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+cat >> "$ac_byteorder" << EOF
+/* Define generic byte swapping functions */
+#include <sys/types.h>
+#define swap16(x) __byte_swap_word(x)
+#define swap32(x) __byte_swap_long(x)
+/* No optimized 64 bit byte swapping macro is available */
+#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\
+			      ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\
+			      ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\
+			      ((uint64_t)(x) << 8)  & 0x000000ff00000000ULL | \\
+			      ((x) >> 8)  & 0x00000000ff000000ULL | \\
+			      ((x) >> 24) & 0x0000000000ff0000ULL | \\
+			      ((x) >> 40) & 0x000000000000ff00ULL | \\
+			      ((x) >> 56) & 0x00000000000000ffULL))
+
+EOF
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NXSwapLong in machine/byte_order.h" >&5
+$as_echo_n "checking for NXSwapLong in machine/byte_order.h... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <machine/byte_order.h>
+#ifdef NXSwapLong
+ 	symbol is present
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "symbol is present|\<NXSwapLong\>" >/dev/null 2>&1; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+cat >> "$ac_byteorder" << EOF
+/* Define generic byte swapping functions */
+#include <machine/byte_order.h>
+#define swap16(x) NXSwapShort(x)
+#define swap32(x) NXSwapLong(x)
+#define swap64(x) NXSwapLongLong(x)
+
+EOF
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+	if test $ac_cv_c_bigendian = yes; then
+		cat >> "$ac_byteorder" << EOF
+/* No other byte swapping functions are available on this big-endian system */
+#define swap16(x)	((uint16_t)(((x) << 8) | ((uint16_t)(x) >> 8)))
+#define swap32(x)	((uint32_t)(((uint32_t)(x) << 24) & 0xff000000UL | \\
+				    ((uint32_t)(x) << 8)  & 0x00ff0000UL | \\
+				    ((x) >> 8)  & 0x0000ff00UL | \\
+				    ((x) >> 24) & 0x000000ffUL))
+#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\
+			      ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\
+			      ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\
+			      ((uint64_t)(x) << 8)  & 0x000000ff00000000ULL | \\
+			      ((x) >> 8)  & 0x00000000ff000000ULL | \\
+			      ((x) >> 24) & 0x0000000000ff0000ULL | \\
+			      ((x) >> 40) & 0x000000000000ff00ULL | \\
+			      ((x) >> 56) & 0x00000000000000ffULL))
+
+EOF
+	else
+ cat >> "$ac_byteorder" << EOF
+/* Use these as generic byteswapping macros on this little endian system */
+#define swap16(x)		ntohs(x)
+#define swap32(x)		ntohl(x)
+/* No optimized 64 bit byte swapping macro is available */
+#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\
+			      ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\
+			      ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\
+			      ((uint64_t)(x) << 8)  & 0x000000ff00000000ULL | \\
+			      ((x) >> 8)  & 0x00000000ff000000ULL | \\
+			      ((x) >> 24) & 0x0000000000ff0000ULL | \\
+			      ((x) >> 40) & 0x000000000000ff00ULL | \\
+			      ((x) >> 56) & 0x00000000000000ffULL))
+
+EOF
+	fi
+
+
+fi
+rm -f conftest*
+
+
+
+fi
+rm -f conftest*
+
+
+
+fi
+rm -f conftest*
+
+
+
+fi
+rm -f conftest*
+
+
+
+fi
+rm -f conftest*
+
+
+
+
+if test "$HAVE_LE32TOH" != "1"; then
+ cat >> "$ac_byteorder" << EOF
+/* The byte swapping macros have the form: */
+/*   EENN[a]toh or htoEENN[a] where EE is be (big endian) or */
+/* le (little-endian), NN is 16 or 32 (number of bits) and a, */
+/* if present, indicates that the endian side is a pointer to an */
+/* array of uint8_t bytes instead of an integer of the specified length. */
+/* h refers to the host's ordering method. */
+
+/* So, to convert a 32-bit integer stored in a buffer in little-endian */
+/* format into a uint32_t usable on this machine, you could use: */
+/*   uint32_t value = le32atoh(&buf[3]); */
+/* To put that value back into the buffer, you could use: */
+/*   htole32a(&buf[3], value); */
+
+/* Define aliases for the standard byte swapping macros */
+/* Arguments to these macros must be properly aligned on natural word */
+/* boundaries in order to work properly on all architectures */
+#ifndef htobe16
+#define htobe16(x) htons(x)
+#endif
+#ifndef htobe32
+#define htobe32(x) htonl(x)
+#endif
+#ifndef be16toh
+#define be16toh(x) ntohs(x)
+#endif
+#ifndef be32toh
+#define be32toh(x) ntohl(x)
+#endif
+
+#define HTOBE16(x) (x) = htobe16(x)
+#define HTOBE32(x) (x) = htobe32(x)
+#define BE32TOH(x) (x) = be32toh(x)
+#define BE16TOH(x) (x) = be16toh(x)
+
+EOF
+
+ if test $ac_cv_c_bigendian = yes; then
+  cat >> "$ac_byteorder" << EOF
+/* Define our own extended byte swapping macros for big-endian machines */
+#ifndef htole16
+#define htole16(x)      swap16(x)
+#endif
+#ifndef htole32
+#define htole32(x)      swap32(x)
+#endif
+#ifndef le16toh
+#define le16toh(x)      swap16(x)
+#endif
+#ifndef le32toh
+#define le32toh(x)      swap32(x)
+#endif
+
+#ifndef htobe64
+#define htobe64(x)      (x)
+#endif
+#ifndef be64toh
+#define be64toh(x)      (x)
+#endif
+
+#define HTOLE16(x)      (x) = htole16(x)
+#define HTOLE32(x)      (x) = htole32(x)
+#define LE16TOH(x)      (x) = le16toh(x)
+#define LE32TOH(x)      (x) = le32toh(x)
+
+#define HTOBE64(x)      (void) (x)
+#define BE64TOH(x)      (void) (x)
+
+EOF
+ else
+  cat >> "$ac_byteorder" << EOF
+/* On little endian machines, these macros are null */
+#ifndef htole16
+#define htole16(x)      (x)
+#endif
+#ifndef htole32
+#define htole32(x)      (x)
+#endif
+#ifndef htole64
+#define htole64(x)      (x)
+#endif
+#ifndef le16toh
+#define le16toh(x)      (x)
+#endif
+#ifndef le32toh
+#define le32toh(x)      (x)
+#endif
+#ifndef le64toh
+#define le64toh(x)      (x)
+#endif
+
+#define HTOLE16(x)      (void) (x)
+#define HTOLE32(x)      (void) (x)
+#define HTOLE64(x)      (void) (x)
+#define LE16TOH(x)      (void) (x)
+#define LE32TOH(x)      (void) (x)
+#define LE64TOH(x)      (void) (x)
+
+/* These don't have standard aliases */
+#ifndef htobe64
+#define htobe64(x)      swap64(x)
+#endif
+#ifndef be64toh
+#define be64toh(x)      swap64(x)
+#endif
+
+#define HTOBE64(x)      (x) = htobe64(x)
+#define BE64TOH(x)      (x) = be64toh(x)
+
+EOF
+ fi
+fi
+
+cat >> "$ac_byteorder" << EOF
+/* Define the C99 standard length-specific integer types */
+#include <_stdint.h>
+
+EOF
+
+case "${effective_target}" in
+ i[3456]86-*)
+  cat >> "$ac_byteorder" << EOF
+/* Here are some macros to create integers from a byte array */
+/* These are used to get and put integers from/into a uint8_t array */
+/* with a specific endianness.  This is the most portable way to generate */
+/* and read messages to a network or serial device.  Each member of a */
+/* packet structure must be handled separately. */
+
+/* The i386 and compatibles can handle unaligned memory access, */
+/* so use the optimized macros above to do this job */
+#define be16atoh(x)     be16toh(*(uint16_t*)(x))
+#define be32atoh(x)     be32toh(*(uint32_t*)(x))
+#define be64atoh(x)     be64toh(*(uint64_t*)(x))
+#define le16atoh(x)     le16toh(*(uint16_t*)(x))
+#define le32atoh(x)     le32toh(*(uint32_t*)(x))
+#define le64atoh(x)     le64toh(*(uint64_t*)(x))
+
+#define htobe16a(a,x)   *(uint16_t*)(a) = htobe16(x)
+#define htobe32a(a,x)   *(uint32_t*)(a) = htobe32(x)
+#define htobe64a(a,x)   *(uint64_t*)(a) = htobe64(x)
+#define htole16a(a,x)   *(uint16_t*)(a) = htole16(x)
+#define htole32a(a,x)   *(uint32_t*)(a) = htole32(x)
+#define htole64a(a,x)   *(uint64_t*)(a) = htole64(x)
+
+EOF
+  ;;
+
+ *)
+  cat >> "$ac_byteorder" << EOF
+/* Here are some macros to create integers from a byte array */
+/* These are used to get and put integers from/into a uint8_t array */
+/* with a specific endianness.  This is the most portable way to generate */
+/* and read messages to a network or serial device.  Each member of a */
+/* packet structure must be handled separately. */
+
+/* Non-optimized but portable macros */
+#define be16atoh(x)     ((uint16_t)(((x)[0]<<8)|(x)[1]))
+#define be32atoh(x)     ((uint32_t)(((x)[0]<<24)|((x)[1]<<16)|((x)[2]<<8)|(x)[3]))
+#define be64atoh(x)     ((uint64_t)(((x)[0]<<56)|((x)[1]<<48)|((x)[2]<<40)| \\
+        ((x)[3]<<32)|((x)[4]<<24)|((x)[5]<<16)|((x)[6]<<8)|(x)[7]))
+#define le16atoh(x)     ((uint16_t)(((x)[1]<<8)|(x)[0]))
+#define le32atoh(x)     ((uint32_t)(((x)[3]<<24)|((x)[2]<<16)|((x)[1]<<8)|(x)[0]))
+#define le64atoh(x)     ((uint64_t)(((x)[7]<<56)|((x)[6]<<48)|((x)[5]<<40)| \\
+        ((x)[4]<<32)|((x)[3]<<24)|((x)[2]<<16)|((x)[1]<<8)|(x)[0]))
+
+#define htobe16a(a,x)   (a)[0]=(uint8_t)((x)>>8), (a)[1]=(uint8_t)(x)
+#define htobe32a(a,x)   (a)[0]=(uint8_t)((x)>>24), (a)[1]=(uint8_t)((x)>>16), \\
+        (a)[2]=(uint8_t)((x)>>8), (a)[3]=(uint8_t)(x)
+#define htobe64a(a,x)   (a)[0]=(uint8_t)((x)>>56), (a)[1]=(uint8_t)((x)>>48), \\
+        (a)[2]=(uint8_t)((x)>>40), (a)[3]=(uint8_t)((x)>>32), \\
+        (a)[4]=(uint8_t)((x)>>24), (a)[5]=(uint8_t)((x)>>16), \\
+        (a)[6]=(uint8_t)((x)>>8), (a)[7]=(uint8_t)(x)
+#define htole16a(a,x)   (a)[1]=(uint8_t)((x)>>8), (a)[0]=(uint8_t)(x)
+#define htole32a(a,x)   (a)[3]=(uint8_t)((x)>>24), (a)[2]=(uint8_t)((x)>>16), \\
+        (a)[1]=(uint8_t)((x)>>8), (a)[0]=(uint8_t)(x)
+#define htole64a(a,x)   (a)[7]=(uint8_t)((x)>>56), (a)[6]=(uint8_t)((x)>>48), \\
+        (a)[5]=(uint8_t)((x)>>40), (a)[4]=(uint8_t)((x)>>32), \\
+        (a)[3]=(uint8_t)((x)>>24), (a)[2]=(uint8_t)((x)>>16), \\
+        (a)[1]=(uint8_t)((x)>>8), (a)[0]=(uint8_t)(x)
+
+EOF
+  ;;
+esac
+
+
+cat >> "$ac_byteorder" << EOF
+#endif /*__BYTEORDER_H*/
+EOF
+
+if cmp -s $ac_byteorder_h $ac_byteorder 2>/dev/null; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_byteorder_h is unchanged" >&5
+$as_echo "$as_me: $ac_byteorder_h is unchanged" >&6;}
+  rm $ac_byteorder
+else
+  rm -f $ac_byteorder_h
+  mv $ac_byteorder $ac_byteorder_h
+fi
+
+# ------ AX CREATE STDINT H -------------------------------------
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint types" >&5
+$as_echo_n "checking for stdint types... " >&6; }
+ac_stdint_h=`echo include/_stdint.h`
+# try to shortcircuit - if the default include path of the compiler
+# can find a "stdint.h" header then we assume that all compilers can.
+if ${ac_cv_header_stdint_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS=""
+old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS=""
+old_CFLAGS="$CFLAGS"     ; CFLAGS=""
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdint.h>
+int
+main ()
+{
+int_least32_t v = 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_stdint_result="(assuming C99 compatible system)"
+ ac_cv_header_stdint_t="stdint.h";
+else
+  ac_cv_header_stdint_t=""
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+if test "$GCC" = "yes" && test ".$ac_cv_header_stdint_t" = "."; then
+CFLAGS="-std=c99"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdint.h>
+int
+main ()
+{
+int_least32_t v = 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: your GCC compiler has a defunct stdint.h for its default-mode" >&5
+$as_echo "$as_me: WARNING: your GCC compiler has a defunct stdint.h for its default-mode" >&2;}
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+CXXFLAGS="$old_CXXFLAGS"
+CPPFLAGS="$old_CPPFLAGS"
+CFLAGS="$old_CFLAGS"
+fi
+
+
+v="... $ac_cv_header_stdint_h"
+if test "$ac_stdint_h" = "stdint.h" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (are you sure you want them in ./stdint.h?)" >&5
+$as_echo "(are you sure you want them in ./stdint.h?)" >&6; }
+elif test "$ac_stdint_h" = "inttypes.h" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (are you sure you want them in ./inttypes.h?)" >&5
+$as_echo "(are you sure you want them in ./inttypes.h?)" >&6; }
+elif test "_$ac_cv_header_stdint_t" = "_" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: (putting them into $ac_stdint_h)$v" >&5
+$as_echo "(putting them into $ac_stdint_h)$v" >&6; }
+else
+ ac_cv_header_stdint="$ac_cv_header_stdint_t"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint (shortcircuit)" >&5
+$as_echo "$ac_cv_header_stdint (shortcircuit)" >&6; }
+fi
+
+if test "_$ac_cv_header_stdint_t" = "_" ; then # can not shortcircuit..
+
+
+inttype_headers=`echo  | sed -e 's/,/ /g'`
+
+ac_cv_stdint_result="(no helpful system typedefs seen)"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uintptr_t" >&5
+$as_echo_n "checking for stdint uintptr_t... " >&6; }
+if ${ac_cv_header_stdint_x+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+ ac_cv_header_stdint_x="" # the 1997 typedefs (inttypes.h)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5
+$as_echo "(..)" >&6; }
+  for i in    stdint.h inttypes.h sys/inttypes.h $inttype_headers
+  do
+   unset ac_cv_type_uintptr_t
+   unset ac_cv_type_uint64_t
+   ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "#include <$i>
+"
+if test "x$ac_cv_type_uintptr_t" = xyes; then :
+  ac_cv_header_stdint_x=$i
+else
+  continue
+fi
+
+   ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include<$i>
+"
+if test "x$ac_cv_type_uint64_t" = xyes; then :
+  and64="/uint64_t"
+else
+  and64=""
+fi
+
+      stdint.h inttypes.h sys/inttypes.h $inttype_headers
+ break
+  done
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uintptr_t" >&5
+$as_echo_n "checking for stdint uintptr_t... " >&6; }
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint_x" >&5
+$as_echo "$ac_cv_header_stdint_x" >&6; }
+
+
+if test "_$ac_cv_header_stdint_x" = "_" ; then
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uint32_t" >&5
+$as_echo_n "checking for stdint uint32_t... " >&6; }
+if ${ac_cv_header_stdint_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+ ac_cv_header_stdint_o="" # the 1995 typedefs (sys/inttypes.h)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5
+$as_echo "(..)" >&6; }
+  for i in    inttypes.h sys/inttypes.h stdint.h $inttype_headers
+  do
+   unset ac_cv_type_uint32_t
+   unset ac_cv_type_uint64_t
+   ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "#include <$i>
+"
+if test "x$ac_cv_type_uint32_t" = xyes; then :
+  ac_cv_header_stdint_o=$i
+else
+  continue
+fi
+
+   ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "#include<$i>
+"
+if test "x$ac_cv_type_uint64_t" = xyes; then :
+  and64="/uint64_t"
+else
+  and64=""
+fi
+
+      inttypes.h sys/inttypes.h stdint.h $inttype_headers
+ break
+   break;
+  done
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint uint32_t" >&5
+$as_echo_n "checking for stdint uint32_t... " >&6; }
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint_o" >&5
+$as_echo "$ac_cv_header_stdint_o" >&6; }
+
+fi
+
+if test "_$ac_cv_header_stdint_x" = "_" ; then
+if test "_$ac_cv_header_stdint_o" = "_" ; then
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint u_int32_t" >&5
+$as_echo_n "checking for stdint u_int32_t... " >&6; }
+if ${ac_cv_header_stdint_u+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+ ac_cv_header_stdint_u="" # the BSD typedefs (sys/types.h)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5
+$as_echo "(..)" >&6; }
+  for i in    sys/types.h inttypes.h sys/inttypes.h $inttype_headers ; do
+   unset ac_cv_type_u_int32_t
+   unset ac_cv_type_u_int64_t
+   ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "#include <$i>
+"
+if test "x$ac_cv_type_u_int32_t" = xyes; then :
+  ac_cv_header_stdint_u=$i
+else
+  continue
+fi
+
+   ac_fn_c_check_type "$LINENO" "u_int64_t" "ac_cv_type_u_int64_t" "#include<$i>
+"
+if test "x$ac_cv_type_u_int64_t" = xyes; then :
+  and64="/u_int64_t"
+else
+  and64=""
+fi
+
+      sys/types.h inttypes.h sys/inttypes.h $inttype_headers
+ break
+   break;
+  done
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint u_int32_t" >&5
+$as_echo_n "checking for stdint u_int32_t... " >&6; }
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdint_u" >&5
+$as_echo "$ac_cv_header_stdint_u" >&6; }
+
+fi fi
+
+if test "_$ac_cv_header_stdint_x" = "_" ; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint datatype model" >&5
+$as_echo_n "checking for stdint datatype model... " >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: (..)" >&5
+$as_echo "(..)" >&6; }
+
+   # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5
+$as_echo_n "checking size of char... " >&6; }
+if ${ac_cv_sizeof_char+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_char" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (char)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_char=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char" >&5
+$as_echo "$ac_cv_sizeof_char" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_CHAR $ac_cv_sizeof_char
+_ACEOF
+
+
+   # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
+$as_echo_n "checking size of short... " >&6; }
+if ${ac_cv_sizeof_short+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_short" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (short)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_short=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
+$as_echo "$ac_cv_sizeof_short" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+_ACEOF
+
+
+   # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
+if ${ac_cv_sizeof_int+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (int)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_int=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+_ACEOF
+
+
+   # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (long)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_long=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
+
+
+   # The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void*" >&5
+$as_echo_n "checking size of void*... " >&6; }
+if ${ac_cv_sizeof_voidp+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void*))" "ac_cv_sizeof_voidp"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_voidp" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (void*)
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_sizeof_voidp=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_voidp" >&5
+$as_echo "$ac_cv_sizeof_voidp" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_VOIDP $ac_cv_sizeof_voidp
+_ACEOF
+
+
+   ac_cv_char_data_model=""
+   ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_char"
+   ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_short"
+   ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_int"
+   ac_cv_long_data_model=""
+   ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_int"
+   ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_long"
+   ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_voidp"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking data model" >&5
+$as_echo_n "checking data model... " >&6; }
+   case "$ac_cv_char_data_model/$ac_cv_long_data_model" in
+    122/242)     ac_cv_data_model="IP16"  ; n="standard 16bit machine" ;;
+    122/244)     ac_cv_data_model="LP32"  ; n="standard 32bit machine" ;;
+    122/*)       ac_cv_data_model="i16"   ; n="unusual int16 model" ;;
+    124/444)     ac_cv_data_model="ILP32" ; n="standard 32bit unixish" ;;
+    124/488)     ac_cv_data_model="LP64"  ; n="standard 64bit unixish" ;;
+    124/448)     ac_cv_data_model="LLP64" ; n="unusual 64bit unixish" ;;
+    124/*)       ac_cv_data_model="i32"   ; n="unusual int32 model" ;;
+    128/888)     ac_cv_data_model="ILP64" ; n="unusual 64bit numeric" ;;
+    128/*)       ac_cv_data_model="i64"   ; n="unusual int64 model" ;;
+    222/*2)      ac_cv_data_model="DSP16" ; n="strict 16bit dsptype" ;;
+    333/*3)      ac_cv_data_model="DSP24" ; n="strict 24bit dsptype" ;;
+    444/*4)      ac_cv_data_model="DSP32" ; n="strict 32bit dsptype" ;;
+    666/*6)      ac_cv_data_model="DSP48" ; n="strict 48bit dsptype" ;;
+    888/*8)      ac_cv_data_model="DSP64" ; n="strict 64bit dsptype" ;;
+    222/*|333/*|444/*|666/*|888/*) :
+                 ac_cv_data_model="iDSP"  ; n="unusual dsptype" ;;
+     *)          ac_cv_data_model="none"  ; n="very unusual model" ;;
+   esac
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_data_model ($ac_cv_long_data_model, $n)" >&5
+$as_echo "$ac_cv_data_model ($ac_cv_long_data_model, $n)" >&6; }
+
+fi
+
+if test "_$ac_cv_header_stdint_x" != "_" ; then
+   ac_cv_header_stdint="$ac_cv_header_stdint_x"
+elif  test "_$ac_cv_header_stdint_o" != "_" ; then
+   ac_cv_header_stdint="$ac_cv_header_stdint_o"
+elif  test "_$ac_cv_header_stdint_u" != "_" ; then
+   ac_cv_header_stdint="$ac_cv_header_stdint_u"
+else
+   ac_cv_header_stdint="stddef.h"
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra inttypes in chosen header" >&5
+$as_echo_n "checking for extra inttypes in chosen header... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ($ac_cv_header_stdint)" >&5
+$as_echo "($ac_cv_header_stdint)" >&6; }
+unset ac_cv_type_int_least32_t
+unset ac_cv_type_int_fast32_t
+ac_fn_c_check_type "$LINENO" "int_least32_t" "ac_cv_type_int_least32_t" "#include <$ac_cv_header_stdint>
+"
+if test "x$ac_cv_type_int_least32_t" = xyes; then :
+
+fi
+
+ac_fn_c_check_type "$LINENO" "int_fast32_t" "ac_cv_type_int_fast32_t" "#include<$ac_cv_header_stdint>
+"
+if test "x$ac_cv_type_int_fast32_t" = xyes; then :
+
+fi
+
+ac_fn_c_check_type "$LINENO" "intmax_t" "ac_cv_type_intmax_t" "#include <$ac_cv_header_stdint>
+"
+if test "x$ac_cv_type_intmax_t" = xyes; then :
+
+fi
+
+
+fi # shortcircut to system "stdint.h"
+# ------------------ PREPARE VARIABLES ------------------------------
+if test "$GCC" = "yes" ; then
+ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1`
+else
+ac_cv_stdint_message="using $CC"
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&5
+$as_echo "make use of $ac_cv_header_stdint in $ac_stdint_h $ac_cv_stdint_result" >&6; }
+
+# ----------------- DONE inttypes.h checks START header -------------
+ac_config_commands="$ac_config_commands $ac_stdint_h"
+
+
+
+# Check whether --enable-dynamic was given.
+if test "${enable_dynamic+set}" = set; then :
+  enableval=$enable_dynamic; enable_dynamic=$enableval
+else
+  enable_dynamic=auto
+fi
+
+
+    DL_LIBS=""
+  if test "${enable_dynamic}" = "auto"; then
+      # default to disabled unless library found.
+      enable_dynamic=no
+      # dlopen
+      for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  DL_LIBS=-ldl
+fi
+
+       saved_LIBS="${LIBS}"
+       LIBS="${LIBS} ${DL_LIBS}"
+       for ac_func in dlopen
+do :
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLOPEN 1
+_ACEOF
+ enable_dynamic=yes
+fi
+done
+
+       LIBS="${saved_LIBS}"
+
+fi
+
+done
+
+      # HP/UX DLL handling
+      for ac_header in dl.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
+if test "x$ac_cv_header_dl_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DL_H 1
+_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_shl_load=yes
+else
+  ac_cv_lib_dld_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+  DL_LIBS=-ldld
+fi
+
+       saved_LIBS="${LIBS}"
+       LIBS="${LIBS} ${DL_LIBS}"
+       for ac_func in shl_load
+do :
+  ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SHL_LOAD 1
+_ACEOF
+ enable_dynamic=yes
+fi
+done
+
+       LIBS="${saved_LIBS}"
+
+fi
+
+done
+
+      if test -z "$DL_LIBS" ; then
+      # old Mac OS X/Darwin (without dlopen)
+      for ac_header in mach-o/dyld.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "mach-o/dyld.h" "ac_cv_header_mach_o_dyld_h" "$ac_includes_default"
+if test "x$ac_cv_header_mach_o_dyld_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_MACH_O_DYLD_H 1
+_ACEOF
+ for ac_func in NSLinkModule
+do :
+  ac_fn_c_check_func "$LINENO" "NSLinkModule" "ac_cv_func_NSLinkModule"
+if test "x$ac_cv_func_NSLinkModule" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_NSLINKMODULE 1
+_ACEOF
+ enable_dynamic=yes
+fi
+done
+
+
+fi
+
+done
+
+      fi
+  fi
+
+
+  DYNAMIC_FLAG=
+  if test "${enable_dynamic}" = yes ; then
+    DYNAMIC_FLAG=-module
+  fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5
+$as_echo_n "checking for sqrt in -lm... " >&6; }
+if ${ac_cv_lib_m_sqrt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sqrt ();
+int
+main ()
+{
+return sqrt ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_m_sqrt=yes
+else
+  ac_cv_lib_m_sqrt=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5
+$as_echo "$ac_cv_lib_m_sqrt" >&6; }
+if test "x$ac_cv_lib_m_sqrt" = xyes; then :
+  MATH_LIB="-lm"
+fi
+
+
+case ${host_os} in
+  os2*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sylog in -lsyslog" >&5
+$as_echo_n "checking for sylog in -lsyslog... " >&6; }
+if ${ac_cv_lib_syslog_sylog+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsyslog  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sylog ();
+int
+main ()
+{
+return sylog ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_syslog_sylog=yes
+else
+  ac_cv_lib_syslog_sylog=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_syslog_sylog" >&5
+$as_echo "$ac_cv_lib_syslog_sylog" >&6; }
+if test "x$ac_cv_lib_syslog_sylog" = xyes; then :
+  SYSLOG_LIBS="-lsyslog"
+fi
+
+  ;;
+  beos*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for syslog in -lbe" >&5
+$as_echo_n "checking for syslog in -lbe... " >&6; }
+if ${ac_cv_lib_be_syslog+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbe  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char syslog ();
+int
+main ()
+{
+return syslog ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_be_syslog=yes
+else
+  ac_cv_lib_be_syslog=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_be_syslog" >&5
+$as_echo "$ac_cv_lib_be_syslog" >&6; }
+if test "x$ac_cv_lib_be_syslog" = xyes; then :
+  SYSLOG_LIBS="-lbe"
+fi
+
+  ;;
+esac
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_start_decompress in -ljpeg" >&5
+$as_echo_n "checking for jpeg_start_decompress in -ljpeg... " >&6; }
+if ${ac_cv_lib_jpeg_jpeg_start_decompress+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljpeg  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jpeg_start_decompress ();
+int
+main ()
+{
+return jpeg_start_decompress ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_jpeg_jpeg_start_decompress=yes
+else
+  ac_cv_lib_jpeg_jpeg_start_decompress=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_start_decompress" >&5
+$as_echo "$ac_cv_lib_jpeg_jpeg_start_decompress" >&6; }
+if test "x$ac_cv_lib_jpeg_jpeg_start_decompress" = xyes; then :
+
+    ac_fn_c_check_header_mongrel "$LINENO" "jconfig.h" "ac_cv_header_jconfig_h" "$ac_includes_default"
+if test "x$ac_cv_header_jconfig_h" = xyes; then :
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeglib - version >= 61 (6a)" >&5
+$as_echo_n "checking for jpeglib - version >= 61 (6a)... " >&6; }
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+        #include <jpeglib.h>
+        #if JPEG_LIB_VERSION >= 61
+          sane_correct_jpeg_lib_version_found
+        #endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "sane_correct_jpeg_lib_version_found" >/dev/null 2>&1; then :
+  sane_cv_use_libjpeg="yes"; JPEG_LIBS="-ljpeg";
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f conftest*
+
+
+fi
+
+
+
+fi
+
+  if test "$sane_cv_use_libjpeg" = "yes" ; then
+
+$as_echo "#define HAVE_LIBJPEG 1" >>confdefs.h
+
+  fi
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFFdOpen in -ltiff" >&5
+$as_echo_n "checking for TIFFFdOpen in -ltiff... " >&6; }
+if ${ac_cv_lib_tiff_TIFFFdOpen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltiff  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char TIFFFdOpen ();
+int
+main ()
+{
+return TIFFFdOpen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_tiff_TIFFFdOpen=yes
+else
+  ac_cv_lib_tiff_TIFFFdOpen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFFdOpen" >&5
+$as_echo "$ac_cv_lib_tiff_TIFFFdOpen" >&6; }
+if test "x$ac_cv_lib_tiff_TIFFFdOpen" = xyes; then :
+
+    ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
+if test "x$ac_cv_header_tiffio_h" = xyes; then :
+  sane_cv_use_libtiff="yes"; TIFF_LIBS="-ltiff"
+fi
+
+
+
+fi
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_init_io in -lpng" >&5
+$as_echo_n "checking for png_init_io in -lpng... " >&6; }
+if ${ac_cv_lib_png_png_init_io+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpng  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char png_init_io ();
+int
+main ()
+{
+return png_init_io ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_png_png_init_io=yes
+else
+  ac_cv_lib_png_png_init_io=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_init_io" >&5
+$as_echo "$ac_cv_lib_png_png_init_io" >&6; }
+if test "x$ac_cv_lib_png_png_init_io" = xyes; then :
+
+    ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
+if test "x$ac_cv_header_png_h" = xyes; then :
+  sane_cv_use_libpng="yes"; PNG_LIBS="-lpng"
+fi
+
+
+
+fi
+
+  if test "$sane_cv_use_libpng" = "yes" ; then
+
+$as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
+
+  fi
+
+
+
+  ac_fn_c_check_header_mongrel "$LINENO" "ieee1284.h" "ac_cv_header_ieee1284_h" "$ac_includes_default"
+if test "x$ac_cv_header_ieee1284_h" = xyes; then :
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libieee1284 >= 0.1.5" >&5
+$as_echo_n "checking for libieee1284 >= 0.1.5... " >&6; }
+if ${sane_cv_use_libieee1284+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ieee1284.h>
+int
+main ()
+{
+
+	struct parport p; char *buf;
+	ieee1284_nibble_read(&p, 0, buf, 1);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  sane_cv_use_libieee1284="yes"; IEEE1284_LIBS="-lieee1284"
+
+else
+  sane_cv_use_libieee1284="no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sane_cv_use_libieee1284" >&5
+$as_echo "$sane_cv_use_libieee1284" >&6; }
+
+fi
+
+
+  if test "$sane_cv_use_libieee1284" = "yes" ; then
+
+$as_echo "#define HAVE_LIBIEEE1284 1" >>confdefs.h
+
+  fi
+
+
+
+
+  case "${host_os}" in
+  linux* | darwin* | mingw*) # enabled by default on Linux, MacOS X and MINGW
+    use_pthread=yes
+    ;;
+  *)
+    use_pthread=no
+  esac
+  have_pthread=no
+
+  #
+  # now that we have the systems preferences, we check
+  # the user
+
+  # Check whether --enable-pthread was given.
+if test "${enable_pthread+set}" = set; then :
+  enableval=$enable_pthread;
+      if test $enableval = yes ; then
+        use_pthread=yes
+      else
+        use_pthread=no
+      fi
+
+fi
+
+
+  if test $use_pthread = yes ; then
+  for ac_header in pthread.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+if test "x$ac_cv_header_pthread_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PTHREAD_H 1
+_ACEOF
+
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+if ${ac_cv_lib_pthread_pthread_create+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_create ();
+int
+main ()
+{
+return pthread_create ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_pthread_pthread_create=yes
+else
+  ac_cv_lib_pthread_pthread_create=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
+  PTHREAD_LIBS="-lpthread"
+fi
+
+       have_pthread=yes
+       save_LIBS="$LIBS"
+       LIBS="$LIBS $PTHREAD_LIBS"
+       for ac_func in pthread_create pthread_kill pthread_join pthread_detach pthread_cancel pthread_testcancel
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+else
+   have_pthread=no; use_pthread=no
+fi
+done
+
+       LIBS="$save_LIBS"
+
+else
+   have_pthread=no; use_pthread=no
+fi
+
+done
+
+  fi
+
+  if test $use_pthread = yes ; then
+
+cat >>confdefs.h <<_ACEOF
+#define USE_PTHREAD "$use_pthread"
+_ACEOF
+
+  else
+        PTHREAD_LIBS=""
+  fi
+  if test "$have_pthread" = "yes" ; then
+    AM_CPPFLAGS="${AM_CPPFLAGS} -D_REENTRANT"
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable pthread support" >&5
+$as_echo_n "checking whether to enable pthread support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_pthread" >&5
+$as_echo "$have_pthread" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use pthread instead of fork" >&5
+$as_echo_n "checking whether to use pthread instead of fork... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_pthread" >&5
+$as_echo "$use_pthread" >&6; }
+
+
+  LOCKPATH_GROUP=uucp
+  use_locking=yes
+  case "${host_os}" in
+    os2* )
+      use_locking=no
+      ;;
+  esac
+
+  #
+  # we check the user
+  # Check whether --enable-locking was given.
+if test "${enable_locking+set}" = set; then :
+  enableval=$enable_locking;
+      if test $enableval = yes ; then
+        use_locking=yes
+      else
+        use_locking=no
+      fi
+
+fi
+
+  if test $use_locking = yes ; then
+
+# Check whether --with-group was given.
+if test "${with_group+set}" = set; then :
+  withval=$with_group; LOCKPATH_GROUP="$withval"
+
+fi
+
+    # check if the group does exist
+    lasterror=""
+    touch sanetest.file
+    chgrp $LOCKPATH_GROUP sanetest.file 2>/dev/null || lasterror=$?
+    rm -f sanetest.file
+    if test ! -z "$lasterror"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Group $LOCKPATH_GROUP does not exist on this system." >&5
+$as_echo "$as_me: WARNING: Group $LOCKPATH_GROUP does not exist on this system." >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Locking feature will be disabled." >&5
+$as_echo "$as_me: WARNING: Locking feature will be disabled." >&2;}
+      use_locking=no
+    fi
+  fi
+  if test $use_locking = yes ; then
+    INSTALL_LOCKPATH=install-lockpath
+
+$as_echo "#define ENABLE_LOCKING 1" >>confdefs.h
+
+  else
+    INSTALL_LOCKPATH=
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable device locking" >&5
+$as_echo_n "checking whether to enable device locking... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_locking" >&5
+$as_echo "$use_locking" >&6; }
+  if test $use_locking = yes ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Setting lockdir group to $LOCKPATH_GROUP" >&5
+$as_echo "$as_me: Setting lockdir group to $LOCKPATH_GROUP" >&6;}
+  fi
+
+
+
+
+
+# Check whether --with-gphoto2 was given.
+if test "${with_gphoto2+set}" = set; then :
+  withval=$with_gphoto2; # If --with-gphoto2=no or --without-gphoto2, disable backend
+               # as "$with_gphoto2" will be set to "no"
+fi
+
+
+  # If --with-gphoto2=yes (or not supplied), first check if
+  # pkg-config exists, then use it to check if libgphoto2 is
+  # present.  If all that works, then see if we can actually link
+  # a program.   And, if that works, then add the -l flags to
+  # GPHOTO2_LIBS and any other flags to GPHOTO2_LDFLAGS to pass to
+  # sane-config.
+  if test "$with_gphoto2" != "no" ; then
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_HAVE_GPHOTO2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$HAVE_GPHOTO2"; then
+  ac_cv_prog_HAVE_GPHOTO2="$HAVE_GPHOTO2" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_HAVE_GPHOTO2="${ac_tool_prefix}pkg-config"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+HAVE_GPHOTO2=$ac_cv_prog_HAVE_GPHOTO2
+if test -n "$HAVE_GPHOTO2"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_GPHOTO2" >&5
+$as_echo "$HAVE_GPHOTO2" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_HAVE_GPHOTO2"; then
+  ac_ct_HAVE_GPHOTO2=$HAVE_GPHOTO2
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_HAVE_GPHOTO2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_HAVE_GPHOTO2"; then
+  ac_cv_prog_ac_ct_HAVE_GPHOTO2="$ac_ct_HAVE_GPHOTO2" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_HAVE_GPHOTO2="pkg-config"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_HAVE_GPHOTO2=$ac_cv_prog_ac_ct_HAVE_GPHOTO2
+if test -n "$ac_ct_HAVE_GPHOTO2"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_HAVE_GPHOTO2" >&5
+$as_echo "$ac_ct_HAVE_GPHOTO2" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_HAVE_GPHOTO2" = x; then
+    HAVE_GPHOTO2="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    HAVE_GPHOTO2=$ac_ct_HAVE_GPHOTO2
+  fi
+else
+  HAVE_GPHOTO2="$ac_cv_prog_HAVE_GPHOTO2"
+fi
+
+
+    if test ${HAVE_GPHOTO2} != "false" ; then
+      if pkg-config --exists libgphoto2 ; then
+        with_gphoto2="`pkg-config --modversion libgphoto2`"
+	GPHOTO2_CPPFLAGS="`pkg-config --cflags libgphoto2`"
+        GPHOTO2_LIBS="`pkg-config --libs libgphoto2`"
+
+        saved_CPPFLAGS="${CPPFLAGS}"
+        CPPFLAGS="${GPHOTO2_CPPFLAGS}"
+	saved_LIBS="${LIBS}"
+	LIBS="${LIBS} ${GPHOTO2_LIBS}"
+ 	# Make sure we an really use the library
+        for ac_func in gp_camera_init
+do :
+  ac_fn_c_check_func "$LINENO" "gp_camera_init" "ac_cv_func_gp_camera_init"
+if test "x$ac_cv_func_gp_camera_init" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GP_CAMERA_INIT 1
+_ACEOF
+ HAVE_GPHOTO2=true
+else
+  HAVE_GPHOTO2=false
+fi
+done
+
+	if test "${HAVE_GPHOTO2}" = "true"; then
+	  for ac_func in gp_port_info_get_path
+do :
+  ac_fn_c_check_func "$LINENO" "gp_port_info_get_path" "ac_cv_func_gp_port_info_get_path"
+if test "x$ac_cv_func_gp_port_info_get_path" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GP_PORT_INFO_GET_PATH 1
+_ACEOF
+
+fi
+done
+
+	fi
+	CPPFLAGS="${saved_CPPFLAGS}"
+        LIBS="${saved_LIBS}"
+      else
+        HAVE_GPHOTO2=false
+      fi
+      if test "${HAVE_GPHOTO2}" = "false"; then
+        GPHOTO2_CPPFLAGS=""
+        GPHOTO2_LIBS=""
+      else
+
+    tmp_LIBS=""
+    for param in ${GPHOTO2_LIBS}; do
+        case "${param}" in
+	-l*)
+         tmp_LIBS="${tmp_LIBS} ${param}"
+	 ;;
+	 *)
+         GPHOTO2_LDFLAGS="${GPHOTO2_LDFLAGS} ${param}"
+	 ;;
+	 esac
+     done
+     GPHOTO2_LIBS="${tmp_LIBS}"
+     unset tmp_LIBS
+     unset param
+
+        if pkg-config --atleast-version=2.5.0 libgphoto2; then
+
+$as_echo "#define GPLOGFUNC_NO_VARGS 1" >>confdefs.h
+
+        fi
+      fi
+    fi
+  fi
+
+
+
+
+
+
+
+# Check whether --with-v4l was given.
+if test "${with_v4l+set}" = set; then :
+  withval=$with_v4l; # If --with-v4l=no or --without-v4l, disable backend
+             # as "$with_v4l" will be set to "no"
+fi
+
+
+if test "$with_v4l" != "no" ; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBV4L" >&5
+$as_echo_n "checking for LIBV4L... " >&6; }
+
+if test -n "$LIBV4L_CFLAGS"; then
+    pkg_cv_LIBV4L_CFLAGS="$LIBV4L_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4l1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libv4l1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBV4L_CFLAGS=`$PKG_CONFIG --cflags "libv4l1" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBV4L_LIBS"; then
+    pkg_cv_LIBV4L_LIBS="$LIBV4L_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4l1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libv4l1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBV4L_LIBS=`$PKG_CONFIG --libs "libv4l1" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBV4L_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libv4l1" 2>&1`
+        else
+	        LIBV4L_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libv4l1" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBV4L_PKG_ERRORS" >&5
+
+	have_libv4l1=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	have_libv4l1=no
+else
+	LIBV4L_CFLAGS=$pkg_cv_LIBV4L_CFLAGS
+	LIBV4L_LIBS=$pkg_cv_LIBV4L_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_libv4l1=yes
+fi
+fi
+
+# Check whether --enable-avahi was given.
+if test "${enable_avahi+set}" = set; then :
+  enableval=$enable_avahi; enable_avahi=$enableval
+else
+  enable_avahi=no
+fi
+
+
+if test "$enable_avahi" = "yes"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVAHI" >&5
+$as_echo_n "checking for AVAHI... " >&6; }
+
+if test -n "$AVAHI_CFLAGS"; then
+    pkg_cv_AVAHI_CFLAGS="$AVAHI_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6.24 \""; } >&5
+  ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6.24 ") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags " avahi-client >= 0.6.24 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$AVAHI_LIBS"; then
+    pkg_cv_AVAHI_LIBS="$AVAHI_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6.24 \""; } >&5
+  ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6.24 ") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs " avahi-client >= 0.6.24 " 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " avahi-client >= 0.6.24 " 2>&1`
+        else
+	        AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " avahi-client >= 0.6.24 " 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$AVAHI_PKG_ERRORS" >&5
+
+	enable_avahi=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	enable_avahi=no
+else
+	AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS
+	AVAHI_LIBS=$pkg_cv_AVAHI_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define WITH_AVAHI 1" >>confdefs.h
+
+fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sane_init in -lsane" >&5
+$as_echo_n "checking for sane_init in -lsane... " >&6; }
+if ${ac_cv_lib_sane_sane_init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsane  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sane_init ();
+int
+main ()
+{
+return sane_init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_sane_sane_init=yes
+else
+  ac_cv_lib_sane_sane_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sane_sane_init" >&5
+$as_echo "$ac_cv_lib_sane_sane_init" >&6; }
+if test "x$ac_cv_lib_sane_sane_init" = xyes; then :
+  LIBSANE_EXISTS="yes"
+fi
+
+
+
+
+
+# Check whether --with-snmp was given.
+if test "${with_snmp+set}" = set; then :
+  withval=$with_snmp;
+fi
+
+
+if test "$with_snmp" = "no"; then
+	echo "Not including SNMP support"
+else
+	# Extract the first word of "net-snmp-config", so it can be a program name with args.
+set dummy net-snmp-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_SNMP_CONFIG_PATH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $SNMP_CONFIG_PATH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_SNMP_CONFIG_PATH="$SNMP_CONFIG_PATH" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_SNMP_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_SNMP_CONFIG_PATH" && ac_cv_path_SNMP_CONFIG_PATH=""no""
+  ;;
+esac
+fi
+SNMP_CONFIG_PATH=$ac_cv_path_SNMP_CONFIG_PATH
+if test -n "$SNMP_CONFIG_PATH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SNMP_CONFIG_PATH" >&5
+$as_echo "$SNMP_CONFIG_PATH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for snmp_timeout in -lnetsnmp" >&5
+$as_echo_n "checking for snmp_timeout in -lnetsnmp... " >&6; }
+if ${ac_cv_lib_netsnmp_snmp_timeout+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnetsnmp  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char snmp_timeout ();
+int
+main ()
+{
+return snmp_timeout ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_netsnmp_snmp_timeout=yes
+else
+  ac_cv_lib_netsnmp_snmp_timeout=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_netsnmp_snmp_timeout" >&5
+$as_echo "$ac_cv_lib_netsnmp_snmp_timeout" >&6; }
+if test "x$ac_cv_lib_netsnmp_snmp_timeout" = xyes; then :
+  LIBSNMP_EXISTS="yes"
+fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for proper SNMP version" >&5
+$as_echo_n "checking for proper SNMP version... " >&6; }
+	if test "$SNMP_CONFIG_PATH" != "no" ; then
+		snmp_version=`$SNMP_CONFIG_PATH --version 2>/dev/null`
+		vers=`echo $snmp_version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2);}'`
+		if test -n "$vers" && test "$vers" -ge 5006; then
+			SNMP_LIBS=`$SNMP_CONFIG_PATH --libs`
+			SNMP_CFLAGS=`$SNMP_CONFIG_PATH --cflags`
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+			with_snmp="yes"
+		else
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You need at least net-snmp 5.6, your version is $snmp_version" >&5
+$as_echo "$as_me: WARNING: You need at least net-snmp 5.6, your version is $snmp_version" >&2;}
+			with_snmp="no"
+		fi
+	else
+		with_snmp="no"
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	fi
+fi
+
+if test "$with_snmp" = "yes" && test "${LIBSNMP_EXISTS}x" = "yesx"; then
+
+
+
+$as_echo "#define HAVE_LIBSNMP 1" >>confdefs.h
+
+else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: net-snmp library disabled, autodetecting network scanners will not be supported." >&5
+$as_echo "$as_me: WARNING: net-snmp library disabled, autodetecting network scanners will not be supported." >&2;}
+fi
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+for ac_header in fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \
+    sys/time.h sys/shm.h sys/ipc.h sys/signal.h sys/scanio.h os2.h \
+    sys/socket.h sys/io.h sys/hw.h sys/types.h linux/ppdev.h \
+    dev/ppbus/ppi.h machine/cpufunc.h sys/sem.h sys/poll.h \
+    windows.h be/kernel/OS.h limits.h sys/ioctl.h asm/types.h\
+    netinet/in.h tiffio.h ifaddrs.h pwd.h getopt.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+for ac_header in asm/io.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "asm/io.h" "ac_cv_header_asm_io_h" "#include <sys/types.h>
+"
+if test "x$ac_cv_header_asm_io_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_ASM_IO_H 1
+_ACEOF
+
+fi
+
+done
+
+
+
+  MISSING_HEADERS=
+  if test "${ac_cv_header_fcntl_h}" != "yes" ; then
+    MISSING_HEADERS="${MISSING_HEADERS}\"fcntl.h\" "
+  fi
+  if test "${ac_cv_header_sys_time_h}" != "yes" ; then
+    MISSING_HEADERS="${MISSING_HEADERS}\"sys/time.h\" "
+  fi
+  if test "${ac_cv_header_unistd_h}" != "yes" ; then
+    MISSING_HEADERS="${MISSING_HEADERS}\"unistd.h\" "
+  fi
+  if test "${ac_cv_header_stdc}" != "yes" ; then
+    MISSING_HEADERS="${MISSING_HEADERS}\"ANSI C headers\" "
+  fi
+  if test "${MISSING_HEADERS}" != "" ; then
+    echo "*** The following essential header files couldn't be found:"
+    echo "*** ${MISSING_HEADERS}"
+    echo "*** Maybe the compiler isn't ANSI C compliant or not properly installed?"
+    echo "*** For details on what went wrong see config.log."
+    as_fn_error $? "Exiting now." "$LINENO" 5
+  fi
+
+
+for ac_header in winsock2.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
+if test "x$ac_cv_header_winsock2_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_WINSOCK2_H 1
+_ACEOF
+ SOCKET_LIB="-lws2_32"
+fi
+
+done
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "resmgr.h" "ac_cv_header_resmgr_h" "$ac_includes_default"
+if test "x$ac_cv_header_resmgr_h" = xyes; then :
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rsm_open_device in -lresmgr" >&5
+$as_echo_n "checking for rsm_open_device in -lresmgr... " >&6; }
+if ${ac_cv_lib_resmgr_rsm_open_device+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lresmgr  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char rsm_open_device ();
+int
+main ()
+{
+return rsm_open_device ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_resmgr_rsm_open_device=yes
+else
+  ac_cv_lib_resmgr_rsm_open_device=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resmgr_rsm_open_device" >&5
+$as_echo "$ac_cv_lib_resmgr_rsm_open_device" >&6; }
+if test "x$ac_cv_lib_resmgr_rsm_open_device" = xyes; then :
+
+
+$as_echo "#define HAVE_RESMGR 1" >>confdefs.h
+
+			RESMGR_LIBS="-lresmgr"
+
+
+fi
+
+
+fi
+
+
+
+
+
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
+
+fi
+
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define pid_t int
+_ACEOF
+
+fi
+
+ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
+if test "x$ac_cv_type_ssize_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define ssize_t int
+_ACEOF
+
+fi
+
+
+ac_fn_c_check_type "$LINENO" "u_char" "ac_cv_type_u_char" "$ac_includes_default"
+if test "x$ac_cv_type_u_char" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_U_CHAR 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_type "$LINENO" "u_short" "ac_cv_type_u_short" "$ac_includes_default"
+if test "x$ac_cv_type_u_short" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_U_SHORT 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_type "$LINENO" "u_int" "ac_cv_type_u_int" "$ac_includes_default"
+if test "x$ac_cv_type_u_int" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_U_INT 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_type "$LINENO" "u_long" "ac_cv_type_u_long" "$ac_includes_default"
+if test "x$ac_cv_type_u_long" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_U_LONG 1
+_ACEOF
+
+
+fi
+
+
+
+# from Python, check for "long long" type
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long support" >&5
+$as_echo_n "checking for long long support... " >&6; }
+have_long_long=no
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+long long x; x = (long long)0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+$as_echo "#define HAVE_LONG_LONG 1" >>confdefs.h
+ have_long_long=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_long_long" >&5
+$as_echo "$have_long_long" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t in <sys/socket.h>" >&5
+$as_echo_n "checking for socklen_t in <sys/socket.h>... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/socket.h>
+
+int
+main ()
+{
+socklen_t len
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; };
+$as_echo "#define socklen_t int" >>confdefs.h
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for union semun in <sys/sem.h>" >&5
+$as_echo_n "checking for union semun in <sys/sem.h>... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>
+
+int
+main ()
+{
+union semun test_semun
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; };
+
+$as_echo "#define HAVE_UNION_SEMUN 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct flock in fcntl.h" >&5
+$as_echo_n "checking for struct flock in fcntl.h... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <fcntl.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "struct flock" >/dev/null 2>&1; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; } ;
+
+$as_echo "#define HAVE_STRUCT_FLOCK 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f conftest*
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux ioctl defines" >&5
+$as_echo_n "checking for Linux ioctl defines... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/ioctl.h>
+#include <asm/types.h>
+
+int
+main ()
+{
+
+__u32 houba = _IOR('v',14, unsigned long);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; };
+have_linux_ioctl_defines="yes";
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are at least two -arch flags with different values.
+	ac_arch=
+	ac_prev=
+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+	 if test -n "$ac_prev"; then
+	   case $ac_word in
+	     i?86 | x86_64 | ppc | ppc64)
+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 ac_arch=$ac_word
+	       else
+		 ac_cv_c_bigendian=universal
+		 break
+	       fi
+	       ;;
+	   esac
+	   ac_prev=
+	 elif test "x$ac_word" = "x-arch"; then
+	   ac_prev=arch
+	 fi
+       done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+	     #include <sys/param.h>
+
+int
+main ()
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+		#include <sys/param.h>
+
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then :
+  # Try to guess by grepping values from an object file.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_c_bigendian=no
+else
+  ac_cv_c_bigendian=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+   no)
+      ;; #(
+   universal)
+
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+     ;; #(
+   *)
+     as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if ${ac_cv_c_const+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+#ifndef __cplusplus
+  /* Ultrix mips cc rejects this sort of thing.  */
+  typedef int charset[2];
+  const charset cs = { 0, 0 };
+  /* SunOS 4.1.1 cc rejects this.  */
+  char const *const *pcpcc;
+  char **ppc;
+  /* NEC SVR4.0.2 mips cc rejects this.  */
+  struct point {int x, y;};
+  static struct point const zero = {0,0};
+  /* AIX XL C 1.02.0.0 rejects this.
+     It does not let you subtract one const X* pointer from another in
+     an arm of an if-expression whose if-part is not a constant
+     expression */
+  const char *g = "string";
+  pcpcc = &g + (g ? g-g : 0);
+  /* HPUX 7.0 cc rejects these. */
+  ++pcpcc;
+  ppc = (char**) pcpcc;
+  pcpcc = (char const *const *) ppc;
+  { /* SCO 3.2v4 cc rejects this sort of thing.  */
+    char tx;
+    char *t = &tx;
+    char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+    *t++ = 0;
+    if (s) return 0;
+  }
+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+    int x[] = {25, 17};
+    const int *foo = &x[0];
+    ++foo;
+  }
+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+    typedef const int *iptr;
+    iptr p = 0;
+    ++p;
+  }
+  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+    struct s { int j; const int *ap[3]; } bx;
+    struct s *b = &bx; b->j = 5;
+  }
+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+    const int foo = 10;
+    if (!foo) return 0;
+  }
+  return !cs[0] && !zero.x;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_const=yes
+else
+  ac_cv_c_const=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
+if test $ac_cv_c_const = no; then
+
+$as_echo "#define const /**/" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if ${ac_cv_c_inline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __cplusplus
+typedef int foo_t;
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
+#endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_inline=$ac_kw
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  test "$ac_cv_c_inline" != no && break
+done
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
+
+case $ac_cv_c_inline in
+  inline | yes) ;;
+  *)
+    case $ac_cv_c_inline in
+      no) ac_val=;;
+      *) ac_val=$ac_cv_c_inline;;
+    esac
+    cat >>confdefs.h <<_ACEOF
+#ifndef __cplusplus
+#define inline $ac_val
+#endif
+_ACEOF
+    ;;
+esac
+
+
+
+
+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+# for constant arguments.  Useless!
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if ${ac_cv_working_alloca_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <alloca.h>
+int
+main ()
+{
+char *p = (char *) alloca (2 * sizeof (int));
+			  if (p) return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_working_alloca_h=yes
+else
+  ac_cv_working_alloca_h=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
+if test $ac_cv_working_alloca_h = yes; then
+
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if ${ac_cv_func_alloca_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# else
+#  ifdef HAVE_ALLOCA_H
+#   include <alloca.h>
+#  else
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
+void *alloca (size_t);
+#    endif
+#   endif
+#  endif
+# endif
+#endif
+
+int
+main ()
+{
+char *p = (char *) alloca (1);
+				    if (p) return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_func_alloca_works=yes
+else
+  ac_cv_func_alloca_works=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
+
+if test $ac_cv_func_alloca_works = yes; then
+
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
+
+else
+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+# that cause trouble.  Some versions do not even contain alloca or
+# contain a buggy version.  If you still want to use their alloca,
+# use ar to extract alloca.o from them instead of compiling alloca.c.
+
+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if ${ac_cv_os_cray+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if defined CRAY && ! defined CRAY2
+webecray
+#else
+wenotbecray
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "webecray" >/dev/null 2>&1; then :
+  ac_cv_os_cray=yes
+else
+  ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
+if test $ac_cv_os_cray = yes; then
+  for ac_func in _getb67 GETB67 getb67; do
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define CRAY_STACKSEG_END $ac_func
+_ACEOF
+
+    break
+fi
+
+  done
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if ${ac_cv_c_stack_direction+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_c_stack_direction=0
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+find_stack_direction (int *addr, int depth)
+{
+  int dir, dummy = 0;
+  if (! addr)
+    addr = &dummy;
+  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
+  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
+  return dir + dummy;
+}
+
+int
+main (int argc, char **argv)
+{
+  return find_stack_direction (0, argc + !argv + 20) < 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_c_stack_direction=1
+else
+  ac_cv_c_stack_direction=-1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
+cat >>confdefs.h <<_ACEOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+_ACEOF
+
+
+fi
+
+ac_fn_c_check_func "$LINENO" "getenv" "ac_cv_func_getenv"
+if test "x$ac_cv_func_getenv" = xyes; then :
+  $as_echo "#define HAVE_GETENV 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" getenv.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS getenv.$ac_objext"
+ ;;
+esac
+
+fi
+
+ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop"
+if test "x$ac_cv_func_inet_ntop" = xyes; then :
+  $as_echo "#define HAVE_INET_NTOP 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" inet_ntop.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS inet_ntop.$ac_objext"
+ ;;
+esac
+
+fi
+
+ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton"
+if test "x$ac_cv_func_inet_pton" = xyes; then :
+  $as_echo "#define HAVE_INET_PTON 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" inet_pton.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS inet_pton.$ac_objext"
+ ;;
+esac
+
+fi
+
+ac_fn_c_check_func "$LINENO" "isfdtype" "ac_cv_func_isfdtype"
+if test "x$ac_cv_func_isfdtype" = xyes; then :
+  $as_echo "#define HAVE_ISFDTYPE 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" isfdtype.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS isfdtype.$ac_objext"
+ ;;
+esac
+
+fi
+
+ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask"
+if test "x$ac_cv_func_sigprocmask" = xyes; then :
+  $as_echo "#define HAVE_SIGPROCMASK 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" sigprocmask.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS sigprocmask.$ac_objext"
+ ;;
+esac
+
+fi
+
+ac_fn_c_check_func "$LINENO" "sleep" "ac_cv_func_sleep"
+if test "x$ac_cv_func_sleep" = xyes; then :
+  $as_echo "#define HAVE_SLEEP 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" sleep.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS sleep.$ac_objext"
+ ;;
+esac
+
+fi
+
+ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf"
+if test "x$ac_cv_func_snprintf" = xyes; then :
+  $as_echo "#define HAVE_SNPRINTF 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" snprintf.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS snprintf.$ac_objext"
+ ;;
+esac
+
+fi
+
+ac_fn_c_check_func "$LINENO" "strcasestr" "ac_cv_func_strcasestr"
+if test "x$ac_cv_func_strcasestr" = xyes; then :
+  $as_echo "#define HAVE_STRCASESTR 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" strcasestr.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strcasestr.$ac_objext"
+ ;;
+esac
+
+fi
+
+ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
+if test "x$ac_cv_func_strdup" = xyes; then :
+  $as_echo "#define HAVE_STRDUP 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" strdup.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strdup.$ac_objext"
+ ;;
+esac
+
+fi
+
+ac_fn_c_check_func "$LINENO" "strndup" "ac_cv_func_strndup"
+if test "x$ac_cv_func_strndup" = xyes; then :
+  $as_echo "#define HAVE_STRNDUP 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" strndup.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strndup.$ac_objext"
+ ;;
+esac
+
+fi
+
+ac_fn_c_check_func "$LINENO" "strsep" "ac_cv_func_strsep"
+if test "x$ac_cv_func_strsep" = xyes; then :
+  $as_echo "#define HAVE_STRSEP 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" strsep.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strsep.$ac_objext"
+ ;;
+esac
+
+fi
+
+ac_fn_c_check_func "$LINENO" "syslog" "ac_cv_func_syslog"
+if test "x$ac_cv_func_syslog" = xyes; then :
+  $as_echo "#define HAVE_SYSLOG 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" syslog.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS syslog.$ac_objext"
+ ;;
+esac
+
+fi
+
+ac_fn_c_check_func "$LINENO" "usleep" "ac_cv_func_usleep"
+if test "x$ac_cv_func_usleep" = xyes; then :
+  $as_echo "#define HAVE_USLEEP 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" usleep.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS usleep.$ac_objext"
+ ;;
+esac
+
+fi
+
+ac_fn_c_check_func "$LINENO" "vsyslog" "ac_cv_func_vsyslog"
+if test "x$ac_cv_func_vsyslog" = xyes; then :
+  $as_echo "#define HAVE_VSYSLOG 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" vsyslog.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS vsyslog.$ac_objext"
+ ;;
+esac
+
+fi
+
+
+if test x != x$ALLOCA; then :
+  LTALLOCA=`echo "$ALLOCA" | sed 's/\.o$//; s/\.obj$//'`.lo
+fi
+
+
+ac_fn_c_check_func "$LINENO" "gethostbyaddr" "ac_cv_func_gethostbyaddr"
+if test "x$ac_cv_func_gethostbyaddr" = xyes; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lbind" >&5
+$as_echo_n "checking for gethostbyaddr in -lbind... " >&6; }
+if ${ac_cv_lib_bind_gethostbyaddr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbind  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyaddr ();
+int
+main ()
+{
+return gethostbyaddr ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_bind_gethostbyaddr=yes
+else
+  ac_cv_lib_bind_gethostbyaddr=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_gethostbyaddr" >&5
+$as_echo "$ac_cv_lib_bind_gethostbyaddr" >&6; }
+if test "x$ac_cv_lib_bind_gethostbyaddr" = xyes; then :
+  BIND_LIB="-lbind"
+fi
+
+fi
+
+ac_fn_c_check_func "$LINENO" "gethostbyaddr" "ac_cv_func_gethostbyaddr"
+if test "x$ac_cv_func_gethostbyaddr" = xyes; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lnsl" >&5
+$as_echo_n "checking for gethostbyaddr in -lnsl... " >&6; }
+if ${ac_cv_lib_nsl_gethostbyaddr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnsl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyaddr ();
+int
+main ()
+{
+return gethostbyaddr ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_nsl_gethostbyaddr=yes
+else
+  ac_cv_lib_nsl_gethostbyaddr=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyaddr" >&5
+$as_echo "$ac_cv_lib_nsl_gethostbyaddr" >&6; }
+if test "x$ac_cv_lib_nsl_gethostbyaddr" = xyes; then :
+  NSL_LIB="-lnsl"
+fi
+
+fi
+
+ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
+if test "x$ac_cv_func_socket" = xyes; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
+$as_echo_n "checking for socket in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_socket+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char socket ();
+int
+main ()
+{
+return socket ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_socket_socket=yes
+else
+  ac_cv_lib_socket_socket=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
+$as_echo "$ac_cv_lib_socket_socket" >&6; }
+if test "x$ac_cv_lib_socket_socket" = xyes; then :
+  SOCKET_LIB="-lsocket"
+fi
+
+fi
+
+ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
+if test "x$ac_cv_func_inet_aton" = xyes; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5
+$as_echo_n "checking for inet_aton in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv_inet_aton+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lresolv  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char inet_aton ();
+int
+main ()
+{
+return inet_aton ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_resolv_inet_aton=yes
+else
+  ac_cv_lib_resolv_inet_aton=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5
+$as_echo "$ac_cv_lib_resolv_inet_aton" >&6; }
+if test "x$ac_cv_lib_resolv_inet_aton" = xyes; then :
+  RESOLV_LIB="-lresolv"
+fi
+
+fi
+
+
+SOCKET_LIBS="$SOCKET_LIB $NSL_LIB $BIND_LIB $RESOLV_LIB"
+
+
+save_LIBS="$LIBS"
+LIBS="$LIBS $SOCKET_LIBS"
+for ac_func in inet_addr inet_aton inet_ntoa
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+LIBS="$save_LIBS"
+
+if test "$ac_cv_header_be_kernel_OS_h" = "yes" ; then
+        ac_cv_func_getaddrinfo=no
+    ac_cv_func_getnameinfo=no
+fi
+
+
+
+
+  for ac_header in $ac_header_list
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+
+
+
+
+for ac_func in getpagesize
+do :
+  ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
+if test "x$ac_cv_func_getpagesize" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETPAGESIZE 1
+_ACEOF
+
+fi
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
+$as_echo_n "checking for working mmap... " >&6; }
+if ${ac_cv_func_mmap_fixed_mapped+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_mmap_fixed_mapped=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+/* malloc might have been renamed as rpl_malloc. */
+#undef malloc
+
+/* Thanks to Mike Haertel and Jim Avera for this test.
+   Here is a matrix of mmap possibilities:
+	mmap private not fixed
+	mmap private fixed at somewhere currently unmapped
+	mmap private fixed at somewhere already mapped
+	mmap shared not fixed
+	mmap shared fixed at somewhere currently unmapped
+	mmap shared fixed at somewhere already mapped
+   For private mappings, we should verify that changes cannot be read()
+   back from the file, nor mmap's back from the file at a different
+   address.  (There have been systems where private was not correctly
+   implemented like the infamous i386 svr4.0, and systems where the
+   VM page cache was not coherent with the file system buffer cache
+   like early versions of FreeBSD and possibly contemporary NetBSD.)
+   For shared mappings, we should conversely verify that changes get
+   propagated back to all the places they're supposed to be.
+
+   Grep wants private fixed already mapped.
+   The main things grep needs to know about mmap are:
+   * does it exist and is it safe to write into the mmap'd area
+   * how to use it (BSD variants)  */
+
+#include <fcntl.h>
+#include <sys/mman.h>
+
+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
+char *malloc ();
+#endif
+
+/* This mess was copied from the GNU getpagesize.h.  */
+#ifndef HAVE_GETPAGESIZE
+# ifdef _SC_PAGESIZE
+#  define getpagesize() sysconf(_SC_PAGESIZE)
+# else /* no _SC_PAGESIZE */
+#  ifdef HAVE_SYS_PARAM_H
+#   include <sys/param.h>
+#   ifdef EXEC_PAGESIZE
+#    define getpagesize() EXEC_PAGESIZE
+#   else /* no EXEC_PAGESIZE */
+#    ifdef NBPG
+#     define getpagesize() NBPG * CLSIZE
+#     ifndef CLSIZE
+#      define CLSIZE 1
+#     endif /* no CLSIZE */
+#    else /* no NBPG */
+#     ifdef NBPC
+#      define getpagesize() NBPC
+#     else /* no NBPC */
+#      ifdef PAGESIZE
+#       define getpagesize() PAGESIZE
+#      endif /* PAGESIZE */
+#     endif /* no NBPC */
+#    endif /* no NBPG */
+#   endif /* no EXEC_PAGESIZE */
+#  else /* no HAVE_SYS_PARAM_H */
+#   define getpagesize() 8192	/* punt totally */
+#  endif /* no HAVE_SYS_PARAM_H */
+# endif /* no _SC_PAGESIZE */
+
+#endif /* no HAVE_GETPAGESIZE */
+
+int
+main ()
+{
+  char *data, *data2, *data3;
+  const char *cdata2;
+  int i, pagesize;
+  int fd, fd2;
+
+  pagesize = getpagesize ();
+
+  /* First, make a file with some known garbage in it. */
+  data = (char *) malloc (pagesize);
+  if (!data)
+    return 1;
+  for (i = 0; i < pagesize; ++i)
+    *(data + i) = rand ();
+  umask (0);
+  fd = creat ("conftest.mmap", 0600);
+  if (fd < 0)
+    return 2;
+  if (write (fd, data, pagesize) != pagesize)
+    return 3;
+  close (fd);
+
+  /* Next, check that the tail of a page is zero-filled.  File must have
+     non-zero length, otherwise we risk SIGBUS for entire page.  */
+  fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
+  if (fd2 < 0)
+    return 4;
+  cdata2 = "";
+  if (write (fd2, cdata2, 1) != 1)
+    return 5;
+  data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
+  if (data2 == MAP_FAILED)
+    return 6;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data2 + i))
+      return 7;
+  close (fd2);
+  if (munmap (data2, pagesize))
+    return 8;
+
+  /* Next, try to mmap the file at a fixed address which already has
+     something else allocated at it.  If we can, also make sure that
+     we see the same garbage.  */
+  fd = open ("conftest.mmap", O_RDWR);
+  if (fd < 0)
+    return 9;
+  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
+		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
+    return 10;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data + i) != *(data2 + i))
+      return 11;
+
+  /* Finally, make sure that changes to the mapped area do not
+     percolate back to the file as seen by read().  (This is a bug on
+     some variants of i386 svr4.0.)  */
+  for (i = 0; i < pagesize; ++i)
+    *(data2 + i) = *(data2 + i) + 1;
+  data3 = (char *) malloc (pagesize);
+  if (!data3)
+    return 12;
+  if (read (fd, data3, pagesize) != pagesize)
+    return 13;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data + i) != *(data3 + i))
+      return 14;
+  close (fd);
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_mmap_fixed_mapped=yes
+else
+  ac_cv_func_mmap_fixed_mapped=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
+$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
+if test $ac_cv_func_mmap_fixed_mapped = yes; then
+
+$as_echo "#define HAVE_MMAP 1" >>confdefs.h
+
+fi
+rm -f conftest.mmap conftest.txt
+
+for ac_func in atexit ioperm i386_set_ioperm \
+    mkdir strftime strstr strtod  \
+    cfmakeraw tcsendbreak strcasecmp strncasecmp _portaccess \
+    getaddrinfo getnameinfo poll setitimer iopl getuid getpass
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+if test "${ac_cv_header_sys_io_h}" = "yes"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inb,outb (provided by sys/io.h)" >&5
+$as_echo_n "checking for inb,outb (provided by sys/io.h)... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/io.h>
+int
+main ()
+{
+inb(0);outb(0,0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      sane_cv_have_sys_io_h_with_inb_outb="yes"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+      sane_cv_have_sys_io_h_with_inb_outb="no"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sys/io.h does not provide inb,outb (non i386/x32/x86_64 arch?)" >&5
+$as_echo "$as_me: WARNING: sys/io.h does not provide inb,outb (non i386/x32/x86_64 arch?)" >&2;}
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test "$sane_cv_have_sys_io_h_with_inb_outb" = "yes"; then
+
+$as_echo "#define SANE_HAVE_SYS_IO_H_WITH_INB_OUTB 1" >>confdefs.h
+
+  fi
+else
+  sane_cv_have_sys_io_h_with_inb_outb="no"
+fi
+
+
+
+
+
+if test "$ac_cv_header_os2_h" = "yes" ; then
+
+$as_echo "#define strncasecmp strnicmp" >>confdefs.h
+
+
+$as_echo "#define strcasecmp stricmp" >>confdefs.h
+
+fi
+
+if test "$ac_cv_header_getopt_h" = "yes" ; then
+  for ac_func in getopt_long
+do :
+  ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long"
+if test "x$ac_cv_func_getopt_long" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETOPT_LONG 1
+_ACEOF
+
+fi
+done
+
+fi
+
+# Slightly abuse the AC_LIBOBJ macro to mark files as replacement code
+if test x$ac_cv_header_getopt_h != xyes \
+       && test x$ac_cv_func_getopt_long != xyes; then :
+  case " $LIBOBJS " in
+  *" getopt.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS getopt.$ac_objext"
+ ;;
+esac
+
+       case " $LIBOBJS " in
+  *" getopt1.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS getopt1.$ac_objext"
+ ;;
+esac
+
+fi
+
+if test -c /dev/urandom ; then
+
+$as_echo "#define HAVE_DEV_URANDOM 1" >>confdefs.h
+
+fi
+
+
+# Check whether --with-systemd was given.
+if test "${with_systemd+set}" = set; then :
+  withval=$with_systemd;
+fi
+
+if test "x$with_systemd" != xno ; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
+$as_echo_n "checking for SYSTEMD... " >&6; }
+
+if test -n "$SYSTEMD_CFLAGS"; then
+    pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SYSTEMD_LIBS"; then
+    pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1`
+        else
+	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SYSTEMD_PKG_ERRORS" >&5
+
+	have_systemd=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	have_systemd=no
+else
+	SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
+	SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_systemd=yes
+fi
+  if test "x$have_systemd" = xno; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
+$as_echo_n "checking for SYSTEMD... " >&6; }
+
+if test -n "$SYSTEMD_CFLAGS"; then
+    pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SYSTEMD_LIBS"; then
+    pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
+        else
+	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SYSTEMD_PKG_ERRORS" >&5
+
+	have_systemd=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	have_systemd=no
+else
+	SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
+	SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_systemd=yes
+fi
+  fi
+  if test "x$have_systemd" = xyes; then
+
+$as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h
+
+  else
+    if test "x$with_systemd" = xyes; then
+      as_fn_error $? "Systemd support was requested but systemd was not found" "$LINENO" 5
+    fi
+  fi
+fi
+
+
+
+# Check whether --with-usb was given.
+if test "${with_usb+set}" = set; then :
+  withval=$with_usb;
+else
+  with_usb=check
+fi
+
+if test xno != "x$with_usb"; then :
+  have_usb=no
+   case x$host_os in #(
+      beos*) :
+    ac_fn_c_check_header_mongrel "$LINENO" "be/drivers/USB_scanner.h" "ac_cv_header_be_drivers_USB_scanner_h" "$ac_includes_default"
+if test "x$ac_cv_header_be_drivers_USB_scanner_h" = xyes; then :
+  have_usb=yes
+fi
+
+ ;; #(
+  os2*) :
+    ac_fn_c_check_header_compile "$LINENO" "usbcalls.h" "ac_cv_header_usbcalls_h" "#include <usb.h>
+         #include <os2.h>
+
+"
+if test "x$ac_cv_header_usbcalls_h" = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UsbQueryNumberDevices in -lusbcall" >&5
+$as_echo_n "checking for UsbQueryNumberDevices in -lusbcall... " >&6; }
+if ${ac_cv_lib_usbcall_UsbQueryNumberDevices+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lusbcall  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char UsbQueryNumberDevices ();
+int
+main ()
+{
+return UsbQueryNumberDevices ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_usbcall_UsbQueryNumberDevices=yes
+else
+  ac_cv_lib_usbcall_UsbQueryNumberDevices=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usbcall_UsbQueryNumberDevices" >&5
+$as_echo "$ac_cv_lib_usbcall_UsbQueryNumberDevices" >&6; }
+if test "x$ac_cv_lib_usbcall_UsbQueryNumberDevices" = xyes; then :
+  USB_LIBS="-lusbcall"
+           have_usb=yes
+
+$as_echo "#define HAVE_USBCALLS 1" >>confdefs.h
+
+
+fi
+
+
+fi
+
+
+       ;; #(
+  *) :
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for USB" >&5
+$as_echo_n "checking for USB... " >&6; }
+
+if test -n "$USB_CFLAGS"; then
+    pkg_cv_USB_CFLAGS="$USB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb-1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$USB_LIBS"; then
+    pkg_cv_USB_LIBS="$USB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_USB_LIBS=`$PKG_CONFIG --libs "libusb-1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libusb-1.0" 2>&1`
+        else
+	        USB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libusb-1.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$USB_PKG_ERRORS" >&5
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for USB" >&5
+$as_echo_n "checking for USB... " >&6; }
+
+if test -n "$USB_CFLAGS"; then
+    pkg_cv_USB_CFLAGS="$USB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb >= 0.1.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libusb >= 0.1.8") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb >= 0.1.8" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$USB_LIBS"; then
+    pkg_cv_USB_LIBS="$USB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb >= 0.1.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libusb >= 0.1.8") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_USB_LIBS=`$PKG_CONFIG --libs "libusb >= 0.1.8" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libusb >= 0.1.8" 2>&1`
+        else
+	        USB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libusb >= 0.1.8" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$USB_PKG_ERRORS" >&5
+
+	         ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default"
+if test "x$ac_cv_header_usb_h" = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_interrupt_read in -lusb" >&5
+$as_echo_n "checking for usb_interrupt_read in -lusb... " >&6; }
+if ${ac_cv_lib_usb_usb_interrupt_read+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lusb  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char usb_interrupt_read ();
+int
+main ()
+{
+return usb_interrupt_read ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_usb_usb_interrupt_read=yes
+else
+  ac_cv_lib_usb_usb_interrupt_read=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
+$as_echo "$ac_cv_lib_usb_usb_interrupt_read" >&6; }
+if test "x$ac_cv_lib_usb_usb_interrupt_read" = xyes; then :
+  USB_LIBS="-lusb"
+             have_usb=yes
+
+fi
+
+fi
+
+
+         for ac_header in lusb0_usb.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "lusb0_usb.h" "ac_cv_header_lusb0_usb_h" "$ac_includes_default"
+if test "x$ac_cv_header_lusb0_usb_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LUSB0_USB_H 1
+_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_interrupt_read in -lusb" >&5
+$as_echo_n "checking for usb_interrupt_read in -lusb... " >&6; }
+if ${ac_cv_lib_usb_usb_interrupt_read+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lusb  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char usb_interrupt_read ();
+int
+main ()
+{
+return usb_interrupt_read ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_usb_usb_interrupt_read=yes
+else
+  ac_cv_lib_usb_usb_interrupt_read=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
+$as_echo "$ac_cv_lib_usb_usb_interrupt_read" >&6; }
+if test "x$ac_cv_lib_usb_usb_interrupt_read" = xyes; then :
+  USB_LIBS="-lusb"
+              have_usb=yes
+
+fi
+
+fi
+
+done
+
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	         ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default"
+if test "x$ac_cv_header_usb_h" = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_interrupt_read in -lusb" >&5
+$as_echo_n "checking for usb_interrupt_read in -lusb... " >&6; }
+if ${ac_cv_lib_usb_usb_interrupt_read+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lusb  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char usb_interrupt_read ();
+int
+main ()
+{
+return usb_interrupt_read ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_usb_usb_interrupt_read=yes
+else
+  ac_cv_lib_usb_usb_interrupt_read=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
+$as_echo "$ac_cv_lib_usb_usb_interrupt_read" >&6; }
+if test "x$ac_cv_lib_usb_usb_interrupt_read" = xyes; then :
+  USB_LIBS="-lusb"
+             have_usb=yes
+
+fi
+
+fi
+
+
+         for ac_header in lusb0_usb.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "lusb0_usb.h" "ac_cv_header_lusb0_usb_h" "$ac_includes_default"
+if test "x$ac_cv_header_lusb0_usb_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LUSB0_USB_H 1
+_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_interrupt_read in -lusb" >&5
+$as_echo_n "checking for usb_interrupt_read in -lusb... " >&6; }
+if ${ac_cv_lib_usb_usb_interrupt_read+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lusb  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char usb_interrupt_read ();
+int
+main ()
+{
+return usb_interrupt_read ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_usb_usb_interrupt_read=yes
+else
+  ac_cv_lib_usb_usb_interrupt_read=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
+$as_echo "$ac_cv_lib_usb_usb_interrupt_read" >&6; }
+if test "x$ac_cv_lib_usb_usb_interrupt_read" = xyes; then :
+  USB_LIBS="-lusb"
+              have_usb=yes
+
+fi
+
+fi
+
+done
+
+
+else
+	USB_CFLAGS=$pkg_cv_USB_CFLAGS
+	USB_LIBS=$pkg_cv_USB_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_LIBUSB_LEGACY 1" >>confdefs.h
+
+         have_usb=yes
+
+fi
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for USB" >&5
+$as_echo_n "checking for USB... " >&6; }
+
+if test -n "$USB_CFLAGS"; then
+    pkg_cv_USB_CFLAGS="$USB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb >= 0.1.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libusb >= 0.1.8") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb >= 0.1.8" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$USB_LIBS"; then
+    pkg_cv_USB_LIBS="$USB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libusb >= 0.1.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libusb >= 0.1.8") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_USB_LIBS=`$PKG_CONFIG --libs "libusb >= 0.1.8" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libusb >= 0.1.8" 2>&1`
+        else
+	        USB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libusb >= 0.1.8" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$USB_PKG_ERRORS" >&5
+
+	         ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default"
+if test "x$ac_cv_header_usb_h" = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_interrupt_read in -lusb" >&5
+$as_echo_n "checking for usb_interrupt_read in -lusb... " >&6; }
+if ${ac_cv_lib_usb_usb_interrupt_read+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lusb  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char usb_interrupt_read ();
+int
+main ()
+{
+return usb_interrupt_read ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_usb_usb_interrupt_read=yes
+else
+  ac_cv_lib_usb_usb_interrupt_read=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
+$as_echo "$ac_cv_lib_usb_usb_interrupt_read" >&6; }
+if test "x$ac_cv_lib_usb_usb_interrupt_read" = xyes; then :
+  USB_LIBS="-lusb"
+             have_usb=yes
+
+fi
+
+fi
+
+
+         for ac_header in lusb0_usb.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "lusb0_usb.h" "ac_cv_header_lusb0_usb_h" "$ac_includes_default"
+if test "x$ac_cv_header_lusb0_usb_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LUSB0_USB_H 1
+_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_interrupt_read in -lusb" >&5
+$as_echo_n "checking for usb_interrupt_read in -lusb... " >&6; }
+if ${ac_cv_lib_usb_usb_interrupt_read+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lusb  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char usb_interrupt_read ();
+int
+main ()
+{
+return usb_interrupt_read ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_usb_usb_interrupt_read=yes
+else
+  ac_cv_lib_usb_usb_interrupt_read=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
+$as_echo "$ac_cv_lib_usb_usb_interrupt_read" >&6; }
+if test "x$ac_cv_lib_usb_usb_interrupt_read" = xyes; then :
+  USB_LIBS="-lusb"
+              have_usb=yes
+
+fi
+
+fi
+
+done
+
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	         ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default"
+if test "x$ac_cv_header_usb_h" = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_interrupt_read in -lusb" >&5
+$as_echo_n "checking for usb_interrupt_read in -lusb... " >&6; }
+if ${ac_cv_lib_usb_usb_interrupt_read+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lusb  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char usb_interrupt_read ();
+int
+main ()
+{
+return usb_interrupt_read ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_usb_usb_interrupt_read=yes
+else
+  ac_cv_lib_usb_usb_interrupt_read=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
+$as_echo "$ac_cv_lib_usb_usb_interrupt_read" >&6; }
+if test "x$ac_cv_lib_usb_usb_interrupt_read" = xyes; then :
+  USB_LIBS="-lusb"
+             have_usb=yes
+
+fi
+
+fi
+
+
+         for ac_header in lusb0_usb.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "lusb0_usb.h" "ac_cv_header_lusb0_usb_h" "$ac_includes_default"
+if test "x$ac_cv_header_lusb0_usb_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LUSB0_USB_H 1
+_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usb_interrupt_read in -lusb" >&5
+$as_echo_n "checking for usb_interrupt_read in -lusb... " >&6; }
+if ${ac_cv_lib_usb_usb_interrupt_read+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lusb  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char usb_interrupt_read ();
+int
+main ()
+{
+return usb_interrupt_read ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_usb_usb_interrupt_read=yes
+else
+  ac_cv_lib_usb_usb_interrupt_read=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_usb_interrupt_read" >&5
+$as_echo "$ac_cv_lib_usb_usb_interrupt_read" >&6; }
+if test "x$ac_cv_lib_usb_usb_interrupt_read" = xyes; then :
+  USB_LIBS="-lusb"
+              have_usb=yes
+
+fi
+
+fi
+
+done
+
+
+else
+	USB_CFLAGS=$pkg_cv_USB_CFLAGS
+	USB_LIBS=$pkg_cv_USB_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_LIBUSB_LEGACY 1" >>confdefs.h
+
+         have_usb=yes
+
+fi
+
+else
+	USB_CFLAGS=$pkg_cv_USB_CFLAGS
+	USB_LIBS=$pkg_cv_USB_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_LIBUSB 1" >>confdefs.h
+
+       have_usb=yes
+
+fi
+     ;;
+esac
+
+fi
+if test xyes = "x$with_usb" && test xyes != "x$have_usb"; then :
+  as_fn_error $? "USB support requested but required libraries not found." "$LINENO" 5
+
+fi
+ if test x != "x$USB_LIBS"; then
+  have_usblib_TRUE=
+  have_usblib_FALSE='#'
+else
+  have_usblib_TRUE='#'
+  have_usblib_FALSE=
+fi
+
+
+
+
+# Unset VERSION during the SCSI header check
+sed "s!^#define VERSION .*!/* & */!" confdefs.h > confdefs.h.tmp
+mv confdefs.h.tmp confdefs.h
+
+for ac_header in IOKit/scsi/SCSITaskLib.h IOKit/cdb/IOSCSILib.h \
+  IOKit/scsi/SCSICommandOperationCodes.h \
+  IOKit/scsi-commands/SCSICommandOperationCodes.h scsi.h sys/scsi.h \
+  sys/scsicmd.h sys/scsiio.h bsd/dev/scsireg.h scsi/sg.h \
+  camlib.h gscdds.h sys/scsi/scsi.h sys/scsi/sgdefs.h \
+  sys/scsi/targets/scgio.h apollo/scsi.h sys/sdi_comm.h \
+  sys/passthrudef.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+# Restore VERSION
+sed "s!/\* \(#define VERSION .*\) \*/!\1!" confdefs.h > confdefs.h.tmp
+mv confdefs.h.tmp confdefs.h
+
+for ac_header in io/cam/cam.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "io/cam/cam.h" "ac_cv_header_io_cam_cam_h" "#include <io/common/iotypes.h>
+"
+if test "x$ac_cv_header_io_cam_cam_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_IO_CAM_CAM_H 1
+_ACEOF
+
+fi
+
+done
+
+for ac_header in ntddscsi.h ddk/ntddscsi.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <windows.h>
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+if test "$ac_cv_header_sys_scsiio_h" = "yes" \
+  && test "$ac_cv_header_scsi_h" = "yes"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if 'scsireq_t' needs to be defined as 'struct scsireq'" >&5
+$as_echo_n "checking if 'scsireq_t' needs to be defined as 'struct scsireq'... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/scsiio.h>
+#include <scsi.h>
+
+int
+main ()
+{
+scsireq_t req
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; };
+
+$as_echo "#define scsireq_t struct scsireq_t" >>confdefs.h
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for scsireq_enter in -lscsi" >&5
+$as_echo_n "checking for scsireq_enter in -lscsi... " >&6; }
+if ${ac_cv_lib_scsi_scsireq_enter+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lscsi  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char scsireq_enter ();
+int
+main ()
+{
+return scsireq_enter ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_scsi_scsireq_enter=yes
+else
+  ac_cv_lib_scsi_scsireq_enter=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_scsi_scsireq_enter" >&5
+$as_echo "$ac_cv_lib_scsi_scsireq_enter" >&6; }
+if test "x$ac_cv_lib_scsi_scsireq_enter" = xyes; then :
+  SCSI_LIBS="-lscsi"
+fi
+ # FreeBSD needs this
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cam_open_device in -lcam" >&5
+$as_echo_n "checking for cam_open_device in -lcam... " >&6; }
+if ${ac_cv_lib_cam_cam_open_device+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcam  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cam_open_device ();
+int
+main ()
+{
+return cam_open_device ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_cam_cam_open_device=yes
+else
+  ac_cv_lib_cam_cam_open_device=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cam_cam_open_device" >&5
+$as_echo "$ac_cv_lib_cam_cam_open_device" >&6; }
+if test "x$ac_cv_lib_cam_cam_open_device" = xyes; then :
+  SCSI_LIBS="-lcam"
+fi
+  # FreeBSD 3+ needs this
+
+for ac_func in scsireq_enter
+do :
+  ac_fn_c_check_func "$LINENO" "scsireq_enter" "ac_cv_func_scsireq_enter"
+if test "x$ac_cv_func_scsireq_enter" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SCSIREQ_ENTER 1
+_ACEOF
+
+fi
+done
+
+
+if test "$ac_cv_header_scsi_sg_h" = "yes"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sg_header.target_status in <scsi/sg.h>" >&5
+$as_echo_n "checking for sg_header.target_status in <scsi/sg.h>... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <scsi/sg.h>
+
+int
+main ()
+{
+
+struct sg_header hdr;
+hdr.target_status = 1;
+return 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; };
+
+$as_echo "#define HAVE_SG_TARGET_STATUS 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+if test "$ac_cv_header_IOKit_scsi_SCSITaskLib_h" = "yes"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCSITaskSGElement in IOKit/scsi/SCSITaskLib.h" >&5
+$as_echo_n "checking for SCSITaskSGElement in IOKit/scsi/SCSITaskLib.h... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#undef VERSION
+#include <IOKit/scsi/SCSITaskLib.h>
+
+int
+main ()
+{
+
+SCSITaskSGElement range;
+return 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; };
+
+$as_echo "#define HAVE_SCSITASKSGELEMENT 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+# Multiple platforms can set SCSI_LIBS so do substitution at end.
+
+
+# Check whether --enable-scsibuffersize was given.
+if test "${enable_scsibuffersize+set}" = set; then :
+  enableval=$enable_scsibuffersize; set_scsibuffersize="$enableval"
+else
+  set_scsibuffersize=131072
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define SCSIBUFFERSIZE $set_scsibuffersize
+_ACEOF
+
+echo "scsi buffersize: $set_scsibuffersize"
+
+# Check whether --enable-scsi-directio was given.
+if test "${enable_scsi_directio+set}" = set; then :
+  enableval=$enable_scsi_directio;
+    if eval "test x$enable_scsi_directio = xyes"; then
+      AM_CFLAGS="$AM_CFLAGS -DENABLE_SCSI_DIRECTIO"
+    fi
+
+fi
+
+
+
+if test "$ac_cv_func_getnameinfo" = "yes" \
+  && test "$ac_cv_func_getaddrinfo" = "yes" ; then
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable IPv6" >&5
+$as_echo_n "checking whether to enable IPv6... " >&6; }
+  # Check whether --enable-ipv6 was given.
+if test "${enable_ipv6+set}" = set; then :
+  enableval=$enable_ipv6;   if test "$enableval" = "no" ; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, manually disabled" >&5
+$as_echo "no, manually disabled" >&6; }
+         ipv6=no
+         fi
+
+fi
+
+
+  if test "$ipv6" != "no" ; then
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+	#define INET6
+	#include <sys/types.h>
+	#include <sys/socket.h>
+int
+main ()
+{
+
+	 /* AF_INET6 available check */
+ 	if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
+   	  exit(1);
+ 	else
+   	  exit(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define ENABLE_IPV6 1" >>confdefs.h
+
+        ipv6=yes
+
+else
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (couldn't compile test program)" >&5
+$as_echo "no (couldn't compile test program)" >&6; }
+        ipv6=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  fi
+
+  if test "$ipv6" != "no" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct sockaddr_storage has an ss_family member" >&5
+$as_echo_n "checking whether struct sockaddr_storage has an ss_family member... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+	#define INET6
+	#include <sys/types.h>
+	#include <sys/socket.h>
+int
+main ()
+{
+
+	/* test if the ss_family member exists in struct sockaddr_storage */
+	struct sockaddr_storage ss;
+	ss.ss_family = AF_INET;
+	exit (0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAS_SS_FAMILY 1" >>confdefs.h
+
+
+else
+
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+		#define INET6
+		#include <sys/types.h>
+		#include <sys/socket.h>
+int
+main ()
+{
+
+		/* test if the __ss_family member exists in struct sockaddr_storage */
+		struct sockaddr_storage ss;
+		ss.__ss_family = AF_INET;
+		exit (0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, but __ss_family exists" >&5
+$as_echo "no, but __ss_family exists" >&6; }
+
+$as_echo "#define HAS___SS_FAMILY 1" >>confdefs.h
+
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		ipv6=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  fi
+
+else
+  ipv6="no"
+fi
+
+# Check whether --enable-preload was given.
+if test "${enable_preload+set}" = set; then :
+  enableval=$enable_preload; enable_preload=$enableval
+else
+  enable_preload=auto
+fi
+
+
 case $host_os in
   cygwin* | mingw* | beos* | os2*)
-  LDFLAGS="$LDFLAGS -no-undefined"
+  AM_LDFLAGS="$AM_LDFLAGS -no-undefined"
 esac
 
 
@@ -18044,7 +20585,7 @@ configdir="${sysconfdir}/sane.d"
 
 
 
-CPPFLAGS="${CPPFLAGS} -DPATH_SANE_CONFIG_DIR=\$(configdir) \
+AM_CPPFLAGS="${AM_CPPFLAGS} -DPATH_SANE_CONFIG_DIR=\$(configdir) \
 	  -DPATH_SANE_DATA_DIR=\$(datadir) \
 	  -DPATH_SANE_LOCK_DIR=\$(locksanedir) \
 	  -DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}"
@@ -18160,7 +20701,7 @@ for be in ${BACKENDS}; do
 
     gphoto2)
     if test "${HAVE_GPHOTO2}" != "true" \
-      -o "${sane_cv_use_libjpeg}" != "yes"; then
+      || test "${sane_cv_use_libjpeg}" != "yes"; then
       echo "*** $be backend requires gphoto2 and JPEG libraries - $DISABLE_MSG"
       backend_supported="no"
     fi
@@ -18213,9 +20754,6 @@ for be in ${BACKENDS}; do
 done
 
 
-
-
-
 if test "${sane_cv_use_libjpeg}" = "yes"; then
   SANEI_SANEI_JPEG_LO="../sanei/sanei_jpeg.lo"
 fi
@@ -18345,7 +20883,7 @@ for be in ${BACKENDS}; do
 
     gphoto2)
     if test "${HAVE_GPHOTO2}" != "true" \
-      -o "${sane_cv_use_libjpeg}" != "yes"; then
+      || test "${sane_cv_use_libjpeg}" != "yes"; then
       echo "*** $be backend requires gphoto2 and JPEG libraries - $DISABLE_MSG"
       backend_supported="no"
     fi
@@ -18434,69 +20972,410 @@ esac
 if test "${enable_parport_directio+set}" = set; then :
   enableval=$enable_parport_directio;
     if eval "test x$enable_parport_directio = xyes"; then
-      CFLAGS="$CFLAGS -DENABLE_PARPORT_DIRECTIO"
+      AM_CFLAGS="$AM_CFLAGS -DENABLE_PARPORT_DIRECTIO"
     fi
 
 fi
 
 
-# Check whether --enable-translations was given.
-if test "${enable_translations+set}" = set; then :
-  enableval=$enable_translations;
+
+# Check whether --with-api-spec was given.
+if test "${with_api_spec+set}" = set; then :
+  withval=$with_api_spec;
 else
-  enable_translations=yes
+  with_api_spec=check
 fi
 
-if eval "test x$enable_translations = xyes" ; then
-  if test x$MSGFMT = xno || test x$XGETTEXT = xno || test $MSGMERGE = no ; then
-    enable_translations=no
-    echo "disabling translations (missing msgfmt, xgettext or msgmerge)"
-  else
-    echo "enabling translations"
+# Extract the first word of "makeindex", so it can be a program name with args.
+set dummy makeindex; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MAKEINDEX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAKEINDEX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MAKEINDEX="$MAKEINDEX" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_MAKEINDEX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_MAKEINDEX" && ac_cv_path_MAKEINDEX="no"
+  ;;
+esac
+fi
+MAKEINDEX=$ac_cv_path_MAKEINDEX
+if test -n "$MAKEINDEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEINDEX" >&5
+$as_echo "$MAKEINDEX" >&6; }
 else
-  echo "disabling translations"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
- if test x$enable_translations = xyes; then
-  ENABLE_TRANSLATIONS_TRUE=
-  ENABLE_TRANSLATIONS_FALSE='#'
+
+
+# Extract the first word of "dvips", so it can be a program name with args.
+set dummy dvips; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DVIPS+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  ENABLE_TRANSLATIONS_TRUE='#'
-  ENABLE_TRANSLATIONS_FALSE=
+  case $DVIPS in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DVIPS="$DVIPS" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_DVIPS="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_DVIPS" && ac_cv_path_DVIPS="no"
+  ;;
+esac
+fi
+DVIPS=$ac_cv_path_DVIPS
+if test -n "$DVIPS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DVIPS" >&5
+$as_echo "$DVIPS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-# Check whether --enable-latex was given.
-if test "${enable_latex+set}" = set; then :
-  enableval=$enable_latex;
+# Extract the first word of "latex", so it can be a program name with args.
+set dummy latex; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_LATEX+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  enable_latex=yes
+  case $LATEX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_LATEX="$LATEX" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_LATEX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_LATEX" && ac_cv_path_LATEX="no"
+  ;;
+esac
+fi
+LATEX=$ac_cv_path_LATEX
+if test -n "$LATEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LATEX" >&5
+$as_echo "$LATEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-if test "x$enable_latex" = "xyes" ; then
-  if test "x$LATEX" = "xno" || test "x$DVIPS" = "xno" || test "x$MAKEINDEX" = "xno" ; then
-    enable_latex=no
-    echo "disabling latex (missing latex, dvips or makeindex)"
-  else
-    echo "enabling latex"
+
+# Extract the first word of "pdflatex", so it can be a program name with args.
+set dummy pdflatex; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PDFLATEX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PDFLATEX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PDFLATEX="$PDFLATEX" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PDFLATEX="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PDFLATEX" && ac_cv_path_PDFLATEX="no"
+  ;;
+esac
+fi
+PDFLATEX=$ac_cv_path_PDFLATEX
+if test -n "$PDFLATEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDFLATEX" >&5
+$as_echo "$PDFLATEX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "fig2dev", so it can be a program name with args.
+set dummy fig2dev; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_FIG2DEV+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $FIG2DEV in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_FIG2DEV="$FIG2DEV" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_FIG2DEV="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_FIG2DEV" && ac_cv_path_FIG2DEV="no"
+  ;;
+esac
+fi
+FIG2DEV=$ac_cv_path_FIG2DEV
+if test -n "$FIG2DEV"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FIG2DEV" >&5
+$as_echo "$FIG2DEV" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "gs", so it can be a program name with args.
+set dummy gs; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GS in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GS="$GS" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GS="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_GS" && ac_cv_path_GS="no"
+  ;;
+esac
+fi
+GS=$ac_cv_path_GS
+if test -n "$GS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GS" >&5
+$as_echo "$GS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "dlh", so it can be a program name with args.
+set dummy dlh; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DLH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $DLH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_DLH="$DLH" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_DLH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_DLH" && ac_cv_path_DLH="no"
+  ;;
+esac
+fi
+DLH=$ac_cv_path_DLH
+if test -n "$DLH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLH" >&5
+$as_echo "$DLH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "ppmtogif", so it can be a program name with args.
+set dummy ppmtogif; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PPMTOGIF+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "disabling latex"
+  case $PPMTOGIF in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PPMTOGIF="$PPMTOGIF" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PPMTOGIF="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PPMTOGIF" && ac_cv_path_PPMTOGIF="no"
+  ;;
+esac
 fi
- if test x$enable_latex = xyes; then
-  USE_LATEX_TRUE=
-  USE_LATEX_FALSE='#'
+PPMTOGIF=$ac_cv_path_PPMTOGIF
+if test -n "$PPMTOGIF"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PPMTOGIF" >&5
+$as_echo "$PPMTOGIF" >&6; }
 else
-  USE_LATEX_TRUE='#'
-  USE_LATEX_FALSE=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
+if test xno != "x$with_api_spec"; then :
+     if    test xno != "x$MAKEINDEX" \
+          && test xno != "x$DVIPS" \
+          && test xno != "x$FIG2DEV" \
+          && test xno != "x$LATEX"; then :
+  with_api_ps=yes
+fi
+   if    test xno != "x$MAKEINDEX" \
+          && test xno != "x$PDFLATEX" \
+          && test xno != "x$FIG2DEV" \
+          && test xno != "x$GS"; then :
+  with_api_pdf=yes
+fi
+   if    test xno != "x$MAKEINDEX" \
+          && test xno != "x$DVIPS" \
+          && test xno != "x$FIG2DEV" \
+          && test xno != "x$DLH" \
+          && test xno != "x$GS" \
+          && test xno != "x$PPMTOFIG" ; then :
+  with_api_html=yes
+fi
+
+   if test xyes = "x$with_api_spec" \
+          && test xyes != "x$with_api_ps" \
+          && test xyes != "x$with_api_pdf" \
+          && test xyes != "x$with_api_html"; then :
+  as_fn_error $? "tools to convert the API spec are missing" "$LINENO" 5
+
+fi
+
+fi
+ if test x$with_api_ps = xyes; then
+  WITH_API_PS_TRUE=
+  WITH_API_PS_FALSE='#'
+else
+  WITH_API_PS_TRUE='#'
+  WITH_API_PS_FALSE=
+fi
 
-DISTCLEAN_FILES="*~ .*~ *.log *.bak *.old *.orig *.out *.rej \"\#\"* \".\\#\"*"
+ if test x$with_api_pdf = xyes; then
+  WITH_API_PDF_TRUE=
+  WITH_API_PDF_FALSE='#'
+else
+  WITH_API_PDF_TRUE='#'
+  WITH_API_PDF_FALSE=
+fi
 
+ if test x$with_api_html = xyes; then
+  WITH_API_HTML_TRUE=
+  WITH_API_HTML_FALSE='#'
+else
+  WITH_API_HTML_TRUE='#'
+  WITH_API_HTML_FALSE=
+fi
 
-ac_config_files="$ac_config_files Makefile lib/Makefile sanei/Makefile frontend/Makefile japi/Makefile backend/Makefile include/Makefile doc/Makefile po/Makefile testsuite/Makefile testsuite/sanei/Makefile testsuite/tools/Makefile tools/Makefile doc/doxygen-sanei.conf doc/doxygen-genesys.conf"
+
+
+
+
+
+
+ac_config_files="$ac_config_files Makefile lib/Makefile sanei/Makefile frontend/Makefile japi/Makefile backend/Makefile include/Makefile doc/Makefile po/Makefile.in testsuite/Makefile testsuite/sanei/Makefile testsuite/tools/Makefile tools/Makefile doc/doxygen-sanei.conf doc/doxygen-genesys.conf"
 
 ac_config_files="$ac_config_files tools/sane-config"
 
@@ -18645,6 +21524,10 @@ Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
 
+if test -z "${have_usblib_TRUE}" && test -z "${have_usblib_FALSE}"; then
+  as_fn_error $? "conditional \"have_usblib\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${COMPILE_SANED_TRUE}" && test -z "${COMPILE_SANED_FALSE}"; then
   as_fn_error $? "conditional \"COMPILE_SANED\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -18657,12 +21540,16 @@ if test -z "${INSTALL_UMAX_PP_TOOLS_TRUE}" && test -z "${INSTALL_UMAX_PP_TOOLS_F
   as_fn_error $? "conditional \"INSTALL_UMAX_PP_TOOLS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${ENABLE_TRANSLATIONS_TRUE}" && test -z "${ENABLE_TRANSLATIONS_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_TRANSLATIONS\" was never defined.
+if test -z "${WITH_API_PS_TRUE}" && test -z "${WITH_API_PS_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_API_PS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_API_PDF_TRUE}" && test -z "${WITH_API_PDF_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_API_PDF\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${USE_LATEX_TRUE}" && test -z "${USE_LATEX_FALSE}"; then
-  as_fn_error $? "conditional \"USE_LATEX\" was never defined.
+if test -z "${WITH_API_HTML_TRUE}" && test -z "${WITH_API_HTML_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_API_HTML\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -19062,7 +21949,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sane-backends $as_me 1.0.25, which was
+This file was extended by sane-backends $as_me 1.0.27, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19128,7 +22015,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-sane-backends config.status 1.0.25
+sane-backends config.status 1.0.27
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -19248,24 +22135,6 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # INIT-COMMANDS
 #
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-# variables for create stdint.h replacement
-PACKAGE="$PACKAGE"
-VERSION="$VERSION"
-ac_stdint_h="$ac_stdint_h"
-_ac_stdint_h=`$as_echo "_$PACKAGE-$ac_stdint_h" | $as_tr_cpp`
-ac_cv_stdint_message="$ac_cv_stdint_message"
-ac_cv_header_stdint_t="$ac_cv_header_stdint_t"
-ac_cv_header_stdint_x="$ac_cv_header_stdint_x"
-ac_cv_header_stdint_o="$ac_cv_header_stdint_o"
-ac_cv_header_stdint_u="$ac_cv_header_stdint_u"
-ac_cv_type_uint64_t="$ac_cv_type_uint64_t"
-ac_cv_type_u_int64_t="$ac_cv_type_u_int64_t"
-ac_cv_char_data_model="$ac_cv_char_data_model"
-ac_cv_long_data_model="$ac_cv_long_data_model"
-ac_cv_type_int_least32_t="$ac_cv_type_int_least32_t"
-ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t"
-ac_cv_type_intmax_t="$ac_cv_type_intmax_t"
-
 
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -19275,12 +22144,12 @@ ac_cv_type_intmax_t="$ac_cv_type_intmax_t"
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
 AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
 DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
 enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
 pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
@@ -19545,6 +22414,31 @@ fi
 
 
 
+# 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%}"
+
+# variables for create stdint.h replacement
+PACKAGE="$PACKAGE"
+VERSION="$VERSION"
+ac_stdint_h="$ac_stdint_h"
+_ac_stdint_h=`$as_echo "_$PACKAGE-$ac_stdint_h" | $as_tr_cpp`
+ac_cv_stdint_message="$ac_cv_stdint_message"
+ac_cv_header_stdint_t="$ac_cv_header_stdint_t"
+ac_cv_header_stdint_x="$ac_cv_header_stdint_x"
+ac_cv_header_stdint_o="$ac_cv_header_stdint_o"
+ac_cv_header_stdint_u="$ac_cv_header_stdint_u"
+ac_cv_type_uint64_t="$ac_cv_type_uint64_t"
+ac_cv_type_u_int64_t="$ac_cv_type_u_int64_t"
+ac_cv_char_data_model="$ac_cv_char_data_model"
+ac_cv_long_data_model="$ac_cv_long_data_model"
+ac_cv_type_int_least32_t="$ac_cv_type_int_least32_t"
+ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t"
+ac_cv_type_intmax_t="$ac_cv_type_intmax_t"
+
 
 _ACEOF
 
@@ -19556,8 +22450,9 @@ do
   case $ac_config_target in
     "include/sane/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/sane/config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "$ac_stdint_h") CONFIG_COMMANDS="$CONFIG_COMMANDS $ac_stdint_h" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
+    "$ac_stdint_h") CONFIG_COMMANDS="$CONFIG_COMMANDS $ac_stdint_h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
     "sanei/Makefile") CONFIG_FILES="$CONFIG_FILES sanei/Makefile" ;;
@@ -19566,7 +22461,7 @@ do
     "backend/Makefile") CONFIG_FILES="$CONFIG_FILES backend/Makefile" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-    "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
+    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
     "testsuite/sanei/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/sanei/Makefile" ;;
     "testsuite/tools/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/tools/Makefile" ;;
@@ -20263,470 +23158,6 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "$ac_stdint_h":C)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_stdint_h : $_ac_stdint_h" >&5
-$as_echo "$as_me: creating $ac_stdint_h : $_ac_stdint_h" >&6;}
-ac_stdint=$tmp/_stdint.h
-
-echo "#ifndef" $_ac_stdint_h >$ac_stdint
-echo "#define" $_ac_stdint_h "1" >>$ac_stdint
-echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint
-echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint
-echo "/* generated $ac_cv_stdint_message */" >>$ac_stdint
-if test "_$ac_cv_header_stdint_t" != "_" ; then
-echo "#define _STDINT_HAVE_STDINT_H" "1" >>$ac_stdint
-echo "#include <stdint.h>" >>$ac_stdint
-echo "#endif" >>$ac_stdint
-echo "#endif" >>$ac_stdint
-else
-
-cat >>$ac_stdint <<STDINT_EOF
-
-/* ................... shortcircuit part ........................... */
-
-#if defined HAVE_STDINT_H || defined _STDINT_HAVE_STDINT_H
-#include <stdint.h>
-#else
-#include <stddef.h>
-
-/* .................... configured part ............................ */
-
-STDINT_EOF
-
-echo "/* whether we have a C99 compatible stdint header file */" >>$ac_stdint
-if test "_$ac_cv_header_stdint_x" != "_" ; then
-  ac_header="$ac_cv_header_stdint_x"
-  echo "#define _STDINT_HEADER_INTPTR" '"'"$ac_header"'"' >>$ac_stdint
-else
-  echo "/* #undef _STDINT_HEADER_INTPTR */" >>$ac_stdint
-fi
-
-echo "/* whether we have a C96 compatible inttypes header file */" >>$ac_stdint
-if  test "_$ac_cv_header_stdint_o" != "_" ; then
-  ac_header="$ac_cv_header_stdint_o"
-  echo "#define _STDINT_HEADER_UINT32" '"'"$ac_header"'"' >>$ac_stdint
-else
-  echo "/* #undef _STDINT_HEADER_UINT32 */" >>$ac_stdint
-fi
-
-echo "/* whether we have a BSD compatible inet types header */" >>$ac_stdint
-if  test "_$ac_cv_header_stdint_u" != "_" ; then
-  ac_header="$ac_cv_header_stdint_u"
-  echo "#define _STDINT_HEADER_U_INT32" '"'"$ac_header"'"' >>$ac_stdint
-else
-  echo "/* #undef _STDINT_HEADER_U_INT32 */" >>$ac_stdint
-fi
-
-echo "" >>$ac_stdint
-
-if test "_$ac_header" != "_" ; then if test "$ac_header" != "stddef.h" ; then
-  echo "#include <$ac_header>" >>$ac_stdint
-  echo "" >>$ac_stdint
-fi fi
-
-echo "/* which 64bit typedef has been found */" >>$ac_stdint
-if test "$ac_cv_type_uint64_t" = "yes" ; then
-echo "#define   _STDINT_HAVE_UINT64_T" "1"  >>$ac_stdint
-else
-echo "/* #undef _STDINT_HAVE_UINT64_T */" >>$ac_stdint
-fi
-if test "$ac_cv_type_u_int64_t" = "yes" ; then
-echo "#define   _STDINT_HAVE_U_INT64_T" "1"  >>$ac_stdint
-else
-echo "/* #undef _STDINT_HAVE_U_INT64_T */" >>$ac_stdint
-fi
-echo "" >>$ac_stdint
-
-echo "/* which type model has been detected */" >>$ac_stdint
-if test "_$ac_cv_char_data_model" != "_" ; then
-echo "#define   _STDINT_CHAR_MODEL" "$ac_cv_char_data_model" >>$ac_stdint
-echo "#define   _STDINT_LONG_MODEL" "$ac_cv_long_data_model" >>$ac_stdint
-else
-echo "/* #undef _STDINT_CHAR_MODEL // skipped */" >>$ac_stdint
-echo "/* #undef _STDINT_LONG_MODEL // skipped */" >>$ac_stdint
-fi
-echo "" >>$ac_stdint
-
-echo "/* whether int_least types were detected */" >>$ac_stdint
-if test "$ac_cv_type_int_least32_t" = "yes"; then
-echo "#define   _STDINT_HAVE_INT_LEAST32_T" "1"  >>$ac_stdint
-else
-echo "/* #undef _STDINT_HAVE_INT_LEAST32_T */" >>$ac_stdint
-fi
-echo "/* whether int_fast types were detected */" >>$ac_stdint
-if test "$ac_cv_type_int_fast32_t" = "yes"; then
-echo "#define   _STDINT_HAVE_INT_FAST32_T" "1" >>$ac_stdint
-else
-echo "/* #undef _STDINT_HAVE_INT_FAST32_T */" >>$ac_stdint
-fi
-echo "/* whether intmax_t type was detected */" >>$ac_stdint
-if test "$ac_cv_type_intmax_t" = "yes"; then
-echo "#define   _STDINT_HAVE_INTMAX_T" "1" >>$ac_stdint
-else
-echo "/* #undef _STDINT_HAVE_INTMAX_T */" >>$ac_stdint
-fi
-echo "" >>$ac_stdint
-
-  cat >>$ac_stdint <<STDINT_EOF
-/* .................... detections part ............................ */
-
-/* whether we need to define bitspecific types from compiler base types */
-#ifndef _STDINT_HEADER_INTPTR
-#ifndef _STDINT_HEADER_UINT32
-#ifndef _STDINT_HEADER_U_INT32
-#define _STDINT_NEED_INT_MODEL_T
-#else
-#define _STDINT_HAVE_U_INT_TYPES
-#endif
-#endif
-#endif
-
-#ifdef _STDINT_HAVE_U_INT_TYPES
-#undef _STDINT_NEED_INT_MODEL_T
-#endif
-
-#ifdef  _STDINT_CHAR_MODEL
-#if     _STDINT_CHAR_MODEL+0 == 122 || _STDINT_CHAR_MODEL+0 == 124
-#ifndef _STDINT_BYTE_MODEL
-#define _STDINT_BYTE_MODEL 12
-#endif
-#endif
-#endif
-
-#ifndef _STDINT_HAVE_INT_LEAST32_T
-#define _STDINT_NEED_INT_LEAST_T
-#endif
-
-#ifndef _STDINT_HAVE_INT_FAST32_T
-#define _STDINT_NEED_INT_FAST_T
-#endif
-
-#ifndef _STDINT_HEADER_INTPTR
-#define _STDINT_NEED_INTPTR_T
-#ifndef _STDINT_HAVE_INTMAX_T
-#define _STDINT_NEED_INTMAX_T
-#endif
-#endif
-
-
-/* .................... definition part ............................ */
-
-/* some system headers have good uint64_t */
-#ifndef _HAVE_UINT64_T
-#if     defined _STDINT_HAVE_UINT64_T  || defined HAVE_UINT64_T
-#define _HAVE_UINT64_T
-#elif   defined _STDINT_HAVE_U_INT64_T || defined HAVE_U_INT64_T
-#define _HAVE_UINT64_T
-typedef u_int64_t uint64_t;
-#endif
-#endif
-
-#ifndef _HAVE_UINT64_T
-/* .. here are some common heuristics using compiler runtime specifics */
-#if defined __STDC_VERSION__ && defined __STDC_VERSION__ >= 199901L
-#define _HAVE_UINT64_T
-#define _HAVE_LONGLONG_UINT64_T
-typedef long long int64_t;
-typedef unsigned long long uint64_t;
-
-#elif !defined __STRICT_ANSI__
-#if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
-#define _HAVE_UINT64_T
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-
-#elif defined __GNUC__ || defined __MWERKS__ || defined __ELF__
-/* note: all ELF-systems seem to have loff-support which needs 64-bit */
-#if !defined _NO_LONGLONG
-#define _HAVE_UINT64_T
-#define _HAVE_LONGLONG_UINT64_T
-typedef long long int64_t;
-typedef unsigned long long uint64_t;
-#endif
-
-#elif defined __alpha || (defined __mips && defined _ABIN32)
-#if !defined _NO_LONGLONG
-typedef long int64_t;
-typedef unsigned long uint64_t;
-#endif
-  /* compiler/cpu type to define int64_t */
-#endif
-#endif
-#endif
-
-#if defined _STDINT_HAVE_U_INT_TYPES
-/* int8_t int16_t int32_t defined by inet code, redeclare the u_intXX types */
-typedef u_int8_t uint8_t;
-typedef u_int16_t uint16_t;
-typedef u_int32_t uint32_t;
-
-/* glibc compatibility */
-#ifndef __int8_t_defined
-#define __int8_t_defined
-#endif
-#endif
-
-#ifdef _STDINT_NEED_INT_MODEL_T
-/* we must guess all the basic types. Apart from byte-adressable system, */
-/* there a few 32-bit-only dsp-systems that we guard with BYTE_MODEL 8-} */
-/* (btw, those nibble-addressable systems are way off, or so we assume) */
-
-
-#if defined _STDINT_BYTE_MODEL
-#if _STDINT_LONG_MODEL+0 == 242
-/* 2:4:2 =  IP16 = a normal 16-bit system                */
-typedef unsigned char   uint8_t;
-typedef unsigned short  uint16_t;
-typedef unsigned long   uint32_t;
-#ifndef __int8_t_defined
-#define __int8_t_defined
-typedef          char    int8_t;
-typedef          short   int16_t;
-typedef          long    int32_t;
-#endif
-#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL == 444
-/* 2:4:4 =  LP32 = a 32-bit system derived from a 16-bit */
-/* 4:4:4 = ILP32 = a normal 32-bit system                */
-typedef unsigned char   uint8_t;
-typedef unsigned short  uint16_t;
-typedef unsigned int    uint32_t;
-#ifndef __int8_t_defined
-#define __int8_t_defined
-typedef          char    int8_t;
-typedef          short   int16_t;
-typedef          int     int32_t;
-#endif
-#elif _STDINT_LONG_MODEL+0 == 484 || _STDINT_LONG_MODEL+0 == 488
-/* 4:8:4 =  IP32 = a 32-bit system prepared for 64-bit    */
-/* 4:8:8 =  LP64 = a normal 64-bit system                 */
-typedef unsigned char   uint8_t;
-typedef unsigned short  uint16_t;
-typedef unsigned int    uint32_t;
-#ifndef __int8_t_defined
-#define __int8_t_defined
-typedef          char    int8_t;
-typedef          short   int16_t;
-typedef          int     int32_t;
-#endif
-/* this system has a "long" of 64bit */
-#ifndef _HAVE_UINT64_T
-#define _HAVE_UINT64_T
-typedef unsigned long   uint64_t;
-typedef          long    int64_t;
-#endif
-#elif _STDINT_LONG_MODEL+0 == 448
-/*      LLP64   a 64-bit system derived from a 32-bit system */
-typedef unsigned char   uint8_t;
-typedef unsigned short  uint16_t;
-typedef unsigned int    uint32_t;
-#ifndef __int8_t_defined
-#define __int8_t_defined
-typedef          char    int8_t;
-typedef          short   int16_t;
-typedef          int     int32_t;
-#endif
-/* assuming the system has a "long long" */
-#ifndef _HAVE_UINT64_T
-#define _HAVE_UINT64_T
-#define _HAVE_LONGLONG_UINT64_T
-typedef unsigned long long uint64_t;
-typedef          long long  int64_t;
-#endif
-#else
-#define _STDINT_NO_INT32_T
-#endif
-#else
-#define _STDINT_NO_INT8_T
-#define _STDINT_NO_INT32_T
-#endif
-#endif
-
-/*
- * quote from SunOS-5.8 sys/inttypes.h:
- * Use at your own risk.  As of February 1996, the committee is squarely
- * behind the fixed sized types; the "least" and "fast" types are still being
- * discussed.  The probability that the "fast" types may be removed before
- * the standard is finalized is high enough that they are not currently
- * implemented.
- */
-
-#if defined _STDINT_NEED_INT_LEAST_T
-typedef  int8_t    int_least8_t;
-typedef  int16_t   int_least16_t;
-typedef  int32_t   int_least32_t;
-#ifdef _HAVE_UINT64_T
-typedef  int64_t   int_least64_t;
-#endif
-
-typedef uint8_t   uint_least8_t;
-typedef uint16_t  uint_least16_t;
-typedef uint32_t  uint_least32_t;
-#ifdef _HAVE_UINT64_T
-typedef uint64_t  uint_least64_t;
-#endif
-  /* least types */
-#endif
-
-#if defined _STDINT_NEED_INT_FAST_T
-typedef  int8_t    int_fast8_t;
-typedef  int       int_fast16_t;
-typedef  int32_t   int_fast32_t;
-#ifdef _HAVE_UINT64_T
-typedef  int64_t   int_fast64_t;
-#endif
-
-typedef uint8_t   uint_fast8_t;
-typedef unsigned  uint_fast16_t;
-typedef uint32_t  uint_fast32_t;
-#ifdef _HAVE_UINT64_T
-typedef uint64_t  uint_fast64_t;
-#endif
-  /* fast types */
-#endif
-
-#ifdef _STDINT_NEED_INTMAX_T
-#ifdef _HAVE_UINT64_T
-typedef  int64_t       intmax_t;
-typedef uint64_t      uintmax_t;
-#else
-typedef          long  intmax_t;
-typedef unsigned long uintmax_t;
-#endif
-#endif
-
-#ifdef _STDINT_NEED_INTPTR_T
-#ifndef __intptr_t_defined
-#define __intptr_t_defined
-/* we encourage using "long" to store pointer values, never use "int" ! */
-#if   _STDINT_LONG_MODEL+0 == 242 || _STDINT_LONG_MODEL+0 == 484
-typedef  unsigned int   uintptr_t;
-typedef           int    intptr_t;
-#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL+0 == 444
-typedef  unsigned long  uintptr_t;
-typedef           long   intptr_t;
-#elif _STDINT_LONG_MODEL+0 == 448 && defined _HAVE_UINT64_T
-typedef        uint64_t uintptr_t;
-typedef         int64_t  intptr_t;
-#else /* matches typical system types ILP32 and LP64 - but not IP16 or LLP64 */
-typedef  unsigned long  uintptr_t;
-typedef           long   intptr_t;
-#endif
-#endif
-#endif
-
-/* The ISO C99 standard specifies that in C++ implementations these
-   should only be defined if explicitly requested.  */
-#if !defined __cplusplus || defined __STDC_CONSTANT_MACROS
-#ifndef UINT32_C
-
-/* Signed.  */
-# define INT8_C(c)      c
-# define INT16_C(c)     c
-# define INT32_C(c)     c
-# ifdef _HAVE_LONGLONG_UINT64_T
-#  define INT64_C(c)    c ## L
-# else
-#  define INT64_C(c)    c ## LL
-# endif
-
-/* Unsigned.  */
-# define UINT8_C(c)     c ## U
-# define UINT16_C(c)    c ## U
-# define UINT32_C(c)    c ## U
-# ifdef _HAVE_LONGLONG_UINT64_T
-#  define UINT64_C(c)   c ## UL
-# else
-#  define UINT64_C(c)   c ## ULL
-# endif
-
-/* Maximal type.  */
-# ifdef _HAVE_LONGLONG_UINT64_T
-#  define INTMAX_C(c)   c ## L
-#  define UINTMAX_C(c)  c ## UL
-# else
-#  define INTMAX_C(c)   c ## LL
-#  define UINTMAX_C(c)  c ## ULL
-# endif
-
-  /* literalnumbers */
-#endif
-#endif
-
-/* These limits are merily those of a two complement byte-oriented system */
-
-/* Minimum of signed integral types.  */
-# define INT8_MIN               (-128)
-# define INT16_MIN              (-32767-1)
-# define INT32_MIN              (-2147483647-1)
-# define INT64_MIN              (-__INT64_C(9223372036854775807)-1)
-/* Maximum of signed integral types.  */
-# define INT8_MAX               (127)
-# define INT16_MAX              (32767)
-# define INT32_MAX              (2147483647)
-# define INT64_MAX              (__INT64_C(9223372036854775807))
-
-/* Maximum of unsigned integral types.  */
-# define UINT8_MAX              (255)
-# define UINT16_MAX             (65535)
-# define UINT32_MAX             (4294967295U)
-# define UINT64_MAX             (__UINT64_C(18446744073709551615))
-
-/* Minimum of signed integral types having a minimum size.  */
-# define INT_LEAST8_MIN         INT8_MIN
-# define INT_LEAST16_MIN        INT16_MIN
-# define INT_LEAST32_MIN        INT32_MIN
-# define INT_LEAST64_MIN        INT64_MIN
-/* Maximum of signed integral types having a minimum size.  */
-# define INT_LEAST8_MAX         INT8_MAX
-# define INT_LEAST16_MAX        INT16_MAX
-# define INT_LEAST32_MAX        INT32_MAX
-# define INT_LEAST64_MAX        INT64_MAX
-
-/* Maximum of unsigned integral types having a minimum size.  */
-# define UINT_LEAST8_MAX        UINT8_MAX
-# define UINT_LEAST16_MAX       UINT16_MAX
-# define UINT_LEAST32_MAX       UINT32_MAX
-# define UINT_LEAST64_MAX       UINT64_MAX
-
-  /* shortcircuit*/
-#endif
-  /* once */
-#endif
-#endif
-STDINT_EOF
-fi
-    if cmp -s $ac_stdint_h $ac_stdint 2>/dev/null; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_stdint_h is unchanged" >&5
-$as_echo "$as_me: $ac_stdint_h is unchanged" >&6;}
-    else
-      ac_dir=`$as_dirname -- "$ac_stdint_h" ||
-$as_expr X"$ac_stdint_h" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_stdint_h" : 'X\(//\)[^/]' \| \
-	 X"$ac_stdint_h" : 'X\(//\)$' \| \
-	 X"$ac_stdint_h" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_stdint_h" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      as_dir="$ac_dir"; as_fn_mkdir_p
-      rm -f $ac_stdint_h
-      mv $ac_stdint $ac_stdint_h
-    fi
- ;;
     "libtool":C)
 
     # See if we are running on zsh, and set the options which allow our
@@ -20781,6 +23212,13 @@ available_tags=""
 
 # ### BEGIN LIBTOOL CONFIG
 
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
 # Assembler program.
 AS=$lt_AS
 
@@ -20790,13 +23228,6 @@ DLLTOOL=$lt_DLLTOOL
 # Object dumper program.
 OBJDUMP=$lt_OBJDUMP
 
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
 # Whether or not to build shared libraries.
 build_libtool_libs=$enable_shared
 
@@ -21360,6 +23791,583 @@ fi
   chmod +x "$ofile"
 
  ;;
+    "po-directories":C)
+    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 ;;
+    "$ac_stdint_h":C)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_stdint_h : $_ac_stdint_h" >&5
+$as_echo "$as_me: creating $ac_stdint_h : $_ac_stdint_h" >&6;}
+ac_stdint=$tmp/_stdint.h
+
+echo "#ifndef" $_ac_stdint_h >$ac_stdint
+echo "#define" $_ac_stdint_h "1" >>$ac_stdint
+echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint
+echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint
+echo "/* generated $ac_cv_stdint_message */" >>$ac_stdint
+if test "_$ac_cv_header_stdint_t" != "_" ; then
+echo "#define _STDINT_HAVE_STDINT_H" "1" >>$ac_stdint
+echo "#include <stdint.h>" >>$ac_stdint
+echo "#endif" >>$ac_stdint
+echo "#endif" >>$ac_stdint
+else
+
+cat >>$ac_stdint <<STDINT_EOF
+
+/* ................... shortcircuit part ........................... */
+
+#if defined HAVE_STDINT_H || defined _STDINT_HAVE_STDINT_H
+#include <stdint.h>
+#else
+#include <stddef.h>
+
+/* .................... configured part ............................ */
+
+STDINT_EOF
+
+echo "/* whether we have a C99 compatible stdint header file */" >>$ac_stdint
+if test "_$ac_cv_header_stdint_x" != "_" ; then
+  ac_header="$ac_cv_header_stdint_x"
+  echo "#define _STDINT_HEADER_INTPTR" '"'"$ac_header"'"' >>$ac_stdint
+else
+  echo "/* #undef _STDINT_HEADER_INTPTR */" >>$ac_stdint
+fi
+
+echo "/* whether we have a C96 compatible inttypes header file */" >>$ac_stdint
+if  test "_$ac_cv_header_stdint_o" != "_" ; then
+  ac_header="$ac_cv_header_stdint_o"
+  echo "#define _STDINT_HEADER_UINT32" '"'"$ac_header"'"' >>$ac_stdint
+else
+  echo "/* #undef _STDINT_HEADER_UINT32 */" >>$ac_stdint
+fi
+
+echo "/* whether we have a BSD compatible inet types header */" >>$ac_stdint
+if  test "_$ac_cv_header_stdint_u" != "_" ; then
+  ac_header="$ac_cv_header_stdint_u"
+  echo "#define _STDINT_HEADER_U_INT32" '"'"$ac_header"'"' >>$ac_stdint
+else
+  echo "/* #undef _STDINT_HEADER_U_INT32 */" >>$ac_stdint
+fi
+
+echo "" >>$ac_stdint
+
+if test "_$ac_header" != "_" ; then if test "$ac_header" != "stddef.h" ; then
+  echo "#include <$ac_header>" >>$ac_stdint
+  echo "" >>$ac_stdint
+fi fi
+
+echo "/* which 64bit typedef has been found */" >>$ac_stdint
+if test "$ac_cv_type_uint64_t" = "yes" ; then
+echo "#define   _STDINT_HAVE_UINT64_T" "1"  >>$ac_stdint
+else
+echo "/* #undef _STDINT_HAVE_UINT64_T */" >>$ac_stdint
+fi
+if test "$ac_cv_type_u_int64_t" = "yes" ; then
+echo "#define   _STDINT_HAVE_U_INT64_T" "1"  >>$ac_stdint
+else
+echo "/* #undef _STDINT_HAVE_U_INT64_T */" >>$ac_stdint
+fi
+echo "" >>$ac_stdint
+
+echo "/* which type model has been detected */" >>$ac_stdint
+if test "_$ac_cv_char_data_model" != "_" ; then
+echo "#define   _STDINT_CHAR_MODEL" "$ac_cv_char_data_model" >>$ac_stdint
+echo "#define   _STDINT_LONG_MODEL" "$ac_cv_long_data_model" >>$ac_stdint
+else
+echo "/* #undef _STDINT_CHAR_MODEL // skipped */" >>$ac_stdint
+echo "/* #undef _STDINT_LONG_MODEL // skipped */" >>$ac_stdint
+fi
+echo "" >>$ac_stdint
+
+echo "/* whether int_least types were detected */" >>$ac_stdint
+if test "$ac_cv_type_int_least32_t" = "yes"; then
+echo "#define   _STDINT_HAVE_INT_LEAST32_T" "1"  >>$ac_stdint
+else
+echo "/* #undef _STDINT_HAVE_INT_LEAST32_T */" >>$ac_stdint
+fi
+echo "/* whether int_fast types were detected */" >>$ac_stdint
+if test "$ac_cv_type_int_fast32_t" = "yes"; then
+echo "#define   _STDINT_HAVE_INT_FAST32_T" "1" >>$ac_stdint
+else
+echo "/* #undef _STDINT_HAVE_INT_FAST32_T */" >>$ac_stdint
+fi
+echo "/* whether intmax_t type was detected */" >>$ac_stdint
+if test "$ac_cv_type_intmax_t" = "yes"; then
+echo "#define   _STDINT_HAVE_INTMAX_T" "1" >>$ac_stdint
+else
+echo "/* #undef _STDINT_HAVE_INTMAX_T */" >>$ac_stdint
+fi
+echo "" >>$ac_stdint
+
+  cat >>$ac_stdint <<STDINT_EOF
+/* .................... detections part ............................ */
+
+/* whether we need to define bitspecific types from compiler base types */
+#ifndef _STDINT_HEADER_INTPTR
+#ifndef _STDINT_HEADER_UINT32
+#ifndef _STDINT_HEADER_U_INT32
+#define _STDINT_NEED_INT_MODEL_T
+#else
+#define _STDINT_HAVE_U_INT_TYPES
+#endif
+#endif
+#endif
+
+#ifdef _STDINT_HAVE_U_INT_TYPES
+#undef _STDINT_NEED_INT_MODEL_T
+#endif
+
+#ifdef  _STDINT_CHAR_MODEL
+#if     _STDINT_CHAR_MODEL+0 == 122 || _STDINT_CHAR_MODEL+0 == 124
+#ifndef _STDINT_BYTE_MODEL
+#define _STDINT_BYTE_MODEL 12
+#endif
+#endif
+#endif
+
+#ifndef _STDINT_HAVE_INT_LEAST32_T
+#define _STDINT_NEED_INT_LEAST_T
+#endif
+
+#ifndef _STDINT_HAVE_INT_FAST32_T
+#define _STDINT_NEED_INT_FAST_T
+#endif
+
+#ifndef _STDINT_HEADER_INTPTR
+#define _STDINT_NEED_INTPTR_T
+#ifndef _STDINT_HAVE_INTMAX_T
+#define _STDINT_NEED_INTMAX_T
+#endif
+#endif
+
+
+/* .................... definition part ............................ */
+
+/* some system headers have good uint64_t */
+#ifndef _HAVE_UINT64_T
+#if     defined _STDINT_HAVE_UINT64_T  || defined HAVE_UINT64_T
+#define _HAVE_UINT64_T
+#elif   defined _STDINT_HAVE_U_INT64_T || defined HAVE_U_INT64_T
+#define _HAVE_UINT64_T
+typedef u_int64_t uint64_t;
+#endif
+#endif
+
+#ifndef _HAVE_UINT64_T
+/* .. here are some common heuristics using compiler runtime specifics */
+#if defined __STDC_VERSION__ && defined __STDC_VERSION__ >= 199901L
+#define _HAVE_UINT64_T
+#define _HAVE_LONGLONG_UINT64_T
+typedef long long int64_t;
+typedef unsigned long long uint64_t;
+
+#elif !defined __STRICT_ANSI__
+#if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
+#define _HAVE_UINT64_T
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+
+#elif defined __GNUC__ || defined __MWERKS__ || defined __ELF__
+/* note: all ELF-systems seem to have loff-support which needs 64-bit */
+#if !defined _NO_LONGLONG
+#define _HAVE_UINT64_T
+#define _HAVE_LONGLONG_UINT64_T
+typedef long long int64_t;
+typedef unsigned long long uint64_t;
+#endif
+
+#elif defined __alpha || (defined __mips && defined _ABIN32)
+#if !defined _NO_LONGLONG
+typedef long int64_t;
+typedef unsigned long uint64_t;
+#endif
+  /* compiler/cpu type to define int64_t */
+#endif
+#endif
+#endif
+
+#if defined _STDINT_HAVE_U_INT_TYPES
+/* int8_t int16_t int32_t defined by inet code, redeclare the u_intXX types */
+typedef u_int8_t uint8_t;
+typedef u_int16_t uint16_t;
+typedef u_int32_t uint32_t;
+
+/* glibc compatibility */
+#ifndef __int8_t_defined
+#define __int8_t_defined
+#endif
+#endif
+
+#ifdef _STDINT_NEED_INT_MODEL_T
+/* we must guess all the basic types. Apart from byte-adressable system, */
+/* there a few 32-bit-only dsp-systems that we guard with BYTE_MODEL 8-} */
+/* (btw, those nibble-addressable systems are way off, or so we assume) */
+
+
+#if defined _STDINT_BYTE_MODEL
+#if _STDINT_LONG_MODEL+0 == 242
+/* 2:4:2 =  IP16 = a normal 16-bit system                */
+typedef unsigned char   uint8_t;
+typedef unsigned short  uint16_t;
+typedef unsigned long   uint32_t;
+#ifndef __int8_t_defined
+#define __int8_t_defined
+typedef          char    int8_t;
+typedef          short   int16_t;
+typedef          long    int32_t;
+#endif
+#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL == 444
+/* 2:4:4 =  LP32 = a 32-bit system derived from a 16-bit */
+/* 4:4:4 = ILP32 = a normal 32-bit system                */
+typedef unsigned char   uint8_t;
+typedef unsigned short  uint16_t;
+typedef unsigned int    uint32_t;
+#ifndef __int8_t_defined
+#define __int8_t_defined
+typedef          char    int8_t;
+typedef          short   int16_t;
+typedef          int     int32_t;
+#endif
+#elif _STDINT_LONG_MODEL+0 == 484 || _STDINT_LONG_MODEL+0 == 488
+/* 4:8:4 =  IP32 = a 32-bit system prepared for 64-bit    */
+/* 4:8:8 =  LP64 = a normal 64-bit system                 */
+typedef unsigned char   uint8_t;
+typedef unsigned short  uint16_t;
+typedef unsigned int    uint32_t;
+#ifndef __int8_t_defined
+#define __int8_t_defined
+typedef          char    int8_t;
+typedef          short   int16_t;
+typedef          int     int32_t;
+#endif
+/* this system has a "long" of 64bit */
+#ifndef _HAVE_UINT64_T
+#define _HAVE_UINT64_T
+typedef unsigned long   uint64_t;
+typedef          long    int64_t;
+#endif
+#elif _STDINT_LONG_MODEL+0 == 448
+/*      LLP64   a 64-bit system derived from a 32-bit system */
+typedef unsigned char   uint8_t;
+typedef unsigned short  uint16_t;
+typedef unsigned int    uint32_t;
+#ifndef __int8_t_defined
+#define __int8_t_defined
+typedef          char    int8_t;
+typedef          short   int16_t;
+typedef          int     int32_t;
+#endif
+/* assuming the system has a "long long" */
+#ifndef _HAVE_UINT64_T
+#define _HAVE_UINT64_T
+#define _HAVE_LONGLONG_UINT64_T
+typedef unsigned long long uint64_t;
+typedef          long long  int64_t;
+#endif
+#else
+#define _STDINT_NO_INT32_T
+#endif
+#else
+#define _STDINT_NO_INT8_T
+#define _STDINT_NO_INT32_T
+#endif
+#endif
+
+/*
+ * quote from SunOS-5.8 sys/inttypes.h:
+ * Use at your own risk.  As of February 1996, the committee is squarely
+ * behind the fixed sized types; the "least" and "fast" types are still being
+ * discussed.  The probability that the "fast" types may be removed before
+ * the standard is finalized is high enough that they are not currently
+ * implemented.
+ */
+
+#if defined _STDINT_NEED_INT_LEAST_T
+typedef  int8_t    int_least8_t;
+typedef  int16_t   int_least16_t;
+typedef  int32_t   int_least32_t;
+#ifdef _HAVE_UINT64_T
+typedef  int64_t   int_least64_t;
+#endif
+
+typedef uint8_t   uint_least8_t;
+typedef uint16_t  uint_least16_t;
+typedef uint32_t  uint_least32_t;
+#ifdef _HAVE_UINT64_T
+typedef uint64_t  uint_least64_t;
+#endif
+  /* least types */
+#endif
+
+#if defined _STDINT_NEED_INT_FAST_T
+typedef  int8_t    int_fast8_t;
+typedef  int       int_fast16_t;
+typedef  int32_t   int_fast32_t;
+#ifdef _HAVE_UINT64_T
+typedef  int64_t   int_fast64_t;
+#endif
+
+typedef uint8_t   uint_fast8_t;
+typedef unsigned  uint_fast16_t;
+typedef uint32_t  uint_fast32_t;
+#ifdef _HAVE_UINT64_T
+typedef uint64_t  uint_fast64_t;
+#endif
+  /* fast types */
+#endif
+
+#ifdef _STDINT_NEED_INTMAX_T
+#ifdef _HAVE_UINT64_T
+typedef  int64_t       intmax_t;
+typedef uint64_t      uintmax_t;
+#else
+typedef          long  intmax_t;
+typedef unsigned long uintmax_t;
+#endif
+#endif
+
+#ifdef _STDINT_NEED_INTPTR_T
+#ifndef __intptr_t_defined
+#define __intptr_t_defined
+/* we encourage using "long" to store pointer values, never use "int" ! */
+#if   _STDINT_LONG_MODEL+0 == 242 || _STDINT_LONG_MODEL+0 == 484
+typedef  unsigned int   uintptr_t;
+typedef           int    intptr_t;
+#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL+0 == 444
+typedef  unsigned long  uintptr_t;
+typedef           long   intptr_t;
+#elif _STDINT_LONG_MODEL+0 == 448 && defined _HAVE_UINT64_T
+typedef        uint64_t uintptr_t;
+typedef         int64_t  intptr_t;
+#else /* matches typical system types ILP32 and LP64 - but not IP16 or LLP64 */
+typedef  unsigned long  uintptr_t;
+typedef           long   intptr_t;
+#endif
+#endif
+#endif
+
+/* The ISO C99 standard specifies that in C++ implementations these
+   should only be defined if explicitly requested.  */
+#if !defined __cplusplus || defined __STDC_CONSTANT_MACROS
+#ifndef UINT32_C
+
+/* Signed.  */
+# define INT8_C(c)      c
+# define INT16_C(c)     c
+# define INT32_C(c)     c
+# ifdef _HAVE_LONGLONG_UINT64_T
+#  define INT64_C(c)    c ## L
+# else
+#  define INT64_C(c)    c ## LL
+# endif
+
+/* Unsigned.  */
+# define UINT8_C(c)     c ## U
+# define UINT16_C(c)    c ## U
+# define UINT32_C(c)    c ## U
+# ifdef _HAVE_LONGLONG_UINT64_T
+#  define UINT64_C(c)   c ## UL
+# else
+#  define UINT64_C(c)   c ## ULL
+# endif
+
+/* Maximal type.  */
+# ifdef _HAVE_LONGLONG_UINT64_T
+#  define INTMAX_C(c)   c ## L
+#  define UINTMAX_C(c)  c ## UL
+# else
+#  define INTMAX_C(c)   c ## LL
+#  define UINTMAX_C(c)  c ## ULL
+# endif
+
+  /* literalnumbers */
+#endif
+#endif
+
+/* These limits are merily those of a two complement byte-oriented system */
+
+/* Minimum of signed integral types.  */
+# define INT8_MIN               (-128)
+# define INT16_MIN              (-32767-1)
+# define INT32_MIN              (-2147483647-1)
+# define INT64_MIN              (-__INT64_C(9223372036854775807)-1)
+/* Maximum of signed integral types.  */
+# define INT8_MAX               (127)
+# define INT16_MAX              (32767)
+# define INT32_MAX              (2147483647)
+# define INT64_MAX              (__INT64_C(9223372036854775807))
+
+/* Maximum of unsigned integral types.  */
+# define UINT8_MAX              (255)
+# define UINT16_MAX             (65535)
+# define UINT32_MAX             (4294967295U)
+# define UINT64_MAX             (__UINT64_C(18446744073709551615))
+
+/* Minimum of signed integral types having a minimum size.  */
+# define INT_LEAST8_MIN         INT8_MIN
+# define INT_LEAST16_MIN        INT16_MIN
+# define INT_LEAST32_MIN        INT32_MIN
+# define INT_LEAST64_MIN        INT64_MIN
+/* Maximum of signed integral types having a minimum size.  */
+# define INT_LEAST8_MAX         INT8_MAX
+# define INT_LEAST16_MAX        INT16_MAX
+# define INT_LEAST32_MAX        INT32_MAX
+# define INT_LEAST64_MAX        INT64_MAX
+
+/* Maximum of unsigned integral types having a minimum size.  */
+# define UINT_LEAST8_MAX        UINT8_MAX
+# define UINT_LEAST16_MAX       UINT16_MAX
+# define UINT_LEAST32_MAX       UINT32_MAX
+# define UINT_LEAST64_MAX       UINT64_MAX
+
+  /* shortcircuit*/
+#endif
+  /* once */
+#endif
+#endif
+STDINT_EOF
+fi
+    if cmp -s $ac_stdint_h $ac_stdint 2>/dev/null; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_stdint_h is unchanged" >&5
+$as_echo "$as_me: $ac_stdint_h is unchanged" >&6;}
+    else
+      ac_dir=`$as_dirname -- "$ac_stdint_h" ||
+$as_expr X"$ac_stdint_h" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_stdint_h" : 'X\(//\)[^/]' \| \
+	 X"$ac_stdint_h" : 'X\(//\)$' \| \
+	 X"$ac_stdint_h" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_stdint_h" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      as_dir="$ac_dir"; as_fn_mkdir_p
+      rm -f $ac_stdint_h
+      mv $ac_stdint $ac_stdint_h
+    fi
+ ;;
     "tools/sane-config":F) chmod a+x tools/sane-config ;;
 
   esac
@@ -21402,9 +24410,9 @@ fi
 
 
 echo "-> Variables used for compilation/linking:"
-echo CPPFLAGS=\"${CPPFLAGS}\"
-echo CFLAGS=\"${CFLAGS}\"
-echo LDFLAGS=\"${LDFLAGS}\"
+echo AM_CPPFLAGS=\"${AM_CPPFLAGS}\"
+echo AM_CFLAGS=\"${AM_CFLAGS}\"
+echo AM_LDFLAGS=\"${AM_LDFLAGS}\"
 echo LIBS=\"${LIBS}\"
 echo "-> Installation directories:"
 echo "Configuration: `eval eval echo ${sysconfdir}`"
@@ -21463,10 +24471,10 @@ if test "$SELECTED_BACKENDS" != "" ; then
   echo "*** connected to your local computer won't be supported.  Only a network"
   echo "*** connection to a remote host is possible."
 fi
-if test "$enable_libusb" != "no" && test "$HAVE_USB" != "yes" ; then
-  echo "*** Warning: sane-backends will be built without libusb support.  There may"
+if test "$with_usb" != "no" && test "$have_usb" != "yes" ; then
+  echo "*** Warning: sane-backends will be built without USB support.  There may"
   echo "*** be valid reasons to do so, e.g. if you don't use USB scanners or on"
-  echo "*** platforms without libusb support but generally this means that you"
+  echo "*** platforms without USB support but generally this means that you"
   echo "*** can't use USB devices with SANE. The most probable cause is that"
   if test "${ac_cv_header_usb_h}" != "yes"; then
     echo "*** the libusb header file usb.h is not installed. If you use Linux"
diff --git a/configure.in b/configure.ac
index 96a52e5..fc6e8a2 100644
--- a/configure.in
+++ b/configure.ac
@@ -1,78 +1,75 @@
-dnl Process this file with autoconf to produce a configure script. -*-m4-*-
-
-dnl ***********************************************************************
-dnl When preparing a release, increase the numeric and string version numbers,
-dnl remove the "cvs" suffix, and set is_release=yes
-AC_INIT([sane-backends],[1.0.25],[sane-devel@lists.alioth.debian.org])
-V_MAJOR=1
-V_MINOR=0
-V_REV=25
-is_release=yes
-dnl ***********************************************************************
-
-m4_ifdef([AC_CONFIG_MACRO_DIR], [AC_CONFIG_MACRO_DIR([m4])])
+dnl Process this file with autoconf to produce a configure script.
+
+dnl ******************************************************************
+dnl  Set up autoconf and automake
+dnl  When preparing a release, modify the numeric version components
+dnl  and remove the git suffix.
+dnl ******************************************************************
+AC_INIT([sane-backends],[1.0.27],
+        [sane-devel@lists.alioth.debian.org])
+AC_PREREQ(2.69)                 dnl minimum autoconf version required
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_HEADERS([include/sane/config.h])
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.11.6 subdir-objects -Wall])
+AM_SILENT_RULES
 dnl Turn off feature were automake will automatically run autoreconf.
-dnl This is because we check in generated files into CVS which has
-dnl known timestamp issues.
+dnl This is because we used to check in generated files into CVS which
+dnl has known timestamp issues.
 AM_MAINTAINER_MODE
 
-AC_CONFIG_HEADERS([include/sane/config.h])
-AC_PREREQ(2.54) dnl Minimum Autoconf version required.
-
-PACKAGE=AC_PACKAGE_NAME
-VERSION=AC_PACKAGE_VERSION
-NUMBER_VERSION=${V_MAJOR}.${V_MINOR}.${V_REV}
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE",
-                   [Define to the name of the distribution.])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION",
-                   [Define to the version of the distribution.])
+dnl ******************************************************************
+dnl  Determine SANE version components and release status
+dnl ******************************************************************
+AS_IF([test x = "x$AWK"],[AC_PROG_AWK])
+AS_IF([test x = "x`echo $VERSION | sed 's/[[.0-9]]//g'`"],
+            [is_release=yes],
+            [is_release=no])
+V_MAJOR=`echo $VERSION | $AWK -F. '{print $1}'`
+V_MINOR=`echo $VERSION | $AWK -F. '{print $2}'`
+V_REV=`echo $VERSION | $AWK -F. '{print $3}' | sed 's/[[^0-9]]//g'`;
+
 AC_DEFINE_UNQUOTED(SANE_DLL_V_MAJOR, $V_MAJOR, [SANE DLL major number])
 AC_DEFINE_UNQUOTED(SANE_DLL_V_MINOR, $V_MINOR, [SANE DLL minor number])
 AC_DEFINE_UNQUOTED(SANE_DLL_V_BUILD, $V_REV, [SANE DLL revision number])
 AC_SUBST(V_MAJOR)
 AC_SUBST(V_MINOR)
 AC_SUBST(V_REV)
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
-AC_SUBST(NUMBER_VERSION)
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST 
-
-dnl no bloody way to have a decent --docdir...
-AC_ARG_WITH(docdir, 
-  AC_HELP_STRING([--with-docdir=DIR],
-                 [documentation @<:@PREFIX/doc/sane-VERSION@:>@]),
-[
-  docdir="${withval}"
-  AC_SUBST([docdir])dnl
-], [
-  AC_SUBST([docdir],         ['${prefix}/doc/sane-${VERSION}'])dnl
-])
 
-dnl ***********************************************************************
-dnl Checks for programs.
-dnl ***********************************************************************
+dnl ******************************************************************
+dnl  Set up the compiler and linker
+dnl ******************************************************************
 AC_PROG_CC
 AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PROG_CPP
+sane_save_CC=$CC
+AC_PROG_CC_C99                  dnl enables extensions to ISO C99 :-(
+AS_IF([test xno != "x$ac_cv_prog_cc_c99"],
+      [AC_MSG_CHECKING([for $sane_save_CC option for ISO C99 w/o extensions])
+       AS_CASE([$ac_cv_prog_cc_c99],
+               [-std=gnu99],      [sane_prog_cc_c99="-std=c99"],
+               [-qlanglvl=extc99],[sane_prog_cc_c99="-qlanglvl=stdc99"])
+       AS_IF([test "x$ac_cv_prog_cc_c99" = "x$sane_prog_cc_c99"],
+             [AC_MSG_RESULT([$ac_cv_prog_cc_99])],
+             [AC_MSG_RESULT([$sane_prog_cc_c99])
+              CC="$sane_save_CC $sane_prog_cc_c99"])
+      ])
 AC_PROG_GCC_TRADITIONAL
+AC_USE_SYSTEM_EXTENSIONS        dnl call before running the C compiler
+
+AM_PROG_AR
+LT_INIT([disable-static win32-dll])
+LT_PREREQ([2.4.2])
+
+dnl *****************************************************************
+dnl  Set up I18N/L10N support
+dnl *****************************************************************
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.18.1])
+
+dnl ***********************************************************************
+dnl Checks for programs.
+dnl ***********************************************************************
 AC_PATH_PROG(SANE_CONFIG_PATH, sane-config, no)
-AC_PATH_PROG(MSGFMT, msgfmt$EXEEXT, no)
-AC_PATH_PROG(XGETTEXT, xgettext$EXEEXT, no)
-AC_PATH_PROG(MSGMERGE, msgmerge$EXEEXT, no)
-AC_PATH_PROG(LATEX, latex$EXEEXT, no)
-AC_PATH_PROG(DVIPS, dvips$EXEEXT, no)
-AC_PATH_PROG(MAKEINDEX, makeindex$EXEEXT, no)
-AC_SUBST(MSGFMT)
-AC_SUBST(XGETTEXT)
-AC_SUBST(MSGMERGE)
-AC_SUBST(LATEX)
-AC_SUBST(DVIPS)
-AC_SUBST(MAKEINDEX)
 
 dnl Call explicitely before using PKG_*
 PKG_PROG_PKG_CONFIG
@@ -82,19 +79,13 @@ AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
 dnl ***********************************************************************
 dnl set compiler/linker flags
 dnl ***********************************************************************
-AC_SUBST(INCLUDES)
-SANE_SET_CFLAGS([$is_release])
-SANE_SET_LDFLAGS
-SANE_LINKER_RPATH
+SANE_SET_AM_CFLAGS([$is_release])
+SANE_SET_AM_LDFLAGS
 
 dnl ***********************************************************************
 dnl Checks for unix variants
 dnl ***********************************************************************
-m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC_USE_SYSTEM_EXTENSIONS])
-m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[AC_GNU_SOURCE])
-m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[AC_AIX])
-m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[AC_MINIX])
-AC_ISC_POSIX
+AC_SEARCH_LIBS([strerror],[cposix])
 
 AC_NEED_BYTEORDER_H([include/byteorder.h])
 AX_CREATE_STDINT_H([include/_stdint.h])
@@ -103,7 +94,7 @@ dnl ***********************************************************************
 dnl Checks for libraries
 dnl ***********************************************************************
 AC_ARG_ENABLE(dynamic,
-	AC_HELP_STRING([--disable-dynamic],
+	AS_HELP_STRING([--disable-dynamic],
 		       [Disable dynamic loading of backends]),
 	[enable_dynamic=$enableval], [enable_dynamic=auto])
 SANE_CHECK_DLL_LIB
@@ -130,7 +121,7 @@ SANE_CHECK_GPHOTO2
 
 
 AC_ARG_WITH(v4l,
-	    AC_HELP_STRING([--with-v4l],
+	    AS_HELP_STRING([--with-v4l],
 			   [include the v4l backend @<:@default=yes@:>@]),
 	    [# If --with-v4l=no or --without-v4l, disable backend
              # as "$with_v4l" will be set to "no"])
@@ -140,7 +131,7 @@ if test "$with_v4l" != "no" ; then
 fi
 
 AC_ARG_ENABLE(avahi,
-	AC_HELP_STRING([--enable-avahi], [enable Avahi support for saned and the net backend]),
+	AS_HELP_STRING([--enable-avahi], [enable Avahi support for saned and the net backend]),
 	[enable_avahi=$enableval], [enable_avahi=no])
 
 if test "$enable_avahi" = "yes"; then
@@ -157,7 +148,7 @@ dnl SNMP CHECKS
 dnl **************************************************************
 
 AC_ARG_WITH(snmp,
-	AC_HELP_STRING([--with-snmp], [enable SNMP support @<:@default=yes@:>@]))
+	AS_HELP_STRING([--with-snmp], [enable SNMP support @<:@default=yes@:>@]))
 
 if test "$with_snmp" = "no"; then
 	echo "Not including SNMP support"
@@ -184,12 +175,12 @@ else
 	fi
 fi
 
-if test "$with_snmp" = "yes" -a "${LIBSNMP_EXISTS}x" = "yesx"; then
+if test "$with_snmp" = "yes" && test "${LIBSNMP_EXISTS}x" = "yesx"; then
 	AC_SUBST(SNMP_LIBS)
 	AC_SUBST(SNMP_CFLAGS)
 	AC_DEFINE(HAVE_LIBSNMP, 1, [Define to 1 if you have the net-snmp library.])
 else
-	AC_MSG_WARN([*** Warning: net-snmp library disabled, autodetecting network scanners will not be supported.])
+	AC_MSG_WARN([net-snmp library disabled, autodetecting network scanners will not be supported.])
 fi
 
 
@@ -203,7 +194,7 @@ AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \
     sys/time.h sys/shm.h sys/ipc.h sys/signal.h sys/scanio.h os2.h \
     sys/socket.h sys/io.h sys/hw.h sys/types.h linux/ppdev.h \
-    dev/ppbus/ppi.h machine/cpufunc.h sys/bitypes.h sys/sem.h sys/poll.h \
+    dev/ppbus/ppi.h machine/cpufunc.h sys/sem.h sys/poll.h \
     windows.h be/kernel/OS.h limits.h sys/ioctl.h asm/types.h\
     netinet/in.h tiffio.h ifaddrs.h pwd.h getopt.h)
 AC_CHECK_HEADERS([asm/io.h],,,[#include <sys/types.h>])
@@ -226,33 +217,33 @@ AC_SUBST(RESMGR_LIBS)
 dnl ***********************************************************************
 dnl Checks for types and structures
 dnl ***********************************************************************
-AC_TYPE_SIGNAL
+
 AC_TYPE_SIZE_T
 AC_TYPE_PID_T
-AC_CHECK_TYPE(ssize_t, long)
+AC_TYPE_SSIZE_T
 SANE_CHECK_U_TYPES
 
 # from Python, check for "long long" type
 AC_MSG_CHECKING(for long long support)
 have_long_long=no
-AC_TRY_COMPILE([], [long long x; x = (long long)0;], AC_DEFINE(HAVE_LONG_LONG, 1, [Define if the long long type is available.]) have_long_long=yes)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[long long x; x = (long long)0;]])],[AC_DEFINE(HAVE_LONG_LONG, 1, Define if the long long type is available.) have_long_long=yes],[])
 AC_MSG_RESULT($have_long_long)
 
 AC_MSG_CHECKING([for socklen_t in <sys/socket.h>])
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/socket.h>
-],[socklen_t len],AC_MSG_RESULT(yes),
+]], [[socklen_t len]])],AC_MSG_RESULT(yes),
 [AC_MSG_RESULT(no); AC_DEFINE(socklen_t,int,
 [Define socklen_t as \'int\' if necessary.])])
 
 AC_MSG_CHECKING([for union semun in <sys/sem.h>])
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/sem.h>
-],[union semun test_semun],[AC_MSG_RESULT(yes);
+]], [[union semun test_semun]])],[AC_MSG_RESULT(yes);
 AC_DEFINE(HAVE_UNION_SEMUN,1,[Define if union semun is available.])],
-AC_MSG_RESULT(no))
+[AC_MSG_RESULT(no)])
 
 AC_MSG_CHECKING([for struct flock in fcntl.h])
 AC_EGREP_HEADER([struct flock], fcntl.h, [AC_MSG_RESULT(yes) ;
@@ -260,12 +251,12 @@ AC_EGREP_HEADER([struct flock], fcntl.h, [AC_MSG_RESULT(yes) ;
                 [Define if struct flock is available.])], AC_MSG_RESULT(no))
 
 AC_MSG_CHECKING([for Linux ioctl defines])
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/ioctl.h>
 #include <asm/types.h>
-],[
+]],[[
 __u32 houba = _IOR('v',14, unsigned long);
-],[AC_MSG_RESULT(yes);
+]])],[AC_MSG_RESULT(yes);
 have_linux_ioctl_defines="yes";],AC_MSG_RESULT(no))
 
 dnl ***********************************************************************
@@ -279,6 +270,16 @@ dnl ***********************************************************************
 dnl Checks for library functions
 dnl ***********************************************************************
 
+dnl Functions for which we provide an implementation if missing
+AC_CONFIG_LIBOBJ_DIR([lib])
+AC_FUNC_ALLOCA
+AC_REPLACE_FUNCS([getenv inet_ntop inet_pton isfdtype sigprocmask \
+    sleep snprintf strcasestr strdup strndup strsep syslog usleep \
+    vsyslog])
+AS_IF([test x != x$ALLOCA],
+      [LTALLOCA=`echo "$ALLOCA" | sed 's/\.o$//; s/\.obj$//'`.lo])
+AC_SUBST(LTALLOCA)
+
 dnl Define SOCKET_LIB, NSL_LIB, BIND_LIB, and RESOLV_LIB  when required 
 dnl for functions we use.
 AC_CHECK_FUNC(gethostbyaddr,, [AC_CHECK_LIB(bind, gethostbyaddr, BIND_LIB="-lbind")])
@@ -296,7 +297,6 @@ dnl SOCKET_LIBS so set LIBS temporarily.
 save_LIBS="$LIBS"
 LIBS="$LIBS $SOCKET_LIBS"
 AC_CHECK_FUNCS(inet_addr inet_aton inet_ntoa)
-AC_REPLACE_FUNCS(inet_ntop inet_pton)
 LIBS="$save_LIBS"
 
 if test "$ac_cv_header_be_kernel_OS_h" = "yes" ; then
@@ -305,14 +305,11 @@ if test "$ac_cv_header_be_kernel_OS_h" = "yes" ; then
     ac_cv_func_getnameinfo=no
 fi
 
-AC_FUNC_ALLOCA
 AC_FUNC_MMAP
 AC_CHECK_FUNCS(atexit ioperm i386_set_ioperm \
     mkdir strftime strstr strtod  \
     cfmakeraw tcsendbreak strcasecmp strncasecmp _portaccess \
     getaddrinfo getnameinfo poll setitimer iopl getuid getpass)
-AC_REPLACE_FUNCS(getenv isfdtype sigprocmask snprintf \
-    strcasestr strdup strndup strsep usleep sleep syslog vsyslog)
 
 dnl sys/io.h might provide ioperm but not inb,outb (like for
 dnl non i386/x32/x86_64 with musl libc)
@@ -344,6 +341,12 @@ if test "$ac_cv_header_getopt_h" = "yes" ; then
   AC_CHECK_FUNCS(getopt_long)
 fi
 
+# Slightly abuse the AC_LIBOBJ macro to mark files as replacement code
+AS_IF([test x$ac_cv_header_getopt_h != xyes \
+       && test x$ac_cv_func_getopt_long != xyes],
+      [AC_LIBOBJ(getopt)
+       AC_LIBOBJ(getopt1)])
+
 dnl ***********************************************************************
 dnl checks for system services
 dnl ***********************************************************************
@@ -351,20 +354,8 @@ if test -c /dev/urandom ; then
     AC_DEFINE(HAVE_DEV_URANDOM, 1, [Is /dev/urandom available?])
 fi
 
-dnl added by PN 3/2/12 to detect cups commented out 15/10/13 since avahi is now used instead
-dnl $as_echo "checking for cups"
-dnl if test -e /usr/include/cups/cups.h ; then
-dnl     AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?])
-dnl 	with_cups="yes"
-dnl 	LIBS="-lcups  $LIBS"
-dnl else
-dnl 	$as_echo "cups.h not found, you may want to install a cups development package"
-dnl 	$as_echo "in order to autodetect network scanners in kodakaio."
-dnl 	with_cups="no"
-dnl fi
-
 AC_ARG_WITH(systemd,
-	AC_HELP_STRING([--with-systemd], [enable systemd support @<:@default=yes@:>@]))
+	AS_HELP_STRING([--with-systemd], [enable systemd support @<:@default=yes@:>@]))
 if test "x$with_systemd" != xno ; then
   PKG_CHECK_MODULES(SYSTEMD, [libsystemd], have_systemd=yes, have_systemd=no)
   if test "x$have_systemd" = xno; then
@@ -372,7 +363,6 @@ if test "x$with_systemd" != xno ; then
   fi
   if test "x$have_systemd" = xyes; then
     AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
-    AC_SUBST(SYSTEMD_LIBS)
   else
     if test "x$with_systemd" = xyes; then
       AC_MSG_ERROR([Systemd support was requested but systemd was not found])
@@ -380,85 +370,63 @@ if test "x$with_systemd" != xno ; then
   fi
 fi
 
-dnl ***********
-dnl USB Support
-dnl ***********
-
-dnl Enable libusb-1.0, if available
-AC_ARG_ENABLE(libusb_1_0,
-	AC_HELP_STRING([--enable-libusb_1_0], [enable libusb-1.0 support if available]),
-	[enable_libusb_1_0=$enableval], [enable_libusb_1_0=no])
-
-dnl USB support enabled by default (if found).  Note: Overloading libusb
-dnl option right now to disable USB support on any platform; even
-dnl if they use a different library name.
-AC_ARG_ENABLE(libusb, 
-    AC_HELP_STRING([--disable-libusb], [disable support for USB in SANE]),,
-    enable_libusb=auto)
-HAVE_USB=no
-if test "$enable_libusb" != "no"; then
-  case ${host_os} in
-  beos*)
-  AC_CHECK_HEADERS(be/drivers/USB_scanner.h, HAVE_USB=yes, AC_MSG_ERROR([USB_scanner.h is required on BeOS]))
-  ;;
-  os2*)
-  AC_CHECK_HEADER(usbcalls.h,
-		  AC_CHECK_LIB(usbcall, UsbQueryNumberDevices, 
-       			       [USB_LIBS="$USB_LIBS -lusbcall"
-				HAVE_USB=yes]),,[#include <usb.h> 
-#include <os2.h>
-])
-  ;;
-  *)
-  dnl If libusb-1.0 is enabled and available, prefer that to the old libusb
-  have_libusb_1_0=no
-  if test "$enable_libusb_1_0" = "yes"; then
-    PKG_CHECK_MODULES(LIBUSB_1_0, [ libusb-1.0 >= 1.0.0 ], have_libusb_1_0=yes, have_libusb_1_0=no)
-    if test "$have_libusb_1_0" = "yes"; then
-      CFLAGS="$CFLAGS $LIBUSB_1_0_CFLAGS"
-      USB_LIBS="$USB_LIBS $LIBUSB_1_0_LIBS"
-      HAVE_USB=yes
-    fi
-  fi
-
-  if test "$have_libusb_1_0" = "no"; then
-    dnl Fallback to the old libusb
-    dnl libusb >= 0.1.8 is required, as we need usb_interrupt_read()
-    AC_CHECK_HEADER(usb.h,
-                    AC_CHECK_LIB(usb, usb_interrupt_read,
-                                 [USB_LIBS="$USB_LIBS -lusb"
-                                  HAVE_USB=yes]))
-    AC_CHECK_HEADERS(lusb0_usb.h,
-		     AC_CHECK_LIB(usb, usb_interrupt_read,
-				  [USB_LIBS="$USB_LIBS -lusb"
-				   HAVE_USB=yes]))
-  fi
-  ;;
-  esac
-fi
-dnl The following logic is useful for distributions.  If they force
-dnl USB support with --enable-libusb=yes then configure will fail
-dnl when its detected that it can not be supported.  Default is
-dnl "auto" which means only enable if libraries are found and do
-dnl not error out.
-if test "$enable_libusb" = "yes" && test "$HAVE_USB" = "no"; then
-  AC_MSG_ERROR([USB support requested but required libraries not found.])
-fi
-if test "$HAVE_USB" = "yes"; then
-  case ${host_os} in
-  os2*)
-  AC_DEFINE(HAVE_USBCALLS, 1, [Define to 1 if you have usbcall.dll.])
-  ;;
-  *)
-  if test "$have_libusb_1_0" = "yes"; then
-    AC_DEFINE(HAVE_LIBUSB_1_0, 1, [Define to 1 if you have libusb-1.0.])
-  else
-    AC_DEFINE(HAVE_LIBUSB, 1, [Define to 1 if you have libusb.])
-  fi
-  ;;
-  esac
-fi
-AC_SUBST(USB_LIBS)
+dnl ******************************************************************
+dnl Check for USB support
+dnl ******************************************************************
+
+AC_ARG_WITH(usb,
+  AS_HELP_STRING([--with-usb], [enable USB support @<:@default=check@:>@]),
+  [],
+  [with_usb=check])
+AS_IF([test xno != "x$with_usb"],
+  [have_usb=no
+   AS_CASE(x$host_os,           dnl odd-ball operating systems first
+    [beos*],
+      [AC_CHECK_HEADER(be/drivers/USB_scanner.h, [have_usb=yes])],
+    [os2*],
+      [AC_CHECK_HEADER(usbcalls.h,
+        [AC_CHECK_LIB(usbcall, UsbQueryNumberDevices,
+          [USB_LIBS="-lusbcall"
+           have_usb=yes
+           AC_DEFINE(HAVE_USBCALLS, [1],
+             [Define to 1 if you have usbcall.dll.])
+          ])
+        ],
+        [],
+        [#include <usb.h>
+         #include <os2.h>
+        ])
+      ],
+    [dnl default to libusb-1.x, fall back to libusb-0.x if missing
+     PKG_CHECK_MODULES([USB], [libusb-1.0],
+      [AC_DEFINE([HAVE_LIBUSB], [1],
+        [Define to 1 if you have libusb-1.0])
+       have_usb=yes
+      ],
+      [PKG_CHECK_MODULES([USB], [libusb >= 0.1.8],
+        [AC_DEFINE([HAVE_LIBUSB_LEGACY], [1],
+          [Define to 1 if you have libusb-0.1])
+         have_usb=yes
+        ],
+        [dnl 10+ years old libusb or Windows version
+         AC_CHECK_HEADER(usb.h,
+          AC_CHECK_LIB(usb, usb_interrupt_read,
+            [USB_LIBS="-lusb"
+             have_usb=yes
+            ]))
+         AC_CHECK_HEADERS(lusb0_usb.h,
+           AC_CHECK_LIB(usb, usb_interrupt_read,
+             [USB_LIBS="-lusb"
+              have_usb=yes
+             ]))
+        ])
+      ])
+    ])
+  ])
+AS_IF([test xyes = "x$with_usb" && test xyes != "x$have_usb"],
+  [AC_MSG_ERROR([USB support requested but required libraries not found.])
+  ])
+AM_CONDITIONAL([have_usblib], [test x != "x$USB_LIBS"])
 
 dnl ************
 dnl SCSI Support
@@ -476,7 +444,7 @@ AC_CHECK_HEADERS(IOKit/scsi/SCSITaskLib.h IOKit/cdb/IOSCSILib.h \
   IOKit/scsi/SCSICommandOperationCodes.h \
   IOKit/scsi-commands/SCSICommandOperationCodes.h scsi.h sys/scsi.h \
   sys/scsicmd.h sys/scsiio.h bsd/dev/scsireg.h scsi/sg.h \
-  camlib.h scdds.h sys/scsi/scsi.h sys/scsi/sgdefs.h \
+  camlib.h gscdds.h sys/scsi/scsi.h sys/scsi/sgdefs.h \
   sys/scsi/targets/scgio.h apollo/scsi.h sys/sdi_comm.h \
   sys/passthrudef.h)
 
@@ -489,16 +457,15 @@ AC_CHECK_HEADERS([ntddscsi.h ddk/ntddscsi.h],,,[#include <windows.h>])
 
 dnl FreeBSD < 3
 if test "$ac_cv_header_sys_scsiio_h" = "yes" \
-  -a "$ac_cv_header_scsi_h" = "yes"; then
+  && test "$ac_cv_header_scsi_h" = "yes"; then
   AC_MSG_CHECKING([if 'scsireq_t' needs to be defined as 'struct scsireq'])
-  AC_TRY_COMPILE([
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/scsiio.h>
 #include <scsi.h>
-],[scsireq_t req],,
+]], [[scsireq_t req]])],,
    [AC_MSG_RESULT(yes);
     AC_DEFINE(scsireq_t, struct scsireq_t,
-    	      [Define scsireq_t as \'struct scsireq\' if necessary.])],
-	      AC_MSG_RESULT(no))
+	      [Define scsireq_t as \'struct scsireq\' if necessary.])])
 fi
 AC_CHECK_LIB(scsi, scsireq_enter, SCSI_LIBS="-lscsi") # FreeBSD needs this
 
@@ -509,14 +476,14 @@ AC_CHECK_FUNCS(scsireq_enter)
 
 if test "$ac_cv_header_scsi_sg_h" = "yes"; then
   AC_MSG_CHECKING([for sg_header.target_status in <scsi/sg.h>])
-  AC_TRY_COMPILE([
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/types.h>
 #include <scsi/sg.h>
-],[
+]],[[
 struct sg_header hdr;
 hdr.target_status = 1;
 return 0;
-],[AC_MSG_RESULT(yes);
+]])],[AC_MSG_RESULT(yes);
    AC_DEFINE(HAVE_SG_TARGET_STATUS,1,
 	     [Define if sg_header.target_status is available.])],
 	     AC_MSG_RESULT(no))
@@ -524,30 +491,25 @@ fi
 
 if test "$ac_cv_header_IOKit_scsi_SCSITaskLib_h" = "yes"; then
   AC_MSG_CHECKING([for SCSITaskSGElement in IOKit/scsi/SCSITaskLib.h])
-  AC_TRY_COMPILE([
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #undef VERSION
 #include <IOKit/scsi/SCSITaskLib.h>
-],[
+]],[[
 SCSITaskSGElement range;
 return 0;
-],[AC_MSG_RESULT(yes);
+]])],[AC_MSG_RESULT(yes);
   AC_DEFINE(HAVE_SCSITASKSGELEMENT, 1,
 	    [Define if SCSITaskSGElement is available.])],
   AC_MSG_RESULT(no))
 fi
 
-dnl disable Linux SCSI generic version 3 to avoid 32/64 bit problems
-if sparc64 -q > /dev/null 2>&1 ; then
-  AC_DEFINE(DISABLE_LINUX_SG_IO, 1, [Should we disable SCSI generic v3?])
-fi
-
 # Multiple platforms can set SCSI_LIBS so do substitution at end.
 AC_SUBST(SCSI_LIBS)
 
 AC_ARG_ENABLE(scsibuffersize, 
-  AC_HELP_STRING([--enable-scsibuffersize=N],
+  AS_HELP_STRING([--enable-scsibuffersize=N],
                  [specify the default size in bytes of the buffer for SCSI
-                  commands [[default=131072]]]),
+                  commands @<:@default=131072@:>@]),
   [set_scsibuffersize="$enableval"], [set_scsibuffersize=131072])
 AC_DEFINE_UNQUOTED(SCSIBUFFERSIZE, $set_scsibuffersize,
                    [SCSI command buffer size])
@@ -557,12 +519,12 @@ dnl only printed when used.
 echo "scsi buffersize: $set_scsibuffersize"
 
 AC_ARG_ENABLE(scsi-directio,
-  AC_HELP_STRING([--enable-scsi-directio],
+  AS_HELP_STRING([--enable-scsi-directio],
                  [enable SCSI direct IO (Linux only, dangerous, see
                   README.linux)]),
   [
     if eval "test x$enable_scsi_directio = xyes"; then
-      CFLAGS="$CFLAGS -DENABLE_SCSI_DIRECTIO"
+      AM_CFLAGS="$AM_CFLAGS -DENABLE_SCSI_DIRECTIO"
     fi
   ])
 
@@ -582,23 +544,19 @@ dnl ***********************************************************************
 dnl initialize libtool
 dnl ***********************************************************************
 AC_ARG_ENABLE(preload,
-	AC_HELP_STRING([--disable-preload],
+	AS_HELP_STRING([--disable-preload],
 		       [Disable preloading of backends]),
 	[enable_preload=$enableval], [enable_preload=auto])
 
-AC_LIBTOOL_WIN32_DLL
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
-
 dnl Windows (cygwin/mingw), BeOS, and OS/2 need this.
 case $host_os in
   cygwin* | mingw* | beos* | os2*)
-  LDFLAGS="$LDFLAGS -no-undefined"
+  AM_LDFLAGS="$AM_LDFLAGS -no-undefined"
 esac
 
 dnl Check for lock dir
 
-AC_ARG_WITH(lockdir, AC_HELP_STRING([--with-lockdir=DIR],
+AC_ARG_WITH(lockdir, AS_HELP_STRING([--with-lockdir=DIR],
                                     [set SANE lockdir @<:@localstatedir/lock/sane@:>@]),
                                     [locksanedir=$withval],[locksanedir=${localstatedir}/lock/sane])
 AC_SUBST(locksanedir)
@@ -611,7 +569,7 @@ dnl enable/disable backends and features based on previous tests and user's
 dnl choice
 dnl ***********************************************************************
 
-CPPFLAGS="${CPPFLAGS} -DPATH_SANE_CONFIG_DIR=\$(configdir) \
+AM_CPPFLAGS="${AM_CPPFLAGS} -DPATH_SANE_CONFIG_DIR=\$(configdir) \
 	  -DPATH_SANE_DATA_DIR=\$(datadir) \
 	  -DPATH_SANE_LOCK_DIR=\$(locksanedir) \
 	  -DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}"
@@ -627,7 +585,7 @@ AM_CONDITIONAL(COMPILE_SANED, test x$SANED = xsaned)
 dnl These are the backends that are build in any case:
 
 AC_ARG_ENABLE(local-backends,
-  AC_HELP_STRING([--disable-local-backends],
+  AS_HELP_STRING([--disable-local-backends],
                  [turn off compilation of all backends but net]))
 
 ALL_BACKENDS="abaton agfafocus apple artec artec_eplus48u as6e \
@@ -663,9 +621,6 @@ fi
 
 SANE_CHECK_BACKENDS
 
-AC_SUBST(LIBV4L_LIBS)
-AC_SUBST(LIBV4L_CFLAGS)
-
 if test "${sane_cv_use_libjpeg}" = "yes"; then
   SANEI_SANEI_JPEG_LO="../sanei/sanei_jpeg.lo"
 fi
@@ -673,7 +628,7 @@ AM_CONDITIONAL(HAVE_JPEG, test x$sane_cv_use_libjpeg = xyes)
 AC_SUBST(SANEI_SANEI_JPEG_LO)
 
 AC_ARG_ENABLE(pnm-backend, 
-  AC_HELP_STRING([--enable-pnm-backend],
+  AS_HELP_STRING([--enable-pnm-backend],
                  [enable the pnm backend for testing frontends (possible security risk, see PROBLEMS file)]),
                  [FILTERED_BACKENDS="${FILTERED_BACKENDS} pnm"],
                  [echo "*** pnm backend not manually selected - disabling"])
@@ -758,57 +713,74 @@ case $host_os in
 esac
 
 AC_ARG_ENABLE(parport-directio,
-  AC_HELP_STRING([--enable-parport-directio],
+  AS_HELP_STRING([--enable-parport-directio],
                  [enable direct hardware access to the parallel port, so 
                   frontends will require special permission level]),
   [
     if eval "test x$enable_parport_directio = xyes"; then
-      CFLAGS="$CFLAGS -DENABLE_PARPORT_DIRECTIO"
+      AM_CFLAGS="$AM_CFLAGS -DENABLE_PARPORT_DIRECTIO"
     fi
   ])
 
-AC_ARG_ENABLE(translations,
-  AC_HELP_STRING([--disable-translations],
-                 [don't install translations of backend options]),,
-		 enable_translations=yes)
-if eval "test x$enable_translations = xyes" ; then
-  if test x$MSGFMT = xno || test x$XGETTEXT = xno || test $MSGMERGE = no ; then
-    enable_translations=no
-    echo "disabling translations (missing msgfmt, xgettext or msgmerge)"
-  else
-    echo "enabling translations"
-  fi
-else
-  echo "disabling translations"
-fi  
-AM_CONDITIONAL(ENABLE_TRANSLATIONS, test x$enable_translations = xyes)
-
-AC_ARG_ENABLE(latex,
-	      AC_HELP_STRING([--disable-latex],
-	      [disable use of latex, et.al., to generate documentation]),,
-	      enable_latex=yes)
-if test "x$enable_latex" = "xyes" ; then
-  if test "x$LATEX" = "xno" || test "x$DVIPS" = "xno" || test "x$MAKEINDEX" = "xno" ; then
-    enable_latex=no
-    echo "disabling latex (missing latex, dvips or makeindex)"
-  else
-    echo "enabling latex"
-  fi
-else
-  echo "disabling latex"
-fi  
-AM_CONDITIONAL(USE_LATEX, test x$enable_latex = xyes)
+dnl ******************************************************************
+dnl  SANE API specification format conversion support
+dnl ******************************************************************
+AC_ARG_WITH(api-spec,
+  AS_HELP_STRING([--with-api-spec],
+    [convert API spec to supported output formats @<:@default=check@:>@]),
+    [],
+    [with_api_spec=check])
+dnl  Test for all tools that may be involved.  These tests are fast and
+dnl  running them allows for the Makefile targets to be formulated such
+dnl  that any non-requested formats can be made using a one-off without
+dnl  the need to reconfigure.
+AC_PATH_PROG(MAKEINDEX, makeindex, no)
+AC_PATH_PROG(DVIPS, dvips, no)
+AC_PATH_PROG(LATEX, latex, no)
+AC_PATH_PROG(PDFLATEX, pdflatex, no)
+AC_PATH_PROG(FIG2DEV, fig2dev, no)
+AC_PATH_PROG(GS, gs, no)
+AC_PATH_PROG(DLH, dlh, no)
+AC_PATH_PROG(PPMTOGIF, ppmtogif, no)
+AS_IF([test xno != "x$with_api_spec"],
+  [dnl  Flag formats for which all required tools have been found
+   AS_IF([   test xno != "x$MAKEINDEX" \
+          && test xno != "x$DVIPS" \
+          && test xno != "x$FIG2DEV" \
+          && test xno != "x$LATEX"],       [with_api_ps=yes])
+   AS_IF([   test xno != "x$MAKEINDEX" \
+          && test xno != "x$PDFLATEX" \
+          && test xno != "x$FIG2DEV" \
+          && test xno != "x$GS"],          [with_api_pdf=yes])
+   AS_IF([   test xno != "x$MAKEINDEX" \
+          && test xno != "x$DVIPS" \
+          && test xno != "x$FIG2DEV" \
+          && test xno != "x$DLH" \
+          && test xno != "x$GS" \
+          && test xno != "x$PPMTOFIG" ],   [with_api_html=yes])
+
+   AS_IF([test xyes = "x$with_api_spec" \
+          && test xyes != "x$with_api_ps" \
+          && test xyes != "x$with_api_pdf" \
+          && test xyes != "x$with_api_html"],
+     [AC_MSG_ERROR([tools to convert the API spec are missing])
+     ])
+  ])
+AM_CONDITIONAL(WITH_API_PS, [test x$with_api_ps = xyes])
+AM_CONDITIONAL(WITH_API_PDF, [test x$with_api_pdf = xyes])
+AM_CONDITIONAL(WITH_API_HTML, [test x$with_api_html = xyes])
 
 dnl ***********************************************************************
 dnl Write output files
 dnl ***********************************************************************
 
-DISTCLEAN_FILES="*~ .*~ *.log *.bak *.old *.orig *.out *.rej \"\#\"* \".\\#\"*"
-AC_SUBST(DISTCLEAN_FILES)
+AC_SUBST(AM_CPPFLAGS)
+AC_SUBST(AM_CFLAGS)
+AC_SUBST(AM_LDFLAGS)
 
 AC_CONFIG_FILES([Makefile lib/Makefile sanei/Makefile frontend/Makefile \
   japi/Makefile backend/Makefile include/Makefile doc/Makefile \
-  po/Makefile testsuite/Makefile testsuite/sanei/Makefile testsuite/tools/Makefile \
+  po/Makefile.in testsuite/Makefile testsuite/sanei/Makefile testsuite/tools/Makefile \
   tools/Makefile doc/doxygen-sanei.conf doc/doxygen-genesys.conf])
 AC_CONFIG_FILES([tools/sane-config], [chmod a+x tools/sane-config])
 AC_CONFIG_FILES([tools/sane-backends.pc])
@@ -819,9 +791,9 @@ dnl print configuration information
 dnl ***********************************************************************
 
 echo "-> Variables used for compilation/linking:"
-echo CPPFLAGS=\"${CPPFLAGS}\"
-echo CFLAGS=\"${CFLAGS}\"
-echo LDFLAGS=\"${LDFLAGS}\"
+echo AM_CPPFLAGS=\"${AM_CPPFLAGS}\"
+echo AM_CFLAGS=\"${AM_CFLAGS}\"
+echo AM_LDFLAGS=\"${AM_LDFLAGS}\"
 echo LIBS=\"${LIBS}\"
 echo "-> Installation directories:"
 echo "Configuration: `eval eval echo ${sysconfdir}`"
@@ -843,7 +815,6 @@ fi
 echo "IPv6 support:  `eval eval echo ${ipv6}`"
 echo "Avahi support: `eval eval echo ${enable_avahi}`"
 echo "SNMP support:  `eval eval echo ${with_snmp}`"
-dnl echo "CUPS support:  `eval eval echo ${with_cups}`" commented out 15/10/13
 echo "-> The following backends will be built:"
 for backend in ${BACKENDS} ; do
   echo $ECHO_N "${backend} " 
@@ -881,10 +852,10 @@ if test "$SELECTED_BACKENDS" != "" ; then
   echo "*** connected to your local computer won't be supported.  Only a network"
   echo "*** connection to a remote host is possible."
 fi
-if test "$enable_libusb" != "no" && test "$HAVE_USB" != "yes" ; then
-  echo "*** Warning: sane-backends will be built without libusb support.  There may"
+if test "$with_usb" != "no" && test "$have_usb" != "yes" ; then
+  echo "*** Warning: sane-backends will be built without USB support.  There may"
   echo "*** be valid reasons to do so, e.g. if you don't use USB scanners or on"
-  echo "*** platforms without libusb support but generally this means that you"
+  echo "*** platforms without USB support but generally this means that you"
   echo "*** can't use USB devices with SANE. The most probable cause is that"
   if test "${ac_cv_header_usb_h}" != "yes"; then
     echo "*** the libusb header file usb.h is not installed. If you use Linux"
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a7e47af..162d01a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,7 +16,7 @@ EXTRA_DIST = scanimage.man sane-config.man sane-find-scanner.man \
 # Backend man pages bypass standard automake man5_MANS because there is not
 # a man page for every supported backend.  We could get rid of
 # custom install/uninstall if we required man pages for every backend.
-BACKEND_MANS_ENABLED = @BACKEND_MANS_ENABLED@
+
 BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
 	sane-dll.5 sane-dc25.5 sane-dmc.5 sane-epson.5 sane-epson2.5 sane-epsonds.5 \
 	sane-hp.5 sane-gphoto2.5 sane-leo.5 sane-lexmark.5 \
@@ -28,7 +28,7 @@ BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
 	sane-mustek_pp.5 sane-dc210.5 sane-v4l.5 sane-snapscan.5 \
 	sane-canon.5 sane-coolscan.5 sane-bh.5 sane-dc240.5 \
 	sane-umax_pp.5 sane-umax1220u.5 sane-sm3600.5 sane-usb.5 \
-     	sane-mustek_usb.5 sane-sceptre.5 sane-canon_pp.5 sane-canon630u.5 \
+	sane-mustek_usb.5 sane-sceptre.5 sane-canon_pp.5 sane-canon630u.5 \
         sane-teco1.5 sane-teco2.5 sane-teco3.5 sane-test.5 sane-sp15c.5 \
 	sane-coolscan2.5 sane-hpsj5s.5 sane-gt68xx.5 sane-artec_eplus48u.5 \
 	sane-ma1509.5 sane-ibm.5 sane-hp5400.5 sane-plustek_pp.5 sane-u12.5 \
@@ -51,7 +51,7 @@ EXTRA_DIST += sane-abaton.man sane-agfafocus.man sane-apple.man sane-as6e.man \
 	sane-mustek_pp.man sane-dc210.man sane-v4l.man sane-snapscan.man \
 	sane-canon.man sane-coolscan.man sane-bh.man sane-dc240.man \
 	sane-umax_pp.man sane-umax1220u.man sane-sm3600.man sane-usb.man \
-     	sane-mustek_usb.man sane-sceptre.man sane-canon_pp.man \
+	sane-mustek_usb.man sane-sceptre.man sane-canon_pp.man \
 	sane-canon630u.man sane-teco1.man sane-teco2.man \
 	sane-teco3.man sane-test.man sane-sp15c.man sane-coolscan2.man \
 	sane-hpsj5s.man sane-gt68xx.man sane-artec_eplus48u.man \
@@ -80,25 +80,15 @@ HTML_PAGES = sane-backends.html sane-backends-external.html \
 endif
 doc_DATA = $(HTML_PAGES)
 
-if USE_LATEX
-STANDARD = sane.ps
-else
-STANDARD =
-endif
-
-all: bemans $(STANDARD) html-pages
+all: bemans $(API_SPECS) html-pages
 
 dist_doc_DATA = backend-writing.txt
 nobase_dist_doc_DATA = $(BEDOCS)
-doc_DATA += $(STANDARD)
+doc_DATA += $(API_SPECS)
 EXTRA_DIST += descriptions.txt releases.txt sane-logo2.jpg sane-logo.png \
   sane.png
 
-LATEX	= TEXINPUTS="$(srcdir):$$TEXINPUTS" @LATEX@
-DVIPS   = @DVIPS@
-MAKEINDEX = @MAKEINDEX@
-DLH	= TEXINPUTS="$(srcdir):$$TEXINPUTS" dlh
-MAN2HTML= nroff -c -man |\
+MAN2HTML = nroff -c -man |\
 	  man2html -compress -topm 6 -botm 6 -nodepage -title $${page} \
           -cgiurl '$$title.$$section.html'|\
 	  sed 's,<BODY>,<BODY BGCOLOR=\#FFFFFF TEXT=\#000000><H1 ALIGN=CENTER><IMG SRC="/images/sane.png" HEIGHT=117 WIDTH=346></H1>,'
@@ -156,8 +146,6 @@ BEDOCS += umax/negative-types.txt umax/sane-logo.jpg \
   umax/sane-umax.jpg umax/umax.BUGS umax/umax.CHANGES umax/umax.FAQ \
   umax/umax.TODO
 
-EXTRA_DIST += sane.tex net.tex html.sty
-
 DESC_FILES = descriptions/abaton.desc descriptions/agfafocus.desc \
   descriptions/apple.desc descriptions/artec.desc \
   descriptions/artec_eplus48u.desc descriptions/as6e.desc \
@@ -216,40 +204,98 @@ DESC_EXT_FILES = descriptions-external/brother2.desc \
   descriptions-external/primax.desc \
   descriptions-external/samsung.desc \
   descriptions-external/scanwit.desc \
+  descriptions-external/utsushi.desc \
   descriptions-external/v4l2.desc \
   descriptions-external/viceo.desc
 EXTRA_DIST += $(DESC_EXT_FILES) descriptions-external/template.desc.
 
-EXTRA_DIST += figs/area.eps figs/area.fig figs/flow.eps figs/flow.fig \
-  figs/hierarchy.eps figs/hierarchy.fig figs/image-data.eps \
-  figs/image-data.fig figs/xfer.eps figs/xfer.fig
-
-EXTRA_DIST += icons/contents.gif icons/index.gif icons/next.gif \
-  icons/next_gr.gif icons/previous.gif icons/previous_gr.gif \
-  icons/references.gif icons/references_gr.gif icons/up.gif icons/up_gr.gif
-
 install-data-local: install-beman5
 
 uninstall-local:
 	rm -rf $(DESTDIR)$(beman5dir)/sane-*.5
 
-sane.ind: $(srcdir)/sane.tex
-	@echo Generating index for sane.tex...
+##  SANE API specification format conversion support
+
+API_SPECS  =
+if WITH_API_PS
+API_SPECS += sane.ps
+endif
+if WITH_API_PDF
+API_SPECS += sane.pdf
+endif
+if WITH_API_HTML
+API_SPECS += sane-html
+endif
+
+API_SPEC_INPUTS  = $(srcdir)/sane.tex
+API_SPEC_INPUTS += $(srcdir)/net.tex
+EXTRA_DIST += $(API_SPEC_INPUTS)
+
+API_SPEC_TEX_FIGS  =
+API_SPEC_TEX_FIGS += figs/area.fig
+API_SPEC_TEX_FIGS += figs/flow.fig
+API_SPEC_TEX_FIGS += figs/hierarchy.fig
+API_SPEC_TEX_FIGS += figs/image-data.fig
+API_SPEC_TEX_FIGS += figs/xfer.fig
+EXTRA_DIST += $(API_SPEC_TEX_FIGS)
+
+API_SPEC_EPS_FIGS  =
+API_SPEC_EPS_FIGS += figs/area.eps
+API_SPEC_EPS_FIGS += figs/flow.eps
+API_SPEC_EPS_FIGS += figs/hierarchy.eps
+API_SPEC_EPS_FIGS += figs/image-data.eps
+API_SPEC_EPS_FIGS += figs/xfer.eps
+
+API_SPEC_PDF_FIGS  =
+API_SPEC_PDF_FIGS += figs/area.pdf
+API_SPEC_PDF_FIGS += figs/flow.pdf
+API_SPEC_PDF_FIGS += figs/hierarchy.pdf
+API_SPEC_PDF_FIGS += figs/image-data.pdf
+API_SPEC_PDF_FIGS += figs/xfer.pdf
+
+##  These icons are referred to in the generated HTML output.
+API_SPEC_HTML_ICONS  =
+API_SPEC_HTML_ICONS += icons/contents.gif
+API_SPEC_HTML_ICONS += icons/index.gif
+API_SPEC_HTML_ICONS += icons/next.gif       icons/next_gr.gif
+API_SPEC_HTML_ICONS += icons/previous.gif   icons/previous_gr.gif
+API_SPEC_HTML_ICONS += icons/references.gif icons/references_gr.gif
+API_SPEC_HTML_ICONS += icons/up.gif         icons/up_gr.gif
+EXTRA_DIST += $(API_SPEC_HTML_ICONS)
+
+am_TEXINPUTS = TEXINPUTS="$(builddir):$(srcdir):$$TEXINPUTS"
+
+sane.ind: $(API_SPEC_INPUTS)
+	@echo Generating index for $<...
 	@touch sane.ind
-	@$(LATEX) $(srcdir)/sane </dev/null >/dev/null && \
-	  $(MAKEINDEX) sane.idx 2>/dev/null && \
-	  $(LATEX) $(srcdir)/sane </dev/null >/dev/null
+	@$(am_TEXINPUTS) $(LATEX) $< </dev/null >/dev/null && \
+	  $(MAKEINDEX) -q sane.idx && \
+	  $(am_TEXINPUTS) $(LATEX) $< </dev/null >/dev/null
 
-sane.dvi: sane.ind
-	@echo Generating sane.dvi from sane.tex...
-	@$(LATEX) $(srcdir)/sane </dev/null >/dev/null
+.fig.eps:
+	@test -d $(@D) || $(MKDIR_P) $(@D)
+	$(FIG2DEV) -L eps $< $@
+
+sane.dvi: $(API_SPEC_INPUTS) $(API_SPEC_EPS_FIGS) sane.ind
+	@echo Generating $@ from $<...
+	@$(am_TEXINPUTS) $(LATEX) $< </dev/null >/dev/null
 
 sane.ps: sane.dvi
-	@echo Generating sane.ps from sane.dvi...
-	@$(DVIPS) sane.dvi -o sane.ps 2>/dev/null
+	@echo Generating $@ from $<...
+	@$(am_TEXINPUTS) $(DVIPS) -q $< -o $@
+
+.fig.pdf:
+	@test -d $(@D) || $(MKDIR_P) $(@D)
+	$(FIG2DEV) -L pdf $< $@
+
+sane.pdf: $(API_SPEC_INPUTS) $(API_SPEC_PDF_FIGS) sane.ind
+	@echo Generating $@ from $<...
+	@$(am_TEXINPUTS) $(PDFLATEX) $< >/dev/null
 
 sane-html: sane.dvi
-	$(DLH) $(srcdir)/sane.tex
+	$(am_TEXINPUTS) $(DLH) $(srcdir)/sane.tex
+
+##  ^^
 
 html-man: $(MANPAGES)
 	@for page in $(MANPAGES); do \
@@ -292,16 +338,18 @@ descriptions.db: $(DESC_FILES) ../tools/sane-desc
 	@../tools/sane-desc -m ascii -s ${srcdir}/descriptions \
 	  > descriptions.db
 
-descriptions-external.db: $(DESC_FILES) ../tools/sane-desc
+descriptions-external.db: $(DESC_EXT_FILES) ../tools/sane-desc
 	@../tools/sane-desc -m ascii -s ${srcdir}/descriptions-external \
 	  > descriptions-external.db
 
 html-pages: $(HTML_PAGES)
-html: html-pages html-man sane-html
+html-local: html-pages html-man sane-html
 
 clean-local:
 	rm -f *.toc *.aux *.log *.cp *.fn *.tp *.vr *.pg *.ky *.blg *.idx *.cb
 	rm -f *.ilg
+	rm -f $(API_SPEC_EPS_FIGS) $(API_SPEC_PDF_FIGS)
+	-rmdir figs
 
 distclean-local:
 	rm -f $(MANPAGES)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index ef83201..d678cf1 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -78,17 +78,25 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@WITH_API_PS_TRUE@am__append_1 = sane.ps
+@WITH_API_PDF_TRUE@am__append_2 = sane.pdf
+@WITH_API_HTML_TRUE@am__append_3 = sane-html
 subdir = doc
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs $(srcdir)/doxygen-sanei.conf.in \
 	$(srcdir)/doxygen-genesys.conf.in $(dist_doc_DATA) \
 	$(nobase_dist_doc_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ltoptions.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/byteorder.m4 \
-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/byteorder.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -155,7 +163,10 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -167,15 +178,6 @@ AWK = @AWK@
 BACKENDS = @BACKENDS@
 BACKEND_CONFS_ENABLED = @BACKEND_CONFS_ENABLED@
 BACKEND_LIBS_ENABLED = @BACKEND_LIBS_ENABLED@
-
-# Create a list of man pages for only backends that are compiled in so
-# that is all that gets installed.  Also, build a complete list of all
-# backend man pages.  This allows a user to optionally generate all
-# man pages in HTML form for things like posting to a web site.
-#
-# Backend man pages bypass standard automake man5_MANS because there is not
-# a man page for every supported backend.  We could get rid of
-# custom install/uninstall if we required man pages for every backend.
 BACKEND_MANS_ENABLED = @BACKEND_MANS_ENABLED@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -185,7 +187,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISTCLEAN_FILES = @DISTCLEAN_FILES@
+DLH = @DLH@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
@@ -198,34 +200,42 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FIG2DEV = @FIG2DEV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
 GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
+GS = @GS@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
 IEEE1284_LIBS = @IEEE1284_LIBS@
-INCLUDES = @INCLUDES@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LOCKPATH = @INSTALL_LOCKPATH@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JPEG_LIBS = @JPEG_LIBS@
-LATEX = TEXINPUTS="$(srcdir):$$TEXINPUTS" @LATEX@
+LATEX = @LATEX@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
-LINKER_RPATH = @LINKER_RPATH@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCKPATH_GROUP = @LOCKPATH_GROUP@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINDEX = @MAKEINDEX@
@@ -234,10 +244,10 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MATH_LIB = @MATH_LIB@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
-NUMBER_VERSION = @NUMBER_VERSION@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -250,10 +260,13 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PNG_LIBS = @PNG_LIBS@
+POSUB = @POSUB@
+PPMTOGIF = @PPMTOGIF@
 PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@
 PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -275,12 +288,16 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 V_MAJOR = @V_MAJOR@
 V_MINOR = @V_MINOR@
 V_REV = @V_REV@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -366,16 +383,19 @@ EXTRA_DIST = scanimage.man sane-config.man sane-find-scanner.man \
 	sane-rts8891.man sane-coolscan3.man sane-kvs1025.man \
 	sane-kvs20xx.man sane-kvs40xx.man sane-p5.man \
 	sane-magicolor.man sane.man saned.man descriptions.txt \
-	releases.txt sane-logo2.jpg sane-logo.png sane.png sane.tex \
-	net.tex html.sty $(DESC_FILES) descriptions/template.desc. \
-	$(DESC_EXT_FILES) descriptions-external/template.desc. \
-	figs/area.eps figs/area.fig figs/flow.eps figs/flow.fig \
-	figs/hierarchy.eps figs/hierarchy.fig figs/image-data.eps \
-	figs/image-data.fig figs/xfer.eps figs/xfer.fig \
-	icons/contents.gif icons/index.gif icons/next.gif \
-	icons/next_gr.gif icons/previous.gif icons/previous_gr.gif \
-	icons/references.gif icons/references_gr.gif icons/up.gif \
-	icons/up_gr.gif
+	releases.txt sane-logo2.jpg sane-logo.png sane.png \
+	$(DESC_FILES) descriptions/template.desc. $(DESC_EXT_FILES) \
+	descriptions-external/template.desc. $(API_SPEC_INPUTS) \
+	$(API_SPEC_TEX_FIGS) $(API_SPEC_HTML_ICONS)
+
+# Create a list of man pages for only backends that are compiled in so
+# that is all that gets installed.  Also, build a complete list of all
+# backend man pages.  This allows a user to optionally generate all
+# man pages in HTML form for things like posting to a web site.
+#
+# Backend man pages bypass standard automake man5_MANS because there is not
+# a man page for every supported backend.  We could get rid of
+# custom install/uninstall if we required man pages for every backend.
 BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
 	sane-dll.5 sane-dc25.5 sane-dmc.5 sane-epson.5 sane-epson2.5 sane-epsonds.5 \
 	sane-hp.5 sane-gphoto2.5 sane-leo.5 sane-lexmark.5 \
@@ -387,7 +407,7 @@ BACKEND_5MANS = sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-as6e.5 \
 	sane-mustek_pp.5 sane-dc210.5 sane-v4l.5 sane-snapscan.5 \
 	sane-canon.5 sane-coolscan.5 sane-bh.5 sane-dc240.5 \
 	sane-umax_pp.5 sane-umax1220u.5 sane-sm3600.5 sane-usb.5 \
-     	sane-mustek_usb.5 sane-sceptre.5 sane-canon_pp.5 sane-canon630u.5 \
+	sane-mustek_usb.5 sane-sceptre.5 sane-canon_pp.5 sane-canon630u.5 \
         sane-teco1.5 sane-teco2.5 sane-teco3.5 sane-test.5 sane-sp15c.5 \
 	sane-coolscan2.5 sane-hpsj5s.5 sane-gt68xx.5 sane-artec_eplus48u.5 \
 	sane-ma1509.5 sane-ibm.5 sane-hp5400.5 sane-plustek_pp.5 sane-u12.5 \
@@ -405,12 +425,9 @@ MANPAGES = $(man1_MANS) $(BACKEND_5MANS) $(man7_MANS) $(man8_MANS)
 @CROSS_COMPILING_FALSE@	     sane-mfgs.html sane-mfgs-external.html
 
 @CROSS_COMPILING_TRUE@HTML_PAGES = 
-doc_DATA = $(HTML_PAGES) $(STANDARD)
-@USE_LATEX_FALSE@STANDARD = 
-@USE_LATEX_TRUE@STANDARD = sane.ps
+doc_DATA = $(HTML_PAGES) $(API_SPECS)
 dist_doc_DATA = backend-writing.txt
 nobase_dist_doc_DATA = $(BEDOCS)
-DLH = TEXINPUTS="$(srcdir):$$TEXINPUTS" dlh
 MAN2HTML = nroff -c -man |\
 	  man2html -compress -topm 6 -botm 6 -nodepage -title $${page} \
           -cgiurl '$$title.$$section.html'|\
@@ -502,12 +519,27 @@ DESC_EXT_FILES = descriptions-external/brother2.desc \
   descriptions-external/primax.desc \
   descriptions-external/samsung.desc \
   descriptions-external/scanwit.desc \
+  descriptions-external/utsushi.desc \
   descriptions-external/v4l2.desc \
   descriptions-external/viceo.desc
 
+API_SPECS = $(am__append_1) $(am__append_2) $(am__append_3)
+API_SPEC_INPUTS = $(srcdir)/sane.tex $(srcdir)/net.tex
+API_SPEC_TEX_FIGS = figs/area.fig figs/flow.fig figs/hierarchy.fig \
+	figs/image-data.fig figs/xfer.fig
+API_SPEC_EPS_FIGS = figs/area.eps figs/flow.eps figs/hierarchy.eps \
+	figs/image-data.eps figs/xfer.eps
+API_SPEC_PDF_FIGS = figs/area.pdf figs/flow.pdf figs/hierarchy.pdf \
+	figs/image-data.pdf figs/xfer.pdf
+API_SPEC_HTML_ICONS = icons/contents.gif icons/index.gif \
+	icons/next.gif icons/next_gr.gif icons/previous.gif \
+	icons/previous_gr.gif icons/references.gif \
+	icons/references_gr.gif icons/up.gif icons/up_gr.gif
+am_TEXINPUTS = TEXINPUTS="$(builddir):$(srcdir):$$TEXINPUTS"
 all: all-am
 
 .SUFFIXES:
+.SUFFIXES: .eps .fig .pdf
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -823,7 +855,9 @@ dvi: dvi-am
 
 dvi-am:
 
-html-am:
+html: html-am
+
+html-am: html-local
 
 info: info-am
 
@@ -884,14 +918,15 @@ uninstall-man: uninstall-man1 uninstall-man7 uninstall-man8
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	clean-local cscopelist-am ctags-am distclean distclean-generic \
 	distclean-libtool distclean-local distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-dist_docDATA \
-	install-docDATA install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-man1 install-man7 \
-	install-man8 install-nobase_dist_docDATA install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+	html-am html-local info info-am install install-am \
+	install-data install-data-am install-data-local \
+	install-dist_docDATA install-docDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-man7 install-man8 \
+	install-nobase_dist_docDATA install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
 	uninstall-am uninstall-dist_docDATA uninstall-docDATA \
@@ -899,7 +934,7 @@ uninstall-man: uninstall-man1 uninstall-man7 uninstall-man8
 	uninstall-man8 uninstall-nobase_dist_docDATA
 
 
-all: bemans $(STANDARD) html-pages
+all: bemans $(API_SPECS) html-pages
 
 %.1 %.5 %.7 %.8: %.man
 	@echo "Generating manpage $@...";
@@ -926,23 +961,35 @@ install-data-local: install-beman5
 uninstall-local:
 	rm -rf $(DESTDIR)$(beman5dir)/sane-*.5
 
-sane.ind: $(srcdir)/sane.tex
-	@echo Generating index for sane.tex...
+sane.ind: $(API_SPEC_INPUTS)
+	@echo Generating index for $<...
 	@touch sane.ind
-	@$(LATEX) $(srcdir)/sane </dev/null >/dev/null && \
-	  $(MAKEINDEX) sane.idx 2>/dev/null && \
-	  $(LATEX) $(srcdir)/sane </dev/null >/dev/null
+	@$(am_TEXINPUTS) $(LATEX) $< </dev/null >/dev/null && \
+	  $(MAKEINDEX) -q sane.idx && \
+	  $(am_TEXINPUTS) $(LATEX) $< </dev/null >/dev/null
+
+.fig.eps:
+	@test -d $(@D) || $(MKDIR_P) $(@D)
+	$(FIG2DEV) -L eps $< $@
 
-sane.dvi: sane.ind
-	@echo Generating sane.dvi from sane.tex...
-	@$(LATEX) $(srcdir)/sane </dev/null >/dev/null
+sane.dvi: $(API_SPEC_INPUTS) $(API_SPEC_EPS_FIGS) sane.ind
+	@echo Generating $@ from $<...
+	@$(am_TEXINPUTS) $(LATEX) $< </dev/null >/dev/null
 
 sane.ps: sane.dvi
-	@echo Generating sane.ps from sane.dvi...
-	@$(DVIPS) sane.dvi -o sane.ps 2>/dev/null
+	@echo Generating $@ from $<...
+	@$(am_TEXINPUTS) $(DVIPS) -q $< -o $@
+
+.fig.pdf:
+	@test -d $(@D) || $(MKDIR_P) $(@D)
+	$(FIG2DEV) -L pdf $< $@
+
+sane.pdf: $(API_SPEC_INPUTS) $(API_SPEC_PDF_FIGS) sane.ind
+	@echo Generating $@ from $<...
+	@$(am_TEXINPUTS) $(PDFLATEX) $< >/dev/null
 
 sane-html: sane.dvi
-	$(DLH) $(srcdir)/sane.tex
+	$(am_TEXINPUTS) $(DLH) $(srcdir)/sane.tex
 
 html-man: $(MANPAGES)
 	@for page in $(MANPAGES); do \
@@ -985,16 +1032,18 @@ descriptions.db: $(DESC_FILES) ../tools/sane-desc
 	@../tools/sane-desc -m ascii -s ${srcdir}/descriptions \
 	  > descriptions.db
 
-descriptions-external.db: $(DESC_FILES) ../tools/sane-desc
+descriptions-external.db: $(DESC_EXT_FILES) ../tools/sane-desc
 	@../tools/sane-desc -m ascii -s ${srcdir}/descriptions-external \
 	  > descriptions-external.db
 
 html-pages: $(HTML_PAGES)
-html: html-pages html-man sane-html
+html-local: html-pages html-man sane-html
 
 clean-local:
 	rm -f *.toc *.aux *.log *.cp *.fn *.tp *.vr *.pg *.ky *.blg *.idx *.cb
 	rm -f *.ilg
+	rm -f $(API_SPEC_EPS_FIGS) $(API_SPEC_PDF_FIGS)
+	-rmdir figs
 
 distclean-local:
 	rm -f $(MANPAGES)
diff --git a/doc/backend-writing.txt b/doc/backend-writing.txt
index 7b49041..7e34d6a 100644
--- a/doc/backend-writing.txt
+++ b/doc/backend-writing.txt
@@ -43,8 +43,8 @@ CONFIGURATION AND BUILD SYSTEM
 ------------------------------
 
 Sane-backends uses the autoconf and automake tools. The configure script is
-generated from configure.in and aclocal.m4 by running "autoreconf". 
-Simple checks (e.g. for headers) should be placed into configure.in while 
+generated from configure.ac and aclocal.m4 by running "autoreconf".
+Simple checks (e.g. for headers) should be placed into configure.ac while
 for more complex stuff acinclude.m4 is the right file. After changes in one 
 of these files, "autoreconf" should be called.  This will then call a
 chain of autotools, such as autoconf to generate configure, autoheader
@@ -77,14 +77,15 @@ sane-backends distribution.
 
 sane-backends/
   * acinclude.m4 aclocal.m4 compile config.guess config.sub configure 
-    configure.in depcomp install-sh ltmain.sh Makefile.am Makefile.in missing 
+    configure.ac depcomp install-sh ltmain.sh Makefile.am Makefile.in missing
     mkinstalldirs: Part of the build system as explained above.
   * ChangeLog:
-    The ChangeLog contains all the changes made since the last stable release. 
-    If anything is changed in git, it must be also mentioned in ChangeLog. 
-    It's not enough to write just a git commit message, as users won't have 
-    access to these messages. For more details on the format, see the SANE 
-    git page on the website.
+    The ChangeLog contains all the changes made since the last stable release.
+    If anything is changed in git, write a decent commit message documenting
+    your work.  This commit message will be included as is in the ChangeLog
+    file for the next stable release.  Users of development code should refer
+    to the `git log` output or the on-line log.
+    For more details on the format, see the SANE git page on the website.
   * ChangeLog-1.0.0, ChangeLog-1.0.1 (...):
     These files contain the ChangeLogs of older releases. Once a new release has
     been made, the current ChangeLog renamed to ChangeLog-1.something.something
@@ -153,7 +154,7 @@ sane-backends/doc/
      Contains additional information about newbackend, e.g. READMEs or TODO
      files. 
    General files:
-   * Makefile.in:
+   * Makefile.am:
      "sane-newbackend.5" must be added to variable BACKEND_5MANS and
       "sane-newbackend.man" to EXTRA_DIST. A backend documentation directory 
       (if used) must be added to the BEDOCS variable.
@@ -228,7 +229,7 @@ PROGRAMMING
 
 * To add the backend to the existing SANE code, the following must be done at
   least:
-    - add the backend name to ALL_BACKENDS in configure.in (and run autoreconf)
+    - add the backend name to ALL_BACKENDS in configure.ac (and run autoreconf)
     - Add new backend to BACKEND_CONFS, be_convenience_libs, be_dlopen_libs,
       and define _lib${backend}_la_SOURCES and 
       nodist_libsane_${backend}_la_SOURCES; using an existing backend as
@@ -254,20 +255,18 @@ PROGRAMMING
 
 * Please be courteous to programmer's with terminals that are 80
   characters wide.  It's not difficult to avoid long lines, so please
-  do so.  Note that in ANSI C you can split long strings into pieces
+  do so.  Note that in standard C you can split long strings into pieces
   separated by white space.  For example,
   "this is an awfully long string" can be written as "this is an "
   "awfully long string".
 
-* Use only ANSI C for your backend. C99 is not supported by the compilers of
-  some older platforms so please avoid using its features.
+* Use only standard C for your backend.  ISO C99 support will be enabled
+  if supported by the compiler detected by configure.
 
 * Please do not depend on compiler specific features or, if you do, make
   the dependency conditional so other compilers will still be able to
   compile the files.  In particular:
 
-    - do not use C++ style comments (//-line comments)
-
     - do not declare dynamically sized automatic arrays; instead,
       use alloca() after including "../include/lalloca.h".  For example:
 
@@ -295,7 +294,7 @@ PROGRAMMING
       compiler-dependent.
 
 * If you use headers or libraries that may not be available on all systems,
-  write a check for configure.in and include it conditionally. If your backend
+  write a check for configure.ac and include it conditionally. If your backend
   depends on these libraries or headers, compile the backend only if they are 
   available (see pint for an example).
 
@@ -476,7 +475,7 @@ In sane-backends/backend/
 
 In sane-backends/doc/
 * Add an entry for the man page in sane.man
-* Add the man page file in doc/Makefile.in
+* Add the man page file in doc/Makefile.am
 * Move the description file from descriptions-external/ to doc/descriptions/
 * Check that the description file is correct: "cd doc; make html-pages" and
   check the html pages result with a browser.
diff --git a/doc/descriptions-external/brother.desc b/doc/descriptions-external/brother.desc
index e875a4c..a261712 100644
--- a/doc/descriptions-external/brother.desc
+++ b/doc/descriptions-external/brother.desc
@@ -202,12 +202,6 @@
 :usbid "0x04f9" "0x0157"
 :comment "No report yet."
 
-:model "MFC-3820CN"
-:status :untested
-:interface "USB network"
-:usbid "0x04f9" "0x014b"
-:comment "No report yet."
-
 :model "MFC-3820J"
 :status :untested
 :interface "USB"
@@ -217,7 +211,7 @@
 :model "MFC-3820CN"
 :status :good
 :interface "USB network"
-;:usbid "0x04f9" "0x014b"
+:usbid "0x04f9" "0x014b"
 :comment "Network connection is reported to work."
 
 :model "MFC-4420C"
diff --git a/doc/descriptions-external/brother2.desc b/doc/descriptions-external/brother2.desc
index adda1e3..92b5450 100644
--- a/doc/descriptions-external/brother2.desc
+++ b/doc/descriptions-external/brother2.desc
@@ -43,7 +43,7 @@
 :model "DCP-116C"
 :status :untested
 :interface "USB"
-;:usbid "0x04f9" "0x018c"
+:usbid "0x04f9" "0x018d"
 :comment "No report yet."
 
 :model "DCP-117C"
@@ -65,7 +65,7 @@
 :model "DCP-315CN"
 :status :untested
 :interface "USB network"
-;:usbid "0x04f9" ""
+:usbid "0x04f9" "0x0191"
 :comment "No report yet."
 
 :model "DCP-330C"
@@ -77,7 +77,7 @@
 :model "DCP-340CW"
 :status :untested
 :interface "USB"
-;:usbid "0x04f9" ""
+:usbid "0x04f9" "0x0192"
 :comment "No report yet."
 
 :model "DCP-7010"
@@ -140,7 +140,7 @@
 :model "MFC-425CN"
 :status :untested
 :interface "USB network"
-;:usbid "0x04f9" ""
+:usbid "0x04f9" "0x0194"
 :comment "No report yet."
 
 :model "MFC-5440CN"
@@ -177,7 +177,7 @@
 :model "MFC-640CW"
 :status :untested
 :interface "USB"
-;:usbid "0x04f9" ""
+:usbid "0x04f9" "0x0197"
 :comment "No report yet."
 
 :model "MFC-7220"
@@ -213,23 +213,23 @@
 :model "MFC-820CW"
 :status :untested
 :interface "USB"
-;:usbid "0x04f9" "0x0180"
+:usbid "0x04f9" "0x0195"
 :comment "No report yet."
 
 :model "MFC-8460N"
 :status :untested
 :interface "USB"
-;:usbid "0x04f9" "0x0180"
+:usbid "0x04f9" "0x01a5"
 :comment "No report yet."
 
 :model "MFC-8860DN"
 :status :untested
 :interface "USB"
-;:usbid "0x04f9" "0x0180"
+:usbid "0x04f9" "0x01a6"
 :comment "No report yet."
 
 :model "MFC-9420CN"
 :status :untested
 :interface "USB network"
-;:usbid "0x04f9" ""
+:usbid "0x04f9" "0x018a"
 :comment "No report yet."
diff --git a/doc/descriptions-external/hpaio.desc b/doc/descriptions-external/hpaio.desc
index 5b4cc5c..5b4cc5c 100755..100644
--- a/doc/descriptions-external/hpaio.desc
+++ b/doc/descriptions-external/hpaio.desc
diff --git a/doc/descriptions-external/mustek_a3p1.desc b/doc/descriptions-external/mustek_a3p1.desc
index e38b87a..e38b87a 100755..100644
--- a/doc/descriptions-external/mustek_a3p1.desc
+++ b/doc/descriptions-external/mustek_a3p1.desc
diff --git a/doc/descriptions-external/samsung.desc b/doc/descriptions-external/samsung.desc
index 6bb2d0f..d784159 100644
--- a/doc/descriptions-external/samsung.desc
+++ b/doc/descriptions-external/samsung.desc
@@ -22,7 +22,7 @@
 
 :mfg "Samsung"                     ; name a manufacturer
 :url "http://www.samsung.com/"
-:comment "Multi Function Peripheral. External backend made by Samsung."
+:comment "Multi Function Peripheral. External backend made by Samsung.  Please check the Samsung website and/or contact us if you have a Samsung device not mentioned here."
 
 ; name models for above-specified mfg.
 :model "SCX-4016"
@@ -78,11 +78,3 @@
 :interface "Parport USB"
 :status :untested
 :comment "Please contact us if you use this device."
-
-:model "For models not mentioned here, check Samsung website"
-:interface "USB"
-:status :untested
-:comment "Please contact us if you have a Samsung device not mentioned here.""
-
-; :comment and :url specifiers are optional after :mfg, :model, :desc,
-;  and at the top-level.
diff --git a/doc/descriptions-external/utsushi.desc b/doc/descriptions-external/utsushi.desc
new file mode 100644
index 0000000..d82ed18
--- /dev/null
+++ b/doc/descriptions-external/utsushi.desc
@@ -0,0 +1,458 @@
+;;;  utsushi.desc                               -*- emacs-lisp -*- (sort of)
+;;;  Copyright (C) 2015, 2016 Meeuwissen
+;;;
+;;;  License: GPL-3.0+
+;;;  Author : Olaf Meeuwissen
+;;;
+;;;  This file is part of the 'Utsushi' package.
+;;;  This package 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 3 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 ought to have received a copy of the GNU General Public License
+;;;  along with this package.  If not, see <http://www.gnu.org/licenses/>.
+
+;;  Backend data
+;;
+:backend "utsushi"
+:url     "https://github.com/utsushi/utsushi"
+
+;;  Device and manufacturer information.
+;;
+:devicetype :scanner
+:mfg        "EPSON"
+:url        "http://www.epson.com/"
+
+;;  List of EPSON scanners and all-in-ones.
+
+:model     "DS-40"
+:interface "USB"
+:usbid     "0x04b8" "0x0152"
+:status    :good
+
+:model     "DS-510"
+:interface "USB"
+:usbid     "0x04b8" "0x014c"
+:status    :good
+
+:model     "DS-520"
+:interface "USB"
+:usbid     "0x04b8" "0x0154"
+:status    :good
+
+:model     "DS-560"
+:interface "USB"
+:usbid     "0x04b8" "0x0150"
+:status    :good
+
+:model     "DS-760"
+:interface "USB"
+:usbid     "0x04b8" "0x014d"
+:status    :good
+
+:model     "DS-780N"
+:interface "USB"
+:usbid     "0x04b8" "0x0164"
+:status    :good
+
+:model     "DS-860"
+:interface "USB"
+:usbid     "0x04b8" "0x014d"
+:status    :good
+
+:model     "DS-5500"
+:interface "USB"
+:usbid     "0x04b8" "0x0145"
+:status    :good
+
+:model     "DS-6500"
+:interface "USB"
+:usbid     "0x04b8" "0x0145"
+:status    :good
+
+:model     "DS-7500"
+:interface "USB"
+:usbid     "0x04b8" "0x0145"
+:status    :good
+
+:model     "DS-50000"
+:interface "USB"
+:usbid     "0x04b8" "0x0146"
+:status    :good
+
+:model     "DS-60000"
+:interface "USB"
+:usbid     "0x04b8" "0x0146"
+:status    :good
+
+:model     "DS-70000"
+:interface "USB"
+:usbid     "0x04b8" "0x0146"
+:status    :good
+
+:model     "EP-10VA"
+:interface "USB"
+:usbid     "0x04b8" "0x1108"
+:status    :good
+
+:model     "EP-808A"
+:interface "USB"
+:usbid     "0x04b8" "0x110a"
+:status    :good
+
+:model     "EP-978A3"
+:interface "USB"
+:usbid     "0x04b8" "0x1109"
+:status    :good
+
+:model     "ES-400"
+:interface "USB"
+:usbid     "0x04b8" "0x0156"
+:status    :good
+
+:model     "ET-2500"
+:interface "USB"
+:usbid     "0x04b8" "0x1105"
+:status    :good
+
+:model     "ET-2550"
+:interface "USB"
+:usbid     "0x04b8" "0x1106"
+:status    :good
+
+:model     "ET-4500"
+:interface "USB"
+:usbid     "0x04b8" "0x1107"
+:status    :good
+
+:model     "ET-4550"
+:interface "USB"
+:usbid     "0x04b8" "0x1101"
+:status    :good
+
+:model     "L220"
+:interface "USB"
+:usbid     "0x04b8" "0x08d1"
+:status    :good
+
+:model     "L360"
+:interface "USB"
+:usbid     "0x04b8" "0x08d1"
+:status    :good
+
+:model     "L365"
+:interface "USB"
+:usbid     "0x04b8" "0x08d2"
+:status    :good
+
+:model     "L366"
+:interface "USB"
+:usbid     "0x04b8" "0x08d2"
+:status    :good
+
+:model     "L455"
+:interface "USB"
+:usbid     "0x04b8" "0x08c2"
+:status    :good
+
+:model     "L565"
+:interface "USB"
+:usbid     "0x04b8" "0x08d3"
+:status    :good
+
+:model     "L566"
+:interface "USB"
+:usbid     "0x04b8" "0x08d3"
+:status    :good
+
+:model     "L655"
+:interface "USB"
+:usbid     "0x04b8" "0x1101"
+:status    :good
+
+:model     "PX-M7050"
+:interface "USB"
+:usbid     "0x04b8" "0x08bc"
+:status    :good
+
+:model     "PX-M7050FX"
+:interface "USB"
+:usbid     "0x04b8" "0x08cc"
+:status    :good
+
+:model     "PX-M840FX"
+:interface "USB"
+:usbid     "0x04b8" "0x08cd"
+:status    :good
+
+:model     "PX-M860F"
+:interface "USB"
+:usbid     "0x04b8" "0x08ce"
+:status    :good
+
+:model     "WF-6530"
+:interface "USB"
+:usbid     "0x04b8" "0x08cd"
+:status    :good
+
+:model     "WF-6590"
+:interface "USB"
+:usbid     "0x04b8" "0x08cf"
+:status    :good
+
+:model     "WF-8510"
+:interface "USB"
+:usbid     "0x04b8" "0x08bc"
+:status    :good
+
+:model     "WF-8590"
+:interface "USB"
+:usbid     "0x04b8" "0x08bc"
+:status    :good
+
+:model     "WF-R8590"
+:interface "USB"
+:usbid     "0x04b8" "0x08cc"
+:status    :good
+
+:model     "XP-220"
+:interface "USB"
+:usbid     "0x04b8" "0x08c0"
+:status    :good
+
+:model     "XP-230"
+:interface "USB"
+:usbid     "0x04b8" "0x1102"
+:status    :good
+
+:model     "XP-235"
+:interface "USB"
+:usbid     "0x04b8" "0x1102"
+:status    :good
+
+:model     "XP-322"
+:interface "USB"
+:usbid     "0x04b8" "0x1103"
+:status    :good
+
+:model     "XP-335"
+:interface "USB"
+:usbid     "0x04b8" "0x1103"
+:status    :good
+
+:model     "XP-430"
+:interface "USB"
+:usbid     "0x04b8" "0x1104"
+:status    :good
+
+:model     "XP-432"
+:interface "USB"
+:usbid     "0x04b8" "0x1104"
+:status    :good
+
+:model     "XP-435"
+:interface "USB"
+:usbid     "0x04b8" "0x1104"
+:status    :good
+
+:model     "XP-530"
+:interface "USB"
+:usbid     "0x04b8" "0x110c"
+:status    :good
+
+:model     "XP-830"
+:interface "USB"
+:usbid     "0x04b8" "0x110b"
+:status    :good
+
+:model     "XP-960"
+:interface "USB"
+:usbid     "0x04b8" "0x1109"
+:status    :good
+
+; These are models for which we don't know the model name yet.
+; Upstream releases have stopped providing the information we
+; need to fill out the :model fields :-(
+
+:model     "PID 0155"
+:interface "USB"
+:usbid     "0x04b8" "0x0155"
+:status    :good
+
+:model     "PID 0157"
+:interface "USB"
+:usbid     "0x04b8" "0x0157"
+:status    :good
+
+:model     "PID 0159"
+:interface "USB"
+:usbid     "0x04b8" "0x0159"
+:status    :good
+
+:model     "PID 015A"
+:interface "USB"
+:usbid     "0x04b8" "0x015a"
+:status    :good
+
+:model     "PID 015C"
+:interface "USB"
+:usbid     "0x04b8" "0x015c"
+:status    :good
+
+:model     "PID 015D"
+:interface "USB"
+:usbid     "0x04b8" "0x015d"
+:status    :good
+
+:model     "PID 015E"
+:interface "USB"
+:usbid     "0x04b8" "0x015e"
+:status    :good
+
+:model     "PID 015F"
+:interface "USB"
+:usbid     "0x04b8" "0x015f"
+:status    :good
+
+:model     "PID 0162"
+:interface "USB"
+:usbid     "0x04b8" "0x0162"
+:status    :good
+
+:model     "PID 0163"
+:interface "USB"
+:usbid     "0x04b8" "0x0163"
+:status    :good
+
+:model     "PID 110D"
+:interface "USB"
+:usbid     "0x04b8" "0x110d"
+:status    :good
+
+:model     "PID 110F"
+:interface "USB"
+:usbid     "0x04b8" "0x110f"
+:status    :good
+
+:model     "PID 1112"
+:interface "USB"
+:usbid     "0x04b8" "0x1112"
+:status    :good
+
+:model     "PID 1113"
+:interface "USB"
+:usbid     "0x04b8" "0x1113"
+:status    :good
+
+:model     "PID 1114"
+:interface "USB"
+:usbid     "0x04b8" "0x1114"
+:status    :good
+
+:model     "PID 1115"
+:interface "USB"
+:usbid     "0x04b8" "0x1115"
+:status    :good
+
+:model     "PID 1116"
+:interface "USB"
+:usbid     "0x04b8" "0x1116"
+:status    :good
+
+:model     "PID 1117"
+:interface "USB"
+:usbid     "0x04b8" "0x1117"
+:status    :good
+
+:model     "PID 1118"
+:interface "USB"
+:usbid     "0x04b8" "0x1118"
+:status    :good
+
+:model     "PID 1119"
+:interface "USB"
+:usbid     "0x04b8" "0x1119"
+:status    :good
+
+:model     "PID 111A"
+:interface "USB"
+:usbid     "0x04b8" "0x111a"
+:status    :good
+
+:model     "PID 111B"
+:interface "USB"
+:usbid     "0x04b8" "0x111b"
+:status    :good
+:comment   "EP-879A?"
+
+:model     "PID 111C"
+:interface "USB"
+:usbid     "0x04b8" "0x111c"
+:status    :good
+
+:model     "PID 111D"
+:interface "USB"
+:usbid     "0x04b8" "0x111d"
+:status    :good
+
+:model     "PID 111E"
+:interface "USB"
+:usbid     "0x04b8" "0x111e"
+:status    :good
+
+:model     "PID 111F"
+:interface "USB"
+:usbid     "0x04b8" "0x111f"
+:status    :good
+
+:model     "PID 1120"
+:interface "USB"
+:usbid     "0x04b8" "0x1120"
+:status    :good
+
+:model     "PID 1121"
+:interface "USB"
+:usbid     "0x04b8" "0x1121"
+:status    :good
+
+:model     "PID 1122"
+:interface "USB"
+:usbid     "0x04b8" "0x1122"
+:status    :good
+
+:model     "PID 1123"
+:interface "USB"
+:usbid     "0x04b8" "0x1123"
+:status    :good
+:comment   "EP-30VA?"
+
+:model     "PID 1125"
+:interface "USB"
+:usbid     "0x04b8" "0x1125"
+:status    :good
+
+:model     "PID 1126"
+:interface "USB"
+:usbid     "0x04b8" "0x1126"
+:status    :good
+
+:model     "PID 1127"
+:interface "USB"
+:usbid     "0x04b8" "0x1127"
+:status    :good
+
+:model     "PID 1128"
+:interface "USB"
+:usbid     "0x04b8" "0x1128"
+:status    :good
+
+:model     "PID 112B"
+:interface "USB"
+:usbid     "0x04b8" "0x112b"
+:status    :good
diff --git a/doc/descriptions/as6e.desc b/doc/descriptions/as6e.desc
index 5270a80..e269807 100644
--- a/doc/descriptions/as6e.desc
+++ b/doc/descriptions/as6e.desc
@@ -9,7 +9,7 @@
 ;
 
 :backend "as6e"			; name of backend
-:version "0.5"			; version of backend
+:version "0.5 (unmaintained)"	; version of backend
 :manpage "sane-as6e"		; name of manpage (if it exists)
 :url "http://as6edriver.sourceforge.net/"
 
diff --git a/doc/descriptions/bh.desc b/doc/descriptions/bh.desc
index d20715e..cea51d7 100644
--- a/doc/descriptions/bh.desc
+++ b/doc/descriptions/bh.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "bh"                     ; name of backend
-:version "1.0-4"                    ; version of backend
+:version "1.0-4 (unmaintained)"   ; version of backend
 :manpage "sane-bh"                ; name of manpage (if it exists)
 :url "http://www.martoneconsulting.com/sane-bh.html" ; backend's web page
 :comment "Supports Copiscan II scanners with Remote SCSI Controller (RSC) interface"
diff --git a/doc/descriptions/canon630u.desc b/doc/descriptions/canon630u.desc
index b4fa418..c4c3026 100644
--- a/doc/descriptions/canon630u.desc
+++ b/doc/descriptions/canon630u.desc
@@ -11,7 +11,7 @@
 
 :backend "canon630u"                ; name of backend
 :manpage "sane-canon630u"
-:version "0.1"                  ; version of backend
+:version "0.1 (unmaintained)"       ; version of backend
 ;:status :beta
 :url "http://canon-fb630u.sourceforge.net/" ; backend home page
 
diff --git a/doc/descriptions/canon_dr.desc b/doc/descriptions/canon_dr.desc
index 86a8507..8bf6964 100644
--- a/doc/descriptions/canon_dr.desc
+++ b/doc/descriptions/canon_dr.desc
@@ -90,8 +90,8 @@
 
 :model "DR-2010M"
 :interface "USB"
-:status :untested
-:comment "Mac version of DR-2010C? Please test!"
+:status :complete
+:comment "DR-2010C with a different label, same USB IDs"
 
 :model "DR-2050C"
 :interface "USB"
@@ -181,8 +181,8 @@
 :model "DR-5010C"
 :interface "USB"
 :usbid "0x04a9" "0x1606"
-:status :untested
-:comment "Please test!"
+:status :basic
+:comment "ADF and Duplex work, needs more testing"
 
 :model "DR-5020"
 :interface "SCSI"
@@ -289,7 +289,8 @@
 :model "DR-F120"
 :interface "USB"
 :usbid "0x1083" "0x1654"
-:status :untested
+:status :basic
+:comment "Flatbed not working. ADF working. Simplex+duplex, all resolutions <= 600, gray/color, calibration poor."
 
 :model "DR-G1100"
 :interface "USB"
@@ -323,13 +324,14 @@
 
 :model "P-150"
 :interface "USB"
-;:usbid "0x1083" "0x"
+;:usbid "0x1083" "0x162c"
 :status :untested
+:comment "Same as P-150M?"
 
 :model "P-150M"
 :interface "USB"
-;:usbid "0x1083" "0x"
-:status :untested
+:usbid "0x1083" "0x162c"
+:status :good
 
 :model "P-201"
 :interface "USB"
@@ -348,6 +350,12 @@
 :status :basic
 :comment "All modes and resolutions working, but calibration is poor."
 
+:model "P-208"
+:interface "USB"
+:usbid "0x1083" "0x164e"
+:status :basic
+:comment "This is the same device as the 0x164c P-208, but the mode switch on the scanner is in the wrong position, you must move the switch."
+
 :model "DR-P208II"
 :interface "USB"
 :usbid "0x1083" "0x165d"
diff --git a/doc/descriptions/canon_pp.desc b/doc/descriptions/canon_pp.desc
index ddd7a46..6a3613a 100644
--- a/doc/descriptions/canon_pp.desc
+++ b/doc/descriptions/canon_pp.desc
@@ -10,7 +10,7 @@
 
 :backend "canon_pp"		; name of backend
 :manpage "sane-canon_pp"
-:version "0.33"			; version of backend
+:version "0.33 (unmaintained)"	; version of backend
 
 :url "http://canon-fb330p.sourceforge.net" ; backend home page
 
diff --git a/doc/descriptions/cardscan.desc b/doc/descriptions/cardscan.desc
index a0a87db..df106de 100644
--- a/doc/descriptions/cardscan.desc
+++ b/doc/descriptions/cardscan.desc
@@ -11,14 +11,14 @@
 
 :backend "cardscan"              ; name of backend
 :url "http://www.thebility.com/cardscan/" 
-:version "2"                 ; version of backend
+:version "3"                 ; version of backend
 :manpage "sane-cardscan"         ; name of manpage (if it exists)
 :comment "Backend updated for SANE release 1.0.21, see sane-cardscan manpage"
 :devicetype :scanner             ; start of a list of devices....
                                  ; other types:  :stillcam, :vidcam,
                                  ;               :meta, :api
 
-:mfg "Corex"                   ; name a manufacturer
+:mfg "Corex/Dymo"                   ; name a manufacturer
 :url "http://www.cardscan.com/"
 
 :model "800c"
@@ -33,3 +33,11 @@
 :status :basic
 :comment "4 inch wide 8bit Gray or 24bit Color simplex card/receipt scanner"
 
+:mfg "Sanford"                   ; name a manufacturer
+
+:model "800c"
+:interface "USB"
+:usbid "0x0451" "0x6250"
+:status :good
+:comment "4 inch wide 8bit Gray or 24bit Color simplex card/receipt scanner"
+
diff --git a/doc/descriptions/coolscan.desc b/doc/descriptions/coolscan.desc
index 8d7b060..6ccb496 100644
--- a/doc/descriptions/coolscan.desc
+++ b/doc/descriptions/coolscan.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "coolscan"               ; name of backend
-:version "0.4.3"                  ; version of backend
+:version "0.4.3 (unmaintained)"   ; version of backend
 :url "http://andreas.rick.free.fr/sane/" ; backend's web page
 :manpage "sane-coolscan"
 :devicetype :scanner              ; start of a list of devices....
diff --git a/doc/descriptions/coolscan2.desc b/doc/descriptions/coolscan2.desc
index e6c7359..7e34b33 100644
--- a/doc/descriptions/coolscan2.desc
+++ b/doc/descriptions/coolscan2.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "coolscan2"
-:version "0.1.8"
+:version "0.1.8 (unmaintained)"
 :manpage "sane-coolscan2"
 :url "http://coolscan2.sourceforge.net/"
 
diff --git a/doc/descriptions/coolscan3.desc b/doc/descriptions/coolscan3.desc
index d8359bd..136d75f 100644
--- a/doc/descriptions/coolscan3.desc
+++ b/doc/descriptions/coolscan3.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "coolscan3"
-:version "1.0.0"
+:version "1.0.0 (unmaintained)"
 :manpage "sane-coolscan3"
 
 :devicetype :scanner
diff --git a/doc/descriptions/dc210.desc b/doc/descriptions/dc210.desc
index e7dbced..1f6191e 100644
--- a/doc/descriptions/dc210.desc
+++ b/doc/descriptions/dc210.desc
@@ -1,7 +1,7 @@
 ;Kodak DC210 backend .desc file by Brian J. Murrell
 
 :backend "dc210"		; name of backend
-:version "0.0"                  ; version of backend
+:version "0.0 (unmaintained)"	; version of backend
 :manpage "sane-dc210"		; name of manpage (if it exists)
 :url "mailto:peter@fales-lorenz.net"   ; backend's web page
 
diff --git a/doc/descriptions/dc240.desc b/doc/descriptions/dc240.desc
index 5a0b52c..6250ce5 100644
--- a/doc/descriptions/dc240.desc
+++ b/doc/descriptions/dc240.desc
@@ -1,7 +1,7 @@
 ;Kodak DC240 backend .desc file by Peter S. Fales
 
 :backend "dc240"		; name of backend
-:version "0.0"                  ; version of backend
+:version "0.0 (unmaintained)"	; version of backend
 :manpage "sane-dc240"		; name of manpage (if it exists)
 :url "mailto:peter@fales-lorenz.net"   ; backend's web page
 
diff --git a/doc/descriptions/dc25.desc b/doc/descriptions/dc25.desc
index c6996ad..e270521 100644
--- a/doc/descriptions/dc25.desc
+++ b/doc/descriptions/dc25.desc
@@ -1,7 +1,7 @@
 ;Kodak DC25 backend .desc file by Peter Fales
 
 :backend "dc25"				; name of backend
-:version "1.2"  			; version of backend
+:version "1.2 (unmaintained)"		; version of backend
 :manpage "sane-dc25"			; name of manpage (if it exists)
 :url "mailto:peter@fales-lorenz.net";
 :devicetype :stillcam			; start of a list of devices....
diff --git a/doc/descriptions/dell1600n_net.desc b/doc/descriptions/dell1600n_net.desc
index 6aacf18..6759564 100644
--- a/doc/descriptions/dell1600n_net.desc
+++ b/doc/descriptions/dell1600n_net.desc
@@ -3,7 +3,7 @@
 ; Jon Chambers <jon@jon.demon.co.uk>, 2006-05-29
 ;
 :backend "dell1600n_net"
-
+:version "unmaintained"
 :devicetype :scanner
 
 :mfg "Dell"
diff --git a/doc/descriptions/dll.desc b/doc/descriptions/dll.desc
index 4995873..721b7d4 100644
--- a/doc/descriptions/dll.desc
+++ b/doc/descriptions/dll.desc
@@ -1,5 +1,5 @@
 :backend "dll"               ; name of backend
-:version "1.0.13"
+:version "1.0.13 (unmaintained)"
 :manpage "sane-dll"
 :url "mailto:henning@meier-geinitz.de"
 
diff --git a/doc/descriptions/epjitsu.desc b/doc/descriptions/epjitsu.desc
index b11ee96..03bc8fb 100644
--- a/doc/descriptions/epjitsu.desc
+++ b/doc/descriptions/epjitsu.desc
@@ -10,8 +10,7 @@
 ;
 
 :backend "epjitsu"               ; name of backend
-:url "http://www.thebility.com/epjitsu/" 
-:version "27"                    ; version of backend
+:version "31"                    ; version of backend
 :manpage "sane-epjitsu"          ; name of manpage (if it exists)
 :comment "Backend updated for SANE release 1.0.26, see sane-epjitsu manpage"
 :devicetype :scanner             ; start of a list of devices....
@@ -24,15 +23,15 @@
 ;==================================================
 :model "fi-60F"
 :interface "USB"
-:status :basic
+:status :good
 :usbid "0x04c5" "0x10c7"
-:comment "A6-size flatbed, 300/600 dpi, color/gray/binary"
+:comment "A6-size flatbed. Hardware provides 150/200/300/400/600 dpi in color. Software creates other resolutions, plus grayscale and binary modes. Hardware grayscale mode is not used due to poor calibration."
 
 :model "ScanSnap S300"
 :interface "USB"
 :status :good
 :usbid "0x04c5" "0x1156"
-:comment "Duplex, 150/225/300/600 dpi, color/gray/binary, AC/USB power, buttons/sensors all supported. Scanner always scans in _triplex_ color, fast USB required."
+:comment "Letter-size ADF. Hardware provides duplex, 150/225/300/600 dpi in color on AC or USB power. Software creates other resolutions, plus grayscale and binary modes. All buttons and sensors are exposed. Scanner always scans in _triplex_ color, fast USB required."
 
 :model "ScanSnap S300M"
 :interface "USB"
@@ -40,11 +39,11 @@
 :usbid "0x04c5" "0x117f"
 :comment "Same as S300, with different usb id"
 
-:model "ScanSnap S1100"
+:model "fi-65F"
 :interface "USB"
 :status :good
-:usbid "0x04c5" "0x1200"
-:comment "Hardware only supports 300 and 600 dpi simplex color. Backend manufactures gray and binary modes."
+:usbid "0x04c5" "0x11bd"
+:comment "Same as fi-60f, with different usb id. Button support untested."
 
 :model "ScanSnap S1300"
 :interface "USB"
@@ -52,14 +51,20 @@
 :usbid "0x04c5" "0x11ed"
 :comment "Same as S300, with different usb id"
 
+:model "ScanSnap S1100"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x1200"
+:comment "Letter-size ADF. Hardware provides simplex, 300/600 dpi in color on USB power. Software creates other resolutions, plus grayscale and binary modes. All buttons and sensors are exposed. Scanner always scans in _triplex_ color, fast USB required."
+
 :model "ScanSnap S1300i"
 :interface "USB"
 :status :good
 :usbid "0x04c5" "0x128d"
-:comment "Similar to S1300."
+:comment "Same as S300, with different usb id"
 
-:model "fi-65F"
+:model "ScanSnap S1100i"
 :interface "USB"
-:status :basic
-;:usbid "0x04c5" "0x10c7"
-:comment "A6-size flatbed, 300/600 dpi, color/gray/binary."
+:status :good
+:usbid "0x04c5" "0x1447"
+:comment "Same as S1100, with different usb id"
diff --git a/doc/descriptions/epson.desc b/doc/descriptions/epson.desc
index 1c9d8a2..65f466f 100644
--- a/doc/descriptions/epson.desc
+++ b/doc/descriptions/epson.desc
@@ -10,8 +10,7 @@
 ;
 
 :backend "epson"                  ; name of backend
-;:version "0.2.42"                ; version of backend
-:version "unmaintained"           ; version of backend
+:version "0.2.42 (unmaintained)"  ; version of backend
 :new :no
 :manpage "sane-epson"             ; name of manpage (if it exists)
 :url "http://www.khk.net/sane"    ; backend's web page
diff --git a/doc/descriptions/epson2.desc b/doc/descriptions/epson2.desc
index de61b76..772a77f 100644
--- a/doc/descriptions/epson2.desc
+++ b/doc/descriptions/epson2.desc
@@ -10,7 +10,7 @@
 ; DO NOT EDIT - It's automatically generated.
 
 :backend "epson2"
-:version "1.0.124"
+:version "1.0.124 (unmaintained)"
 :new :no
 :manpage "sane-epson2"
 
diff --git a/doc/descriptions/epsonds.desc b/doc/descriptions/epsonds.desc
index 0b7c6c6..99121d1 100644
--- a/doc/descriptions/epsonds.desc
+++ b/doc/descriptions/epsonds.desc
@@ -6,8 +6,8 @@
 ;
 
 :backend "epsonds"
-:version "1.0.18"
-:new :yes
+:version "1.0.18 (unmaintained)"
+:new :no
 :manpage "sane-epsonds"
 
 :devicetype :scanner
diff --git a/doc/descriptions/fujitsu.desc b/doc/descriptions/fujitsu.desc
index d4e232b..60f8c5b 100644
--- a/doc/descriptions/fujitsu.desc
+++ b/doc/descriptions/fujitsu.desc
@@ -12,9 +12,9 @@
 
 :backend "fujitsu"               ; name of backend
 :url "http://www.thebility.com/fujitsu/" 
-:version "127"                   ; version of backend
+:version "133"                   ; version of backend
 :manpage "sane-fujitsu"          ; name of manpage (if it exists)
-:comment "Backend updated for SANE release 1.0.25, see sane-fujitsu manpage"
+:comment "Backend updated for SANE release 1.0.26, see sane-fujitsu manpage"
 :devicetype :scanner             ; start of a list of devices....
                                  ; other types:  :stillcam, :vidcam,
                                  ;               :meta, :api
@@ -131,6 +131,12 @@
 :usbid "0x04c5" "0x116f"
 :comment "small, recent, discontinued"
 
+:model "fi-6125"
+:interface "USB"
+:status :complete
+:usbid "0x04c5" "0x11ee"
+:comment "small, recent, discontinued"
+
 :model "fi-6130"
 :interface "USB"
 :status :complete
@@ -155,6 +161,42 @@
 :usbid "0x04c5" "0x11f4"
 :comment "small, recent, discontinued"
 
+:model "fi-6120ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x146d"
+:comment "small, recent, discontinued, expected to work"
+
+:model "fi-6220ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x146e"
+:comment "small, recent, discontinued, expected to work"
+
+:model "fi-6125ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x1463"
+:comment "small, recent, discontinued, expected to work"
+
+:model "fi-6225ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x1464"
+:comment "small, recent, discontinued, expected to work"
+
+:model "fi-6130ZLA"
+:interface "SCSI USB"
+:status :complete
+:usbid "0x04c5" "0x1461"
+:comment "small, recent, discontinued"
+
+:model "fi-6230ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x1462"
+:comment "small, recent, discontinued, expected to work"
+
 :model "ScanSnap S1500"
 :interface "USB"
 :status :complete
@@ -319,7 +361,7 @@
 :usbid "0x04c5" "0x114e"
 :comment "medium, recent, discontinued"
 
-:model "fi-6140Z"
+:model "fi-6140Z/fi-6140ZLA"
 :interface "SCSI USB"
 :status :complete
 :usbid "0x04c5" "0x11f1"
@@ -331,6 +373,30 @@
 :usbid "0x04c5" "0x11f2"
 :comment "medium, recent, discontinued"
 
+:model "fi-6135ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x146b"
+:comment "medium, recent, discontinued, expected to work"
+
+:model "fi-6235ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x146c"
+:comment "medium, recent, discontinued, expected to work"
+
+:model "fi-6140ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x145f"
+:comment "medium, recent, discontinued, expected to work"
+
+:model "fi-6240ZLA"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x1460"
+:comment "medium, recent, discontinued, expected to work"
+
 ;==================================================
 ; CURRENT MODELS, MEDIUM
 
@@ -486,5 +552,131 @@
 
 :model "fi-6400"
 :interface "SCSI USB"
+:status :good
+:usbid "0x04c5" "0x14ac"
+
+;==================================================
+; 2015/2016/2017 NEW MODELS, UNORDERED
+
+:model "fi-6420"
+:interface "SCSI USB"
+:status :untested
+:usbid "0x04c5" "0x14bd"
+
+:model "fi-6225"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x11ef"
+
+:model "ScanSnap iX500EE"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x13f3"
+
+:model "ScanPartner SP25"
+:interface "USB"
+:status :unsupported
+:usbid "0x04c5" "0x1409"
+:comment "Possibly Genesys protocol?"
+
+:model "ScanPartner SP30"
+:interface "USB"
+:status :unsupported
+:usbid "0x04c5" "0x140a"
+:comment "Possibly Genesys protocol?"
+
+:model "ScanPartner SP30F"
+:interface "USB"
+:status :unsupported
+:usbid "0x04c5" "0x140c"
+:comment "Possibly Genesys protocol?"
+
+:model "N7100"
+:interface "USB Ethernet"
+:status :untested
+:usbid "0x04c5" "0x146f"
+
+:model "fi-7480"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x14b8"
+
+:model "fi-7460"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x14be"
+
+:model "fi-7140"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14df"
+
+:model "fi-7240"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14e0"
+
+:model "fi-7135"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14e1"
+
+:model "fi-7235"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14e2"
+
+:model "fi-7130"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14e3"
+
+:model "fi-7230"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14e4"
+
+:model "fi-7125"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14e5"
+
+:model "fi-7225"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14e6"
+
+:model "fi-7120"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14e7"
+
+:model "fi-7220"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x14e8"
+
+:model "fi-400F"
+:interface "USB"
+:status :untested
+:usbid "0x04c5" "0x151e"
+
+:model "fi-7030"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x151f"
+
+:model "fi-7700"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x1520"
+
+:model "fi-7600"
+:interface "USB"
+:status :good
+:usbid "0x04c5" "0x1521"
+
+:model "fi-7700S"
+:interface "USB"
 :status :untested
-;:usbid "0x04c5" "0x"
+:usbid "0x04c5" "0x1522"
diff --git a/doc/descriptions/genesys.desc b/doc/descriptions/genesys.desc
index 6d400f2..f6fb8a3 100644
--- a/doc/descriptions/genesys.desc
+++ b/doc/descriptions/genesys.desc
@@ -148,7 +148,7 @@
 :model "CanoScan LiDE 120"
 :interface "USB"
 :usbid "0x04a9" "0x190e"
-:status :unsupported
+:status :complete
 :comment "GL124+ based, resolution from 75 to 2400 dpi"
 
 :model "CanoScan LiDE 200"
diff --git a/doc/descriptions/gphoto2.desc b/doc/descriptions/gphoto2.desc
index 48dd8ee..f341649 100644
--- a/doc/descriptions/gphoto2.desc
+++ b/doc/descriptions/gphoto2.desc
@@ -1,7 +1,7 @@
 ;gphoto2 backend .desc file by Peter S. Fales
 
 :backend "gphoto2"		; name of backend
-:version "0.0"                  ; version of backend
+:version "0.0 (unmaintained)"	; version of backend
 :manpage "sane-gphoto2"		; name of manpage (if it exists)
 :url "mailto:peter@fales-lorenz.net"   ; backend's web page
 
diff --git a/doc/descriptions/gt68xx.desc b/doc/descriptions/gt68xx.desc
index 5bc8f0e..16e4af9 100644
--- a/doc/descriptions/gt68xx.desc
+++ b/doc/descriptions/gt68xx.desc
@@ -1,5 +1,5 @@
 :backend "gt68xx"
-:version "1.0-84"
+:version "1.0-84 (unmaintained)"
 :manpage "sane-gt68xx"
 :url "http://www.meier-geinitz.de/sane/gt68xx-backend/"
 :comment "Only the USB scanners mentioned below are supported. For other Mustek BearPaws, look at the Plustek and the MA-1509 backend."
diff --git a/doc/descriptions/hp3900.desc b/doc/descriptions/hp3900.desc
index f2abaad..d1aa9a1 100644
--- a/doc/descriptions/hp3900.desc
+++ b/doc/descriptions/hp3900.desc
@@ -10,7 +10,7 @@
 ; See doc/descriptions.txt for details.
 
 :backend "hp3900"
-:version "0.12"
+:version "0.12 (unmaintained)"
 :manpage "sane-hp3900"
 :url "http://sourceforge.net/projects/hp3900-series/"
 :comment "Still Beta"
diff --git a/doc/descriptions/hp4200.desc b/doc/descriptions/hp4200.desc
index 69f7e1d..6c25882 100644
--- a/doc/descriptions/hp4200.desc
+++ b/doc/descriptions/hp4200.desc
@@ -10,7 +10,7 @@
 
 
 :backend "hp4200"               ; name of backend
-:version "1.0-2"                    ; version of backend
+:version "1.0-2 (unmaintained)" ; version of backend
 :manpage "sane-hp4200"           ; name of manpage (if it exists)
 :url "http://hp4200-backend.sourceforge.net" ; backend's web page
 
diff --git a/doc/descriptions/hp5400.desc b/doc/descriptions/hp5400.desc
index c4cb528..49d386f 100644
--- a/doc/descriptions/hp5400.desc
+++ b/doc/descriptions/hp5400.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "hp5400"		; name of backend
-:version "1.0-2"		; version of backend
+:version "1.0-2 (unmaintained)"	; version of backend
 :manpage "sane-hp5400"		; name of manpage (if it exists)
 :url "http://sourceforge.net/projects/hp5400backend"  ; backend's web page
 :comment "HP5400 and HP5470 scanners. Prototype backend available"
@@ -37,6 +37,7 @@
 
 :model "ScanJet 5490c"		; name models for above-specified mfg.
 :interface "USB"		; interface type of the device:
+:usbid "0x03f0" "0x1105"
 :status :basic
 
 
diff --git a/doc/descriptions/hpljm1005.desc b/doc/descriptions/hpljm1005.desc
index 12876e4..d60142b 100644
--- a/doc/descriptions/hpljm1005.desc
+++ b/doc/descriptions/hpljm1005.desc
@@ -9,7 +9,7 @@
 ; All other information is optional (but what good is the file without it?).
 
 :backend "hpljm1005"
-:version "0"
+:version "0 (unmaintained)"
 :manpage "sane-hpljm1005"
 
 :devicetype :scanner
diff --git a/doc/descriptions/hpsj5s.desc b/doc/descriptions/hpsj5s.desc
index 87057e6..c4bc100 100644
--- a/doc/descriptions/hpsj5s.desc
+++ b/doc/descriptions/hpsj5s.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "hpsj5s"                 ; name of backend
-:version "0.03"                   ; version of backend
+:version "0.03 (unmaintained)"    ; version of backend
 ;:status :alpha                     ; :alpha, :beta, :stable, :new
 :manpage "sane-hpsj5s"                ; name of manpage (if it exists)
 :url "http://hpsj5s.sourceforge.net/" ; backend's web page
diff --git a/doc/descriptions/ibm.desc b/doc/descriptions/ibm.desc
index d3d5b06..c04fa31 100644
--- a/doc/descriptions/ibm.desc
+++ b/doc/descriptions/ibm.desc
@@ -10,7 +10,7 @@
 
 :backend "ibm"                 ; name of backend
 :url "http://www.meier-geinitz.de/sane/ibm-backend/"
-:version "1.0-4"          ; version of backend
+:version "1.0-4 (unmaintained)" ; version of backend
 ;
 :manpage "sane-ibm"            ; name of manpage (if it exists)
 :comment "This backend has had only limited testing. It needs more work especially for the Ricoh scanners. Patches are welcome."
diff --git a/doc/descriptions/leo.desc b/doc/descriptions/leo.desc
index 279300c..cf0cec3 100644
--- a/doc/descriptions/leo.desc
+++ b/doc/descriptions/leo.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "leo"                    ; name of backend
-:version "1.0-10"                  ; version of backend
+:version "1.0-10 (unmaintained)"  ; version of backend
 :manpage "sane-leo"               ; name of manpage (if it exists)
 :url "http://www.zago.net/sane/#leo" ; backend's web page
 
diff --git a/doc/descriptions/lexmark.desc b/doc/descriptions/lexmark.desc
index 2cc4de1..ac0b97c 100644
--- a/doc/descriptions/lexmark.desc
+++ b/doc/descriptions/lexmark.desc
@@ -10,7 +10,7 @@
 
 
 :backend "lexmark"                ; name of backend
-:version "1.0-0"                  ; version of backend (or "unmaintained")
+:version "1.0-0 (unmaintained)"   ; version of backend (or "unmaintained")
 :manpage "sane-lexmark"           ; name of manpage (if it exists)
 :url "http://stef.dev.free.fr/sane/lexmark"
 				  ; backend's web page
diff --git a/doc/descriptions/ma1509.desc b/doc/descriptions/ma1509.desc
index db78a55..d28aeed 100644
--- a/doc/descriptions/ma1509.desc
+++ b/doc/descriptions/ma1509.desc
@@ -9,7 +9,7 @@
 ;
 
 :backend "ma1509"		; name of backend
-:version "1.0-3"			; version of backend
+:version "1.0-3 (unmaintained)"	; version of backend
 :manpage "sane-ma1509"		; name of manpage (if it exists)
 :url "http://www.meier-geinitz.de/sane/ma1509-backend/"  ; backend's web page
 
diff --git a/doc/descriptions/magicolor.desc b/doc/descriptions/magicolor.desc
index be785e9..7f0c341 100644
--- a/doc/descriptions/magicolor.desc
+++ b/doc/descriptions/magicolor.desc
@@ -6,7 +6,7 @@
 ;
 
 :backend "magicolor"
-:version "1.0.0"
+:version "1.0.0 (unmaintained)"
 :manpage "sane-magicolor"
 :url "http://wiki.kainhofer.com/hardware/magicolor_scan"
 
diff --git a/doc/descriptions/matsushita.desc b/doc/descriptions/matsushita.desc
index e7822f8..51f330f 100644
--- a/doc/descriptions/matsushita.desc
+++ b/doc/descriptions/matsushita.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "matsushita"             ; name of backend
-:version "1.0-7"                  ; version of backend
+:version "1.0-7 (unmaintained)"   ; version of backend
 :manpage "sane-matsushita"        ; name of manpage
 :url "http://www.zago.net/sane"    ; backend's web page
 
diff --git a/doc/descriptions/microtek.desc b/doc/descriptions/microtek.desc
index 214bb9a..09203f5 100644
--- a/doc/descriptions/microtek.desc
+++ b/doc/descriptions/microtek.desc
@@ -1,5 +1,5 @@
 :backend "microtek"
-:version "0.13.1"
+:version "0.13.1 (unmaintained)"
 :manpage "sane-microtek" 
 :url "http://www.mir.com/mtek/"
 
diff --git a/doc/descriptions/mustek.desc b/doc/descriptions/mustek.desc
index cefea83..2ba44f1 100644
--- a/doc/descriptions/mustek.desc
+++ b/doc/descriptions/mustek.desc
@@ -9,7 +9,7 @@
 ;
 
 :backend "mustek"		; name of backend
-:version "1.0-138"		; version of backend
+:version "1.0-138 (unmaintained)"	; version of backend
 :manpage "sane-mustek"		; name of manpage (if it exists)
 :url "http://www.meier-geinitz.de/sane/mustek-backend/"
 :comment "Most Mustek SCSI scanners are supported by this backend. For USB scanners, look at the mustek_usb backend."
diff --git a/doc/descriptions/mustek_pp.desc b/doc/descriptions/mustek_pp.desc
index 4a32988..1586b8b 100644
--- a/doc/descriptions/mustek_pp.desc
+++ b/doc/descriptions/mustek_pp.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "mustek_pp"              ; name of backend
-:version "13"                     ; version of backend
+:version "13 (unmaintained)"      ; version of backend
 :manpage "sane-mustek_pp"         ; name of manpage (if it exists)
                                   ; backend's web page
 :url "http://penguin-breeder.org/sane/mustek_pp/"
diff --git a/doc/descriptions/mustek_usb.desc b/doc/descriptions/mustek_usb.desc
index 5cee3d2..b03edbd 100644
--- a/doc/descriptions/mustek_usb.desc
+++ b/doc/descriptions/mustek_usb.desc
@@ -1,5 +1,5 @@
 :backend "mustek_usb"
-:version "1.0-18"
+:version "1.0-18 (unmaintained)"
 :manpage "sane-mustek_usb"
 :url "http://www.meier-geinitz.de/sane/mustek_usb-backend/"
 :comment "Only the USB scanners mentioned below are supported. For BearPaws, look at the Plustek, MA-1509, and gt68xx backends."
diff --git a/doc/descriptions/mustek_usb2.desc b/doc/descriptions/mustek_usb2.desc
index 011cef9..ec5b967 100644
--- a/doc/descriptions/mustek_usb2.desc
+++ b/doc/descriptions/mustek_usb2.desc
@@ -1,5 +1,5 @@
 :backend "mustek_usb2"
-:version "1.0-10"
+:version "1.0-10 (unmaintained)"
 :manpage "sane-mustek_usb2"
 :url "http://www.meier-geinitz.de/sane/mustek_usb2-backend/"
 :comment "Only BearPaw 2448TA Pro is supported at the moment"
diff --git a/doc/descriptions/nec.desc b/doc/descriptions/nec.desc
index e8ce961..3817089 100644
--- a/doc/descriptions/nec.desc
+++ b/doc/descriptions/nec.desc
@@ -1,5 +1,5 @@
 :backend "nec"                  ; name of backend
-:version "0.12"                 ; version of backend
+:version "0.12 (unmaintained)"  ; version of backend
 :url "http://www5a.biglobe.ne.jp/~saetaka/"
 				; backend's homepage
 :manpage "sane-nec"
diff --git a/doc/descriptions/net.desc b/doc/descriptions/net.desc
index 1807c49..cece232 100644
--- a/doc/descriptions/net.desc
+++ b/doc/descriptions/net.desc
@@ -1,5 +1,5 @@
 :backend "net"               ; name of backend
-:version "1.0.14"
+:version "1.0.14 (unmaintained)"
 :manpage "sane-net"
 :url "http://www.penguin-breeder.org/?page=sane-net"
 
diff --git a/doc/descriptions/niash.desc b/doc/descriptions/niash.desc
index 960468c..9be55f2 100644
--- a/doc/descriptions/niash.desc
+++ b/doc/descriptions/niash.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "niash"
-:version "0.3"
+:version "0.3 (unmaintained)"
 :manpage "sane-niash"
 :url "http://sourceforge.net/projects/hp3300backend"
 
diff --git a/doc/descriptions/p5.desc b/doc/descriptions/p5.desc
index 70adf16..7548902 100644
--- a/doc/descriptions/p5.desc
+++ b/doc/descriptions/p5.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "p5"              ; name of backend
-:version "1"               ; version of backend
+:version "1 (unmaintained)"; version of backend
 :manpage "sane-p5"         ; name of manpage (if it exists)
 :comment "New backend for SANE release 1.0.21, see sane-p5 manpage"
 :url "http://www.sane-project.org/" ; backend's web page
diff --git a/doc/descriptions/pie.desc b/doc/descriptions/pie.desc
index 45abb8e..9d9177e 100644
--- a/doc/descriptions/pie.desc
+++ b/doc/descriptions/pie.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "pie"                    ; name of backend
-:version "1.0"                    ; version of backend
+:version "1.0 (unmaintained)"     ; version of backend
 :manpage "sane-pie"               ; name of manpage (if it exists)
 :url "http://www.munton.demon.co.uk/sane"  ; backend's web page
 
diff --git a/doc/descriptions/pieusb.desc b/doc/descriptions/pieusb.desc
index 102cd45..c0d17a9 100644
--- a/doc/descriptions/pieusb.desc
+++ b/doc/descriptions/pieusb.desc
@@ -10,8 +10,8 @@
 ;
 
 :backend "pieusb"                 ; name of backend
-:version "1.0"                    ; version of backend
-:new :yes
+:version "1.0 (unmaintained)"     ; version of backend
+:new :no
 :manpage "sane-pieusb"            ; name of manpage (if it exists)
 :url "https://github.com/kkaempf/sane-backends"  ; backend's web page
 
@@ -24,33 +24,47 @@
 
 :model "PowerSlide 3600"
 :interface "USB"
+:usbid "0x05e3" "0x0142"
 :status :untested
 :comment "Identical to Reflecta DigitDia 3600"
 
 :model "PowerSlide 3650"
 :interface "USB"
-:status :untested
+:usbid "0x05e3" "0x0142"
+:status :basic
 :comment "Identical to Reflecta DigitDia 4000"
 
 :model "PowerSlide 4000"
 :interface "USB"
-:status :untested
+:usbid "0x05e3" "0x0142"
+:status :basic
 :comment "Identical to Reflecta DigitDia 5000"
 
 :model "PowerSlide 5000"
 :interface "USB"
-:status :untested
+:usbid "0x05e3" "0x0142"
+:status :basic
 :comment "Identical to Reflecta DigitDia 6000"
 
 :mfg "Reflecta"
 :url "https://reflecta.de"
 
-:model "Reflecta ProScan 7200"
+:model "Reflecta ProScan 10T"
 :interface "USB"
 :usbid "0x05e3" "0x0145"
 :status :basic
+
+:model "Reflecta ProScan 7200"
+:interface "USB"
+:usbid "0x05e3" "0x0145"
+:status :good
 :comment "Similar to PrimeFilm 7250 scanner from Pacific Image Electronics"
 
+:model "CrystalScan 3600"
+:interface "USB"
+:usbid 0x05e3 0x0145
+:status :basic
+
 :model "CrystalScan 7200"
 :interface "USB"
 :status :untested
@@ -63,16 +77,19 @@
 
 :model "DigitDia 3600"
 :interface "USB"
+:usbid "0x05e3" "0x0142"
 :status :untested
 :comment "Identical to Pacific Image Electronics PowerSlide 3600 scanner"
 
 :model "DigitDia 4000"
 :interface "USB"
-:status :untested
+:usbid "0x05e3" "0x0142"
+:status :basic
 :comment "Identical to Pacific Image Electronics PowerSlide 3650 scanner"
 
 :model "DigitDia 5000"
 :interface "USB"
+:usbid "0x05e3" "0x0142"
 :status :untested
 :comment "Identical to Pacific Image Electronics PowerSlide 4000 scanner"
 
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index 84ddcd4..ad33faa 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -11,7 +11,7 @@
 ; See doc/descriptions.txt for details.
 
 :backend "pixma"                  ; name of backend
-:version "0.17.23"                ; version of backend (or "unmaintained")
+:version "0.17.37"                ; version of backend (or "unmaintained")
 :manpage "sane-pixma"             ; name of manpage (if it exists)
 ;:comment "Devices marked as experimantal are disabled by default. See the manual page for how to enable them."
 
@@ -34,6 +34,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA E470 Series"
+:interface "USB"
+:usbid "0x04a9" "0x180c"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA E480 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1789"
@@ -70,6 +76,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA G3000"
+:interface "USB WIFI"
+:usbid "0x04a9" "0x181d"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA MG2100 Series"
 :interface "USB"
 :usbid "0x04a9" "0x1751"
@@ -100,6 +112,12 @@
 :status :complete
 :comment "All resolutions supported (up to 600DPI)."
 
+:model "PIXMA MG3000 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x180b"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA MG3100 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1752"
@@ -121,8 +139,8 @@
 :model "PIXMA MG3600 Series"
 :interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x178a"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "All resolutions supported (up to 1200DPI)."
 
 :model "PIXMA MG4100 Series"
 :interface "USB"
@@ -155,10 +173,10 @@
 :comment "All resolutions supported (up to 2400DPI)."
 
 :model "PIXMA MG5400 Series"
-:interface "USB"
+:interface "USB WiFi"
 :usbid "0x04a9" "0x1764"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "All resolutions supported (up to 2400DPI)."
 
 :model "PIXMA MG5500 Series"
 :interface "USB WiFi"
@@ -172,6 +190,12 @@
 :status :complete
 :comment "All resolutions supported (up to 1200DPI)."
 
+:model "PIXMA MG5700 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x178e"
+:status :complete
+:comment "All resolutions supported (up to 1200 DPI)."
+
 :model "PIXMA MG6100 Series"
 :interface "USB"
 :usbid "0x04a9" "0x174a"
@@ -208,6 +232,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA MG6800 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x178d"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA MG6900 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x178c"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA MG7100 Series"
 :interface "USB"
 :usbid "0x04a9" "0x1772"
@@ -220,6 +256,12 @@
 :status :complete
 :comment "All resolutions supported (up to 2400DPI)."
 
+:model "PIXMA MG7700 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x178b"
+:status :complete
+:comment "All resolutions supported (up to 2400DPI)."
+
 :model "PIXMA MG8100 Series"
 :interface "USB"
 :usbid "0x04a9" "0x174b"
@@ -232,6 +274,18 @@
 :status :complete
 :comment "All resolutions supported (up to 4800DPI)."
 
+:model "PIXUS MP5"
+:interface "USB"
+:usbid "0x04a9" "0x2635"
+:status :untested
+:comment "Testers needed! Identical with imageCLASS MPC190."
+
+:model "PIXUS MP10"
+:interface "USB"
+:usbid "0x04a9" "0x261f"
+:status :complete
+:comment "All resolutions supported (up to 600DPI). Identical with imageCLASS MPC200."
+
 :model "PIXMA MP140"
 :interface "USB"
 :usbid "0x04a9" "0x172b"
@@ -737,6 +791,30 @@
 :status :complete
 :comment "Flatbed and ADF scan. All resolutions supported (up to 4800DPI)"
 
+:model "PIXMA TS9000 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x179f"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS8000 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1800"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS6000 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1801"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS5000 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1802"
+:status :untested
+:comment "Testers needed!"
+
 :model "imageCLASS D420"
 :interface "USB"
 :usbid "0x04a9" "0x26ef"
@@ -767,6 +845,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "i-SENSYS MF230 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x27d1"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI). WiFi only for w Types."
+
+:model "i-SENSYS MF240 Series"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27d2"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI). ADF only 300DPI."
+
 :model "i-SENSYS MF810/820"
 :interface "USB Ethernet"
 :usbid "0x04a9" "0x27a6"
@@ -956,10 +1046,10 @@
 :model "i-SENSYS MF6100 Series"
 :interface "USB Ethernet"
 :usbid "0x04a9" "0x278e"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI). Note: document feeder does not have 600DPI capability."
 
-:model "imageCLASS MF6500 series"
+:model "imageCLASS MF6500 Series"
 :interface "USB"
 :usbid "0x04a9" "0x2686"
 :status :complete
@@ -1007,6 +1097,18 @@
 :status :untested
 :comment "Same protocol as MF8200C Series? Testers needed!"
 
+:model "imageCLASS MPC190"
+:interface "USB"
+:usbid "0x04a9" "0x2635"
+:status :untested
+:comment "Testers needed! Identical with SmartBase MPC190 and PIXUS MP5."
+
+:model "imageCLASS MPC200"
+:interface "USB"
+:usbid "0x04a9" "0x261f"
+:status :complete
+:comment "All resolutions supported (up to 600DPI). Identical with SmartBase MPC200 and PIXUS MP10."
+
 :model "imageRUNNER 1020/1024/1025"
 :interface "USB"
 :usbid "0x04a9" "0x26e6"
@@ -1034,8 +1136,8 @@
 :model "MAXIFY MB5000 Series"
 :interface "USB"
 :usbid "0x04a9" "0x1776"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "Flatbed works, All resolutions supported (up to 1200DPI), ADF does not work"
 
 :model "MAXIFY MB5300 Series"
 :interface "USB"
diff --git a/doc/descriptions/pnm.desc b/doc/descriptions/pnm.desc
index 7daeee1..9920b78 100644
--- a/doc/descriptions/pnm.desc
+++ b/doc/descriptions/pnm.desc
@@ -1,5 +1,5 @@
 :backend "pnm"
-:version "1.0.8"
+:version "1.0.8 (unmaintained)"
 :manpage "sane-pnm"
 :url "mailto:henning@meier-geinitz.de"
 
diff --git a/doc/descriptions/rts8891.desc b/doc/descriptions/rts8891.desc
index 7e30ea4..e37f158 100644
--- a/doc/descriptions/rts8891.desc
+++ b/doc/descriptions/rts8891.desc
@@ -10,7 +10,7 @@
 
 
 :backend "rts8891"               ; name of backend
-:version "1.0-0"                    ; version of backend (or "unmaintained")
+:version "1.0-0 (unmaintained)"  ; version of backend (or "unmaintained")
 :manpage "sane-rts8891"        ; name of manpage (if it exists)
 :url "http://stef.dev.free.fr/sane/rts8891/index.html" 
 				  ; backend's web page
diff --git a/doc/descriptions/sceptre.desc b/doc/descriptions/sceptre.desc
index e39559c..aa4f515 100644
--- a/doc/descriptions/sceptre.desc
+++ b/doc/descriptions/sceptre.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "sceptre"
-:version "1.0-10"                  ; version of backend
+:version "1.0-10 (unmaintained)"   ; version of backend
 :manpage "sane-sceptre"           ; name of manpage
 :url "http://www.zago.net/sane/"   ; backend's web page
 
diff --git a/doc/descriptions/sharp.desc b/doc/descriptions/sharp.desc
index 85fde0c..63000af 100644
--- a/doc/descriptions/sharp.desc
+++ b/doc/descriptions/sharp.desc
@@ -1,5 +1,5 @@
 :backend "sharp"                ; name of backend
-:version "0.32"                 ; version of backend
+:version "0.32 (unmaintained)"  ; version of backend
 ;:status :beta                   ; :alpha, :beta, :stable, :new
 :url "http://www.satzbau-gmbh.de/staff/abel/sane-sharp.html" 
 				; backend's homepage
diff --git a/doc/descriptions/sm3600.desc b/doc/descriptions/sm3600.desc
index 760b4cf..56e31e1 100644
--- a/doc/descriptions/sm3600.desc
+++ b/doc/descriptions/sm3600.desc
@@ -7,7 +7,7 @@
 ;
 
 :backend "sm3600"                 ; name of backend
-:version "0.1"                    ; version of backend
+:version "0.1 (unmaintained)"     ; version of backend
 :manpage "sane-sm3600"            ; name of manpage (if it exists)
 :url "http://sm3600.sourceforge.net/" ; backend's web page
 
diff --git a/doc/descriptions/sm3840.desc b/doc/descriptions/sm3840.desc
index 6d60ace..e40193f 100644
--- a/doc/descriptions/sm3840.desc
+++ b/doc/descriptions/sm3840.desc
@@ -11,7 +11,7 @@
 ; See doc/descriptions.txt for details.
 
 :backend "sm3840"                 ; name of backend
-:version "1.1"                    ; version of backend (or "unmaintained")
+:version "1.1 (unmaintained)"     ; version of backend (or "unmaintained")
 :manpage "sane-sm3840"          ; name of manpage (if it exists)
 :url "http://www.ziplabel.com/sm3840/" ; backend's web page
 :comment "This reverse-engineered backend supports the USB ScanMaker 3840 model" 
diff --git a/doc/descriptions/st400.desc b/doc/descriptions/st400.desc
index ca3de68..6cd3a08 100644
--- a/doc/descriptions/st400.desc
+++ b/doc/descriptions/st400.desc
@@ -1,7 +1,7 @@
 ; ST400 backend .desc by Ingo Wilken
 
 :backend "st400"			; name of backend
-:version "1.6"                        ; version number
+:version "1.6 (unmaintained)"		; version number
 :manpage "sane-st400"		; name of manpage (if it exists)
 :url "http://www.informatik.uni-oldenburg.de/~ingo/sane/" ; backend's web page
 
diff --git a/doc/descriptions/stv680.desc b/doc/descriptions/stv680.desc
index fee96d7..d54e6be 100644
--- a/doc/descriptions/stv680.desc
+++ b/doc/descriptions/stv680.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "stv680"                  ; name of backend
-:version "1.0-1"                   ; version of backend
+:version "1.0-1 (unmaintained)"    ; version of backend
 :manpage "sane-stv680"
 :url "http://gkall.hobby.nl/stv680-aiptek.html" ; backend's web page
 :comment "This vidcam backend is for the stv0680 chipset, See the website for more info."
diff --git a/doc/descriptions/teco1.desc b/doc/descriptions/teco1.desc
index 89ac03f..e5b4132 100644
--- a/doc/descriptions/teco1.desc
+++ b/doc/descriptions/teco1.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "teco1"                  ; name of backend
-:version "1.0-10"                 ; version of backend
+:version "1.0-10 (unmaintained)"  ; version of backend
 :manpage "sane-teco1"             ; name of manpage (if it exists)
 :url "http://www.zago.net/sane/#teco"    ; backend's web page
 
diff --git a/doc/descriptions/teco2.desc b/doc/descriptions/teco2.desc
index 23479ab..ec0e686 100644
--- a/doc/descriptions/teco2.desc
+++ b/doc/descriptions/teco2.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "teco2"                  ; name of backend
-:version "1.0-9"                  ; version of backend
+:version "1.0-9 (unmaintained)"   ; version of backend
 :manpage "sane-teco2"
 :url "http://gkall.hobby.nl/teco2.html"   ; backend's web page
 
diff --git a/doc/descriptions/teco3.desc b/doc/descriptions/teco3.desc
index f551309..a2f3e92 100644
--- a/doc/descriptions/teco3.desc
+++ b/doc/descriptions/teco3.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "teco3"                  ; name of backend
-:version "1.0-1"                  ; version of backend
+:version "1.0-1 (unmaintained)"   ; version of backend
 :manpage "sane-teco3"             ; name of manpage (if it exists)
 :url "http://www.zago.net/sane/#teco3"    ; backend's web page
 
diff --git a/doc/descriptions/test.desc b/doc/descriptions/test.desc
index cf27e87..657c2ea 100644
--- a/doc/descriptions/test.desc
+++ b/doc/descriptions/test.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "test"               ; name of backend
-:version "1.0-28"                    ; version of backend
+:version "1.0-28 (unmaintained)"     ; version of backend
 :manpage "sane-test"           ; name of manpage (if it exists)
 :url "http://www.meier-geinitz.de/sane/test-backend/" ; backend's web page
 
diff --git a/doc/descriptions/umax.desc b/doc/descriptions/umax.desc
index 73525a5..8f5a22b 100644
--- a/doc/descriptions/umax.desc
+++ b/doc/descriptions/umax.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "umax"                   ; name of backend
-:version "1.0-41"                 ; version of backend
+:version "1.0-41 (unmaintained)"  ; version of backend
 :manpage "sane-umax"              ; name of manpage (if it exists)
 :url "http://www.rauch-domain.de/sane-umax/index.html" ; backend's web page
 
diff --git a/doc/descriptions/umax_pp.desc b/doc/descriptions/umax_pp.desc
index fb3bf3f..e07a4a0 100644
--- a/doc/descriptions/umax_pp.desc
+++ b/doc/descriptions/umax_pp.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "umax_pp"              ; name of backend
-:version "1"                      ; version of backend
+:version "1 (unmaintained)"     ; version of backend
 :manpage "sane-umax_pp"         ; name of manpage (if it exists)
                                   ; backend's web page
 :url "http://umax1220p.sourceforge.net/"
diff --git a/doc/descriptions/unsupported.desc b/doc/descriptions/unsupported.desc
index d7e4128..2217594 100644
--- a/doc/descriptions/unsupported.desc
+++ b/doc/descriptions/unsupported.desc
@@ -668,6 +668,28 @@
 :comment "Probably unsupported. "
 
 ;********************************************************************************************
+:mfg "Fujitsu"
+:url "http://www.fujitsu.com/"
+
+:model "SP1120"
+:interface "USB"
+:usbid "0x04c5" "0x1473"
+:status :unsupported
+:comment "Genesys GL310 chipset, not supported by sane-genesys backend."
+
+:model "SP1125"
+:interface "USB"
+:usbid "0x04c5" "0x1475"
+:status :unsupported
+:comment "Genesys GL310 chipset, not supported by sane-genesys backend."
+
+:model "SP1130"
+:interface "USB"
+:usbid "0x04c5" "0x1476"
+:status :unsupported
+:comment "Genesys GL310 chipset, not supported by sane-genesys backend."
+
+;********************************************************************************************
 
 :mfg "Genius"
 :url "http://www.geniusnet.com.tw/"
@@ -1939,6 +1961,7 @@
 
 :model "DocuPen RC800"
 :interface "USB"
+:usbid "0x18dd" "0x1000"
 :status :unsupported
 :comment "Probably not supported. No details known."
 
@@ -2411,6 +2434,7 @@
 
 :model "Astra 6700"
 :interface "USB"
+:usbid "0x0638" "0x0a30"
 :status :unsupported
 :comment "Not supported. No chipset information available. Same as Avision iVina FB2400."
 
diff --git a/doc/descriptions/v4l.desc b/doc/descriptions/v4l.desc
index d585a94..711f453 100644
--- a/doc/descriptions/v4l.desc
+++ b/doc/descriptions/v4l.desc
@@ -10,7 +10,7 @@
 ;
 
 :backend "v4l"                    ; name of backend
-:version "1.0-3"                  ; version of backend
+:version "1.0-3 (unmaintained)"   ; version of backend
 :manpage "sane-v4l"               ; name of manpage (if it exists)
 :url "mailto:henning@meier-geinitz.de" ; backend's web page
 
diff --git a/doc/descriptions/xerox_mfp.desc b/doc/descriptions/xerox_mfp.desc
index 59b56dd..dd9d283 100644
--- a/doc/descriptions/xerox_mfp.desc
+++ b/doc/descriptions/xerox_mfp.desc
@@ -53,6 +53,36 @@
 :mfg "Samsung"
 :url "http://www.samsung.com"
 
+:model "X4300 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3324"
+:status :untested
+
+:model "K4350 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3325"
+:status :untested
+
+:model "X7600 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3326"
+:status :untested
+
+:model "K7600 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3327"
+:status :untested
+
+:model "K703 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3331"
+:status :untested
+
+:model "X703 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3332"
+:status :untested
+
 :model "SCX-4x16"
 :interface "USB"
 :usbid "0x04e8" "0x3409"
@@ -290,7 +320,7 @@
 
 :model "SCX-3405W"
 :interface "Ethernet"
-:status :basic
+:status :good
 
 :model "SCX-3400"
 :interface "USB"
@@ -305,17 +335,17 @@
 :model "SCX-4729FD"
 :interface "USB"
 :usbid "0x04e8" "0x3453"
-:status :basic
+:status :good
 
 :model "CLX-6260"
 :interface "USB"
 :usbid "0x04e8" "0x3455"
-:status :minimal
+:status :good
 
 :model "CLX-3300 Series"
 :interface "USB"
 :usbid "0x04e8" "0x3456"
-:status :basic
+:status :good
 
 :model "SCX-470x"
 :interface "USB"
@@ -325,7 +355,7 @@
 :model "CLX-4190"
 :interface "USB"
 :usbid "0x04e8" "0x345a"
-:status :minimal
+:status :good
 
 :model "SCX-4650 4x21S Series"
 :interface "USB"
@@ -352,3 +382,33 @@
 :usbid "0x04e8" "0x3468"
 :status :untested
 
+:model "M458x Series"
+:interface "USB"
+:usbid "0x04e8" "0x346f"
+:status :untested
+
+:model "M4370 5370 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3471"
+:status :untested
+
+:model "X401 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3477"
+:status :untested
+
+:model "K401 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3478"
+:status :untested
+
+:model "K3250 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3481"
+:status :untested
+
+:model "X3220 Series"
+:interface "USB"
+:usbid "0x04e8" "0x3482"
+:status :untested
+
diff --git a/doc/figs/area.eps b/doc/figs/area.eps
deleted file mode 100644
index 3613fa3..0000000
--- a/doc/figs/area.eps
+++ /dev/null
@@ -1,126 +0,0 @@
-%!PS-Adobe-2.0 EPSF-2.0
-%%Title: area.fig
-%%Creator: fig2dev Version 3.1 Patchlevel 1
-%%CreationDate: Wed Dec  4 19:19:37 1996
-%%For: davidm@panda.mosberger (David Mosberger-Tang)
-%%Orientation: Portrait
-%%BoundingBox: 0 0 221 205
-%%Pages: 0
-%%BeginSetup
-%%IncludeFeature: *PageSize Letter
-%%EndSetup
-%%EndComments
-/$F2psDict 200 dict def
-$F2psDict begin
-$F2psDict /mtrx matrix put
-/col-1 {} def
-/col0 {0.000 0.000 0.000 srgb} bind def
-/col1 {0.000 0.000 1.000 srgb} bind def
-/col2 {0.000 1.000 0.000 srgb} bind def
-/col3 {0.000 1.000 1.000 srgb} bind def
-/col4 {1.000 0.000 0.000 srgb} bind def
-/col5 {1.000 0.000 1.000 srgb} bind def
-/col6 {1.000 1.000 0.000 srgb} bind def
-/col7 {1.000 1.000 1.000 srgb} bind def
-/col8 {0.000 0.000 0.560 srgb} bind def
-/col9 {0.000 0.000 0.690 srgb} bind def
-/col10 {0.000 0.000 0.820 srgb} bind def
-/col11 {0.530 0.810 1.000 srgb} bind def
-/col12 {0.000 0.560 0.000 srgb} bind def
-/col13 {0.000 0.690 0.000 srgb} bind def
-/col14 {0.000 0.820 0.000 srgb} bind def
-/col15 {0.000 0.560 0.560 srgb} bind def
-/col16 {0.000 0.690 0.690 srgb} bind def
-/col17 {0.000 0.820 0.820 srgb} bind def
-/col18 {0.560 0.000 0.000 srgb} bind def
-/col19 {0.690 0.000 0.000 srgb} bind def
-/col20 {0.820 0.000 0.000 srgb} bind def
-/col21 {0.560 0.000 0.560 srgb} bind def
-/col22 {0.690 0.000 0.690 srgb} bind def
-/col23 {0.820 0.000 0.820 srgb} bind def
-/col24 {0.500 0.190 0.000 srgb} bind def
-/col25 {0.630 0.250 0.000 srgb} bind def
-/col26 {0.750 0.380 0.000 srgb} bind def
-/col27 {1.000 0.500 0.500 srgb} bind def
-/col28 {1.000 0.630 0.630 srgb} bind def
-/col29 {1.000 0.750 0.750 srgb} bind def
-/col30 {1.000 0.880 0.880 srgb} bind def
-/col31 {1.000 0.840 0.000 srgb} bind def
-
-end
-save
--59.0 231.0 translate
-1 -1 scale
-
-/clp {closepath} bind def
-/ef {eofill} bind def
-/gr {grestore} bind def
-/gs {gsave} bind def
-/l {lineto} bind def
-/m {moveto} bind def
-/n {newpath} bind def
-/s {stroke} bind def
-/slc {setlinecap} bind def
-/slj {setlinejoin} bind def
-/slw {setlinewidth} bind def
-/srgb {setrgbcolor} bind def
-/rot {rotate} bind def
-/sc {scale} bind def
-/tr {translate} bind def
-/tnt {dup dup currentrgbcolor
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb}
-  bind def
-/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul
-  4 -2 roll mul srgb} bind def
-/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def
-/$F2psEnd {$F2psEnteredState restore end} def
-%%EndProlog
-
-$F2psBegin
-10 setmiterlimit
- 0.06000 0.06000 sc
-% Polyline
-n 1725 1725 m 3375 1725 l  3375 2775 l  1725 2775 l  clp gs col7 0.90 shd ef gr 
-/Helvetica findfont 180.00 scalefont setfont
-2550 2302 m
-gs 1 -1 sc (scan area) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-7.500 slw
-% Polyline
-n 1200 525 m 1200 3825 l gs col7 0.80 shd ef gr  gs col-1 s gr 
-n 1230.00 3681.00 m 1200.00 3825.00 l 1170.00 3681.00 l  1200.50 3705.50 l 1230.00 3681.00 l clp gs 0.00 setgray ef gr gs col-1 s gr
-% Polyline
-n 1050 675 m 4650 675 l gs col7 0.80 shd ef gr  gs col-1 s gr 
-n 4506.00 645.00 m 4650.00 675.00 l 4506.00 705.00 l  4530.50 675.50 l 4506.00 645.00 l clp gs 0.00 setgray ef gr gs col-1 s gr
-/Helvetica findfont 180.00 scalefont setfont
-3375 3150 m
-gs 1 -1 sc (bottom-right) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-1725 1500 m
-gs 1 -1 sc (top-left) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-2700 1050 m
-gs 1 -1 sc (scan surface) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-1050 3600 m
-gs 1 -1 sc (y) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-4425 525 m
-gs 1 -1 sc (x) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-1080 585 m
-gs 1 -1 sc (0) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-% Polyline
-n 1725 1650 m 1725 1800 l  gs col-1 s gr 
-% Polyline
-n 1650 1725 m 1800 1725 l  gs col-1 s gr 
-% Polyline
-n 3375 2700 m 3375 2850 l  gs col-1 s gr 
-% Polyline
-n 3300 2775 m 3450 2775 l  gs col-1 s gr 
-15.000 slw
-% Polyline
-n 1200 675 m 4275 675 l  4275 3375 l  1200 3375 l  clp  gs col-1 s gr 
-$F2psEnd
-restore
diff --git a/doc/figs/flow.eps b/doc/figs/flow.eps
deleted file mode 100644
index 55fd7d1..0000000
--- a/doc/figs/flow.eps
+++ /dev/null
@@ -1,161 +0,0 @@
-%!PS-Adobe-2.0 EPSF-2.0
-%%Title: flow.fig
-%%Creator: fig2dev Version 3.1 Patchlevel 1
-%%CreationDate: Tue Dec  3 22:09:10 1996
-%%For: davidm@panda.mosberger (David Mosberger-Tang)
-%%Orientation: Portrait
-%%BoundingBox: 0 0 601 542
-%%Pages: 0
-%%BeginSetup
-%%IncludeFeature: *PageSize Letter
-%%EndSetup
-%%EndComments
-/$F2psDict 200 dict def
-$F2psDict begin
-$F2psDict /mtrx matrix put
-/col-1 {} def
-/col0 {0.000 0.000 0.000 srgb} bind def
-/col1 {0.000 0.000 1.000 srgb} bind def
-/col2 {0.000 1.000 0.000 srgb} bind def
-/col3 {0.000 1.000 1.000 srgb} bind def
-/col4 {1.000 0.000 0.000 srgb} bind def
-/col5 {1.000 0.000 1.000 srgb} bind def
-/col6 {1.000 1.000 0.000 srgb} bind def
-/col7 {1.000 1.000 1.000 srgb} bind def
-/col8 {0.000 0.000 0.560 srgb} bind def
-/col9 {0.000 0.000 0.690 srgb} bind def
-/col10 {0.000 0.000 0.820 srgb} bind def
-/col11 {0.530 0.810 1.000 srgb} bind def
-/col12 {0.000 0.560 0.000 srgb} bind def
-/col13 {0.000 0.690 0.000 srgb} bind def
-/col14 {0.000 0.820 0.000 srgb} bind def
-/col15 {0.000 0.560 0.560 srgb} bind def
-/col16 {0.000 0.690 0.690 srgb} bind def
-/col17 {0.000 0.820 0.820 srgb} bind def
-/col18 {0.560 0.000 0.000 srgb} bind def
-/col19 {0.690 0.000 0.000 srgb} bind def
-/col20 {0.820 0.000 0.000 srgb} bind def
-/col21 {0.560 0.000 0.560 srgb} bind def
-/col22 {0.690 0.000 0.690 srgb} bind def
-/col23 {0.820 0.000 0.820 srgb} bind def
-/col24 {0.500 0.190 0.000 srgb} bind def
-/col25 {0.630 0.250 0.000 srgb} bind def
-/col26 {0.750 0.380 0.000 srgb} bind def
-/col27 {1.000 0.500 0.500 srgb} bind def
-/col28 {1.000 0.630 0.630 srgb} bind def
-/col29 {1.000 0.750 0.750 srgb} bind def
-/col30 {1.000 0.880 0.880 srgb} bind def
-/col31 {1.000 0.840 0.000 srgb} bind def
-
-end
-save
--161.0 577.0 translate
-1 -1 scale
-
-/clp {closepath} bind def
-/ef {eofill} bind def
-/gr {grestore} bind def
-/gs {gsave} bind def
-/l {lineto} bind def
-/m {moveto} bind def
-/n {newpath} bind def
-/s {stroke} bind def
-/slc {setlinecap} bind def
-/slj {setlinejoin} bind def
-/slw {setlinewidth} bind def
-/srgb {setrgbcolor} bind def
-/rot {rotate} bind def
-/sc {scale} bind def
-/tr {translate} bind def
-/tnt {dup dup currentrgbcolor
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb}
-  bind def
-/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul
-  4 -2 roll mul srgb} bind def
-/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def
-/$F2psEnd {$F2psEnteredState restore end} def
-%%EndProlog
-
-$F2psBegin
-10 setmiterlimit
- 0.06000 0.06000 sc
-7.500 slw
-% Polyline
-n 2700 600 m 10200 600 l  10200 9600 l  2700 9600 l  clp gs col7 0.95 shd ef gr  gs col-1 s gr 
-% Polyline
-n 3300 2400 m 10200 2400 l  10200 8925 l  3300 8925 l  clp gs col7 0.90 shd ef gr  gs col-1 s gr 
-% Polyline
-n 3900 2925 m 10200 2925 l  10200 4650 l  3900 4650 l  clp gs col7 0.85 shd ef gr  gs col-1 s gr 
-% Polyline
-n 3900 4800 m 10200 4800 l  10200 8250 l  3900 8250 l  clp gs col7 0.85 shd ef gr  gs col-1 s gr 
-% Polyline
-n 10350 3000 m 10425 3075 l  10425 4500 l  10350 4575 l  gs col-1 s gr 
-% Polyline
-n 10350 4875 m 10425 4950 l  10425 8100 l  10350 8175 l  gs col-1 s gr 
-/Helvetica-Oblique findfont 270.00 scalefont setfont
-10575 6600 m
-gs 1 -1 sc (image acquisition) col-1 show gr
-/Helvetica-Oblique findfont 270.00 scalefont setfont
-10575 3825 m
-gs 1 -1 sc (device setup) col-1 show gr
-/Helvetica-Oblique findfont 270.00 scalefont setfont
-4200 7515 m
-gs 1 -1 sc (- go back to) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-5775 7515 m
-gs 1 -1 sc (sane_start\(\)) col-1 show gr
-/Helvetica-Oblique findfont 270.00 scalefont setfont
-7275 7515 m
-gs 1 -1 sc (if more frames desired) col-1 show gr
-/Helvetica-Oblique findfont 270.00 scalefont setfont
-4200 3300 m
-gs 1 -1 sc (- use:) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-4200 5100 m
-gs 1 -1 sc (- sane_start\(\)) col-1 show gr
-/Helvetica-Oblique findfont 270.00 scalefont setfont
-4500 4500 m
-gs 1 -1 sc (repeatedly to configure device as desired) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-5400 4080 m
-gs 1 -1 sc (sane_control_option\(\)) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-5400 3600 m
-gs 1 -1 sc (sane_get_option_descriptor\(\)) col-1 show gr
-/Helvetica-Oblique findfont 270.00 scalefont setfont
-4200 5700 m
-gs 1 -1 sc (- use:) col-1 show gr
-/Helvetica-Oblique findfont 270.00 scalefont setfont
-4500 6900 m
-gs 1 -1 sc (repeatedly until read returns EOF) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-5400 6000 m
-gs 1 -1 sc (sane_get_parameters\(\)) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-5400 6450 m
-gs 1 -1 sc (sane_read\(\)) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-4200 8100 m
-gs 1 -1 sc (- sane_cancel\(\)) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-3000 1200 m
-gs 1 -1 sc (- sane_init\(\)) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-3000 9300 m
-gs 1 -1 sc (- sane_exit\(\)) col-1 show gr
-/Helvetica-Oblique findfont 270.00 scalefont setfont
-3600 1800 m
-gs 1 -1 sc (- pick desired device, possibly by using) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-3600 2700 m
-gs 1 -1 sc (- sane_open\(\)) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-3600 8700 m
-gs 1 -1 sc (- sane_close\(\)) col-1 show gr
-/Helvetica findfont 270.00 scalefont setfont
-4800 2175 m
-gs 1 -1 sc (sane_get_devices\(\)) col-1 show gr
-$F2psEnd
-restore
diff --git a/doc/figs/hierarchy.eps b/doc/figs/hierarchy.eps
deleted file mode 100644
index 978b3ab..0000000
--- a/doc/figs/hierarchy.eps
+++ /dev/null
@@ -1,209 +0,0 @@
-%!PS-Adobe-2.0 EPSF-2.0
-%%Title: hierarchy.fig
-%%Creator: fig2dev Version 3.1 Patchlevel 2
-%%CreationDate: Thu Jan 30 22:02:12 1997
-%%For: davidm@panda.mosberger (David Mosberger-Tang)
-%Magnification: 1.00
-%%Orientation: Landscape
-%%BoundingBox: 0 0 355 722
-%%Pages: 0
-%%BeginSetup
-%%IncludeFeature: *PageSize Letter
-%%EndSetup
-%%EndComments
-/$F2psDict 200 dict def
-$F2psDict begin
-$F2psDict /mtrx matrix put
-/col-1 {0 setgray} bind def
-/col0 {0.000 0.000 0.000 srgb} bind def
-/col1 {0.000 0.000 1.000 srgb} bind def
-/col2 {0.000 1.000 0.000 srgb} bind def
-/col3 {0.000 1.000 1.000 srgb} bind def
-/col4 {1.000 0.000 0.000 srgb} bind def
-/col5 {1.000 0.000 1.000 srgb} bind def
-/col6 {1.000 1.000 0.000 srgb} bind def
-/col7 {1.000 1.000 1.000 srgb} bind def
-/col8 {0.000 0.000 0.560 srgb} bind def
-/col9 {0.000 0.000 0.690 srgb} bind def
-/col10 {0.000 0.000 0.820 srgb} bind def
-/col11 {0.530 0.810 1.000 srgb} bind def
-/col12 {0.000 0.560 0.000 srgb} bind def
-/col13 {0.000 0.690 0.000 srgb} bind def
-/col14 {0.000 0.820 0.000 srgb} bind def
-/col15 {0.000 0.560 0.560 srgb} bind def
-/col16 {0.000 0.690 0.690 srgb} bind def
-/col17 {0.000 0.820 0.820 srgb} bind def
-/col18 {0.560 0.000 0.000 srgb} bind def
-/col19 {0.690 0.000 0.000 srgb} bind def
-/col20 {0.820 0.000 0.000 srgb} bind def
-/col21 {0.560 0.000 0.560 srgb} bind def
-/col22 {0.690 0.000 0.690 srgb} bind def
-/col23 {0.820 0.000 0.820 srgb} bind def
-/col24 {0.500 0.190 0.000 srgb} bind def
-/col25 {0.630 0.250 0.000 srgb} bind def
-/col26 {0.750 0.380 0.000 srgb} bind def
-/col27 {1.000 0.500 0.500 srgb} bind def
-/col28 {1.000 0.630 0.630 srgb} bind def
-/col29 {1.000 0.750 0.750 srgb} bind def
-/col30 {1.000 0.880 0.880 srgb} bind def
-/col31 {1.000 0.840 0.000 srgb} bind def
-
-end
-save
--17.0 -17.0 translate
- 90 rotate
-1 -1 scale
-
-/cp {closepath} bind def
-/ef {eofill} bind def
-/gr {grestore} bind def
-/gs {gsave} bind def
-/sa {save} bind def
-/rs {restore} bind def
-/l {lineto} bind def
-/m {moveto} bind def
-/rm {rmoveto} bind def
-/n {newpath} bind def
-/s {stroke} bind def
-/sh {show} bind def
-/slc {setlinecap} bind def
-/slj {setlinejoin} bind def
-/slw {setlinewidth} bind def
-/srgb {setrgbcolor} bind def
-/rot {rotate} bind def
-/sc {scale} bind def
-/sd {setdash} bind def
-/ff {findfont} bind def
-/sf {setfont} bind def
-/scf {scalefont} bind def
-/sw {stringwidth} bind def
-/tr {translate} bind def
-/tnt {dup dup currentrgbcolor
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb}
-  bind def
-/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul
-  4 -2 roll mul srgb} bind def
-/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def
-/$F2psEnd {$F2psEnteredState restore end} def
-%%EndProlog
-
-$F2psBegin
-10 setmiterlimit
-n 0 612 m 0 0 l 792 0 l 792 612 l cp clip
- 0.06000 0.06000 sc
-% Polyline
-n 5700 3825 m 300 3825 l 300 300 l 5700 300 l cp gs 0.90 setgray ef gr 
-% Polyline
-n 12300 5550 m 7200 5550 l 7200 300 l 12300 300 l cp gs 0.90 setgray ef gr 
-15.000 slw
-% Polyline
-n 10650 4785 m 12150 4785 l 12150 5385 l 10650 5385 l cp gs col-1 s gr 
-/Helvetica ff 270.00 scf sf
-11399 5182 m
-gs 1 -1 sc (qcam) dup sw pop 2 div neg 0 rm  col-1 sh gr
-% Polyline
-n 7350 4785 m 8850 4785 l 8850 5385 l 7350 5385 l cp gs col-1 s gr 
-/Helvetica ff 270.00 scf sf
-8099 5182 m
-gs 1 -1 sc (hp) dup sw pop 2 div neg 0 rm  col-1 sh gr
-% Polyline
-n 2250 1185 m 3750 1185 l 3750 1785 l 2250 1785 l cp gs col-1 s gr 
-% Polyline
-n 450 2985 m 1950 2985 l 1950 3585 l 450 3585 l cp gs col-1 s gr 
-% Polyline
-n 2250 2985 m 3750 2985 l 3750 3585 l 2250 3585 l cp gs col-1 s gr 
-% Polyline
-n 4050 2985 m 5550 2985 l 5550 3585 l 4050 3585 l cp gs col-1 s gr 
-% Polyline
-n 8850 1185 m 10350 1185 l 10350 1785 l 8850 1785 l cp gs col-1 s gr 
-7.500 slw
-% Polyline
-n 2700 1800 m 1200 3000 l gs col-1 s gr 
-% Polyline
-n 3000 1800 m 3000 3000 l gs col-1 s gr 
-% Polyline
-n 3300 1800 m 4800 3000 l gs col-1 s gr 
-% Polyline
-n 9600 1800 m 9600 2100 l gs col-1 s gr 
-% Polyline
-n 9450 2700 m 8100 4800 l gs col-1 s gr 
-% Polyline
-n 11400 4200 m 11400 4800 l gs col-1 s gr 
-% Polyline
-n 1200 3600 m 1200 4200 l gs col-1 s gr 
-% Polyline
-n 3000 3600 m 3000 4125 l gs col-1 s gr 
-% Polyline
-n 7875 5400 m 7350 5850 l gs col-1 s gr 
-% Polyline
-n 8250 5400 m 8775 5850 l gs col-1 s gr 
-% Polyline
-n 11475 5400 m 11475 5850 l gs col-1 s gr 
-15.000 slw
-% Polyline
-n 8850 2100 m 10350 2100 l 10350 2700 l 8850 2700 l cp gs col-1 s gr 
-% Polyline
-n 10650 3600 m 12150 3600 l 12150 4200 l 10650 4200 l cp gs col-1 s gr 
-7.500 slw
-% Polyline
-n 9750 2700 m 11400 3600 l gs col-1 s gr 
-% Interp Spline
-gs n 4800 3600 m
-	4390.2 4024.4 4259.0 4249.4 4275 4500 curveto
-	4300.2 4894.5 4554.6 5418.2 5025 5475 curveto
-	5575.9 5541.5 5962.1 4914.2 6150 4575 curveto
-	6573.5 3810.6 5758.1 2145.7 6525 1350 curveto
-	7224.0 624.7 8573.7 446.9 9450 900 curveto
-	9524.5 938.5 9562.0 1013.5 9600 1200 curveto
- gs col-1 s gr
- gr
-
-/Helvetica ff 270.00 scf sf
-1199 3382 m
-gs 1 -1 sc (pnm) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica ff 270.00 scf sf
-2999 3382 m
-gs 1 -1 sc (mustek) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica-Oblique ff 210.00 scf sf
-1200 4425 m
-gs 1 -1 sc (pnm files) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica-Oblique ff 210.00 scf sf
-3000 4380 m
-gs 1 -1 sc (scanner) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica-Oblique ff 210.00 scf sf
-7350 6165 m
-gs 1 -1 sc (scanner 1) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica-Oblique ff 210.00 scf sf
-8925 6165 m
-gs 1 -1 sc (scanner 2) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica-Oblique ff 210.00 scf sf
-11475 6135 m
-gs 1 -1 sc (video camera) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica-Oblique ff 210.00 scf sf
-3000 600 m
-gs 1 -1 sc (machine A) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica-Oblique ff 210.00 scf sf
-9600 630 m
-gs 1 -1 sc (machine B) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica-Oblique ff 210.00 scf sf
-4725 5850 m
-gs 1 -1 sc (network connection) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica ff 270.00 scf sf
-2999 1582 m
-gs 1 -1 sc (dll) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica ff 270.00 scf sf
-4799 3382 m
-gs 1 -1 sc (net) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica ff 270.00 scf sf
-9599 1582 m
-gs 1 -1 sc (saned) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica ff 270.00 scf sf
-9599 2482 m
-gs 1 -1 sc (dll) dup sw pop 2 div neg 0 rm  col-1 sh gr
-/Helvetica ff 270.00 scf sf
-11399 3982 m
-gs 1 -1 sc (autolum) dup sw pop 2 div neg 0 rm  col-1 sh gr
-$F2psEnd
-rs
diff --git a/doc/figs/image-data.eps b/doc/figs/image-data.eps
deleted file mode 100644
index 13e6b8a..0000000
--- a/doc/figs/image-data.eps
+++ /dev/null
@@ -1,178 +0,0 @@
-%!PS-Adobe-2.0 EPSF-2.0
-%%Title: image-data.fig
-%%Creator: fig2dev Version 3.1 Patchlevel 1
-%%CreationDate: Fri Nov 22 08:53:36 1996
-%%For: davidm@panda.mosberger (David Mosberger-Tang)
-%%Orientation: Portrait
-%%BoundingBox: 0 0 521 93
-%%Pages: 0
-%%BeginSetup
-%%IncludeFeature: *PageSize Letter
-%%EndSetup
-%%EndComments
-/$F2psDict 200 dict def
-$F2psDict begin
-$F2psDict /mtrx matrix put
-/col-1 {} def
-/col0 {0.000 0.000 0.000 srgb} bind def
-/col1 {0.000 0.000 1.000 srgb} bind def
-/col2 {0.000 1.000 0.000 srgb} bind def
-/col3 {0.000 1.000 1.000 srgb} bind def
-/col4 {1.000 0.000 0.000 srgb} bind def
-/col5 {1.000 0.000 1.000 srgb} bind def
-/col6 {1.000 1.000 0.000 srgb} bind def
-/col7 {1.000 1.000 1.000 srgb} bind def
-/col8 {0.000 0.000 0.560 srgb} bind def
-/col9 {0.000 0.000 0.690 srgb} bind def
-/col10 {0.000 0.000 0.820 srgb} bind def
-/col11 {0.530 0.810 1.000 srgb} bind def
-/col12 {0.000 0.560 0.000 srgb} bind def
-/col13 {0.000 0.690 0.000 srgb} bind def
-/col14 {0.000 0.820 0.000 srgb} bind def
-/col15 {0.000 0.560 0.560 srgb} bind def
-/col16 {0.000 0.690 0.690 srgb} bind def
-/col17 {0.000 0.820 0.820 srgb} bind def
-/col18 {0.560 0.000 0.000 srgb} bind def
-/col19 {0.690 0.000 0.000 srgb} bind def
-/col20 {0.820 0.000 0.000 srgb} bind def
-/col21 {0.560 0.000 0.560 srgb} bind def
-/col22 {0.690 0.000 0.690 srgb} bind def
-/col23 {0.820 0.000 0.820 srgb} bind def
-/col24 {0.500 0.190 0.000 srgb} bind def
-/col25 {0.630 0.250 0.000 srgb} bind def
-/col26 {0.750 0.380 0.000 srgb} bind def
-/col27 {1.000 0.500 0.500 srgb} bind def
-/col28 {1.000 0.630 0.630 srgb} bind def
-/col29 {1.000 0.750 0.750 srgb} bind def
-/col30 {1.000 0.880 0.880 srgb} bind def
-/col31 {1.000 0.840 0.000 srgb} bind def
-
-end
-save
--88.0 120.0 translate
-1 -1 scale
-
-/clp {closepath} bind def
-/ef {eofill} bind def
-/gr {grestore} bind def
-/gs {gsave} bind def
-/l {lineto} bind def
-/m {moveto} bind def
-/n {newpath} bind def
-/s {stroke} bind def
-/slc {setlinecap} bind def
-/slj {setlinejoin} bind def
-/slw {setlinewidth} bind def
-/srgb {setrgbcolor} bind def
-/rot {rotate} bind def
-/sc {scale} bind def
-/tr {translate} bind def
-/tnt {dup dup currentrgbcolor
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb}
-  bind def
-/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul
-  4 -2 roll mul srgb} bind def
-/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def
-/$F2psEnd {$F2psEnteredState restore end} def
-%%EndProlog
-
-$F2psBegin
-10 setmiterlimit
- 0.06000 0.06000 sc
-7.500 slw
-% Polyline
-n 1800 1200 m 3150 1200 l  3150 1350 l  1800 1350 l  clp  gs col-1 s gr 
-/Helvetica findfont 180.00 scalefont setfont
-1875 1125 m
-gs 1 -1 sc (7 6 5 4 3 2 1 0) col-1 show gr
-% Polyline
-n 3150 1200 m 4500 1200 l  4500 1350 l  3150 1350 l  clp  gs col-1 s gr 
-/Helvetica findfont 180.00 scalefont setfont
-3225 1125 m
-gs 1 -1 sc (7 6 5 4 3 2 1 0) col-1 show gr
-% Polyline
-n 4500 1200 m 5850 1200 l  5850 1350 l  4500 1350 l  clp  gs col-1 s gr 
-/Helvetica findfont 180.00 scalefont setfont
-4575 1125 m
-gs 1 -1 sc (7 6 5 4 3 2 1 0) col-1 show gr
-15.000 slw
-% Polyline
-n 1800 1200 m 5850 1200 l  5850 1350 l  1800 1350 l  clp  gs col-1 s gr 
-7.500 slw
-% Polyline
-n 1800 900 m 1950 825 l  3750 825 l  3825 750 l  3900 825 l  5700 825 l 
- 5850 900 l  gs col-1 s gr 
-/Helvetica findfont 180.00 scalefont setfont
-2475 1575 m
-gs 1 -1 sc (r) col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-3825 1575 m
-gs 1 -1 sc (g) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-5175 1575 m
-gs 1 -1 sc (b) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-3825 600 m
-gs 1 -1 sc (pixel 0) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-% Polyline
-n 5850 1200 m 7200 1200 l  7200 1350 l  5850 1350 l  clp  gs col-1 s gr 
-/Helvetica findfont 180.00 scalefont setfont
-5925 1125 m
-gs 1 -1 sc (7 6 5 4 3 2 1 0) col-1 show gr
-% Polyline
-n 7200 1200 m 8550 1200 l  8550 1350 l  7200 1350 l  clp  gs col-1 s gr 
-/Helvetica findfont 180.00 scalefont setfont
-7275 1125 m
-gs 1 -1 sc (7 6 5 4 3 2 1 0) col-1 show gr
-% Polyline
-n 8550 1200 m 9900 1200 l  9900 1350 l  8550 1350 l  clp  gs col-1 s gr 
-/Helvetica findfont 180.00 scalefont setfont
-8625 1125 m
-gs 1 -1 sc (7 6 5 4 3 2 1 0) col-1 show gr
-15.000 slw
-% Polyline
-n 5850 1200 m 9900 1200 l  9900 1350 l  5850 1350 l  clp  gs col-1 s gr 
-7.500 slw
-% Polyline
-n 5850 900 m 6000 825 l  7800 825 l  7875 750 l  7950 825 l  9750 825 l 
- 9900 900 l  gs col-1 s gr 
-/Helvetica findfont 180.00 scalefont setfont
-6525 1575 m
-gs 1 -1 sc (r) col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-7875 1575 m
-gs 1 -1 sc (g) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-9225 1575 m
-gs 1 -1 sc (b) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-7875 600 m
-gs 1 -1 sc (pixel 1) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-9225 1950 m
-gs 1 -1 sc (byte 5) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-7875 1950 m
-gs 1 -1 sc (byte 4) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-6525 1950 m
-gs 1 -1 sc (byte 3) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-5175 1950 m
-gs 1 -1 sc (byte 2) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-3825 1950 m
-gs 1 -1 sc (byte1) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-2475 1950 m
-gs 1 -1 sc (byte0) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-10050 1275 m
-gs 1 -1 sc (....) dup stringwidth pop 2 div neg 0 rmoveto  col-1 show gr
-/Helvetica findfont 180.00 scalefont setfont
-1725 1125 m
-gs 1 -1 sc (bit:) dup stringwidth pop neg 0 rmoveto  col-1 show gr
-$F2psEnd
-restore
diff --git a/doc/figs/xfer.eps b/doc/figs/xfer.eps
deleted file mode 100644
index 04abf91..0000000
--- a/doc/figs/xfer.eps
+++ /dev/null
@@ -1,117 +0,0 @@
-%!PS-Adobe-2.0 EPSF-2.0
-%%Title: xfer.fig
-%%Creator: fig2dev Version 3.1 Patchlevel 1
-%%CreationDate: Fri Nov 22 08:53:30 1996
-%%For: davidm@panda.mosberger (David Mosberger-Tang)
-%%Orientation: Portrait
-%%BoundingBox: 0 0 362 182
-%%Pages: 0
-%%BeginSetup
-%%IncludeFeature: *PageSize Letter
-%%EndSetup
-%%EndComments
-/$F2psDict 200 dict def
-$F2psDict begin
-$F2psDict /mtrx matrix put
-/col-1 {} def
-/col0 {0.000 0.000 0.000 srgb} bind def
-/col1 {0.000 0.000 1.000 srgb} bind def
-/col2 {0.000 1.000 0.000 srgb} bind def
-/col3 {0.000 1.000 1.000 srgb} bind def
-/col4 {1.000 0.000 0.000 srgb} bind def
-/col5 {1.000 0.000 1.000 srgb} bind def
-/col6 {1.000 1.000 0.000 srgb} bind def
-/col7 {1.000 1.000 1.000 srgb} bind def
-/col8 {0.000 0.000 0.560 srgb} bind def
-/col9 {0.000 0.000 0.690 srgb} bind def
-/col10 {0.000 0.000 0.820 srgb} bind def
-/col11 {0.530 0.810 1.000 srgb} bind def
-/col12 {0.000 0.560 0.000 srgb} bind def
-/col13 {0.000 0.690 0.000 srgb} bind def
-/col14 {0.000 0.820 0.000 srgb} bind def
-/col15 {0.000 0.560 0.560 srgb} bind def
-/col16 {0.000 0.690 0.690 srgb} bind def
-/col17 {0.000 0.820 0.820 srgb} bind def
-/col18 {0.560 0.000 0.000 srgb} bind def
-/col19 {0.690 0.000 0.000 srgb} bind def
-/col20 {0.820 0.000 0.000 srgb} bind def
-/col21 {0.560 0.000 0.560 srgb} bind def
-/col22 {0.690 0.000 0.690 srgb} bind def
-/col23 {0.820 0.000 0.820 srgb} bind def
-/col24 {0.500 0.190 0.000 srgb} bind def
-/col25 {0.630 0.250 0.000 srgb} bind def
-/col26 {0.750 0.380 0.000 srgb} bind def
-/col27 {1.000 0.500 0.500 srgb} bind def
-/col28 {1.000 0.630 0.630 srgb} bind def
-/col29 {1.000 0.750 0.750 srgb} bind def
-/col30 {1.000 0.880 0.880 srgb} bind def
-/col31 {1.000 0.840 0.000 srgb} bind def
-
-end
-save
--134.0 370.0 translate
-1 -1 scale
-
-/clp {closepath} bind def
-/ef {eofill} bind def
-/gr {grestore} bind def
-/gs {gsave} bind def
-/l {lineto} bind def
-/m {moveto} bind def
-/n {newpath} bind def
-/s {stroke} bind def
-/slc {setlinecap} bind def
-/slj {setlinejoin} bind def
-/slw {setlinewidth} bind def
-/srgb {setrgbcolor} bind def
-/rot {rotate} bind def
-/sc {scale} bind def
-/tr {translate} bind def
-/tnt {dup dup currentrgbcolor
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb}
-  bind def
-/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul
-  4 -2 roll mul srgb} bind def
-/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def
-/$F2psEnd {$F2psEnteredState restore end} def
-%%EndProlog
-
-$F2psBegin
-10 setmiterlimit
- 0.06000 0.06000 sc
-15.000 slw
-% Polyline
-n 2400 3300 m 8100 3300 l  gs col-1 s gr 
-n 7812.00 3240.00 m 8100.00 3300.00 l 7812.00 3360.00 l  7860.50 3300.50 l 7812.00 3240.00 l clp gs 0.00 setgray ef gr gs col-1 s gr
-7.500 slw
-% Polyline
-n 8100 3375 m 2400 3675 l  gs col-1 s gr 
-15.000 slw
-n 2690.76 3719.78 m 2400.00 3675.00 l 2684.45 3599.95 l  2640.17 3662.89 l 2690.76 3719.78 l clp gs 0.00 setgray ef gr gs col-1 s gr
-% Polyline
-n 2400 3750 m 8100 3750 l  gs col-1 s gr 
-n 7812.00 3690.00 m 8100.00 3750.00 l 7812.00 3810.00 l  7860.50 3750.50 l 7812.00 3690.00 l clp gs 0.00 setgray ef gr gs col-1 s gr
-7.500 slw
-% Polyline
-n 8100 3825 m 2400 4125 l  gs col-1 s gr 
-15.000 slw
-n 2690.76 4169.78 m 2400.00 4125.00 l 2684.45 4049.95 l  2640.17 4112.89 l 2690.76 4169.78 l clp gs 0.00 setgray ef gr gs col-1 s gr
-7.500 slw
-% Polyline
-n 2250 3150 m 8250 3150 l  8250 6150 l  2250 6150 l  clp  gs col-1 s gr 
-15.000 slw
-% Polyline
-n 2400 4200 m 8100 4200 l  gs col-1 s gr 
-n 7812.00 4140.00 m 8100.00 4200.00 l 7812.00 4260.00 l  7860.50 4200.50 l 7812.00 4140.00 l clp gs 0.00 setgray ef gr gs col-1 s gr
-7.500 slw
-% Polyline
-n 8100 4275 m 2400 4575 l  gs col-1 s gr 
-15.000 slw
-n 2690.76 4619.78 m 2400.00 4575.00 l 2684.45 4499.95 l  2640.17 4562.89 l 2690.76 4619.78 l clp gs 0.00 setgray ef gr gs col-1 s gr
-% Polyline
-n 2400 4650 m 8100 4650 l  gs col-1 s gr 
-n 7812.00 4590.00 m 8100.00 4650.00 l 7812.00 4710.00 l  7860.50 4650.50 l 7812.00 4590.00 l clp gs 0.00 setgray ef gr gs col-1 s gr
-$F2psEnd
-restore
diff --git a/doc/html.sty b/doc/html.sty
deleted file mode 100644
index 5b55985..0000000
--- a/doc/html.sty
+++ /dev/null
@@ -1,232 +0,0 @@
-% LaTeX2HTML Version 95.1 : html.sty
-%
-% This file contains definitions of LaTeX commands which are
-% processed in a special way by the translator. 
-% For example, there are commands for embedding external hypertext links,
-% for cross-references between documents or for including
-% raw HTML.
-% This file includes the comments.sty file v2.0 by Victor Eijkhout
-% In most cases these commands do nothing when processed by LaTeX.
-
-% Modifications:
-%
-%  nd = Nikos Drakos <nikos@cbl.leeds.ac.uk>
-%  jz = Jelle van Zeijl <jvzeijl@isou17.estec.esa.nl>
-
-% jz 22-APR-94 - Added support for htmlref
-% nd  - Created
-
-
-
-% Exit if the style file is already loaded
-% (suggested by Lee Shombert <las@potomac.wash.inmet.com>
-\ifx \htmlstyloaded\relax \endinput\else\let\htmlstyloaded\relax\fi
-
-%%% LINKS TO EXTERNAL DOCUMENTS
-%
-% This can be used to provide links to arbitrary documents.
-% The first argumment should be the text that is going to be
-% highlighted and the second argument a URL.
-% The hyperlink will appear as a hyperlink in the HTML 
-% document and as a footnote in the dvi or ps files.
-%
-\newcommand{\htmladdnormallinkfoot}[2]{#1\footnote{#2}} 
-
-% This is an alternative definition of the command above which
-% will ignore the URL in the dvi or ps files.
-\newcommand{\htmladdnormallink}[2]{#1}
-
-% This command takes as argument a URL pointing to an image.
-% The image will be embedded in the HTML document but will
-% be ignored in the dvi and ps files.
-%
-\newcommand{\htmladdimg}[1]{}
-
-%%% CROSS-REFERENCES BETWEEN (LOCAL OR REMOTE) DOCUMENTS
-%
-% This can be used to refer to symbolic labels in other Latex 
-% documents that have already been processed by the translator.
-% The arguments should be:
-% #1 : the URL to the directory containing the external document
-% #2 : the path to the labels.pl file of the external document.
-% If the external document lives on a remote machine then labels.pl 
-% must be copied on the local machine.
-%
-%e.g. \externallabels{http://cbl.leeds.ac.uk/nikos/WWW/doc/tex2html/latex2html}
-%                    {/usr/cblelca/nikos/tmp/labels.pl}
-% The arguments are ignored in the dvi and ps files.
-%
-\newcommand{\externallabels}[2]{}
-
-% This complements the \externallabels command above. The argument
-% should be a label defined in another latex document and will be
-% ignored in the dvi and ps files.
-%
-\newcommand{\externalref}[1]{}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Comment.sty   version 2.0, 19 June 1992
-% selectively in/exclude pieces of text: the user can define new
-% comment versions, and each is controlled separately.
-% This style can be used with plain TeX or LaTeX, and probably
-% most other packages too.
-%
-% Examples of use in LaTeX and TeX follow \endinput
-%
-% Author
-%    Victor Eijkhout
-%    Department of Computer Science
-%    University Tennessee at Knoxville
-%    104 Ayres Hall
-%    Knoxville, TN 37996
-%    USA
-%
-%    eijkhout@cs.utk.edu
-%
-% Usage: all text included in between
-%    \comment ... \endcomment
-% or \begin{comment} ... \end{comment}
-% is discarded. The closing command should appear on a line
-% of its own. No starting spaces, nothing after it.
-% This environment should work with arbitrary amounts
-% of comment.
-%
-% Other 'comment' environments are defined by
-% and are selected/deselected with
-% \includecomment{versiona}
-% \excludecoment{versionb}
-%
-% These environments are used as
-% \versiona ... \endversiona
-% or \begin{versiona} ... \end{versiona}
-% with the closing command again on a line of its own.
-%
-% Basic approach:
-% to comment something out, scoop up  every line in verbatim mode
-% as macro argument, then throw it away.
-% For inclusions, both the opening and closing comands
-% are defined as noop
-%
-% Changed \next to \html@next to prevent clashes with other sty files
-% (mike@emn.fr)
-% Changed \html@next to \htmlnext so the \makeatletter and
-% \makeatother commands could be removed (they were causing other
-% style files - changebar.sty - to crash) (nikos@cbl.leeds.ac.uk)
-% Changed \htmlnext back to \html@next...
-
-\makeatletter
-\def\makeinnocent#1{\catcode`#1=12 }
-\def\csarg#1#2{\expandafter#1\csname#2\endcsname}
-
-\def\ThrowAwayComment#1{\begingroup
-    \def\CurrentComment{#1}%
-    \let\do\makeinnocent \dospecials
-    \makeinnocent\^^L% and whatever other special cases
-    \endlinechar`\^^M \catcode`\^^M=12 \xComment}
-{\catcode`\^^M=12 \endlinechar=-1 %
- \gdef\xComment#1^^M{\def\test{#1}
-      \csarg\ifx{PlainEnd\CurrentComment Test}\test
-          \let\html@next\endgroup
-      \else \csarg\ifx{LaLaEnd\CurrentComment Test}\test
-            \edef\html@next{\endgroup\noexpand\end{\CurrentComment}}
-      \else \let\html@next\xComment
-      \fi \fi \html@next}
-}
-\makeatother
-
-\def\includecomment
- #1{\expandafter\def\csname#1\endcsname{}%
-    \expandafter\def\csname end#1\endcsname{}}
-\def\excludecomment
- #1{\expandafter\def\csname#1\endcsname{\ThrowAwayComment{#1}}%
-    {\escapechar=-1\relax
-     \csarg\xdef{PlainEnd#1Test}{\string\\end#1}%
-     \csarg\xdef{LaLaEnd#1Test}{\string\\end\string\{#1\string\}}%
-    }}
-
-\excludecomment{comment}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%% RAW HTML 
-% 
-% Enclose raw HTML between a \begin{rawhtml} and \end{rawhtml}.
-% The html environment ignores its body
-%
-\excludecomment{rawhtml}
-
-%%% HTML ONLY
-%
-% Enclose LaTeX constructs which will only appear in the 
-% HTML output and will be ignored by LaTeX with 
-% \begin{htmlonly} and \end{htmlonly}
-%
-\excludecomment{htmlonly}
-% Shorter version
-\newcommand{\html}[1]{}
-
-
-%%% LaTeX ONLY
-% Enclose LaTeX constructs which will only appear in the 
-% DVI output and will be ignored by latex2html with 
-%\begin{latexonly} and \end{latexonly}
-%
-\newenvironment{latexonly}{}{}
-% Shorter version
-\newcommand{\latex}[1]{#1}
-
-%%% HYPERREF 
-% Suggested by Eric M. Carol <eric@ca.utoronto.utcc.enfm>
-% Similar to \ref but accepts conditional text. 
-% The first argument is HTML text which will become ``hyperized''
-% (underlined).
-% The second and third arguments are text which will appear only in the paper
-% version (DVI file), enclosing the fourth argument which is a reference to a label.
-%
-%e.g. \hyperref{using the tracer}{using the tracer (see Section}{)}{trace}
-% where there is a corresponding \label{trace}
-%
-\newcommand{\hyperref}[4]{#2\ref{#4}#3}
-
-%%% HTMLREF
-% Reference in HTML version only.
-% Mix between \htmladdnormallink and \hyperref.
-% First arg is text for in both versions, second is label for use in HTML
-% version.
-\newcommand{\htmlref}[2]{#1}
-
-%%% HTMLIMAGE
-% This command can be used inside any environment that is converted
-% into an inlined image (eg a "figure" environment) in order to change
-% the way the image will be translated. The argument of \htmlimage
-% is really a string of options separated by commas ie 
-% [scale=<scale factor>],[external],[thumbnail=<reduction factor>
-% The scale option allows control over the size of the final image.
-% The ``external'' option will cause the image not to be inlined 
-% (images are inlined by default). External images will be accessible
-% via a hypertext link. 
-% The ``thumbnail'' option will cause a small inlined image to be 
-% placed in the caption. The size of the thumbnail depends on the
-% reduction factor. The use of the ``thumbnail'' option implies
-% the ``external'' option.
-%
-% Example:
-% \htmlimage{scale=1.5,external,thumbnail=0.2}
-% will cause a small thumbnail image 1/5th of the original size to be
-% placed in the final document, pointing to an external image 1.5
-% times bigger than the original.
-% 
-\newcommand{\htmlimage}[1]{}
-
-%%% HTMLADDTONAVIGATION
-% This command appends its argument to the buttons in the navigation
-% panel. It is ignored by LaTeX.
-%
-% Example:
-% \htmladdtonavigation{\htmladdnormallink
-%              {\htmladdimg{http://server/path/to/gif}}
-%              {http://server/path}}
-\newcommand{\htmladdtonavigation}[1]{}
-
-% typeset a url:
-\newcommand{\url}[1]{\texttt{#1}}
diff --git a/doc/releases.txt b/doc/releases.txt
index a1b5478..1579b15 100644
--- a/doc/releases.txt
+++ b/doc/releases.txt
@@ -14,22 +14,26 @@ Day 35: Release
 
 Before the release:
 
-* set :new :yes on any new backend .desc files
+* set :new :yes on any new backend .desc files, by looking for added files:
+
+  cd backend
+  ls | while read aa; do git log --follow --diff-filter=A --find-renames=40% --format="%ai  $aa" "$aa"; done > foo.log
+
+  Then inspect foo.log for any files added since the last release.
 * Make sure that config.guess and config.sub are up-to-date (get them from
-  savannah.gnu.org/projects/config)
-* configure.in: increase version number
-* configure.in: remove 'git' from textual version number
-* configure.in: set is_release=yes
-* OPTIONAL: aclocal.m4: recreate by running aclocal
-* OPTIONAL: include/sane/config.h.in: recreate (autoheader in root of checkout)
-* DONT run autoreconf, it will overwrite our custom ltmain.sh
-* configure: recreate by running autoconf
-* NEWS: update and enter date of release
+  savannah.gnu.org/projects/config) (git clone is easiest)
+* configure.ac: remove 'git' from textual version number, and increment it
+* run autoreconf --force but do *NOT* use the --install option as it will
+  overwrite our custom ltmain.sh
+* ChangeLog: generate from git log, something like:
+  git log RELEASE_1_0_25..HEAD > ChangeLog
+* NEWS: update and enter date of release, etc
+  Get list of heavily change backends via: git diff --stat RELEASE_1_0_25
+  Get other things by reading ChangeLog
 * sane-backends.lsm: update
-* ChangeLog: set release marker
 * git commit -a
 * tag git with release tag; e.g.: 'git tag -a RELEASE_1_0_15'
-* probably DONT want to git push here, cause alioth will rebuild it's local
+* probably DONT want to git push here, because alioth will rebuild it's local
   checkout needlessly
 
 Making the release:
@@ -74,13 +78,17 @@ Announcing the release:
 
 After the release:
 
-* move ChangeLog to ChangeLog-"version"
-* start a new ChangeLog
-* add ChangeLog-"version" to EXTRA_DIST in Makefile.in and Makefile.am
-* configure.in: bump textual version & add 'git' suffix
-* configure.in: bump V_REV
-* configure.in: set is_release=no
+#### consider not adding old changelogs to release package
+* move ChangeLog to ChangeLogs/ChangeLog-"version"
+* start a new ChangeLog, with the following message:
+
+This file is automatically generated at release time using git commit messages.
+
+For the latest changes please refer to the output of `git log` or see:
+https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=sane/sane-backends.git;a=log
+
+* configure.ac: bump textual version & add 'git' suffix
 * configure: regenerate with autoconf
 * remove the ':new' tag from any new backends .desc files
 * git add new files and commit
-* git push --tags
+* git push && git push --tags (one of these might give an error 'remote: fatal: bad object 0000000000000000000000000000000000000000', try the other one)
diff --git a/doc/sane-avision.man b/doc/sane-avision.man
index 299bb72..6a991b6 100644
--- a/doc/sane-avision.man
+++ b/doc/sane-avision.man
@@ -36,6 +36,7 @@ a hash mark (#) are ignored. A sample configuration file is shown below:
 \ 
  option force\-a4
  option force\-a3
+ option skip\-adf
  option disable\-gamma\-table
  option disable\-calibration
 \ 
@@ -61,6 +62,15 @@ known to return bogus data are marked in the backend
 so if you need this option please report this to the
 backend maintainer. USE WITH CARE!
 .TP
+skip\-adf:
+Forces the backend to ignore an inconsistent ADF
+status returned by the scanner (ADF not present, but
+ADF model number non-zero).  Without this option, the
+backend will make several attempts to reset the ADF
+and retry the query in this situation, and will fail
+with a "not supported" error if the ADF still doesn't
+respond.
+.TP
 disable\-gamma\-table:
 Disables the usage of the scanner's gamma-table. You
 might try this if your scans hang or only produces
diff --git a/doc/sane-epjitsu.man b/doc/sane-epjitsu.man
index 5d2a8ca..3552691 100644
--- a/doc/sane-epjitsu.man
+++ b/doc/sane-epjitsu.man
@@ -1,4 +1,4 @@
-.TH sane\-epjitsu 5 "12 Jun 2014" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane\-epjitsu 5 "11 Apr 2017" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-epjitsu
 
 .SH NAME
@@ -7,7 +7,7 @@ sane\-epjitsu \- SANE backend for Epson-based Fujitsu USB scanners.
 .SH DESCRIPTION
 The 
 .B sane\-epjitsu
-library implements a SANE (Scanner Access Now Easy) backend which provides basic access the Fujitsu fi\-60F/fi\-65F and ScanSnap S300/S1300/S1100 scanners.
+library implements a SANE (Scanner Access Now Easy) backend which provides basic access the Fujitsu fi\-60F/fi\-65F and ScanSnap S300/S1300(i)/S1100(i) scanners.
 
 .SH HARDWARE SUPPORT
 These scanners are fairly limited, only supporting a couple of modes and resolutions, and always scanning full width. The backend supports missing modes (binary, grayscale) and intermediate resolutions in software, but provides only minimal scan area controls. See 
@@ -87,7 +87,7 @@ The backend uses a single environment variable, SANE_DEBUG_EPJITSU, which enable
 Only limited scan area options are exposed.
 .br
 .br
-fi\-60F and fi\-65F hardware grayscale mode is not used.
+fi\-60F and fi\-65F hardware grayscale mode is not used, because the calibration code is not finished.
 .RE
 
 .SH CREDITS
diff --git a/doc/sane-epson.man b/doc/sane-epson.man
index d474bb7..af2b3cf 100644
--- a/doc/sane-epson.man
+++ b/doc/sane-epson.man
@@ -77,7 +77,7 @@ The
 option selects the bit depth the scanner is using. This option is only
 available for scanners that support more than one bit depth. Older
 scanners will always transfer the image in 8bit mode. Newer scanners
-allow to select either 8 bits, 12 or 14 bits per color channel. For a
+allow one to select either 8 bits, 12 or 14 bits per color channel. For a
 color scan this means an effective color depth of 36 or 42 bits over
 all three channels. The valid choices depend on the scanner model.
 
diff --git a/doc/sane-epson2.man b/doc/sane-epson2.man
index 896b340..6d47eea 100644
--- a/doc/sane-epson2.man
+++ b/doc/sane-epson2.man
@@ -123,7 +123,7 @@ The
 option selects the bit depth the scanner is using. This option is only
 available for scanners that support more than one bit depth. Older
 scanners will always transfer the image in 8bit mode. Newer scanners
-allow to select either 8 bits, 12 or 14 bits per color channel. For a
+allow one to select either 8 bits, 12 or 14 bits per color channel. For a
 color scan this means an effective color depth of 36 or 42 bits over
 all three channels. The valid choices depend on the scanner model.
 
diff --git a/doc/sane-epsonds.man b/doc/sane-epsonds.man
index ea9bcbb..3324804 100644
--- a/doc/sane-epsonds.man
+++ b/doc/sane-epsonds.man
@@ -29,7 +29,7 @@ The
 option selects the bit depth the scanner is using. This option is only
 available for scanners that support more than one bit depth. Older
 scanners will always transfer the image in 8bit mode. Newer scanners
-allow to select either 8 bits, 12 or 14 bits per color channel. For a
+allow one to select either 8 bits, 12 or 14 bits per color channel. For a
 color scan this means an effective color depth of 36 or 42 bits over
 all three channels. The valid choices depend on the scanner model.
 
diff --git a/doc/sane-fujitsu.man b/doc/sane-fujitsu.man
index 29004d9..6bd5f73 100644
--- a/doc/sane-fujitsu.man
+++ b/doc/sane-fujitsu.man
@@ -1,4 +1,4 @@
-.TH sane\-fujitsu 5 "31 Aug 2015" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane\-fujitsu 5 "08 Apr 2017" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-fujitsu
 
 .SH NAME
@@ -10,7 +10,7 @@ The
 library implements a SANE (Scanner Access Now Easy) backend which
 provides access to most Fujitsu flatbed and ADF scanners.
 
-This document describes backend version 127, which shipped with SANE 1.0.25.
+This document describes backend version 133, which shipped with SANE 1.0.26.
 
 .SH SUPPORTED HARDWARE
 This version supports every known model which speaks the Fujitsu SCSI and 
@@ -42,6 +42,7 @@ SP\-Jr        M3097E+/DE   S300/S300M
 SP\-10/10C    M3099A/EH/EX S1300/S1100
 SP\-15C/300C               fi\-60F
 SP\-600C/620C              fi\-5015C
+                          SP\-2x/3x
 .fi
 .ft R
 .RE
diff --git a/doc/sane-genesys.man b/doc/sane-genesys.man
index ee3e0af..cd00cc3 100644
--- a/doc/sane-genesys.man
+++ b/doc/sane-genesys.man
@@ -10,7 +10,7 @@ access to USB flatbed scanners based on the Genesys GL646, GL841, GL843, GL847 a
 At present, the following scanners are known to work with this backend:
 .PP 
 .RS
-Canon LiDE 35/40/50/60/100/110/200/210/220/700
+Canon LiDE 35/40/50/60/100/110/120/200/210/220/700
 .br
 Hewlett-Packard HP2300C/HP2400/HP3670/HP3690/G4010/G4050
 .br
@@ -52,7 +52,7 @@ in the feeder then start calibration either by passing the \-\-calibrate option
 or by clicking on the available 'calibrate' button in the 'advanced options' in a graphical
 frontend. The result of the calibration is stored in a file in the home directory of the user doing it.
 If you plug the scanner in another machine or use it with another account, calibration
-will have to be redone, unles you use the \-\-calibration\-file option.
+will have to be redone, unless you use the \-\-calibration\-file option.
 If no home directory is defined,
 USERAPPPROFILE will be used, then TMPDIR or TMP. If none of these directories exist, the backend will try
 to write in the current working directory. Flatbed scanners also make use of the calibration file as a cache
@@ -71,7 +71,7 @@ A value of -1 means forever, 0 means no cache.
 .B \-\-threshold percent
 .RS
 	0..100% (in steps of 1). Select minimum brightness to get a white point. Pixels
-whith brightness below that value will be scanned as black.
+with brightness below that value will be scanned as black.
 .RE
 
 .B \-\-brightness value
@@ -285,6 +285,9 @@ Brian Paavo from Benthic Science Limited for donating a Canoscan LiDE 700F.
 .TP
 Dany Qumsiyeh for donating a Canoscan LiDE 210 and a LiDE 220.
 .br
+.TP
+Luc Verhaegen for donating a Canoscan LiDE 120.
+.br
 
 .SH "SEE ALSO"
 .BR sane (7),
diff --git a/doc/sane-mustek_usb.man b/doc/sane-mustek_usb.man
index dfcb8eb..a934e8a 100644
--- a/doc/sane-mustek_usb.man
+++ b/doc/sane-mustek_usb.man
@@ -180,6 +180,7 @@ export SANE_DEBUG_MUSTEK_USB=4
 .BR sane\-ma1509 (5)
 .br
 .IR @DOCDIR@/mustek_usb/mustek_usb.CHANGES ,
+.br
 .I @DOCDIR@/mustek_usb/mustek_usb.TODO
 .br
 .I http://www.meier\-geinitz.de/sane/mustek_usb\-backend/
diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index ca692cb..1058e92 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -1,4 +1,4 @@
-.TH "sane\-pixma" "5" "30 Sep 2015" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH "sane\-pixma" "5" "20 May 2017" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-pixma
 .SH NAME
 sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners
@@ -17,9 +17,11 @@ Currently, the following models work with this backend:
 .RS
 PIXMA MG2100, MG2200, MG2400, MG2500, MG2900, MG3100, MG3200
 .br
-PIXMA MG3500, MG4200, MG5100, MG5200, MG5300, MG5500, MG5600
+PIXMA MG3500, MG3600, MG4200, MG5100, MG5200, MG5300, MG5400
 .br
-PIXMA MG6100, MG6200, MG6300, MG6400, MG7100, MG7500, MG8200
+PIXMA MG5500, MG5600, MG5700, MG6100, MG6200, MG6300, MG6400
+.br
+PIXMA MG7100, MG7500, MG7700, MG8200
 .br
 PIXMA MP140, MP150, MP160, MP170, MP180, MP190
 .br
@@ -45,6 +47,8 @@ PIXMA MX410, MX420, MX470, MX510, MX520, MX530, MX700, MX720
 .br
 PIXMA MX850, MX860, MX870, MX882, MX885, MX890, MX920, MX7600
 .br
+PIXUS MP10
+.br
 imageCLASS MF3110, MF3240, MF4010, MF4018
 .br
 imageCLASS MF4120, MF4122, MF4140, MF4150
@@ -53,17 +57,17 @@ imageCLASS MF4270, MF4350d, MF4370dn, MF4380dn
 .br
 imageCLASS MF4410, MF4430, MF4570dw, MF4660, MF4690
 .br
-imageCLASS MF5730, MF5770, MF6550, D420, D480, D530
-.br
-i-SENSYS MF3010, MF4320d, MF4330d, MF4500 Series
+imageCLASS MF5730, MF5770, MF6550, MPC200, D420, D480, D530
 .br
-i-SENSYS MF4700 Series, MF4800 Series, MF8200C Series
+i-SENSYS MF230, MF240, MF3010, MF4320d, MF4330d, MF4500, MF4700
 .br
-i-SENSYS MF8300 Series
+i-SENSYS MF4800, MF6100, MF8200C, MF8300
 .br
 imageRUNNER 1020/1024/1025
 .br
 CanoScan 8800F, 9000F, 9000F Mark II
+.br
+MAXIFY MB5000 (ADF is not working)
 .RE
 .PP
 The following models are not well tested and/or the scanner sometimes hangs
@@ -79,23 +83,29 @@ in the backend so that they get recognized and activated.
 Feedback in the sane\-devel mailing list welcome.
 .PP
 .RS
-PIXMA E400, E460, E480, E500, E510, E560, E600, E610
+PIXMA E400, E460, E470, E480, E500, E510, E560, E600, E610
 .br
-PIXMA MG3600, MG4100, MG5400, MG6500, MG6600, MG8100
+PIXMA MG3000, MG4100, MG6500, MG6600, MG6800, MG6900, MG8100
 .br
 PIXMA MP375R, MP493, MP495, MP740
 .br
 PIXMA MX320, MX390, MX430, MX450, MX490, MX710
 .br
+PIXMA G3000
+.br
+PIXMA TS9000, TS800, TS6000, TS5000
+.br
+PIXUS MP5
+.br
 imageCLASS MF810/820, MF5630, MF5650, MF5750, MF8030, MF8170c
 .br
-imageRUNNER 1133
+imageCLASS MPC190
 .br
-i-SENSYS MF210 Series, MF220 Series, MF5880dn, MF5900 Series
+imageRUNNER 1133
 .br
-i-SENSYS MF6100 Series, MF6680dn, MF8500C Series
+i-SENSYS MF210, MF220, MF5880dn, MF5900, MF6680dn, MF8500C
 .br
-MAXIFY MB2000, MB2300, MB5000, MB5300
+MAXIFY MB2000, MB2300, MB5300
 .RE
 .PP
 \#The following models may use partly the same Pixma protocol as other devices
@@ -139,15 +149,21 @@ an up-to-date status at the project homepage. (See below).
 Users feedback is essential to help improve features and performances. 
 .SH OPTIONS
 Besides "well-known" options (e.g. resolution, mode etc.) pixma backend also
-provides the following
-\#.B experimental
-options for button handling, i.e. the options might change in the future.
+provides the following options, i.e. the options might change in the future.
 .br
 The button status can be polled i.e. with 'scanimage \-A'.
 .br
 Button scan is disabled on MAC OS X due to darwin libusb not handling
 timeouts in usb interrupt reads, but may work when using the network protocol.
 .TP
+.I adf\-wait
+This option enables and sets the time in seconds waiting for a document
+inserted into the
+.BR Automatic
+.BR Document
+.BR Feeder .
+The maximum allowed waiting time is 3600 sec (= 1 hour).
+.TP
 .I button\-controlled
 This option can be used by applications (like
 .BR scanadf (1)
@@ -209,21 +225,21 @@ support dynamic loading).
 .I @CONFIGDIR@/pixma.conf
 The backend configuration file (see also description of
 .B SANE_CONFIG_DIR
-below). The files contains an optional list of networked scanners. Normally 
-only scanners that can not be auto-detected because they are on a different 
+below). The file contains an optional list of networked scanners. Normally 
+only scanners that cannot be auto-detected because they are on a different 
 subnet shall be listed here. If your OS does not allow enumeration of 
-interfaces (i.e. it does not support the getifaddrs() function) you may need 
+interfaces (i.e. it does not support the getifaddrs() function) you also may need 
 to add your scanner here as well.
+.RS
 .PP
-Scanners shall be listed as:
+.I Scanners shall be listed in the configuraton file as follows:
 .PP
 .RS
-.I <method>://<host>[:port] 
+.I <method>://<host>[:port][/timeout=<value>]
 .RE
-.RS
 .PP
 where method indicates the protocol used (bjnp is used for inkjet multi-functionals
-and mfnp is used for laser multi-functionals).
+and mfnp is used for laser multi-functionals). 
 .PP
 host is the hostname or IP address of the scanner, e.g. bjnp://10.0.1.4 
 for IPv4, bjnp://[2001:888:118e:18e2:21e:8fff:fe36:b64a] for a literal 
@@ -232,7 +248,25 @@ IPv6-address or bjnp://myscanner.mydomain.org for a hostname.
 The port number is optional and in normally implied by the method.
 Port 8610 is the standard port for mfnp, 8612 for bjnp.
 .PP
-Define each scanner on a new line.
+A scanner specific timeout value for the network protocol can be set using the 
+bjnp-timeout parameter. The value is in ms.
+.PP
+Define scanners each on a new line.
+.PP
+More globally applicable tinmeouts can be set using the bjnp-timeout parameter as folllows:
+.PP
+.RS
+.I bjnp-timeout=<value>
+.RE
+.PP
+A timeout defined using bjnp-timeout will apply to the following scanner definitions
+in the file. If required the bjnp-timeout setting 
+can be defined multiple times, where each settng will apply only to the scanners that
+follow the setting. The last setting is used for the auto discovered scanners.
+If not explicitely set,  the default 1000ms setting will apply. 
+.PP
+Setting timeouts should only be required in exceptional cases.
+.PP
 .SH USB SUPPORT
 USB scanners will be auto-detected and require no configuration.
 .SH NETWORKING SUPPORT
diff --git a/doc/sane-xerox_mfp.man b/doc/sane-xerox_mfp.man
index 0f896ce..0ffa3e8 100644
--- a/doc/sane-xerox_mfp.man
+++ b/doc/sane-xerox_mfp.man
@@ -1,47 +1,20 @@
 .TH sane\-xerox_mfp 5 "15 Dec 2008" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-xerox_mfp
 .SH NAME
-sane\-xerox_mfp \- SANE backend for Xerox Phaser 3200MFP device
+sane\-xerox_mfp \- SANE backend for Xerox Phaser 3200MFP device et al.
 .SH DESCRIPTION
 The
 .B sane\-xerox_mfp
 library implements a SANE (Scanner Access Now Easy) backend that provides
-access to the following USB and network multifunction-peripheral:
-.PP
-.RS
-Phaser 3200MFP
-.br
-Dell MFP Laser Printer 1815dn
-.br
-Xerox Phaser 6110MFP
-.br
-Samsung CLX-3170fn & CLX-3175FW
-.br
-Samsung SCX-4200
-.br
-Samsung SCX-4300
-.br
-Samsung SCX-4500
-.br
-Samsung SCX-4500W
-.br
-Samsung SCX4725-FN
-.br
-Xerox WorkCentre 3119 Series
-.RE
-.PP
-If you own a scanner other than the ones listed above that works with this
-backend, please let us know this by sending the scanner's exact model name and
-the USB vendor and device ids (e.g. from
-.IR /proc/bus/usb/devices ,
-.I sane\-find\-scanner
-or syslog) to us. Even if the scanner's name is only slightly different from
-the models mentioned above, please let us know.
+access to several Samsung-based Samsung, Xerox, and Dell scanners.
+Please see full list of supported devices at
+http://www.sane\-project.org/sane\-supported\-devices.html
+
 .SH CONFIGURATION
 .I @CONFIGDIR@/xerox_mfp.conf
 USB scanners do not need any configuration.
 
-For SCX-4500W in network mode you need to specify
+For SCX\-4500W in network mode you need to specify
 .PP
 .RS
 .B tcp host_address [port]
@@ -70,14 +43,24 @@ debug levels increase the verbosity of the output.
 
 Example: 
 export SANE_DEBUG_XEROX_MFP=4
-.SH AUTHOR
-Alex Belkin <abc@telekom.ru>
 
-Samsung SCX-4500W scan over network support
-Alexander Kuznetsov <acca(at)cpan.org>
-.SH BUGS:
+.SH LIMITATIONS
 Multicast autoconfiguration for LAN scanners is not implemented yet. IPv6 addressing never been tested.
 
+.SH BUGS AND SUPPORT
+If you have found a bug or need support please follow open\-source way of acquiring support via
+mail\-lists http://www.sane\-project.org/mailing\-lists.html or SANE bug tracker 
+http://www.sane\-project.org/bugs.html
+
+.SH AUTHORS
+Alex Belkin <abc@telekom.ru>
+.br
+Samsung SCX\-4500W scan over network support by
+Alexander Kuznetsov <acca(at)cpan.org>
+.br
+Color scanning on Samsung M2870 model and Xerox Cognac 3215 & 3225 models by
+Laxmeesh Onkar Markod <m.laxmeesh@samsung.com>
+
 .SH "SEE ALSO"
 .BR sane (7),
 .BR sane\-usb (5)
diff --git a/doc/sane.man b/doc/sane.man
index 4fad9a9..3eadf42 100644
--- a/doc/sane.man
+++ b/doc/sane.man
@@ -524,6 +524,12 @@ The sane\-umax1220u backend supports the UMAX Astra 1220U (USB) flatbed scanner
 (and also the UMAX Astra 2000U, sort of). See
 .BR sane\-umax1220u (5)
 for details.
+.TP
+.B xerox_mfp
+The sane\-xerox_mfp backend supports multiple Samsung-based Samsung, Xerox, and Dell
+scanners. See
+.BR sane\-xerox_mfp (5)
+for details.
 .PP
 Also, have a look at the backend information page at
 .I http://www.sane\-project.org/sane\-supported\-devices.html
@@ -917,7 +923,8 @@ for details).
 .BR sane\-umax (5),
 .BR sane\-umax_pp (5),
 .BR sane\-usb (5),
-.BR sane\-v4l (5)
+.BR sane\-v4l (5),
+.BR sane\-xerox_mfp (5)
 
 .SH AUTHOR
 David Mosberger-Tang and many many more (see
diff --git a/doc/sane.tex b/doc/sane.tex
index 1132576..4611797 100644
--- a/doc/sane.tex
+++ b/doc/sane.tex
@@ -1,6 +1,6 @@
-\documentclass[11pt,DVIps]{report}
+\documentclass[11pt]{report}
 
-\usepackage{times,epsfig,html}
+\usepackage{times,graphicx,url}
 % Not Currently using changebar package so comment out to reduce
 % external dependencies.
 %\usepackage{changebar}
@@ -15,9 +15,9 @@
 \setlength{\marginparsep}{0pt}
 \addtolength{\topmargin}{-0.75in}
 
-\title{\huge SANE Standard Version 1.05}
+\title{\huge SANE Standard Version 1.06}
 \author{}
-\date{2006-04-02} 
+\date{2008-05-03}
 
 \makeindex
 
@@ -196,7 +196,7 @@ platform dependent.  Several possibilities exist:
 \begin{figure}[htbp]
   \begin{center}
     \leavevmode
-    \psfig{file=figs/hierarchy.eps,angle=270,width=\textwidth}
+    \includegraphics[width=\textwidth]{figs/hierarchy}
     \caption{Example SANE Hiearchy}
     \label{fig:hierarchy}
   \end{center}
@@ -280,7 +280,7 @@ significant bit, and the rightmost pixel in the least significant bit.
 \begin{figure}[htbp]
   \begin{center}
     \leavevmode
-    \psfig{file=figs/xfer.eps,width=0.5\textwidth}
+    \includegraphics[width=0.5\textwidth]{figs/xfer}
     \caption{Transfer order of image data bytes}
     \label{fig:xfer}
   \end{center}
@@ -304,7 +304,7 @@ fashion.
 \begin{figure}[htbp]
   \begin{center}
     \leavevmode
-    \psfig{file=figs/image-data.eps,width=0.8\textwidth}
+    \includegraphics[width=0.8\textwidth]{figs/image-data}
     \caption{Bit and byte order or image data}
     \label{fig:pixels}
   \end{center}
@@ -1683,7 +1683,7 @@ exiting the backend.
 \begin{figure}[htb]
   \begin{center}
     \leavevmode
-    \psfig{file=figs/flow.eps,height=0.5\textheight}
+    \includegraphics[height=0.5\textheight]{figs/flow}
     \caption{Code flow}
     \label{fig:flow}
   \end{center}
@@ -1826,7 +1826,7 @@ conversions.
 \begin{figure}[tbp]
   \begin{center}
     \leavevmode
-    \psfig{file=figs/area.eps,height=0.3\textheight}
+    \includegraphics[height=0.3\textheight]{figs/area}
     \caption{Scan area options}
     \label{fig:area}
   \end{center}
@@ -1873,9 +1873,7 @@ The SANE standard is discussed and evolved via a mailing list.
 Anybody with email access to the Internet can automatically join and
 leave the discussion group by sending mail to the following address.
 \begin{quote}\index{mailing list}
-\begin{verbatim}
-sane-devel-request@lists.alioth.debian.org
-\end{verbatim}
+\url{sane-devel-request@lists.alioth.debian.org}
 \end{quote}
 To subscribe, send a mail with the body ``\verb|subscribe sane-devel|'' to the
 above address.
diff --git a/doc/saned.man b/doc/saned.man
index 5f7bc20..7b0fa4a 100644
--- a/doc/saned.man
+++ b/doc/saned.man
@@ -226,7 +226,7 @@ compiled in, but then logging of debug information is not supported.
 The systemd configuration is different for the 2 options, so
 both are described below.
 .SH Systemd configuration for saned with systemd support compiled in
-for the systemd configuration we need to add 2 configuation files in 
+for the systemd configuration we need to add 2 configuration files in
 .I /etc/systemd/system.
 .PP
 The first file we need to add here is called 
@@ -301,7 +301,7 @@ forwarded to the system log.
 This configuration will also work when Saned is compiled WITH systemd integration
 support, but it does not allow debugging information to be logged.
 .PP
-for systemd configuration for saned, we need to add 2 configuation files in
+for systemd configuration for saned, we need to add 2 configuration files in
 .I /etc/systemd/system.
 .PP
 The first file we need to add here is called
diff --git a/frontend/Makefile.am b/frontend/Makefile.am
index 23061b3..525953f 100644
--- a/frontend/Makefile.am
+++ b/frontend/Makefile.am
@@ -14,21 +14,21 @@ else
 EXTRA_PROGRAMS += saned
 endif
 
-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
 
-scanimage_SOURCES = scanimage.c stiff.c stiff.h
+scanimage_SOURCES = scanimage.c sicc.c sicc.h stiff.c stiff.h
 scanimage_LDADD = ../backend/libsane.la ../sanei/libsanei.la ../lib/liblib.la \
-             ../lib/libfelib.la @PNG_LIBS@ @JPEG_LIBS@
+                  $(PNG_LIBS) $(JPEG_LIBS)
 
 saned_SOURCES = saned.c
 saned_LDADD = ../backend/libsane.la ../sanei/libsanei.la ../lib/liblib.la \
-             ../lib/libfelib.la @SYSLOG_LIBS@ @SYSTEMD_LIBS@
+              $(SYSLOG_LIBS) $(SYSTEMD_LIBS) $(AVAHI_LIBS)
 
 test_SOURCES = test.c
-test_LDADD = ../lib/liblib.la ../lib/libfelib.la ../backend/libsane.la
+test_LDADD = ../lib/liblib.la ../backend/libsane.la
 
 tstbackend_SOURCES = tstbackend.c
-tstbackend_LDADD = ../lib/liblib.la ../lib/libfelib.la ../backend/libsane.la
+tstbackend_LDADD = ../lib/liblib.la ../backend/libsane.la
 
 clean-local:
 	rm -f test tstbackend
diff --git a/frontend/Makefile.in b/frontend/Makefile.in
index 2e36e0e..9ea467f 100644
--- a/frontend/Makefile.in
+++ b/frontend/Makefile.in
@@ -86,11 +86,16 @@ subdir = frontend
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ltoptions.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/byteorder.m4 \
-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/byteorder.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -102,24 +107,25 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
 PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
 am_saned_OBJECTS = saned.$(OBJEXT)
 saned_OBJECTS = $(am_saned_OBJECTS)
+am__DEPENDENCIES_1 =
 saned_DEPENDENCIES = ../backend/libsane.la ../sanei/libsanei.la \
-	../lib/liblib.la ../lib/libfelib.la
+	../lib/liblib.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
-am_scanimage_OBJECTS = scanimage.$(OBJEXT) stiff.$(OBJEXT)
+am_scanimage_OBJECTS = scanimage.$(OBJEXT) sicc.$(OBJEXT) \
+	stiff.$(OBJEXT)
 scanimage_OBJECTS = $(am_scanimage_OBJECTS)
 scanimage_DEPENDENCIES = ../backend/libsane.la ../sanei/libsanei.la \
-	../lib/liblib.la ../lib/libfelib.la
+	../lib/liblib.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_test_OBJECTS = test.$(OBJEXT)
 test_OBJECTS = $(am_test_OBJECTS)
-test_DEPENDENCIES = ../lib/liblib.la ../lib/libfelib.la \
-	../backend/libsane.la
+test_DEPENDENCIES = ../lib/liblib.la ../backend/libsane.la
 am_tstbackend_OBJECTS = tstbackend.$(OBJEXT)
 tstbackend_OBJECTS = $(am_tstbackend_OBJECTS)
-tstbackend_DEPENDENCIES = ../lib/liblib.la ../lib/libfelib.la \
-	../backend/libsane.la
+tstbackend_DEPENDENCIES = ../lib/liblib.la ../backend/libsane.la
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -186,7 +192,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \
+	-I$(top_srcdir)/include
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -207,7 +217,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISTCLEAN_FILES = @DISTCLEAN_FILES@
+DLH = @DLH@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
@@ -220,34 +230,42 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FIG2DEV = @FIG2DEV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
 GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
+GS = @GS@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
 IEEE1284_LIBS = @IEEE1284_LIBS@
-INCLUDES = @INCLUDES@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LOCKPATH = @INSTALL_LOCKPATH@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JPEG_LIBS = @JPEG_LIBS@
 LATEX = @LATEX@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
-LINKER_RPATH = @LINKER_RPATH@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCKPATH_GROUP = @LOCKPATH_GROUP@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINDEX = @MAKEINDEX@
@@ -256,10 +274,10 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MATH_LIB = @MATH_LIB@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
-NUMBER_VERSION = @NUMBER_VERSION@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -272,10 +290,13 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PNG_LIBS = @PNG_LIBS@
+POSUB = @POSUB@
+PPMTOGIF = @PPMTOGIF@
 PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@
 PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -297,12 +318,16 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 V_MAJOR = @V_MAJOR@
 V_MINOR = @V_MINOR@
 V_REV = @V_REV@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -358,19 +383,18 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
-scanimage_SOURCES = scanimage.c stiff.c stiff.h
+scanimage_SOURCES = scanimage.c sicc.c sicc.h stiff.c stiff.h
 scanimage_LDADD = ../backend/libsane.la ../sanei/libsanei.la ../lib/liblib.la \
-             ../lib/libfelib.la @PNG_LIBS@ @JPEG_LIBS@
+                  $(PNG_LIBS) $(JPEG_LIBS)
 
 saned_SOURCES = saned.c
 saned_LDADD = ../backend/libsane.la ../sanei/libsanei.la ../lib/liblib.la \
-             ../lib/libfelib.la @SYSLOG_LIBS@ @SYSTEMD_LIBS@
+              $(SYSLOG_LIBS) $(SYSTEMD_LIBS) $(AVAHI_LIBS)
 
 test_SOURCES = test.c
-test_LDADD = ../lib/liblib.la ../lib/libfelib.la ../backend/libsane.la
+test_LDADD = ../lib/liblib.la ../backend/libsane.la
 tstbackend_SOURCES = tstbackend.c
-tstbackend_LDADD = ../lib/liblib.la ../lib/libfelib.la ../backend/libsane.la
+tstbackend_LDADD = ../lib/liblib.la ../backend/libsane.la
 all: all-am
 
 .SUFFIXES:
@@ -528,27 +552,31 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/saned.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scanimage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sicc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stiff.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tstbackend.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/frontend/saned.c b/frontend/saned.c
index 108512d..3bb99bb 100644
--- a/frontend/saned.c
+++ b/frontend/saned.c
@@ -82,6 +82,8 @@
 #include <pwd.h>
 #include <grp.h>
 
+#include "lgetopt.h"
+
 #if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL)
 # include <sys/poll.h>
 #else
@@ -196,16 +198,19 @@ static AvahiEntryGroup *avahi_group = NULL;
 #endif
 
 #ifdef ENABLE_IPV6
-# define SANE_IN6_IS_ADDR_LOOPBACK(a) \
+# ifndef IN6_IS_ADDR_LOOPBACK
+# define IN6_IS_ADDR_LOOPBACK(a) \
         (((const uint32_t *) (a))[0] == 0                                   \
          && ((const uint32_t *) (a))[1] == 0                                \
          && ((const uint32_t *) (a))[2] == 0                                \
          && ((const uint32_t *) (a))[3] == htonl (1)) 
-
-#define SANE_IN6_IS_ADDR_V4MAPPED(a) \
+# endif
+# ifndef IN6_IS_ADDR_V4MAPPED
+# define IN6_IS_ADDR_V4MAPPED(a) \
 ((((const uint32_t *) (a))[0] == 0)                                 \
  && (((const uint32_t *) (a))[1] == 0)                              \
  && (((const uint32_t *) (a))[2] == htonl (0xffff))) 
+# endif
 #endif /* ENABLE_IPV6 */
 
 #ifndef MAXHOSTNAMELEN
@@ -247,6 +252,7 @@ static int num_handles;
 static int debug;
 static int run_mode;
 static Handle *handle;
+static char *bind_addr;
 static union
 {
   int w;
@@ -786,7 +792,7 @@ check_host (int fd)
 #ifdef ENABLE_IPV6
   sin6 = &remote_address.sin6;
 
-  if (SANE_IN6_IS_ADDR_V4MAPPED (sin6->sin6_addr.s6_addr))
+  if (IN6_IS_ADDR_V4MAPPED ((struct in6_addr *)sin6->sin6_addr.s6_addr))
     {
       DBG (DBG_DBG, "check_host: detected an IPv4-mapped address\n");
       remote_ipv4 = remote_ip + 7;
@@ -843,7 +849,7 @@ check_host (int fd)
 	break;
 #ifdef ENABLE_IPV6
       case AF_INET6:
-	if (SANE_IN6_IS_ADDR_LOOPBACK (sin6->sin6_addr.s6_addr))
+	if (IN6_IS_ADDR_LOOPBACK ((struct in6_addr *)sin6->sin6_addr.s6_addr))
 	  {
 	    DBG (DBG_MSG,
 		 "check_host: remote host is IN6_LOOPBACK: access granted\n");
@@ -1428,7 +1434,7 @@ start_scan (Wire * w, int h, SANE_Start_Reply * reply)
   SANE_Handle be_handle;
   int fd, len;
   in_port_t data_port;
-  int ret;
+  int ret = -1;
 
   be_handle = handle[h].handle;
 
@@ -1986,6 +1992,38 @@ process_request (Wire * w)
 	    return 1;
 	  }
 
+        /* Addresses CVE-2017-6318 (#315576, Debian BTS #853804) */
+        /* This is done here (rather than in sanei/sanei_wire.c where
+         * it should be done) to minimize scope of impact and amount
+         * of code change.
+         */
+        if (w->direction == WIRE_DECODE
+            && req.value_type == SANE_TYPE_STRING
+            && req.action     == SANE_ACTION_GET_VALUE)
+          {
+            if (req.value)
+              {
+                /* FIXME: If req.value contains embedded NUL
+                 *        characters, this is wrong but we do not have
+                 *        access to the amount of memory allocated in
+                 *        sanei/sanei_wire.c at this point.
+                 */
+                w->allocated_memory -= (1 + strlen (req.value));
+                free (req.value);
+              }
+            req.value = malloc (req.value_size);
+            if (!req.value)
+              {
+                w->status = ENOMEM;
+                DBG (DBG_ERR,
+                     "process_request: (control_option) "
+                     "h=%d (%s)\n", req.handle, strerror (w->status));
+                return 1;
+              }
+            memset (req.value, 0, req.value_size);
+            w->allocated_memory += req.value_size;
+          }
+
 	can_authorize = 1;
 
 	memset (&reply, 0, sizeof (reply));	/* avoid leaking bits */
@@ -2807,13 +2845,13 @@ do_bindings (int *nfds, struct pollfd **fds)
   hints.ai_flags = AI_PASSIVE;
   hints.ai_socktype = SOCK_STREAM;
 
-  err = getaddrinfo (NULL, SANED_SERVICE_NAME, &hints, &res);
+  err = getaddrinfo (bind_addr, SANED_SERVICE_NAME, &hints, &res);
   if (err)
     {
       DBG (DBG_WARN, "do_bindings: \" %s \" service unknown on your host; you should add\n", SANED_SERVICE_NAME);
       DBG (DBG_WARN, "do_bindings:      %s %d/tcp saned # SANE network scanner daemon\n", SANED_SERVICE_NAME, SANED_SERVICE_PORT);
       DBG (DBG_WARN, "do_bindings: to your /etc/services file (or equivalent). Proceeding anyway.\n");
-      err = getaddrinfo (NULL, SANED_SERVICE_PORT_S, &hints, &res);
+      err = getaddrinfo (bind_addr, SANED_SERVICE_PORT_S, &hints, &res);
       if (err)
 	{
 	  DBG (DBG_ERR, "do_bindings: getaddrinfo() failed even with numeric port: %s\n", gai_strerror (err));
@@ -2891,7 +2929,10 @@ do_bindings (int *nfds, struct pollfd **fds)
   memset (&sin, 0, sizeof (sin));
 
   sin.sin_family = AF_INET;
-  sin.sin_addr.s_addr = INADDR_ANY;
+  if(bind_addr)
+    sin.sin_addr.s_addr = inet_addr(bind_addr);
+  else
+    sin.sin_addr.s_addr = INADDR_ANY;
   sin.sin_port = port;
 
   DBG (DBG_DBG, "do_bindings: socket ()\n");
@@ -2923,7 +2964,7 @@ do_bindings (int *nfds, struct pollfd **fds)
 
 
 static void
-run_standalone (int argc, char **argv)
+run_standalone (char *user)
 {
   struct pollfd *fds = NULL;
   struct pollfd *fdp = NULL;
@@ -2944,13 +2985,13 @@ run_standalone (int argc, char **argv)
 
   if (run_mode != SANED_RUN_DEBUG)
     {
-      if (argc > 2)
+      if (user)
 	{
-	  pwent = getpwnam(argv[2]);
+	  pwent = getpwnam(user);
 
 	  if (pwent == NULL)
 	    {
-	      DBG (DBG_ERR, "FATAL ERROR: user %s not found on system\n", argv[2]);
+	      DBG (DBG_ERR, "FATAL ERROR: user %s not found on system\n", user);
 	      bail_out (1);
 	    }
 
@@ -2981,7 +3022,7 @@ run_standalone (int argc, char **argv)
 
               while (grp->gr_mem[i])
 		{
-                  if (strcmp(grp->gr_mem[i], argv[2]) == 0)
+                  if (strcmp(grp->gr_mem[i], user) == 0)
                     {
                       int need_to_add = 1, j;
 
@@ -3172,7 +3213,7 @@ run_standalone (int argc, char **argv)
 
 
 static void
-run_inetd (int argc, char **argv)
+run_inetd (char __sane_unused__ *sock)
 {
   
   int fd = -1;
@@ -3238,18 +3279,13 @@ run_inetd (int argc, char **argv)
 
       close (dave_null);
     }
-#ifndef HAVE_OS2_H
-  /* Unused in this function */
-  argc = argc;
-  argv = argv;
-
-#else
+#ifdef HAVE_OS2_H
   /* under OS/2, the socket handle is passed as argument on the command
      line; the socket handle is relative to IBM TCP/IP, so a call
      to impsockethandle() is required to add it to the EMX runtime */
-  if (argc == 2)
+  if (sock)
     {
-      fd = _impsockhandle (atoi (argv[1]), 0);
+      fd = _impsockhandle (atoi (sock), 0);
       if (fd == -1)
 	perror ("impsockhandle");
     }
@@ -3258,11 +3294,44 @@ run_inetd (int argc, char **argv)
   handle_connection(fd);
 }
 
+static void usage(char *me, int err)
+{
+  fprintf (stderr,
+       "Usage: %s [OPTIONS]\n\n"
+       " Options:\n\n"
+       "  -a, --alone[=user]	run standalone and fork in background as `user'\n"
+       "  -d, --debug[=level]	run foreground with output to stdout\n"
+       "			and debug level `level' (default is 2)\n"
+       "  -s, --syslog[=level]	run foreground with output to syslog\n"
+       "			and debug level `level' (default is 2)\n"
+       "  -b, --bind=addr	bind address `addr'\n"
+       "  -h, --help		show this help message and exit\n", me);
+
+  exit(err);
+}
+
+static int debug;
+
+static struct option long_options[] =
+{
+/* These options set a flag. */
+  {"help",	no_argument,		0, 'h'},
+  {"alone",	optional_argument,	0, 'a'},
+  {"debug",	optional_argument,	0, 'd'},
+  {"syslog",	optional_argument,	0, 's'},
+  {"bind",	required_argument,	0, 'b'},
+  {0,		0,			0,  0 }
+};
 
 int
 main (int argc, char *argv[])
 {
   char options[64] = "";
+  char *user = NULL;
+  char *sock = NULL;
+  int c;
+  int long_index = 0;
+
   debug = DBG_WARN;
 
   prog_name = strrchr (argv[0], '/');
@@ -3274,34 +3343,30 @@ main (int argc, char *argv[])
   numchildren = 0;
   run_mode = SANED_RUN_INETD;
 
-  if (argc >= 2)
+  while((c = getopt_long(argc, argv,"ha::d::s::b:", long_options, &long_index )) != -1)
     {
-      if (strncmp (argv[1], "-a", 2) == 0)
+      switch(c) {
+      case 'a':
 	run_mode = SANED_RUN_ALONE;
-      else if (strncmp (argv[1], "-d", 2) == 0)
-	{
-	  run_mode = SANED_RUN_DEBUG;
-	  log_to_syslog = SANE_FALSE;
-	}
-      else if (strncmp (argv[1], "-s", 2) == 0)
+	user = optarg;
+	break;
+      case 'd':
+	log_to_syslog = SANE_FALSE;
+      case 's':
 	run_mode = SANED_RUN_DEBUG;
-      else
-        {
-          printf ("Usage: saned [ -a [ username ] | -d [ n ] | -s [ n ] ] | -h\n");
-          if ((strncmp (argv[1], "-h", 2) == 0) ||
-               (strncmp (argv[1], "--help", 6) == 0))
-            exit (EXIT_SUCCESS);
-          else
-            exit (EXIT_FAILURE);
-        }
-    }
-
-  if (run_mode == SANED_RUN_DEBUG)
-    {
-      if (argv[1][2])
-	debug = atoi (argv[1] + 2);
-
-      DBG (DBG_WARN, "main: starting debug mode (level %d)\n", debug);
+	if(optarg)
+	  debug = atoi(optarg);
+	break;
+      case 'b':
+	bind_addr = optarg;
+	break;
+      case 'h':
+	usage(argv[0], EXIT_SUCCESS);
+	break;
+      default:
+	usage(argv[0], EXIT_FAILURE);
+	break;
+      }
     }
 
   if (log_to_syslog)
@@ -3342,11 +3407,15 @@ main (int argc, char *argv[])
 
   if ((run_mode == SANED_RUN_ALONE) || (run_mode == SANED_RUN_DEBUG))
     {
-      run_standalone(argc, argv);
+      run_standalone(user);
     }
   else
     {
-      run_inetd(argc, argv);
+#ifdef HAVE_OS2_H
+      if (argc == 2)
+	sock = argv[1];
+#endif
+      run_inetd(sock);
     }
 
   DBG (DBG_WARN, "saned exiting\n");
diff --git a/frontend/scanimage.c b/frontend/scanimage.c
index 7f7c1f0..fe02750 100644
--- a/frontend/scanimage.c
+++ b/frontend/scanimage.c
@@ -56,6 +56,7 @@
 #include "../include/sane/sanei.h"
 #include "../include/sane/saneopts.h"
 
+#include "sicc.h"
 #include "stiff.h"
 
 #include "../include/md5.h"
@@ -322,7 +323,7 @@ auth_callback (SANE_String_Const resource,
     }
 }
 
-static RETSIGTYPE
+static void
 sighandler (int signum)
 {
   static SANE_Bool first_time = SANE_TRUE;
@@ -1165,9 +1166,14 @@ write_pnm_header (SANE_Frame format, int width, int height, int depth, FILE *ofp
 
 #ifdef HAVE_LIBPNG
 static void
-write_png_header (SANE_Frame format, int width, int height, int depth, FILE *ofp, png_structp* png_ptr, png_infop* info_ptr)
+write_png_header (SANE_Frame format, int width, int height, int depth, int dpi, const char * icc_profile, FILE *ofp, png_structp* png_ptr, png_infop* info_ptr)
 {
   int color_type;
+  /* PNG does not have imperial reference units, so we must convert to metric. */
+  /* There are nominally 39.3700787401575 inches in a meter. */
+  const double pixels_per_meter = dpi * 39.3700787401575;
+  size_t icc_size = 0;
+  void *icc_buffer;
 
   *png_ptr = png_create_write_struct
        (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
@@ -1200,13 +1206,47 @@ write_png_header (SANE_Frame format, int width, int height, int depth, FILE *ofp
     depth, color_type, PNG_INTERLACE_NONE,
     PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
 
+  png_set_pHYs(*png_ptr, *info_ptr,
+    pixels_per_meter, pixels_per_meter,
+    PNG_RESOLUTION_METER);
+
+  if (icc_profile)
+    {
+      icc_buffer = sanei_load_icc_profile(icc_profile, &icc_size);
+      if (icc_size > 0)
+        {
+	  /* libpng will abort if the profile and image colour spaces do not match*/
+	  /* The data colour space field is at bytes 16 to 20 in an ICC profile */
+	  /* see: ICC.1:2010 § 7.2.6 */
+	  int is_gray_profile = strncmp((char *) icc_buffer + 16, "GRAY", 4) == 0;
+	  int is_rgb_profile = strncmp((char *) icc_buffer + 16, "RGB ", 4) == 0;
+	  if ((is_gray_profile && color_type == PNG_COLOR_TYPE_GRAY) ||
+	      (is_rgb_profile && color_type == PNG_COLOR_TYPE_RGB))
+	    {
+	      png_set_iCCP(*png_ptr, *info_ptr, basename(icc_profile), PNG_COMPRESSION_TYPE_BASE, icc_buffer, icc_size);
+	    }
+	  else
+	    {
+	      if (is_gray_profile)
+	        {
+		  fprintf(stderr, "Ignoring 'GRAY' space ICC profile because the image is RGB.\n");
+	        }
+	      if (is_rgb_profile)
+	        {
+		  fprintf(stderr, "Ignoring 'RGB ' space ICC profile because the image is Grayscale.\n");
+		}
+	    }
+	  free(icc_buffer);
+	}
+    }
+
   png_write_info(*png_ptr, *info_ptr);
 }
 #endif
 
 #ifdef HAVE_LIBJPEG
 static void
-write_jpeg_header (SANE_Frame format, int width, int height, FILE *ofp, struct jpeg_compress_struct *cinfo, struct jpeg_error_mgr *jerr)
+write_jpeg_header (SANE_Frame format, int width, int height, int dpi, FILE *ofp, struct jpeg_compress_struct *cinfo, struct jpeg_error_mgr *jerr)
 {
   cinfo->err = jpeg_std_error(jerr);
   jpeg_create_compress(cinfo);
@@ -1231,6 +1271,11 @@ write_jpeg_header (SANE_Frame format, int width, int height, FILE *ofp, struct j
     }
 
   jpeg_set_defaults(cinfo);
+  /* jpeg_set_defaults overrides density, be careful. */
+  cinfo->density_unit = 1;   /* Inches */
+  cinfo->X_density = cinfo->Y_density = dpi;
+  cinfo->write_JFIF_header = TRUE;
+
   jpeg_set_quality(cinfo, 75, TRUE);
   jpeg_start_compress(cinfo, TRUE);
 }
@@ -1379,13 +1424,15 @@ scan_it (FILE *ofp)
 #ifdef HAVE_LIBPNG
 		  case OUTPUT_PNG:
 		    write_png_header (parm.format, parm.pixels_per_line,
-				      parm.lines, parm.depth, ofp, &png_ptr, &info_ptr);
+				      parm.lines, parm.depth, resolution_value,
+				      icc_profile, ofp, &png_ptr, &info_ptr);
 		    break;
 #endif
 #ifdef HAVE_LIBJPEG
 		  case OUTPUT_JPEG:
 		    write_jpeg_header (parm.format, parm.pixels_per_line,
-				      parm.lines, ofp, &cinfo, &jerr);
+				       parm.lines, resolution_value,
+				       ofp, &cinfo, &jerr);
 		    break;
 #endif
 		  }
@@ -1529,6 +1576,21 @@ scan_it (FILE *ofp)
 			  for(j = 0; j < parm.bytes_per_line; j++)
 			    pngbuf[j] = ~pngbuf[j];
 			}
+#ifndef WORDS_BIGENDIAN
+                      /* SANE is endian-native, PNG is big-endian, */
+                      /* see: https://www.w3.org/TR/2003/REC-PNG-20031110/#7Integers-and-byte-order */
+                      if (parm.depth == 16)
+                        {
+                          int j;
+                          for (j = 0; j < parm.bytes_per_line; j += 2)
+                            {
+                              SANE_Byte LSB;
+                              LSB = pngbuf[j];
+                              pngbuf[j] = pngbuf[j + 1];
+                              pngbuf[j + 1] = LSB;
+                            }
+                        }
+#endif
 		      png_write_row(png_ptr, pngbuf);
 		      i += parm.bytes_per_line - pngrow;
 		      left -= parm.bytes_per_line - pngrow;
@@ -1635,13 +1697,15 @@ scan_it (FILE *ofp)
 #ifdef HAVE_LIBPNG
       case OUTPUT_PNG:
 	write_png_header (parm.format, parm.pixels_per_line,
-                          image.height, parm.depth, ofp, &png_ptr, &info_ptr);
+			  image.height, parm.depth, resolution_value,
+			  icc_profile, ofp, &png_ptr, &info_ptr);
       break;
 #endif
 #ifdef HAVE_LIBJPEG
       case OUTPUT_JPEG:
 	write_jpeg_header (parm.format, parm.pixels_per_line,
-	parm.lines, ofp, &cinfo, &jerr);
+			   parm.lines, resolution_value,
+			   ofp, &cinfo, &jerr);
       break;
 #endif
       }
@@ -2474,9 +2538,16 @@ List of available devices:", prog_name);
         ofp = stdout;
 
       if (batch)
-	fprintf (stderr,
-		 "Scanning %d pages, incrementing by %d, numbering from %d\n",
-		 batch_count, batch_increment, batch_start_at);
+	{
+	  fputs("Scanning ", stderr);
+	  if (batch_count == BATCH_COUNT_UNLIMITED)
+	    fputs("infinity", stderr);
+	  else
+	    fprintf(stderr, "%d", batch_count);
+	  fprintf (stderr,
+		   " page%s, incrementing by %d, numbering from %d\n",
+		   batch_count == 1 ? "" : "s", batch_increment, batch_start_at);
+	}
 
       else if(isatty(fileno(ofp))){
 	fprintf (stderr,"%s: output is not a file, exiting\n", prog_name);
@@ -2509,8 +2580,6 @@ List of available devices:", prog_name);
 
 		  if (readbuf2 == NULL)
 		    {
-		      fprintf (stderr, "Batch terminated, %d pages scanned\n",
-			       (n - batch_increment));
 		      if (ofp)
 			{
 			  fclose (ofp);
@@ -2612,6 +2681,13 @@ List of available devices:", prog_name);
 	      && (batch_count == BATCH_COUNT_UNLIMITED || --batch_count))
 	     && SANE_STATUS_GOOD == status);
 
+      if (batch)
+	{
+	  int num_pgs = (n - batch_start_at) / batch_increment;
+	  fprintf (stderr, "Batch terminated, %d page%s scanned\n",
+		   num_pgs, num_pgs == 1 ? "" : "s");
+	}
+
       if (batch
 	  && SANE_STATUS_NO_DOCS == status
 	  && (batch_count == BATCH_COUNT_UNLIMITED)
diff --git a/frontend/sicc.c b/frontend/sicc.c
new file mode 100644
index 0000000..c93e5c3
--- /dev/null
+++ b/frontend/sicc.c
@@ -0,0 +1,67 @@
+/* Load an ICC profile for embedding in an output file
+   Copyright (C) 2017 Aaron Muir Hamilton <aaron@correspondwith.me>
+
+   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+#include "../include/sane/config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/stat.h>
+
+void *
+sanei_load_icc_profile (const char *path, size_t *size)
+{
+  FILE *fd = NULL;
+  size_t stated_size = 0;
+  void *profile = NULL;
+  struct stat s;
+
+  fd = fopen(path, "r");
+
+  if (!fd)
+  {
+    fprintf(stderr, "Could not open ICC profile %s\n", path);
+  }
+  else
+  {
+    fstat(fileno(fd), &s);
+    stated_size = 16777216 * fgetc(fd) + 65536 * fgetc(fd) + 256 * fgetc(fd) + fgetc(fd);
+    rewind(fd);
+
+    if (stated_size > (size_t) s.st_size)
+    {
+      fprintf(stderr, "Ignoring ICC profile because file %s is shorter than the profile\n", path);
+    }
+    else
+    {
+      profile = malloc(stated_size);
+
+      if (fread(profile, stated_size, 1, fd) != 1)
+      {
+        fprintf(stderr, "Error reading ICC profile %s\n", path);
+        free(profile);
+      }
+      else
+      {
+        fclose(fd);
+        *size = stated_size;
+        return profile;
+      }
+    }
+    fclose(fd);
+  }
+  return NULL;
+}
diff --git a/frontend/sicc.h b/frontend/sicc.h
new file mode 100644
index 0000000..5c225da
--- /dev/null
+++ b/frontend/sicc.h
@@ -0,0 +1,19 @@
+/* Load an ICC profile for embedding in an output file
+   Copyright (C) 2017 Aaron Muir Hamilton <aaron@correspondwith.me>
+
+   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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+void *
+sanei_load_icc_profile (const char *path, size_t *size);
diff --git a/frontend/stiff.c b/frontend/stiff.c
index 01d845b..c9153e5 100644
--- a/frontend/stiff.c
+++ b/frontend/stiff.c
@@ -1,6 +1,7 @@
 /* Create SANE/tiff headers TIFF interfacing routines for SANE
    Copyright (C) 2000 Peter Kirchgessner
    Copyright (C) 2002 Oliver Rauch: added tiff ICC profile
+   Copyright (C) 2017 Aaron Muir Hamilton <aaron@correspondwith.me>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -20,6 +21,7 @@
    2000-11-19, PK: Color TIFF-header: write 3 values for bits per sample
    2001-12-16, PK: Write fill order tag for b/w-images
    2002-08-27, OR: Added tiff tag for ICC profile
+   2017-04-16, AMH: Separate ICC profile loading into a separate file
 */
 #ifdef _AIX
 # include "../include/lalloca.h"	/* MUST come first for AIX! */
@@ -31,6 +33,7 @@
 #include "../include/sane/config.h"
 #include "../include/sane/sane.h"
 
+#include "sicc.h"
 #include "stiff.h"
 
 typedef struct {
@@ -269,22 +272,12 @@ write_tiff_grey_header (FILE *fptr, int width, int height, int depth,
     int strip_bytecount;
     int ntags;
     int motorola, bps, maxsamplevalue;
-    FILE *icc_file = 0;
-    int icc_len = -1;
+    void *icc_buffer = NULL;
+    size_t icc_size = 0;
 
     if (icc_profile)
     {
-      icc_file = fopen(icc_profile, "r");
-
-      if (!icc_file)
-      {
-        fprintf(stderr, "Could not open ICC profile %s\n", icc_profile);
-      }
-      else
-      {
-        icc_len = 16777216 * fgetc(icc_file) + 65536 * fgetc(icc_file) + 256 * fgetc(icc_file) + fgetc(icc_file);
-        rewind(icc_file);
-      }
+      icc_buffer = sanei_load_icc_profile(icc_profile, &icc_size);
     }
 
     ifd = create_ifd ();
@@ -302,10 +295,10 @@ write_tiff_grey_header (FILE *fptr, int width, int height, int depth,
         data_size += 2*4 + 2*4;
     }
 
-    if (icc_len > 0) /* if icc profile exists add memory for tag */
+    if (icc_size > 0) /* if icc profile exists add memory for tag */
     {
         ntags += 1;
-        data_size += icc_len;
+        data_size += icc_size;
     }
 
     ifd_size = 2 + ntags*12 + 4;
@@ -355,10 +348,10 @@ write_tiff_grey_header (FILE *fptr, int width, int height, int depth,
         add_ifd_entry (ifd, 296, IFDE_TYP_SHORT, 1, 2);
     }
 
-    if (icc_len > 0) /* add ICC-profile TAG */
+    if (icc_size > 0) /* add ICC-profile TAG */
     {
-      add_ifd_entry(ifd, 34675, 7, icc_len, data_offset);
-      data_offset += icc_len;
+      add_ifd_entry(ifd, 34675, 7, (int) icc_size, data_offset);
+      data_offset += icc_size;
     }
 
     /* I prefer motorola format. Its human readable. But for 16 bit, */
@@ -383,33 +376,16 @@ write_tiff_grey_header (FILE *fptr, int width, int height, int depth,
         write_i4 (fptr, 1, motorola);
     }
 
-    /* Write ICC profile */
-    if (icc_len > 0)
+    if (icc_size > 0)
     {
-      int i;
-      for (i=0; i<icc_len; i++)
-      {
-        if (!feof(icc_file))
-        {
-          fputc(fgetc(icc_file), fptr);
-        }
-        else
-        {
-          fprintf(stderr, "ICC profile %s is too short\n", icc_profile);
-          break;
-        }
-      }
+      fwrite(icc_buffer, icc_size, 1, fptr);
     }
 
-    if (icc_file)
-    {
-      fclose(icc_file);
-    }
+    free(icc_buffer);
 
     free_ifd (ifd);
 }
 
-
 static void
 write_tiff_color_header (FILE *fptr, int width, int height, int depth,
                          int resolution, const char *icc_profile)
@@ -419,22 +395,12 @@ write_tiff_color_header (FILE *fptr, int width, int height, int depth,
     int strip_bytecount;
     int ntags;
     int motorola, bps, maxsamplevalue;
-    FILE *icc_file = 0;
-    int icc_len = -1;
+    void *icc_buffer = NULL;
+    size_t icc_size = 0;
 
     if (icc_profile)
     {
-      icc_file = fopen(icc_profile, "r");
-
-      if (!icc_file)
-      {
-        fprintf(stderr, "Could not open ICC profile %s\n", icc_profile);
-      }
-      else
-      {
-        icc_len = 16777216 * fgetc(icc_file) + 65536 * fgetc(icc_file) + 256 * fgetc(icc_file) + fgetc(icc_file);
-        rewind(icc_file);
-      }
+      icc_buffer = sanei_load_icc_profile(icc_profile, &icc_size);
     }
 
 
@@ -454,10 +420,10 @@ write_tiff_color_header (FILE *fptr, int width, int height, int depth,
         data_size += 2*4 + 2*4;
     }
 
-    if (icc_len > 0) /* if icc profile exists add memory for tag */
+    if (icc_size > 0) /* if icc profile exists add memory for tag */
     {
         ntags += 1;
-        data_size += icc_len;
+        data_size += icc_size;
     }
 
 
@@ -513,10 +479,10 @@ write_tiff_color_header (FILE *fptr, int width, int height, int depth,
         add_ifd_entry (ifd, 296, IFDE_TYP_SHORT, 1, 2);
     }
 
-    if (icc_len > 0) /* add ICC-profile TAG */
+    if (icc_size > 0) /* add ICC-profile TAG */
     {
-      add_ifd_entry(ifd, 34675, 7, icc_len, data_offset);
-      data_offset += icc_len;
+      add_ifd_entry(ifd, 34675, 7, (int) icc_size, data_offset);
+      data_offset += icc_size;
     }
 
 
@@ -558,27 +524,12 @@ write_tiff_color_header (FILE *fptr, int width, int height, int depth,
     }
 
     /* Write ICC profile */
-    if (icc_len > 0)
+    if (icc_size > 0)
     {
-      int i;
-      for (i=0; i<icc_len; i++)
-      {
-        if (!feof(icc_file))
-        {
-          fputc(fgetc(icc_file), fptr);
-        }
-        else
-        {
-          fprintf(stderr, "ICC profile %s is too short\n", icc_profile);
-          break;
-        }
-      }
+      fwrite(icc_buffer, icc_size, 1, fptr);
     }
 
-    if (icc_file)
-    {
-      fclose(icc_file);
-    }
+    free(icc_buffer);
 
     free_ifd (ifd);
 }
diff --git a/include/Makefile.in b/include/Makefile.in
index 45395a4..3ccbdf3 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -82,11 +82,16 @@ subdir = include
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs $(nobase_include_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ltoptions.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/byteorder.m4 \
-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/byteorder.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -164,7 +169,10 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -185,7 +193,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISTCLEAN_FILES = @DISTCLEAN_FILES@
+DLH = @DLH@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
@@ -198,34 +206,42 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FIG2DEV = @FIG2DEV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
 GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
+GS = @GS@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
 IEEE1284_LIBS = @IEEE1284_LIBS@
-INCLUDES = @INCLUDES@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LOCKPATH = @INSTALL_LOCKPATH@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JPEG_LIBS = @JPEG_LIBS@
 LATEX = @LATEX@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
-LINKER_RPATH = @LINKER_RPATH@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCKPATH_GROUP = @LOCKPATH_GROUP@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINDEX = @MAKEINDEX@
@@ -234,10 +250,10 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MATH_LIB = @MATH_LIB@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
-NUMBER_VERSION = @NUMBER_VERSION@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -250,10 +266,13 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PNG_LIBS = @PNG_LIBS@
+POSUB = @POSUB@
+PPMTOGIF = @PPMTOGIF@
 PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@
 PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -275,12 +294,16 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 V_MAJOR = @V_MAJOR@
 V_MINOR = @V_MINOR@
 V_REV = @V_REV@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/include/sane/config.h.in b/include/sane/config.h.in
index ace060c..9a90a8d 100644
--- a/include/sane/config.h.in
+++ b/include/sane/config.h.in
@@ -1,4 +1,4 @@
-/* include/sane/config.h.in.  Generated from configure.in by autoheader.  */
+/* include/sane/config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define if building universal (internal helper macro) */
 #undef AC_APPLE_UNIVERSAL_BUILD
@@ -11,15 +11,19 @@
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
-/* Should we disable SCSI generic v3? */
-#undef DISABLE_LINUX_SG_IO
-
 /* Define to 1 if the system supports IPv6 */
 #undef ENABLE_IPV6
 
 /* Define to 1 if device locking should be enabled. */
 #undef ENABLE_LOCKING
 
+/* Define to 1 if translation of program messages to the user's native
+   language is requested. */
+#undef ENABLE_NLS
+
+/* Define if GPLogFunc does not take a va_list. */
+#undef GPLOGFUNC_NO_VARGS
+
 /* Define to 1 if struct sockaddr_storage has an ss_family member */
 #undef HAS_SS_FAMILY
 
@@ -46,9 +50,6 @@
 /* Define to 1 if you have the `atexit' function. */
 #undef HAVE_ATEXIT
 
-/* Define to 1 if you have the <be/drivers/USB_scanner.h> header file. */
-#undef HAVE_BE_DRIVERS_USB_SCANNER_H
-
 /* Define to 1 if you have the <be/kernel/OS.h> header file. */
 #undef HAVE_BE_KERNEL_OS_H
 
@@ -58,9 +59,21 @@
 /* Define to 1 if you have the <camlib.h> header file. */
 #undef HAVE_CAMLIB_H
 
+/* 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 `cfmakeraw' function. */
 #undef HAVE_CFMAKERAW
 
+/* 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
+
 /* Define to 1 if you have the <ddk/ntddscsi.h> header file. */
 #undef HAVE_DDK_NTDDSCSI_H
 
@@ -103,6 +116,9 @@
 /* Define to 1 if you have the `getpass' function. */
 #undef HAVE_GETPASS
 
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
 /* Define to 1 if you have the `getuid' function. */
 #undef HAVE_GETUID
 
@@ -112,9 +128,15 @@
 /* Define to 1 if you have the `gp_port_info_get_path' function. */
 #undef HAVE_GP_PORT_INFO_GET_PATH
 
+/* Define to 1 if you have the <gscdds.h> header file. */
+#undef HAVE_GSCDDS_H
+
 /* Define to 1 if you have the `i386_set_ioperm' function. */
 #undef HAVE_I386_SET_IOPERM
 
+/* Define if you have the iconv() function and it works. */
+#undef HAVE_ICONV
+
 /* Define to 1 if you have the <ifaddrs.h> header file. */
 #undef HAVE_IFADDRS_H
 
@@ -177,11 +199,11 @@
 /* Define to 1 if you have the net-snmp library. */
 #undef HAVE_LIBSNMP
 
-/* Define to 1 if you have libusb. */
+/* Define to 1 if you have libusb-1.0 */
 #undef HAVE_LIBUSB
 
-/* Define to 1 if you have libusb-1.0. */
-#undef HAVE_LIBUSB_1_0
+/* Define to 1 if you have libusb-0.1 */
+#undef HAVE_LIBUSB_LEGACY
 
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
@@ -252,9 +274,6 @@
 /* define if you have the resmgr library */
 #undef HAVE_RESMGR
 
-/* Define to 1 if you have the <scdds.h> header file. */
-#undef HAVE_SCDDS_H
-
 /* Define to 1 if you have the `scsireq_enter' function. */
 #undef HAVE_SCSIREQ_ENTER
 
@@ -333,9 +352,6 @@
 /* Is /usr/include/systemd/sd-daemon.h available? */
 #undef HAVE_SYSTEMD
 
-/* Define to 1 if you have the <sys/bitypes.h> header file. */
-#undef HAVE_SYS_BITYPES_H
-
 /* Define to 1 if you have the <sys/dsreq.h> header file. */
 #undef HAVE_SYS_DSREQ_H
 
@@ -454,7 +470,7 @@
    */
 #undef LT_OBJDIR
 
-/* Define to the name of the distribution. */
+/* Name of package */
 #undef PACKAGE
 
 /* Define to the address where bug reports for this package should be sent. */
@@ -475,9 +491,6 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
 /* SANE DLL revision number */
 #undef SANE_DLL_V_BUILD
 
@@ -544,7 +557,7 @@
 #endif
 
 
-/* Define to the version of the distribution. */
+/* Version number of package */
 #undef VERSION
 
 /* define if Avahi support is enabled for saned and the net backend */
@@ -593,7 +606,7 @@
 /* Define socklen_t as \'int\' if necessary. */
 #undef socklen_t
 
-/* Define to `long' if <sys/types.h> does not define. */
+/* Define to `int' if <sys/types.h> does not define. */
 #undef ssize_t
 
 /* Define for OS/2 only */
diff --git a/include/sane/sanei.h b/include/sane/sanei.h
index ece1beb..9458f34 100644
--- a/include/sane/sanei.h
+++ b/include/sane/sanei.h
@@ -92,6 +92,9 @@
 /** @name Public macros and functions
  * @{
  */
+/** @def __sane_unused__
+ * Mark parameters as potentially unused.
+ */
 /** @def STRINGIFY(x)
  * Turn parameter into string.
  */
@@ -137,6 +140,14 @@
 /* @} */
 
 /* A few convenience macros:  */
+
+/** @hideinitializer */
+#ifdef __GNUC__
+#define __sane_unused__ __attribute__((unused))
+#else
+#define __sane_unused__
+#endif
+
 /** @hideinitializer */
 #define NELEMS(a)	((int)(sizeof (a) / sizeof (a[0])))
 
diff --git a/include/sane/sanei_backend.h b/include/sane/sanei_backend.h
index 1b5afe2..8273e88 100644
--- a/include/sane/sanei_backend.h
+++ b/include/sane/sanei_backend.h
@@ -9,25 +9,21 @@
  */
 
 
-/*
- * Compiler related options
- */
-
-/** Mark unused variables/parameters
- *
- * Tells the compiler a variable is unused, so the compiler doesn't spit a warning. 
- */
-#ifdef __GNUC__
-#define __sane_unused__ __attribute__((unused))
-#else
-#define __sane_unused__
-#endif
-
 /** @name Compatibility macros
  * @{
  */
 #include <sane/sanei_debug.h>
 
+#if __STDC_VERSION__ >= 199901L
+/* __func__ is provided */
+#elif __GNUC__ >= 5
+/* __func__ is provided */
+#elif __GNUC__ >= 2
+# define __func__ __FUNCTION__
+#else
+# define __func__ "(unknown)"
+#endif
+
 #ifdef HAVE_SYS_HW_H
   /* OS/2 i/o-port access compatibility macros: */
 # define inb(p)         _inp8 (p)
diff --git a/include/sane/sanei_thread.h b/include/sane/sanei_thread.h
index f152c93..fa72481 100644
--- a/include/sane/sanei_thread.h
+++ b/include/sane/sanei_thread.h
@@ -61,6 +61,7 @@
 #include "../include/sane/config.h"
 
 #ifdef USE_PTHREAD
+#include <pthread.h>
 typedef pthread_t SANE_Pid;
 #else
 typedef int SANE_Pid;
@@ -88,10 +89,10 @@ extern SANE_Bool sanei_thread_is_forked (void);
  * regardless of SANE_Pid's data type.
  *
  * @return
- * - SANE_TRUE - if pid is not a valid process
- * - SANE_FALSE - if pid is a valid process
+ * - SANE_TRUE - if pid is a valid process
+ * - SANE_FALSE - if pid is not a valid process
  */
-extern SANE_Bool sanei_thread_is_invalid (SANE_Pid pid);
+extern SANE_Bool sanei_thread_is_valid (SANE_Pid pid);
 
 /** Spawn a new task.
  *
diff --git a/include/sane/sanei_udp.h b/include/sane/sanei_udp.h
index c44afdd..e32fc1a 100644
--- a/include/sane/sanei_udp.h
+++ b/include/sane/sanei_udp.h
@@ -27,6 +27,9 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 
 extern SANE_Status sanei_udp_open(const char *host, int port, int *fdp);
 extern SANE_Status sanei_udp_open_broadcast(int *fdp);
diff --git a/install-sh b/install-sh
index 377bb86..756420d 100755
--- a/install-sh
+++ b/install-sh
@@ -345,34 +345,41 @@ do
 	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
 	    ;;
 	  *)
+            # $RANDOM is not portable (e.g. dash);  use it when possible to
+            # lower collision chance
 	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+	    trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
 
+	     # As "mkdir -p" follows symlinks and we work in /tmp possibly;  so
+	     # create the $tmpdir first (and fail if unsuccessful) to make sure
+	     # that nobody tries to guess the $tmpdir name.
 	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+		$mkdirprog $mkdir_mode "$tmpdir" &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
 	    then
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
 		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   test_tmpdir="$tmpdir/a"
+		   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
 		   case $ls_ld_tmpdir in
 		     d????-?r-*) different_mode=700;;
 		     d????-?--*) different_mode=755;;
 		     *) false;;
 		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
 		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
 		   }
 		 }
 	      then posix_mkdir=:
 	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
+	      rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
 	    else
 	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	      rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
 	    fi
 	    trap '' 0;;
 	esac;;
diff --git a/japi/Makefile.am b/japi/Makefile.am
index 5d66e82..cc7ac4a 100644
--- a/japi/Makefile.am
+++ b/japi/Makefile.am
@@ -8,19 +8,15 @@
 #	Makefile for a Java project with native methods.
 #
 
-V_MAJOR = @V_MAJOR@
-V_MINOR = @V_MINOR@
-V_REV = @V_REV@
-
 JAVAROOT=.
-CLASSPATH_ENV=.
-JAVAH=javah -jni -cp $(CLASSPATH_ENV)
+MY_CLASSPATH=.
+JAVAH=javah -jni -cp $(MY_CLASSPATH)
 
 #	We'll need something in 'configure' for the Java includes.
-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include \
+AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include \
 	      -I$(top_srcdir)/include -I${JDK_HOME}/include \
 	      -I${JDK_HOME}/include/genunix
-AM_LDFLAGS = @STRICT_LDFLAGS@ -version-number $(V_MAJOR):$(V_MINOR):$(VREV)
+AM_LDFLAGS += $(STRICT_LDFLAGS) -version-number $(V_MAJOR):$(V_MINOR):$(V_REV)
 
 JAVA_SRC = SaneDevice.java SaneOption.java SaneRange.java\
 	   Sane.java SaneParameters.java ScanIt.java \
@@ -31,7 +27,7 @@ dist_noinst_JAVA = $(JAVA_SRC)
 
 LIBSANE = ../backend/libsane.la
 
-EXTRA_DIST = Makefile.in README.JAVA 
+EXTRA_DIST = README.JAVA
 
 lib_LTLIBRARIES = libsanej.la
 
diff --git a/japi/Makefile.in b/japi/Makefile.in
index fa5e6cb..4a42758 100644
--- a/japi/Makefile.in
+++ b/japi/Makefile.in
@@ -87,11 +87,16 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp \
 	$(dist_noinst_JAVA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ltoptions.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/byteorder.m4 \
-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/byteorder.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -178,6 +183,7 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 JAVAC = javac
+CLASSPATH_ENV = CLASSPATH=$(JAVAROOT):$(srcdir)/$(JAVAROOT)$${CLASSPATH:+":$$CLASSPATH"}
 am__java_sources = $(dist_noinst_JAVA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
@@ -202,7 +208,15 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+
+#	We'll need something in 'configure' for the Java includes.
+AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \
+	-I$(top_srcdir)/include -I${JDK_HOME}/include \
+	-I${JDK_HOME}/include/genunix
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@ $(STRICT_LDFLAGS) -version-number \
+	$(V_MAJOR):$(V_MINOR):$(V_REV)
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -223,7 +237,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISTCLEAN_FILES = @DISTCLEAN_FILES@
+DLH = @DLH@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
@@ -236,34 +250,42 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FIG2DEV = @FIG2DEV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
 GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
+GS = @GS@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
 IEEE1284_LIBS = @IEEE1284_LIBS@
-INCLUDES = @INCLUDES@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LOCKPATH = @INSTALL_LOCKPATH@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JPEG_LIBS = @JPEG_LIBS@
 LATEX = @LATEX@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
-LINKER_RPATH = @LINKER_RPATH@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCKPATH_GROUP = @LOCKPATH_GROUP@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINDEX = @MAKEINDEX@
@@ -272,10 +294,10 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MATH_LIB = @MATH_LIB@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
-NUMBER_VERSION = @NUMBER_VERSION@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -288,10 +310,13 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PNG_LIBS = @PNG_LIBS@
+POSUB = @POSUB@
+PPMTOGIF = @PPMTOGIF@
 PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@
 PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -313,12 +338,16 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 V_MAJOR = @V_MAJOR@
 V_MINOR = @V_MINOR@
 V_REV = @V_REV@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -375,15 +404,8 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 JAVAROOT = .
-CLASSPATH_ENV = .
-JAVAH = javah -jni -cp $(CLASSPATH_ENV)
-
-#	We'll need something in 'configure' for the Java includes.
-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include \
-	      -I$(top_srcdir)/include -I${JDK_HOME}/include \
-	      -I${JDK_HOME}/include/genunix
-
-AM_LDFLAGS = @STRICT_LDFLAGS@ -version-number $(V_MAJOR):$(V_MINOR):$(VREV)
+MY_CLASSPATH = .
+JAVAH = javah -jni -cp $(MY_CLASSPATH)
 JAVA_SRC = SaneDevice.java SaneOption.java SaneRange.java\
 	   Sane.java SaneParameters.java ScanIt.java \
 	   ImageCanvas.java ImageCanvasClient.java \
@@ -391,7 +413,7 @@ JAVA_SRC = SaneDevice.java SaneOption.java SaneRange.java\
 
 dist_noinst_JAVA = $(JAVA_SRC)
 LIBSANE = ../backend/libsane.la
-EXTRA_DIST = Makefile.in README.JAVA 
+EXTRA_DIST = README.JAVA
 lib_LTLIBRARIES = libsanej.la
 BUILT_SOURCES = Sane.h
 CLEANFILES = Sane.h
@@ -481,22 +503,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sane.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d6e2135..8fc2da8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,12 +3,10 @@
 ##
 ##  This file is part of the "Sane" build infra-structure.  See
 ##  included LICENSE file for license information.
-AM_CPPFLAGS = -I. -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS += -I. -I$(top_builddir)/include -I$(top_srcdir)/include
 
-noinst_LTLIBRARIES = liblib.la libfelib.la
+noinst_LTLIBRARIES = liblib.la
 
-libfelib_la_SOURCES = getopt.c getopt1.c md5.c syslog.c vsyslog.c
-
-liblib_la_SOURCES = alloca.c getenv.c inet_ntop.c inet_pton.c \
-	isfdtype.c sigprocmask.c sleep.c snprintf.c strcasestr.c \
-	strdup.c strndup.c strsep.c usleep.c
+liblib_la_SOURCES  = md5.c
+liblib_la_CPPFLAGS = -I$(top_srcdir)/include
+liblib_la_LIBADD   = $(LTALLOCA) $(LTLIBOBJS)
diff --git a/lib/Makefile.in b/lib/Makefile.in
index b0fea29..4246975 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -80,13 +80,21 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = lib
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
+	$(top_srcdir)/mkinstalldirs alloca.c getenv.c isfdtype.c \
+	getopt1.c sleep.c strdup.c strsep.c syslog.c usleep.c getopt.c \
+	inet_pton.c sigprocmask.c inet_ntop.c vsyslog.c strcasestr.c \
+	snprintf.c strndup.c $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ltoptions.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/byteorder.m4 \
-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/byteorder.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -94,19 +102,13 @@ CONFIG_HEADER = $(top_builddir)/include/sane/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
-libfelib_la_LIBADD =
-am_libfelib_la_OBJECTS = getopt.lo getopt1.lo md5.lo syslog.lo \
-	vsyslog.lo
-libfelib_la_OBJECTS = $(am_libfelib_la_OBJECTS)
+liblib_la_DEPENDENCIES = $(LTALLOCA) $(LTLIBOBJS)
+am_liblib_la_OBJECTS = liblib_la-md5.lo
+liblib_la_OBJECTS = $(am_liblib_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
-liblib_la_LIBADD =
-am_liblib_la_OBJECTS = alloca.lo getenv.lo inet_ntop.lo inet_pton.lo \
-	isfdtype.lo sigprocmask.lo sleep.lo snprintf.lo strcasestr.lo \
-	strdup.lo strndup.lo strsep.lo usleep.lo
-liblib_la_OBJECTS = $(am_liblib_la_OBJECTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -141,8 +143,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(libfelib_la_SOURCES) $(liblib_la_SOURCES)
-DIST_SOURCES = $(libfelib_la_SOURCES) $(liblib_la_SOURCES)
+SOURCES = $(liblib_la_SOURCES)
+DIST_SOURCES = $(liblib_la_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -171,7 +173,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(top_builddir)/include \
+	-I$(top_srcdir)/include
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -192,7 +198,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISTCLEAN_FILES = @DISTCLEAN_FILES@
+DLH = @DLH@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
@@ -205,34 +211,42 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FIG2DEV = @FIG2DEV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
 GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
+GS = @GS@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
 IEEE1284_LIBS = @IEEE1284_LIBS@
-INCLUDES = @INCLUDES@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LOCKPATH = @INSTALL_LOCKPATH@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JPEG_LIBS = @JPEG_LIBS@
 LATEX = @LATEX@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
-LINKER_RPATH = @LINKER_RPATH@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCKPATH_GROUP = @LOCKPATH_GROUP@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINDEX = @MAKEINDEX@
@@ -241,10 +255,10 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MATH_LIB = @MATH_LIB@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
-NUMBER_VERSION = @NUMBER_VERSION@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -257,10 +271,13 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PNG_LIBS = @PNG_LIBS@
+POSUB = @POSUB@
+PPMTOGIF = @PPMTOGIF@
 PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@
 PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -282,12 +299,16 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 V_MAJOR = @V_MAJOR@
 V_MINOR = @V_MINOR@
 V_REV = @V_REV@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -343,13 +364,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I. -I$(top_builddir)/include -I$(top_srcdir)/include
-noinst_LTLIBRARIES = liblib.la libfelib.la
-libfelib_la_SOURCES = getopt.c getopt1.c md5.c syslog.c vsyslog.c
-liblib_la_SOURCES = alloca.c getenv.c inet_ntop.c inet_pton.c \
-	isfdtype.c sigprocmask.c sleep.c snprintf.c strcasestr.c \
-	strdup.c strndup.c strsep.c usleep.c
-
+noinst_LTLIBRARIES = liblib.la
+liblib_la_SOURCES = md5.c
+liblib_la_CPPFLAGS = -I$(top_srcdir)/include
+liblib_la_LIBADD = $(LTALLOCA) $(LTLIBOBJS)
 all: all-am
 
 .SUFFIXES:
@@ -396,9 +414,6 @@ clean-noinstLTLIBRARIES:
 	  rm -f $${locs}; \
 	}
 
-libfelib.la: $(libfelib_la_OBJECTS) $(libfelib_la_DEPENDENCIES) $(EXTRA_libfelib_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(LINK)  $(libfelib_la_OBJECTS) $(libfelib_la_LIBADD) $(LIBS)
-
 liblib.la: $(liblib_la_OBJECTS) $(liblib_la_DEPENDENCIES) $(EXTRA_liblib_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK)  $(liblib_la_OBJECTS) $(liblib_la_LIBADD) $(LIBS)
 
@@ -408,46 +423,56 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloca.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getenv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet_ntop.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet_pton.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isfdtype.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sigprocmask.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sleep.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasestr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strdup.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strndup.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strsep.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/syslog.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usleep.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vsyslog.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/alloca.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getenv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt1.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inet_ntop.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inet_pton.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/isfdtype.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sigprocmask.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sleep.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/snprintf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strcasestr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strdup.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strndup.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strsep.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/syslog.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/usleep.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vsyslog.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblib_la-md5.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+liblib_la-md5.lo: md5.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblib_la-md5.lo -MD -MP -MF $(DEPDIR)/liblib_la-md5.Tpo -c -o liblib_la-md5.lo `test -f 'md5.c' || echo '$(srcdir)/'`md5.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblib_la-md5.Tpo $(DEPDIR)/liblib_la-md5.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='md5.c' object='liblib_la-md5.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblib_la-md5.lo `test -f 'md5.c' || echo '$(srcdir)/'`md5.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -576,7 +601,7 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+	-rm -rf $(DEPDIR) ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -622,7 +647,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+	-rm -rf $(DEPDIR) ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/lib/md5.c b/lib/md5.c
index fd53191..72b36f3 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -133,8 +133,8 @@ md5_finish_ctx (struct md5_ctx *ctx, void *resbuf)
   memcpy (&ctx->buffer[bytes], fillbuf, pad);
 
   /* Put the 64-bit file length in *bits* at the end of the buffer.  */
-  *(md5_uint32 *) &ctx->buffer[bytes + pad] = SWAP (ctx->total[0] << 3);
-  *(md5_uint32 *) &ctx->buffer[bytes + pad + 4] = SWAP ((ctx->total[1] << 3) |
+  ((md5_uint32 *) ctx->buffer)[bytes + pad] = SWAP (ctx->total[0] << 3);
+  ((md5_uint32 *) ctx->buffer)[bytes + pad + 4] = SWAP ((ctx->total[1] << 3) |
 							(ctx->total[0] >> 29));
 
   /* Process last bytes.  */
diff --git a/lib/strcasestr.c b/lib/strcasestr.c
index 8999c50..8999c50 100755..100644
--- a/lib/strcasestr.c
+++ b/lib/strcasestr.c
diff --git a/ltmain.sh b/ltmain.sh
index 99ee917..dd687a9 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -73,7 +73,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.11
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -83,7 +83,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4.2
+VERSION="2.4.2 Debian-2.4.2-1.11"
 TIMESTAMP=""
 package_revision=1.3337
 
@@ -6127,7 +6127,10 @@ func_mode_link ()
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
 	esac
       fi
       if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -6447,19 +6450,19 @@ func_mode_link ()
 	    # It is a libtool convenience library, so add in its objects.
 	    func_append convenience " $ladir/$objdir/$old_library"
 	    func_append old_convenience " $ladir/$objdir/$old_library"
+	    tmp_libs=
+	    for deplib in $dependency_libs; do
+	      deplibs="$deplib $deplibs"
+	      if $opt_preserve_dup_deps ; then
+		case "$tmp_libs " in
+		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+		esac
+	      fi
+	      func_append tmp_libs " $deplib"
+	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    deplibs="$deplib $deplibs"
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $deplib"
-	  done
 	  continue
 	fi # $pass = conv
 
@@ -7352,6 +7355,9 @@ func_mode_link ()
 	    revision="$number_minor"
 	    lt_irix_increment=no
 	    ;;
+	  *)
+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+	    ;;
 	  esac
 	  ;;
 	no)
diff --git a/m4/gettext.m4 b/m4/gettext.m4
new file mode 100644
index 0000000..f84e6a5
--- /dev/null
+++ b/m4/gettext.m4
@@ -0,0 +1,383 @@
+# gettext.m4 serial 63 (gettext-0.18)
+dnl Copyright (C) 1995-2010 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, 2008-2010.
+
+dnl Macro to add for using GNU gettext.
+
+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
+dnl    default (if it is not specified or empty) is 'no-libtool'.
+dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
+dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
+dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
+dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
+dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
+dnl    $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl    implementations (in libc or libintl) without the ngettext() function
+dnl    will be ignored.  If NEEDSYMBOL is specified and is
+dnl    'need-formatstring-macros', then GNU gettext implementations that don't
+dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
+dnl INTLDIR is used to find the intl libraries.  If empty,
+dnl    the value `$(top_builddir)/intl/' is used.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl    and used.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl    Catalog format: none
+dnl    Catalog extension: none
+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_GNU_GETTEXT],
+[
+  dnl Argument checking.
+  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
+    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+])])])])])
+  ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
+    [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
+  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],
+      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, [
+    AC_REQUIRE([AM_INTL_SUBDIR])dnl
+  ])
+
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  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 { 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:
+  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
+  dnl documented, we avoid it.
+  ifelse(gt_included_intl, yes, , [
+    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+  ])
+
+  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
+    USE_INCLUDED_LIBINTL=no
+  ])
+  LIBINTL=
+  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
+    ifelse(gt_included_intl, yes, [
+      AC_MSG_CHECKING([whether included gettext is requested])
+      AC_ARG_WITH([included-gettext],
+        [  --with-included-gettext use the GNU gettext library included here],
+        nls_cv_force_use_gnu_gettext=$withval,
+        nls_cv_force_use_gnu_gettext=no)
+      AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
+
+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+    ])
+        dnl User does not insist on using GNU NLS library.  Figure out what
+        dnl to use.  If GNU gettext is available we use this.  Else we have
+        dnl to fall back to GNU NLS library.
+
+        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
+'
+        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 * 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 { 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
+          ])
+          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
+          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
+          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
+          dnl even if libiconv doesn't exist.
+          AC_LIB_LINKFLAGS_BODY([intl])
+          AC_CACHE_CHECK([for GNU gettext in 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>
+$gt_revision_test_code
+extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);],
+              [bindtextdomain ("", "");
+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 { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
+              LIBS="$LIBS $LIBICONV"
+              AC_TRY_LINK([#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 *);],
+                [bindtextdomain ("", "");
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+               [LIBINTL="$LIBINTL $LIBICONV"
+                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                eval "$gt_func_gnugettext_libintl=yes"
+               ])
+            fi
+            CPPFLAGS="$gt_save_CPPFLAGS"
+            LIBS="$gt_save_LIBS"])
+        fi
+
+        dnl If an already present or preinstalled GNU gettext() is found,
+        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 { 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.
+          LIBINTL=
+          LTLIBINTL=
+          INCINTL=
+        fi
+
+    ifelse(gt_included_intl, yes, [
+        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+          dnl GNU gettext is not found in the C library.
+          dnl Fall back on included GNU gettext library.
+          nls_cv_use_gnu_gettext=yes
+        fi
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions used to generate GNU NLS library.
+        BUILD_INCLUDED_LIBINTL=yes
+        USE_INCLUDED_LIBINTL=yes
+        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.
+        CATOBJEXT=.gmo
+      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],
+        [Define to 1 if translation of program messages to the user's native language
+   is requested.])
+    else
+      USE_NLS=no
+    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 { 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])
+      fi
+
+      dnl For backward compatibility. Some packages may be using this.
+      AC_DEFINE([HAVE_GETTEXT], [1],
+       [Define if the GNU gettext() function is already present or preinstalled.])
+      AC_DEFINE([HAVE_DCGETTEXT], [1],
+       [Define if the GNU dcgettext() function is already present or preinstalled.])
+    fi
+
+    dnl We need to process the po/ directory.
+    POSUB=po
+  fi
+
+  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-runtime || test "$PACKAGE" = gettext-tools; then
+      BUILD_INCLUDED_LIBINTL=yes
+    fi
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST([BUILD_INCLUDED_LIBINTL])
+    AC_SUBST([USE_INCLUDED_LIBINTL])
+    AC_SUBST([CATOBJEXT])
+
+    dnl For backward compatibility. Some configure.ins may be using this.
+    nls_cv_header_intl=
+    nls_cv_header_libgt=
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    DATADIRNAME=share
+    AC_SUBST([DATADIRNAME])
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INSTOBJEXT=.mo
+    AC_SUBST([INSTOBJEXT])
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    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])
+  ])
+
+  dnl For backward compatibility. Some Makefiles may be using this.
+  INTLLIBS="$LIBINTL"
+  AC_SUBST([INTLLIBS])
+
+  dnl Make all documented variables known to autoconf.
+  AC_SUBST([LIBINTL])
+  AC_SUBST([LTLIBINTL])
+  AC_SUBST([POSUB])
+])
+
+
+dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
+m4_define([gt_NEEDS_INIT],
+[
+  m4_divert_text([DEFAULTS], [gt_needs=])
+  m4_define([gt_NEEDS_INIT], [])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
+AC_DEFUN([AM_GNU_GETTEXT_NEED],
+[
+  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
diff --git a/m4/iconv.m4 b/m4/iconv.m4
new file mode 100644
index 0000000..e2041b9
--- /dev/null
+++ b/m4/iconv.m4
@@ -0,0 +1,214 @@
+# iconv.m4 serial 11 (gettext-0.18.1)
+dnl Copyright (C) 2000-2002, 2007-2010 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([AM_ICONV_LINKFLAGS_BODY],
+[
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([iconv])
+])
+
+AC_DEFUN([AM_ICONV_LINK],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+
+  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed libiconv and not disabled its use
+  dnl via --without-libiconv-prefix, he wants to use it. The first
+  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+  am_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+
+  AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+      [iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);],
+      [am_cv_func_iconv=yes])
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS $LIBICONV"
+      AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+        [iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);],
+        [am_cv_lib_iconv=yes]
+        [am_cv_func_iconv=yes])
+      LIBS="$am_save_LIBS"
+    fi
+  ])
+  if test "$am_cv_func_iconv" = yes; then
+    AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
+      dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
+      am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      AC_TRY_RUN([
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+  /* Test against Solaris 10 bug: Failures are not distinguishable from
+     successful returns.  */
+  {
+    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+    if (cd_ascii_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\263";
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_ascii_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          return 1;
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    return 1;
+  return 0;
+}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
+        [case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac])
+      LIBS="$am_save_LIBS"
+    ])
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+    AC_DEFINE([HAVE_ICONV], [1],
+      [Define if you have the iconv() function and it works.])
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    AC_MSG_CHECKING([how to link with libiconv])
+    AC_MSG_RESULT([$LIBICONV])
+  else
+    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
+    dnl either.
+    CPPFLAGS="$am_save_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
+  AC_SUBST([LIBICONV])
+  AC_SUBST([LTLIBICONV])
+])
+
+dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
+dnl avoid warnings like
+dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
+dnl This is tricky because of the way 'aclocal' is implemented:
+dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
+dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
+dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
+dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
+dnl   warnings.
+m4_define([gl_iconv_AC_DEFUN],
+  m4_version_prereq([2.64],
+    [[AC_DEFUN_ONCE(
+        [$1], [$2])]],
+    [[AC_DEFUN(
+        [$1], [$2])]]))
+gl_iconv_AC_DEFUN([AM_ICONV],
+[
+  AM_ICONV_LINK
+  if test "$am_cv_func_iconv" = yes; then
+    AC_MSG_CHECKING([for iconv declaration])
+    AC_CACHE_VAL([am_cv_proto_iconv], [
+      AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    AC_MSG_RESULT([
+         $am_cv_proto_iconv])
+    AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
+      [Define as const if the declaration of iconv() needs const.])
+  fi
+])
diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4
new file mode 100644
index 0000000..dd91025
--- /dev/null
+++ b/m4/intlmacosx.m4
@@ -0,0 +1,51 @@
+# intlmacosx.m4 serial 3 (gettext-0.18)
+dnl Copyright (C) 2004-2010 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 Checks for special options needed on MacOS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+  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 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
+  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])
+])
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
new file mode 100644
index 0000000..ebb3052
--- /dev/null
+++ b/m4/lib-ld.m4
@@ -0,0 +1,110 @@
+# lib-ld.m4 serial 4 (gettext-0.18)
+dnl Copyright (C) 1996-2003, 2009-2010 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
+dnl with libtool.m4.
+
+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.
+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
+])
+
+dnl From libtool-1.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_ARG_WITH([gnu-ld],
+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([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.
+  AC_MSG_CHECKING([for ld used by GCC])
+  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
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL([acl_cv_path_LD],
+[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])
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT([$LD])
+else
+  AC_MSG_RESULT([no])
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_LIB_PROG_LD_GNU
+])
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
new file mode 100644
index 0000000..c73bd8e
--- /dev/null
+++ b/m4/lib-link.m4
@@ -0,0 +1,774 @@
+# lib-link.m4 serial 21 (gettext-0.18)
+dnl Copyright (C) 2001-2010 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.54])
+
+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
+dnl augments the CPPFLAGS variable.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  pushdef([Name],[translit([$1],[./-], [___])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+    AC_LIB_LINKFLAGS_BODY([$1], [$2])
+    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
+  ])
+  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+  dnl results of this search when this library appears as a dependency.
+  HAVE_LIB[]NAME=yes
+  popdef([NAME])
+  popdef([Name])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. The missing-message
+dnl defaults to 'no' and may contain additional hints for the user.
+dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
+dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  pushdef([Name],[translit([$1],[./-], [___])])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed lib[]Name and not disabled its use
+  dnl via --without-lib[]Name-prefix, he wants to use it.
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+    ac_save_LIBS="$LIBS"
+    dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
+    dnl because these -l options might require -L options that are present in
+    dnl LIBS. -l options benefit only from the -L options listed before it.
+    dnl Otherwise, add it to the front of LIBS, because it may be a static
+    dnl library that depends on another static library that is present in LIBS.
+    dnl Static libraries benefit only from the static libraries listed after
+    dnl it.
+    case " $LIB[]NAME" in
+      *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
+      *)       LIBS="$LIB[]NAME $LIBS" ;;
+    esac
+    AC_TRY_LINK([$3], [$4],
+      [ac_cv_lib[]Name=yes],
+      [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
+    LIBS="$ac_save_LIBS"
+  ])
+  if test "$ac_cv_lib[]Name" = yes; then
+    HAVE_LIB[]NAME=yes
+    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
+    AC_MSG_CHECKING([how to link with lib[]$1])
+    AC_MSG_RESULT([$LIB[]NAME])
+  else
+    HAVE_LIB[]NAME=no
+    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+    dnl $INC[]NAME either.
+    CPPFLAGS="$ac_save_CPPFLAGS"
+    LIB[]NAME=
+    LTLIB[]NAME=
+    LIB[]NAME[]_PREFIX=
+  fi
+  AC_SUBST([HAVE_LIB]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  popdef([NAME])
+  popdef([Name])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl   acl_libext,
+dnl   acl_shlibext,
+dnl   acl_hardcode_libdir_flag_spec,
+dnl   acl_hardcode_libdir_separator,
+dnl   acl_hardcode_direct,
+dnl   acl_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
+  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+  AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
+    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
+  ])
+  wl="$acl_cv_wl"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE([rpath],
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
+])
+
+dnl AC_LIB_FROMPACKAGE(name, package)
+dnl declares that libname comes from the given package. The configure file
+dnl will then not have a --with-libname-prefix option but a
+dnl --with-package-prefix option. Several libraries can come from the same
+dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
+dnl macro call that searches for libname.
+AC_DEFUN([AC_LIB_FROMPACKAGE],
+[
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  define([acl_frompackage_]NAME, [$2])
+  popdef([NAME])
+  pushdef([PACK],[$2])
+  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
+                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  define([acl_libsinpackage_]PACKUP,
+    m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
+  popdef([PACKUP])
+  popdef([PACK])
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
+  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
+                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
+  dnl Autoconf >= 2.61 supports dots in --with options.
+  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_ARG_WITH(P_A_C_K[-prefix],
+[[  --with-]]P_A_C_K[[-prefix[=DIR]  search for ]PACKLIBS[ in DIR/include and DIR/lib
+  --without-]]P_A_C_K[[-prefix     don't search for ]PACKLIBS[ in includedir and libdir]],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+        if test "$acl_libdirstem2" != "$acl_libdirstem" \
+           && ! test -d "$withval/$acl_libdirstem"; then
+          additional_libdir="$withval/$acl_libdirstem2"
+        fi
+      fi
+    fi
+])
+  dnl Search the library and its dependencies in $additional_libdir and
+  dnl $LDFLAGS. Using breadth-first-seach.
+  LIB[]NAME=
+  LTLIB[]NAME=
+  INC[]NAME=
+  LIB[]NAME[]_PREFIX=
+  dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
+  dnl computed. So it has to be reset here.
+  HAVE_LIB[]NAME=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='$1 $2'
+  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"
+        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+        dnl or AC_LIB_HAVE_LINKFLAGS call.
+        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" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+          else
+            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+            dnl that this library doesn't exist. So just drop it.
+            :
+          fi
+        else
+          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+          dnl and the already constructed $LIBNAME/$LTLIBNAME.
+          found_dir=
+          found_la=
+          found_so=
+          found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            dir="$additional_libdir"
+            dnl The same code as in the loop below:
+            dnl First look for a shared library.
+            if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
+              fi
+            fi
+            dnl Then look for a static library.
+            if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIB[]NAME; do
+              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                  dnl First look for a shared library.
+                  if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                  dnl Then look for a static library.
+                  if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+            dnl Found the library.
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+              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/$acl_libdirstem" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+                dnl No hardcoding is needed.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+              else
+                dnl Use an explicit option to hardcode DIR into the resulting
+                dnl binary.
+                dnl Potentially add DIR to ltrpathdirs.
+                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                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
+                dnl The hardcoding into $LIBNAME is system dependent.
+                if test "$acl_hardcode_direct" = yes; then
+                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+                  dnl resulting binary.
+                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                    dnl Use an explicit option to hardcode DIR into the resulting
+                    dnl binary.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    dnl Potentially add DIR to rpathdirs.
+                    dnl The rpathdirs will be appended to $LIBNAME at the end.
+                    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
+                    dnl Rely on "-L$found_dir".
+                    dnl But don't add it if it's already contained in the LDFLAGS
+                    dnl or the already constructed $LIBNAME
+                    haveit=
+                    for x in $LDFLAGS $LIB[]NAME; do
+                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+                    fi
+                    if test "$acl_hardcode_minus_L" != no; then
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    else
+                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
+                      dnl here, because this doesn't fit in flags passed to the
+                      dnl compiler. So give up. No hardcoding. This affects only
+                      dnl very old systems.
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                dnl Linking with a static library.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+              else
+                dnl We shouldn't come here, but anyway it's good to have a
+                dnl fallback.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+              fi
+            fi
+            dnl Assume the include files are nearby.
+            additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                if test "$name" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+              */$acl_libdirstem2 | */$acl_libdirstem2/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
+                if test "$name" = '$1'; then
+                  LIB[]NAME[]_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+              dnl Potentially add $additional_includedir to $INCNAME.
+              dnl But don't add it
+              dnl   1. if it's the standard /usr/include,
+              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
+              dnl   3. if it's already present in $CPPFLAGS or the already
+              dnl      constructed $INCNAME,
+              dnl   4. if it doesn't exist as a directory.
+              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 $INC[]NAME; do
+                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                    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
+                      dnl Really add $additional_includedir to $INCNAME.
+                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+            dnl Look for dependencies.
+            if test -n "$found_la"; then
+              dnl Read the .la file. It defines the variables
+              dnl dlname, library_names, old_library, dependency_libs, current,
+              dnl age, revision, installed, dlopen, dlpreopen, libdir.
+              save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+              dnl We use only dependency_libs.
+              for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
+                    dnl But don't add it
+                    dnl   1. if it's the standard /usr/lib,
+                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
+                    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/$acl_libdirstem" \
+                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; 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 $LIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          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
+                            dnl Really add $additional_libdir to $LIBNAME.
+                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          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
+                            dnl Really add $additional_libdir to $LTLIBNAME.
+                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      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
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      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*)
+                    dnl Handle this in the next round.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                    dnl Handle this in the next round. Throw away the .la's
+                    dnl directory; it is already contained in a preceding -L
+                    dnl option.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                    dnl Most likely an immediate library name.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+            dnl Didn't find the library; assume it is in the system directories
+            dnl known to the linker and runtime loader. (All the system
+            dnl directories known to the linker should also be known to the
+            dnl runtime loader, otherwise the system is severely misconfigured.)
+            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
+      dnl Weird platform: only the last -rpath option counts, the user must
+      dnl pass all path elements in one option. We can arrange that for a
+      dnl single library, but not when more than one $LIBNAMEs are used.
+      alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
+      acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+    else
+      dnl The -rpath options are cumulative.
+      for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+    dnl When using libtool, the option that works for both libraries and
+    dnl executables is -R. The -R options are cumulative.
+    for found_dir in $ltrpathdirs; do
+      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+    done
+  fi
+  popdef([P_A_C_K])
+  popdef([PACKLIBS])
+  popdef([PACKUP])
+  popdef([PACK])
+  popdef([NAME])
+])
+
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
+AC_DEFUN([AC_LIB_APPENDTOVAR],
+[
+  for element in [$2]; do
+    haveit=
+    for x in $[$1]; do
+      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      [$1]="${[$1]}${[$1]:+ }$element"
+    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 "$acl_hardcode_libdir_flag_spec" && test "$acl_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" \
+             && test "X$dir" != "X/usr/$acl_libdirstem2"; 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" \
+                    && test "X$dir" != "X/usr/$acl_libdirstem2"; 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 "$acl_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:+$acl_hardcode_libdir_separator}$dir"
+            done
+            acl_save_libdir="$libdir"
+            libdir="$alldirs"
+            eval flag=\"$acl_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=\"$acl_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
new file mode 100644
index 0000000..1601cea
--- /dev/null
+++ b/m4/lib-prefix.m4
@@ -0,0 +1,224 @@
+# lib-prefix.m4 serial 7 (gettext-0.18)
+dnl Copyright (C) 2001-2005, 2008-2010 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
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+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
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  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],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+      fi
+    fi
+])
+  if test $use_additional = yes; then
+    dnl Potentially add $additional_includedir to $CPPFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/include,
+    dnl   2. if it's already present in $CPPFLAGS,
+    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_includedir" != "X/usr/include"; then
+      haveit=
+      for x in $CPPFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-I$additional_includedir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        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
+          if test -d "$additional_includedir"; then
+            dnl Really add $additional_includedir to $CPPFLAGS.
+            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+          fi
+        fi
+      fi
+    fi
+    dnl Potentially add $additional_libdir to $LDFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/lib,
+    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/$acl_libdirstem"; then
+      haveit=
+      for x in $LDFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-L$additional_libdir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux*) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_libdir"; then
+            dnl Really add $additional_libdir to $LDFLAGS.
+            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+          fi
+        fi
+      fi
+    fi
+  fi
+])
+
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  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"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  $1
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_PREPARE_MULTILIB creates
+dnl - a variable acl_libdirstem, containing the basename of the libdir, either
+dnl   "lib" or "lib64" or "lib/64",
+dnl - a variable acl_libdirstem2, as a secondary possible value for
+dnl   acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
+dnl   "lib/amd64".
+AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+[
+  dnl There is no formal standard regarding lib and lib64.
+  dnl On glibc systems, the current practice is that on a system supporting
+  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+  dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
+  dnl the compiler's default mode by looking at the compiler's library search
+  dnl path. If at least one of its elements ends in /lib64 or points to a
+  dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
+  dnl Otherwise we use the default, namely "lib".
+  dnl On Solaris systems, the current practice is that on a system supporting
+  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
+  dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
+  dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  acl_libdirstem=lib
+  acl_libdirstem2=
+  case "$host_os" in
+    solaris*)
+      dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
+      dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
+      dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
+      dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
+      dnl symlink is missing, so we set acl_libdirstem2 too.
+      AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
+        [AC_EGREP_CPP([sixtyfour bits], [
+#ifdef _LP64
+sixtyfour bits
+#endif
+           ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
+        ])
+      if test $gl_cv_solaris_64bit = yes; then
+        acl_libdirstem=lib/64
+        case "$host_cpu" in
+          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
+          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+        esac
+      fi
+      ;;
+    *)
+      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 ;;
+              */../ | */.. )
+                # Better ignore directories of this form. They are misleading.
+                ;;
+              *) searchdir=`cd "$searchdir" && pwd`
+                 case "$searchdir" in
+                   */lib64 ) acl_libdirstem=lib64 ;;
+                 esac ;;
+            esac
+          fi
+        done
+        IFS="$acl_save_IFS"
+      fi
+      ;;
+  esac
+  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+])
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 56666f0..d7c043f 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1312,7 +1312,7 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -1324,9 +1324,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*)
+	    LD="${LD-ld} -m elf32lppclinux"
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+	  powerpc64-*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -1345,7 +1355,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+	  powerpcle-*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
@@ -1688,7 +1701,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
@@ -2512,17 +2526,6 @@ freebsd* | dragonfly*)
   esac
   ;;
 
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@ -2639,7 +2642,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
@@ -2669,14 +2672,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # Add ABI-specific directories to the system library path.
-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2688,6 +2687,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -3247,10 +3258,6 @@ freebsd* | dragonfly*)
   fi
   ;;
 
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3289,11 +3296,11 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -4041,7 +4048,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -4105,7 +4112,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4340,7 +4347,7 @@ m4_if([$1], [CXX], [
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -4582,6 +4589,9 @@ m4_if([$1], [CXX], [
       ;;
     esac
     ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
     ;;
@@ -4644,6 +4654,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
   openbsd*)
     with_gnu_ld=no
     ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4865,7 +4878,7 @@ _LT_EOF
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -5042,6 +5055,7 @@ _LT_EOF
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
+	_LT_TAGVAR(link_all_deplibs, $1)=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -5346,7 +5360,7 @@ _LT_EOF
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -6226,9 +6240,6 @@ if test "$_lt_caught_CXX_error" != yes; then
         _LT_TAGVAR(ld_shlibs, $1)=yes
         ;;
 
-      gnu*)
-        ;;
-
       haiku*)
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
         _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6390,7 +6401,7 @@ if test "$_lt_caught_CXX_error" != yes; then
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
diff --git a/m4/nls.m4 b/m4/nls.m4
new file mode 100644
index 0000000..003704c
--- /dev/null
+++ b/m4/nls.m4
@@ -0,0 +1,32 @@
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl 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..47f36a4
--- /dev/null
+++ b/m4/po.m4
@@ -0,0 +1,449 @@
+# po.m4 serial 17 (gettext-0.18)
+dnl Copyright (C) 1995-2010 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 Release version of the gettext macros. This is used to ensure that
+  dnl the gettext macros and po/Makefile.in.in are in sync.
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+
+  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])
+
+  dnl Support for AM_XGETTEXT_OPTION.
+  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+
+  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"
+])
+
+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
+[
+  XGETTEXT_EXTRA_OPTIONS=
+])
+
+dnl Registers an option to be passed to xgettext in the po subdirectory.
+AC_DEFUN([AM_XGETTEXT_OPTION],
+[
+  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+])
diff --git a/m4/progtest.m4 b/m4/progtest.m4
new file mode 100644
index 0000000..2d804ac
--- /dev/null
+++ b/m4/progtest.m4
@@ -0,0 +1,92 @@
+# progtest.m4 serial 6 (gettext-0.18)
+dnl Copyright (C) 1996-2003, 2005, 2008-2010 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>, 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],
+[
+# 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_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
+  AC_MSG_RESULT([$][$1])
+else
+  AC_MSG_RESULT([no])
+fi
+AC_SUBST([$1])dnl
+])
diff --git a/missing b/missing
index cdea514..db98974 100755
--- a/missing
+++ b/missing
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
@@ -160,7 +160,7 @@ give_advice ()
       ;;
    autom4te*)
       echo "You might have modified some maintainer files that require"
-      echo "the 'automa4te' program to be rebuilt."
+      echo "the 'autom4te' program to be rebuilt."
       program_details 'autom4te'
       ;;
     bison*|yacc*)
diff --git a/po/LINGUAS b/po/LINGUAS
index 1342011..904d332 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -4,6 +4,8 @@ bg
 cs
 da
 de
+en@boldquot
+en@quot
 en_GB
 eo
 es
diff --git a/po/Makefile.am b/po/Makefile.am
deleted file mode 100644
index d757b11..0000000
--- a/po/Makefile.am
+++ /dev/null
@@ -1,87 +0,0 @@
-##  Makefile.am -- an automake template for Makefile.in file
-##  Copyright (C) 2009 Chris Bagwell and Sane Developers.
-##
-##  This file is part of the "Sane" build infra-structure.  See
-##  included LICENSE file for license information.
-
-# See po/README for documentation.
-
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-MSGMERGE = @MSGMERGE@ -w75
-
-GETTEXT_PACKAGE = @PACKAGE@
-
-TMP_FILE_DIR = .tmp
-
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo ""; fi)
-SRC_FILES=$(shell if test -r $(srcdir)/POTFILES; then grep -v "^\#" $(srcdir)/POTFILES; else echo ""; fi)
-
-PO_FILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-MO_FILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.mo "; done)
-
-EXTRA_DIST = README LINGUAS POTFILES
-EXTRA_DIST += $(PO_FILES)
-
-
-if ENABLE_TRANSLATIONS
-EXTRA_DIST += $(GETTEXT_PACKAGE).pot
-INSTALL_TRANSLATIONS = install-translations
-UNINSTALL_TRANSLATIONS = uninstall-translations
-ALL = all-mos
-else
-INSTALL_TRANSLATIONS = 
-UNINSTALL_TRANSLATIONS = 
-ALL = 
-endif
-
-all: $(ALL)
-
-all-mos: $(MO_FILES)
-
-.po.mo:
-	@echo "generating $@ from $^"
-	@$(MSGFMT) -o $@ $^
-
-install-translations:
-	@for lang in $(PO_LINGUAS) ; do \
-	  dir=$(localedir)/$${lang}/LC_MESSAGES ; \
-	  echo "installing sane-backends $${lang}.mo to $${dir}/$(GETTEXT_PACKAGE).mo..." ; \
-	 $(mkinstalldirs) $(DESTDIR)$${dir} && \
-	 $(INSTALL_DATA) $${lang}.mo $(DESTDIR)$${dir}/$(GETTEXT_PACKAGE).mo ; \
-	 done
-
-install-data-local: $(INSTALL_TRANSLATIONS)
-
-uninstall-translations:
-	@for lang in $(PO_LINGUAS) ; do \
-	   dir=$(localedir)/$${lang}/LC_MESSAGES ; \
-	   echo removing $${dir}/$(GETTEXT_PACKAGE).mo ; \
-	   rm -f $(DESTDIR)$${dir}/$(GETTEXT_PACKAGE).mo ; \
-	 done
-
-uninstall-local: $(UNINSTALL_TRANSLATIONS)
-
-clean-local:
-	rm -f *.mo
-	rm -f *.old
-	rm -f *.pot
-
-$(GETTEXT_PACKAGE).pot: $(SRC_FILES)
-	@echo "creating $@ from $^"
-	@$(XGETTEXT) -d$(GETTEXT_PACKAGE) -kSANE_I18N --flag=SANE_I18N:1:no-c-format -f $(srcdir)/POTFILES -D$(srcdir)
-	@mv $(GETTEXT_PACKAGE).po $(GETTEXT_PACKAGE).pot
-
-update: $(GETTEXT_PACKAGE).pot
-	@for lang in $(PO_LINGUAS) ; do \
-	   pofile=$${lang}.po ; \
-	   if test ! -f $${pofile} ; then \
-	     echo "creating $${pofile}" ; \
-	     cp template.po $${pofile} ; \
-	   fi ; \
-	   echo "updating $${pofile}" ; \
-	   cp $${pofile} $${pofile}.old  ; \
-	   $(MSGMERGE) $${pofile}.old $< -o $${pofile} ; \
-	   rm -f $${pofile}.old template.po ; \
-	 done 
-
diff --git a/po/Makefile.in b/po/Makefile.in
deleted file mode 100644
index 5cfb684..0000000
--- a/po/Makefile.in
+++ /dev/null
@@ -1,552 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 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@
-
-# See po/README for documentation.
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@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@
-@ENABLE_TRANSLATIONS_TRUE@am__append_1 = $(GETTEXT_PACKAGE).pot
-subdir = po
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/mkinstalldirs README
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/byteorder.m4 \
-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/sane/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AVAHI_CFLAGS = @AVAHI_CFLAGS@
-AVAHI_LIBS = @AVAHI_LIBS@
-AWK = @AWK@
-BACKENDS = @BACKENDS@
-BACKEND_CONFS_ENABLED = @BACKEND_CONFS_ENABLED@
-BACKEND_LIBS_ENABLED = @BACKEND_LIBS_ENABLED@
-BACKEND_MANS_ENABLED = @BACKEND_MANS_ENABLED@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTCLEAN_FILES = @DISTCLEAN_FILES@
-DLLTOOL = @DLLTOOL@
-DL_LIBS = @DL_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-DVIPS = @DVIPS@
-DYNAMIC_FLAG = @DYNAMIC_FLAG@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
-GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
-GPHOTO2_LIBS = @GPHOTO2_LIBS@
-GREP = @GREP@
-HAVE_GPHOTO2 = @HAVE_GPHOTO2@
-IEEE1284_LIBS = @IEEE1284_LIBS@
-INCLUDES = @INCLUDES@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LOCKPATH = @INSTALL_LOCKPATH@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JPEG_LIBS = @JPEG_LIBS@
-LATEX = @LATEX@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
-LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
-LIBV4L_LIBS = @LIBV4L_LIBS@
-LINKER_RPATH = @LINKER_RPATH@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCKPATH_GROUP = @LOCKPATH_GROUP@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINDEX = @MAKEINDEX@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MATH_LIB = @MATH_LIB@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@ -w75
-NM = @NM@
-NMEDIT = @NMEDIT@
-NUMBER_VERSION = @NUMBER_VERSION@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_LIBS = @PNG_LIBS@
-PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@
-PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RESMGR_LIBS = @RESMGR_LIBS@
-SANEI_SANEI_JPEG_LO = @SANEI_SANEI_JPEG_LO@
-SANE_CONFIG_PATH = @SANE_CONFIG_PATH@
-SCSI_LIBS = @SCSI_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SNMP_CFLAGS = @SNMP_CFLAGS@
-SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
-SNMP_LIBS = @SNMP_LIBS@
-SOCKET_LIBS = @SOCKET_LIBS@
-STRICT_LDFLAGS = @STRICT_LDFLAGS@
-STRIP = @STRIP@
-SYSLOG_LIBS = @SYSLOG_LIBS@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
-TIFF_LIBS = @TIFF_LIBS@
-USB_LIBS = @USB_LIBS@
-VERSION = @VERSION@
-V_MAJOR = @V_MAJOR@
-V_MINOR = @V_MINOR@
-V_REV = @V_REV@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-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@
-configdir = @configdir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-effective_target = @effective_target@
-exec_prefix = @exec_prefix@
-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@
-locksanedir = @locksanedir@
-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_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-GETTEXT_PACKAGE = @PACKAGE@
-TMP_FILE_DIR = .tmp
-PO_LINGUAS = $(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo ""; fi)
-SRC_FILES = $(shell if test -r $(srcdir)/POTFILES; then grep -v "^\#" $(srcdir)/POTFILES; else echo ""; fi)
-PO_FILES = $(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-MO_FILES = $(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.mo "; done)
-EXTRA_DIST = README LINGUAS POTFILES $(PO_FILES) $(am__append_1)
-@ENABLE_TRANSLATIONS_FALSE@INSTALL_TRANSLATIONS = 
-@ENABLE_TRANSLATIONS_TRUE@INSTALL_TRANSLATIONS = install-translations
-@ENABLE_TRANSLATIONS_FALSE@UNINSTALL_TRANSLATIONS = 
-@ENABLE_TRANSLATIONS_TRUE@UNINSTALL_TRANSLATIONS = uninstall-translations
-@ENABLE_TRANSLATIONS_FALSE@ALL = 
-@ENABLE_TRANSLATIONS_TRUE@ALL = all-mos
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .mo .po
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu po/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
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-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 "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$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
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_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 clean-local mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-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-local
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	clean-local cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-local install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-local
-
-
-all: $(ALL)
-
-all-mos: $(MO_FILES)
-
-.po.mo:
-	@echo "generating $@ from $^"
-	@$(MSGFMT) -o $@ $^
-
-install-translations:
-	@for lang in $(PO_LINGUAS) ; do \
-	  dir=$(localedir)/$${lang}/LC_MESSAGES ; \
-	  echo "installing sane-backends $${lang}.mo to $${dir}/$(GETTEXT_PACKAGE).mo..." ; \
-	 $(mkinstalldirs) $(DESTDIR)$${dir} && \
-	 $(INSTALL_DATA) $${lang}.mo $(DESTDIR)$${dir}/$(GETTEXT_PACKAGE).mo ; \
-	 done
-
-install-data-local: $(INSTALL_TRANSLATIONS)
-
-uninstall-translations:
-	@for lang in $(PO_LINGUAS) ; do \
-	   dir=$(localedir)/$${lang}/LC_MESSAGES ; \
-	   echo removing $${dir}/$(GETTEXT_PACKAGE).mo ; \
-	   rm -f $(DESTDIR)$${dir}/$(GETTEXT_PACKAGE).mo ; \
-	 done
-
-uninstall-local: $(UNINSTALL_TRANSLATIONS)
-
-clean-local:
-	rm -f *.mo
-	rm -f *.old
-	rm -f *.pot
-
-$(GETTEXT_PACKAGE).pot: $(SRC_FILES)
-	@echo "creating $@ from $^"
-	@$(XGETTEXT) -d$(GETTEXT_PACKAGE) -kSANE_I18N --flag=SANE_I18N:1:no-c-format -f $(srcdir)/POTFILES -D$(srcdir)
-	@mv $(GETTEXT_PACKAGE).po $(GETTEXT_PACKAGE).pot
-
-update: $(GETTEXT_PACKAGE).pot
-	@for lang in $(PO_LINGUAS) ; do \
-	   pofile=$${lang}.po ; \
-	   if test ! -f $${pofile} ; then \
-	     echo "creating $${pofile}" ; \
-	     cp template.po $${pofile} ; \
-	   fi ; \
-	   echo "updating $${pofile}" ; \
-	   cp $${pofile} $${pofile}.old  ; \
-	   $(MSGMERGE) $${pofile}.old $< -o $${pofile} ; \
-	   rm -f $${pofile}.old template.po ; \
-	 done 
-
-# 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/po/Makefile.in.in b/po/Makefile.in.in
new file mode 100644
index 0000000..83d8838
--- /dev/null
+++ b/po/Makefile.in.in
@@ -0,0 +1,444 @@
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2007, 2009-2010 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
+# License but which still want to provide support for the GNU gettext
+# 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.18
+GETTEXT_MACRO_VERSION = 0.18
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+SHELL = /bin/sh
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
+datadir = @datadir@
+localedir = @localedir@
+gettextsrcdir = $(datadir)/gettext/po
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+# 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
+MSGCONV = msgconv
+MSGFILTER = msgfilter
+
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
+
+POTFILES = \
+
+CATALOGS = @CATALOGS@
+
+# Makevars gets inserted here. (Don't remove this line!)
+
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+
+.po.mo:
+	@echo "$(MSGFMT) -c -o $@ $<"; \
+	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+
+.po.gmo:
+	@lang=`echo $* | sed -e 's,.*/,,'`; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
+	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+	sed -e '/^#/d' $< > t-$@
+	mv t-$@ $@
+
+
+all: check-macro-version all-@USE_NLS@
+
+all-yes: stamp-po
+all-no:
+
+# Ensure that the gettext macros and this Makefile.in.in are in sync.
+check-macro-version:
+	@test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+	  || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
+	       exit 1; \
+	     }
+
+# $(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 LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
+	  package_gnu='GNU '; \
+	else \
+	  package_gnu=''; \
+	fi; \
+	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; \
+	case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	  '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
+	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --files-from=$(srcdir)/POTFILES.in \
+	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	      --msgid-bugs-address="$$msgid_bugs_address" \
+	    ;; \
+	  *) \
+	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --files-from=$(srcdir)/POTFILES.in \
+	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	      --package-name="$${package_gnu}@PACKAGE@" \
+	      --package-version='@VERSION@' \
+	      --msgid-bugs-address="$$msgid_bugs_address" \
+	    ;; \
+	esac
+	test ! -f $(DOMAIN).po || { \
+	  if test -f $(srcdir)/$(DOMAIN).pot; then \
+	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+	    if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+	    else \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+	      mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	    fi; \
+	  else \
+	    mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	  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$$//'`; \
+	if test -f "$(srcdir)/$${lang}.po"; then \
+	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
+	  cd $(srcdir) \
+	    && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	           '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
+	           *) \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
+	         esac; \
+	       }; \
+	else \
+	  $(MAKE) $${lang}.po-create; \
+	fi
+
+
+install: install-exec install-data
+install-exec:
+install-data: install-data-@USE_NLS@
+	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
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(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"; \
+	  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 \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	      rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+	    fi; \
+	  done; \
+	done
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+	else \
+	  : ; \
+	fi
+installdirs-data-no:
+installdirs-data-yes:
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(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 \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	    fi; \
+	  done; \
+	done
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+uninstall-data-no:
+uninstall-data-yes:
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+	    rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	  done; \
+	done
+
+check: all
+
+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
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES *.mo
+
+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 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: stamp-po $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	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) || exit 1; \
+	  else \
+	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+	  fi; \
+	done
+
+update-po: Makefile
+	$(MAKE) $(DOMAIN).pot-update
+	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-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+	cd $(srcdir); \
+	if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	       '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	       *) \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	     esac; \
+	   }; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "msgmerge for $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+	@:
+
+# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
+# because execution permission bits may not work on the current file system.
+# Use @SHELL@, which is the shell determined by autoconf for the use by its
+# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+	cd $(top_builddir) \
+	  && @SHELL@ ./config.status $(subdir)/$@.in po-directories
+
+force:
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..bb5d203
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,45 @@
+#  Makevars -- snippet for inclusion in po/ -*- Makefile -*-
+#  Copyright (C) 2016  Olaf Meeuwissen and the SANE developers
+#
+#  This file is part of the SANE build infra-structure.  See the
+#  included LICENSE file for license information.
+
+#  Message domain to use.
+#  Normally this is the same as the $(PACKAGE_TARNAME), but note that
+#  gettext does not support that variable (last checked for 0.18.1).
+DOMAIN = $(PACKAGE)
+
+#  Copyright holder for the messages in the $(DOMAIN).pot file.
+#  This is the (set of) copyright holder(s) of files listed in the
+#  POTFILES.in file (insofar they contributed translatable strings).
+#  The translators are expected to transfer the copyright for their
+#  translations to the $(COPYRIGHT_HOLDER)(s), or to disclaim their
+#  copyright thereby putting their strings in the public domain.
+COPYRIGHT_HOLDER = The SANE developers
+
+#  Where to report problems with translatable strings, that is, the
+#  strings in $(DOMAIN).pot or those that really should be in there.
+MSGID_BUGS_ADDRESS = $(PACKAGE_BUGREPORT)
+
+#  Directory locations.
+#  The $(top_builddir) should be relative to the directory that holds
+#  this Makevars file.  The $(subdir) ought to be set such that a `cd
+#  $(top_builddir)/$(subdir)` has no effect (assuming no symlinks in
+#  the path).
+top_builddir = ..
+subdir = po
+
+#  Options to pass to xgettext and other gettext utilities.
+#  Additional options may also by specified using AM_XGETTEXT_OPTION
+#  in `$(top_srcdir)/configure.ac`.  See Makefile.in.in and Rules-*
+#  for variables available
+XGETTEXT_OPTIONS  = --keyword=SANE_I18N
+XGETTEXT_OPTIONS += --flag=SANE_I18N:1:no-c-format
+MSGMERGE_OPTIONS  = --width=75
+
+#  Locale categories, in addition to LC_MESSAGES, for which message
+#  catalogs are to be used.
+EXTRA_LOCALE_CATEGORIES =
+
+EXTRA_DIST  = README
+EXTRA_DIST += Rules-automake
diff --git a/po/POTFILES b/po/POTFILES
deleted file mode 100644
index e98d666..0000000
--- a/po/POTFILES
+++ /dev/null
@@ -1,111 +0,0 @@
-# List of source files containing translatable strings
-# paths relative to po
-../include/sane/saneopts.h
-../backend/sane_strstatus.c
-
-../backend/artec_eplus48u.c
-
-../backend/avision.h
-
-../backend/canon630u.c
-../backend/canon.c
-../backend/canon-sane.c
-
-../backend/canon_dr.c
-../backend/canon_dr.h
-
-../backend/cardscan.c
-../backend/cardscan.h
-
-../backend/epjitsu.c
-../backend/epjitsu.h
-
-../backend/epson.c
-../backend/epson.h
-../backend/epson2.c
-../backend/epson2.h
-
-../backend/fujitsu.c
-../backend/fujitsu.h
-
-../backend/genesys.c
-
-../backend/gt68xx.c
-../backend/gt68xx_low.h
-
-../backend/hp3500.c
-../backend/hp3900_sane.c
-../backend/hp5400_sane.c
-../backend/hp5590.c
-../backend/hp-option.c
-../backend/hp-option.h
-
-../backend/kodak.c
-../backend/kodak.h
-
-../backend/kvs1025.h
-../backend/kvs1025_opt.c
-../backend/kvs20xx.c
-
-../backend/kvs20xx_opt.c
-
-../backend/kvs40xx.c
-../backend/kvs40xx_opt.c
-
-../backend/leo.c
-../backend/leo.h
-
-../backend/lexmark.c
-
-../backend/ma1509.c
-
-../backend/magicolor.c
-
-../backend/matsushita.c
-../backend/matsushita.h
-
-../backend/microtek2.c
-../backend/microtek2.h
-
-../backend/mustek.c
-../backend/mustek_usb.c
-../backend/mustek_usb2.c
-
-../backend/niash.c
-
-../backend/pixma.c
-../backend/pixma_sane_options.c
-
-../backend/plustek.c
-../backend/plustek_pp.c
-
-../backend/pnm.c
-
-../backend/rts8891.c
-
-../backend/sceptre.c
-../backend/sceptre.h
-
-../backend/sm3840.c
-
-../backend/snapscan.c
-../backend/snapscan-options.c
-
-../backend/stv680.c
-../backend/stv680.h
-
-../backend/teco1.c
-../backend/teco1.h
-../backend/teco2.c
-../backend/teco2.h
-../backend/teco3.c
-../backend/teco3.h
-
-../backend/test.c
-
-../backend/u12.c
-
-../backend/umax1220u.c
-../backend/umax.c
-../backend/umax_pp.c
-
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..9988ff5
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,111 @@
+# List of source files containing translatable strings
+# paths relative to the top source directory
+include/sane/saneopts.h
+backend/sane_strstatus.c
+
+backend/artec_eplus48u.c
+
+backend/avision.h
+
+backend/canon630u.c
+backend/canon.c
+backend/canon-sane.c
+
+backend/canon_dr.c
+backend/canon_dr.h
+
+backend/cardscan.c
+backend/cardscan.h
+
+backend/epjitsu.c
+backend/epjitsu.h
+
+backend/epson.c
+backend/epson.h
+backend/epson2.c
+backend/epson2.h
+
+backend/fujitsu.c
+backend/fujitsu.h
+
+backend/genesys.c
+
+backend/gt68xx.c
+backend/gt68xx_low.h
+
+backend/hp3500.c
+backend/hp3900_sane.c
+backend/hp5400_sane.c
+backend/hp5590.c
+backend/hp-option.c
+backend/hp-option.h
+
+backend/kodak.c
+backend/kodak.h
+
+backend/kvs1025.h
+backend/kvs1025_opt.c
+backend/kvs20xx.c
+
+backend/kvs20xx_opt.c
+
+backend/kvs40xx.c
+backend/kvs40xx_opt.c
+
+backend/leo.c
+backend/leo.h
+
+backend/lexmark.c
+
+backend/ma1509.c
+
+backend/magicolor.c
+
+backend/matsushita.c
+backend/matsushita.h
+
+backend/microtek2.c
+backend/microtek2.h
+
+backend/mustek.c
+backend/mustek_usb.c
+backend/mustek_usb2.c
+
+backend/niash.c
+
+backend/pixma.c
+backend/pixma_sane_options.c
+
+backend/plustek.c
+backend/plustek_pp.c
+
+backend/pnm.c
+
+backend/rts8891.c
+
+backend/sceptre.c
+backend/sceptre.h
+
+backend/sm3840.c
+
+backend/snapscan.c
+backend/snapscan-options.c
+
+backend/stv680.c
+backend/stv680.h
+
+backend/teco1.c
+backend/teco1.h
+backend/teco2.c
+backend/teco2.h
+backend/teco3.c
+backend/teco3.h
+
+backend/test.c
+
+backend/u12.c
+
+backend/umax1220u.c
+backend/umax.c
+backend/umax_pp.c
+
diff --git a/po/README b/po/README
deleted file mode 100644
index ff0ad6a..0000000
--- a/po/README
+++ /dev/null
@@ -1,70 +0,0 @@
-2003-02-06
-
-This directory contains translations for the options of the SANE backends.
-They are only used if the gettext tools are found by configure.
-You will need GNU gettext: xgettext, msgfmt and msgmerge. The translations
-are used at least by the frontends XSane and quiteinsane.
-
-
-Users: I want to just read the description of SANE options in my language
--------------------------------------------------------------------------
-
-Use XSane (>=0.90) or your favourite frontend that supports translations, read
-the documentation and set the environment variable LANG to your local setting.
-Example for German: export LANG=de_DE ; xsane
-
-
-Translators: I want to update existing translations
----------------------------------------------------
-
-* cd po ; make update
-* Edit lang.po, add/change translations. (with lang = your
-  language, e.g. "de"). You need an editor that is capable of using the
-  encoding UTF8 (unicode).
-* Add your name to the header. Update the "last translator" field.
-* make ; make install
-
-
-Translators: I want to add a new language
------------------------------------------
-
-* Edit po/LINGUAS, add your language to ALL_LINGUAS.
-* Run automake -OR- update po/Makefile.in accordingly by hand.
-* ./configure
-* Go ahead with "I want to update existing translations".
-
-
-Backend developers: I want to add internationalization support for my backend
------------------------------------------------------------------------------
-
-* Edit the source code of the backend and add SANE_I18N to the appropriate
-  strings. Mark the descriptions (desc) and titles of options with
-  SANE_I18N(). Do the same for string lists used in options. The name of
-  options must NOT be marked. Do NOT mark macros. Especially you don't need
-  to mark standard option strings like SANE_TITLE_NUM_OPTIONS as this is
-  already done in saneopts.h.
-  Examples: s->opt[5].title = SANE_I18N("Enhancement");
-            #define STANDARD_FORMAT SANE_I18N("a4 Paper")
-* Edit po/POTFILES. Add all source code files that contain strings marked
-  by SANE_I18N() to that file.
-* If you want to also add a new language, see above.
-* ./configure
-* See "Update existing translations" or "Add a new language".
-
-
-Frontend developers: I want to add internationalization support for my frontend
--------------------------------------------------------------------------------
-
-* The Makefile installs files called "sane-backends.mo" in the directory
-  "$(prefix)/share/locale/lang/LC_MESSAGES/", e.g.:
-  "/usr/local/share/locale/de/LC_MESSAGES/sane-backends.mo". For every
-  language exactly one .mo file is installed. Earlier releases of
-  sane-backends installed one file per backend, e.g. sane-umax.mo. For
-  backward compatibility, frontends may want to check for these files, also.
-* As mentioned above, GNU gettext is used. 
-* With other NLS implementations, converting the mo files may work.
-
-
-
-Bugs:
-- Using sed to include macros into *.pot isn't nice.
diff --git a/po/Rules-quot b/po/Rules-quot
new file mode 100644
index 0000000..af52487
--- /dev/null
+++ b/po/Rules-quot
@@ -0,0 +1,47 @@
+# Special Makefile rules for English message catalogs with quotation marks.
+
+DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
+
+.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
+
+.insert-header.po-update-en:
+	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
+	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	ll=`echo $$lang | sed -e 's/@.*//'`; \
+	LC_ALL=C; export LC_ALL; \
+	cd $(srcdir); \
+	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "creation of $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+en@quot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
+
+en@boldquot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
+
+mostlyclean: mostlyclean-quot
+mostlyclean-quot:
+	rm -f *.insert-header
diff --git a/po/bg.gmo b/po/bg.gmo
new file mode 100644
index 0000000..755c8ff
--- /dev/null
+++ b/po/bg.gmo
diff --git a/po/bg.po b/po/bg.po
index 25a8401..0e83697 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -4,421 +4,415 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends 1.0.11\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
 "PO-Revision-Date: 2007-12-17 22:59+0100\n"
 "Last-Translator: Pavel Constantinov <pavelconstantinov@bigfoot.com>\n"
 "Language-Team:  <>\n"
-"Language: \n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr "Брой опции"
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr ""
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "Геометри�"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "Повишение"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "Разширено"
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr ""
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "Превю"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr "�аложи монохромно превю"
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr "Дълбочина на бита"
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Режим на �каниране"
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "Скоро�т на �каниране"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr "Източник на �каниране"
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr "�аложи връщане на главата"
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "Горен л�в x"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "Горен л�в y"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "Долен де�ен x"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "Долен де�ен y"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Резолюци� на �каниране"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "Резолюци� по Х"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Резолюци� по Y"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr ""
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, fuzzy, no-c-format
 msgid "Page height"
 msgstr "О�ветление"
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr "Използвай лична гама-таблица"
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr "Интензитет на образа"
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr "Интензитет - червено"
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr "Интензитет - зелено"
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr "Интензитет - �иньо"
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr "Ярко�т"
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "Контра�т"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr "Размер на зърното"
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr "Полутон"
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "Степен на черното"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "Степен на б�лото"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr "Степен на б�лото - червено"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
 msgstr "Степен на б�лото - зелено"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr "Степен на б�лото - �иньо"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "С�нка"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr "С�нка - червено"
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr "С�нка - зелено"
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr "С�нка - �иньо"
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr "О�ветление"
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr "О�ветление - червено"
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr "О�ветление - зелено"
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr "О�ветление - �иньо"
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr "�юан�"
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr "�а�итено�т"
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "Име на файла"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr "Размер на полутонови� де�ен"
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "Полутонов де�ен"
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr "Вържи резолюци�та по X и Y"
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "�егатив"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "Калибраци� на каче�твото"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr "Двойна оптиче�ка резолюци�"
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr "Вържи RGB"
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr "Праг"
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr "Корекци� на аналоговата гама"
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr "�налогова гама - червено"
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr "�налогова гама - зелено"
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr "�налогова гама - �иньо"
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr "Вържи аналоговата гама"
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr "Загрей лампата"
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr "�агла�и време за ек�пониране"
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr "�агла�и време за ек�пониране - червено"
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr "�агла�и време за ек�пониране - зелено"
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr "�агла�и време за ек�пониране - �иньо"
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr "Сканирай време за ек�пониране"
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr "Сканирай време за ек�пониране - червено"
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr "Сканирай време за ек�пониране - зелено"
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr "Сканирай време за ек�пониране - �иньо"
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr "У�танови време за ек�пониране"
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr "�агла�и плътно�тта на лампата"
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr "Сканирай плътно�тта на лампата"
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr "У�танови плътно�тта на лампата"
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr "Изкл. лампа при изход"
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
@@ -427,37 +421,37 @@ msgstr ""
 "Опци� �амо за четене, ко�то указва колко опции поддържа дадено "
 "у�трой�тво."
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, fuzzy, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "Кратък �пи�ък резолюции"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr ""
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, fuzzy, no-c-format
 msgid "Image modification options"
 msgstr "Брой опции"
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, fuzzy, no-c-format
 msgid "Hardware specific options"
 msgstr "Резолюци� на �каниране"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr ""
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr "Пои�кай �каниране за превю на каче�твото."
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -469,7 +463,7 @@ msgstr ""
 "минаване намал�ва изи�квани�та към паметта и времето за �каниране на "
 "превюто."
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
@@ -478,81 +472,81 @@ msgstr ""
 "Брой битове на �емпъл, типичните �тойно�ти �а 1 за \"line-art\" и 8 за "
 "мултибитово �каниране."
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr "Избира режим на �каниране (lineart, монохромно или цветно)."
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr "Указва �коро�тта, � ко�то ще �е извърши �канирането."
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr "Избира източника за �канирането (напр. фидер за документи)."
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr "Оттук можете да наложите връщане на главата."
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "Горна л�ва x позици� на площта за �каниране."
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "Горна л�ва y позици� на площта за �каниране."
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "Долна д��на x позици� на площта за �каниране."
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "Долна д��на y позици� на площта за �каниране."
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr "�агла�� резолюци�та на �канираното изображение."
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr "�агла�� хоризонталната резолюци� на �канираното изображение."
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr "�агла�� вертикалната резолюци� на �канираното изображение."
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
 "sheet-fed scans."
 msgstr ""
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, fuzzy, no-c-format
 msgid "Specifies the height of the media."
 msgstr "�агла�� резолюци�та на �канираното изображение."
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid ""
 "Determines whether a builtin or a custom gamma-table should be used."
 msgstr ""
 "Определ� дали да �е използва вградена или пер�онализирана гама-таблица."
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -563,32 +557,32 @@ msgstr ""
 "червени�, зелени� и �ини� канал едновременно (т.е., това е таблица на "
 "гамата за интензитета)."
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr "Таблица � гама-корекци�та за червени� �ектор."
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr "Таблица � гама-корекци�та за зелени� �ектор."
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr "Таблица � гама-корекци�та на �ини� �ектор."
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr "�а�тройва �рко�тта на полученото изображение."
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr "�а�тройва контра�та на полученото изображение."
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
@@ -597,77 +591,77 @@ msgstr ""
 "Избира \" зърнено�тта\" на полученото изображение. По-ни�ките �тойно�ти "
 "дават по-изо�трени изображени�."
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr ""
 "Избира дали полученото изображение да бъде полутонизирано (dithered)."
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr "Избира кое ниво на о�ветено�т �е �м�та за \"черно\"."
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr "Избира кое ниво на о�ветено�т �е �м�та за \"б�ло\"."
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr "Избира кое ниво на червена о�ветено�т �е �м�та за \"б�ло\"."
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr "Избира кое ниво на зелена о�ветено�т �е �м�та за \"б�ло\"."
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr "Избира кое ниво на �ин� о�ветено�т �е �м�та за \"б�ло\"."
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr "Избира кое ниво на червена о�ветено�т �е �м�та за \"черно\"."
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr "Избира кое ниво на зелена о�ветено�т �е �м�та за \"черно\"."
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr "Избира кое ниво на �ин� о�ветено�т �е �м�та за \"черно\"."
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr ""
 "Избира кое ниво на червена о�ветено�т �е �м�та за \"изц�ло червено\"."
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid ""
 "Selects what green radiance level should be considered \"full green\"."
 msgstr ""
 "Избира кое ниво на зелена о�ветено�т �е �м�та за \"изц�ло зелено\"."
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid ""
 "Selects what blue radiance level should be considered \"full blue\"."
 msgstr "Избира кое ниво на �ин� о�ветено�т �е �м�та за \"изц�ло �иньо\"."
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr "�агла�� оттенъка (в �иньото ниво) на полученото изображение."
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
@@ -677,12 +671,12 @@ msgstr ""
 "по�в�ва при добиването на изображение � фотоапарат. По-големите "
 "�тойно�ти причин�ват повече blooming."
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr "Файловото име на изображението, което ще �е зареди."
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
@@ -691,7 +685,7 @@ msgstr ""
 "�агла�� размера на де�ена за полутонизиране (dithering), който ще �е "
 "използва при �канирането на изображени� � полутонове."
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
@@ -699,287 +693,287 @@ msgstr ""
 "Определ� де�ена за полутонизиране (dithering) при �канирането на "
 "изображени� � полутонове."
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr "Използвай еднакви �тойно�ти за X и Y резолюци�та."
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr "Размени черно и б�ло"
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr "Извърши каче�твена б�ла калибраци�"
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr "Използвай лещи, които удво�ват оптичната резолюци�"
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr "В RGB режим, използвай �ъщите �тойно�ти за в�еки цв�т"
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr "Избери минимална �рко�т за получаване на б�ла точка"
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr "�налогова гама-корекци�"
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr "�налогова гама-корекци� за червено"
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr "�налогова гама-корекци� за зелено"
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr "�налогова гама-корекци� за �иньо"
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr "Загрей лампата преди �каниране"
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr "Дефинирай времето на ек�понаци� за калибраци�"
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr "Дефинирай времето на ек�понаци� за калибраци� на червено"
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr "Дефинирай времето на ек�понаци� за калибраци� на зелено"
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr "Дефинирай времето на ек�понаци� за калибраци� на �иньо"
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr "Дефинирай времето на ек�понаци� за �каниране"
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr "Дефинирай времето на ек�понаци� за �каниране на червено"
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr "Дефинирай времето на ек�понаци� за �каниране на зелено"
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr "Дефинирай времето на ек�понаци� за �каниране на �иньо"
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr "Позволи избор на време за ек�понаци�"
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr "Дефинирай плътно�тта на лампата за калибраци�"
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr "Дефинирай плътно�тта на лампата за �канирането"
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr "Позволи избор на плътно�т на лампата"
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr "Изключи лампата при излизане от програмата"
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, fuzzy, no-c-format
 msgid "Scan button"
 msgstr "Резолюци� на �каниране"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, fuzzy, no-c-format
 msgid "Email button"
 msgstr "Изчакай нати�кане на бутона"
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, fuzzy, no-c-format
 msgid "Fax button"
 msgstr "Изчакай нати�кане на бутона"
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, fuzzy, no-c-format
 msgid "Copy button"
 msgstr "Изчакай нати�кане на бутона"
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr ""
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, fuzzy, no-c-format
 msgid "Cover open"
 msgstr "Цветови де�ен"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "Цв�т"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr "Цветно Lineart"
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr "Цветно � полутонове"
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "Сиво"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr "Полутон"
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "Lineart"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, fuzzy, no-c-format
 msgid "Operation not supported"
 msgstr "��ма поддръжка на полутонове"
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, fuzzy, no-c-format
 msgid "Document feeder jammed"
 msgstr "Feeder за документи"
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, fuzzy, no-c-format
 msgid "Document feeder out of documents"
 msgstr "Feeder за документи"
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, no-c-format
 msgid "Scanner cover is open"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "Ви��щи опции"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr "�агла�и ви��щи опции за повишителните контроли."
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "Калибраци�"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr "Калибрирай преди �ледващото �каниране"
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
@@ -988,12 +982,12 @@ msgstr ""
 "�ко това е позволено, у�трой�твото ще �е калибрира преди �ледващото "
 "�каниране. Иначе, калибраци�та �е прави �амо преди първото пу�кане."
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr "Извърши �амо корекци� на от�енките"
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -1005,1059 +999,1050 @@ msgstr ""
 "оф�ет и време на ек�понаци� - в�е едно вградени или от конфигурационни� "
 "файл."
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr ""
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr "�омер на кадъра за �каниране"
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr "Избира номера на кадъра за �каниране"
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, fuzzy, no-c-format
 msgid "Duplex scan"
 msgstr "Дуплек�но"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid ""
 "Duplex scan provide a scan of the front and back side of the document"
 msgstr ""
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr "Калибрирай �кенера"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr "Задължителна калибраци� преди �каниране"
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr "Сканиране в �ива �кала"
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr "�аправи �каниране в �ива �кала, не цветно"
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr "�налогово увеличение"
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr "Повиши или намали аналоговото увеличение на CCD матрицата"
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "Корекци� на гамата"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr "Избира кривата на коригираната гама"
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr ""
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr ""
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, fuzzy, no-c-format
 msgid "No transparency correction"
 msgstr "Цветова корекци�."
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr ""
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr ""
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, fuzzy, no-c-format
 msgid "Negatives"
 msgstr "�егатив"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, fuzzy, no-c-format
 msgid "Slides"
 msgstr "Солидно б�ло"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "�втоматично"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, fuzzy, no-c-format
 msgid "Normal speed"
 msgstr "�ормално"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, fuzzy, no-c-format
 msgid "1/2 normal speed"
 msgstr "2х2 нормално"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, fuzzy, no-c-format
 msgid "1/3 normal speed"
 msgstr "3х3 нормално"
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, fuzzy, no-c-format
 msgid "rounded parameter"
 msgstr "Параметри за мъгл�во�т"
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr ""
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, fuzzy, no-c-format
 msgid "ADF jam"
 msgstr "ADF"
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr ""
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, fuzzy, no-c-format
 msgid "lamp failure"
 msgstr "Стойно�т на гамата"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr ""
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr ""
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr ""
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr ""
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr ""
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, fuzzy, no-c-format
 msgid "transparency unit lamp failure"
 msgstr "Прозрачно�т"
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr ""
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr ""
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr ""
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr ""
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr ""
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr ""
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr ""
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr ""
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr ""
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr ""
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr ""
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr ""
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr ""
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr ""
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr ""
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr ""
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr ""
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr ""
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr ""
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, fuzzy, no-c-format
 msgid "transparency unit shading error"
 msgstr "Прозрачно�т"
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr ""
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, fuzzy, no-c-format
 msgid "film scanner"
 msgstr "flatbed �кенер"
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr "flatbed �кенер"
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr "Тип екран (film)"
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr ""
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, fuzzy, no-c-format
 msgid "Negative film type"
 msgstr "�егативен филм"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, fuzzy, no-c-format
 msgid "Selects the negative film type"
 msgstr "Избира картинка за те�тване"
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, fuzzy, no-c-format
 msgid "Hardware resolution"
 msgstr "Резолюци� на �каниране"
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, fuzzy, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "Покажи кратък �пи�ък � резолюции"
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr ""
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, fuzzy, no-c-format
 msgid "Auto focus"
 msgstr "�вто изваждане"
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, fuzzy, no-c-format
 msgid "Enable/disable auto focus"
 msgstr "Забрани предв. фоку�"
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr ""
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr ""
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, fuzzy, no-c-format
 msgid "Manual focus position"
 msgstr "Фик�ирай позици� на фоку�а"
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr ""
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr ""
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr ""
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "Огледален образ"
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, fuzzy, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "Прави хоризонтален огледален образ."
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, fuzzy, no-c-format
 msgid "Auto exposure"
 msgstr "У�танови време за ек�пониране"
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, fuzzy, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr "Позволи избор на време за ек�понаци�"
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, fuzzy, no-c-format
 msgid "Calibration now"
 msgstr "Калибраци�"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, fuzzy, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Дефинирай режима на калибраци�"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr ""
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr ""
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, fuzzy, no-c-format
 msgid "Reset scanner"
 msgstr "�кенер � sheetfeed"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, fuzzy, no-c-format
 msgid "Reset the scanner"
 msgstr "�кенер � sheetfeed"
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr ""
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, fuzzy, no-c-format
 msgid "Eject film after each scan"
 msgstr "Извади документа �лед �каниране"
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr ""
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr ""
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr ""
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr ""
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr ""
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, fuzzy, no-c-format
 msgid "Document feeder extras"
 msgstr "Feeder за документи"
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, fuzzy, no-c-format
 msgid "Flatbed only"
 msgstr "Flatbed"
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr ""
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, fuzzy, no-c-format
 msgid "Transparency unit"
 msgstr "Прозрачно�т"
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr ""
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, fuzzy, no-c-format
 msgid "Negative film"
 msgstr "�егативен филм"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, fuzzy, no-c-format
 msgid "Positive or negative film"
 msgstr "Позитивен екран"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr ""
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr ""
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, fuzzy, no-c-format
 msgid "Transparency ratio"
 msgstr "Прозрачно�т"
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, fuzzy, no-c-format
 msgid "Select film type"
 msgstr "Тип екран (film)"
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, fuzzy, no-c-format
 msgid "Select the film type"
 msgstr "Избира полутона"
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "Flatbed"
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, no-c-format
 msgid "ADF Front"
 msgstr ""
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, fuzzy, no-c-format
 msgid "ADF Back"
 msgstr "ADF"
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, fuzzy, no-c-format
 msgid "ADF Duplex"
 msgstr "Дуплек�но"
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, fuzzy, no-c-format
 msgid "Card Front"
 msgstr "Печат"
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, no-c-format
 msgid "Card Back"
 msgstr ""
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, fuzzy, no-c-format
 msgid "Card Duplex"
 msgstr "Дуплек�но"
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "Червено"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "Зелено"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "Синьо"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, fuzzy, no-c-format
 msgid "Enhance Red"
 msgstr "Повишение"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, fuzzy, no-c-format
 msgid "Enhance Green"
 msgstr "Повишение"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, fuzzy, no-c-format
 msgid "Enhance Blue"
 msgstr "Повишение"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr "�ищо"
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr ""
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr ""
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr "Симплек�но"
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr "Дуплек�но"
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr "Прозрачно�т"
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr "�втоматично подаване на документи"
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "Позитивен екран"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "�егативен филм"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr "Фоку� върху �тъклото"
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr "Фоку� 2,5 мм над �тъклото"
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr "Полутон A (Твърд тон)"
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr "Полутон B (Мек тон)"
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr "Полутон C (Net Screen)"
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr "Dither A (4x4 Bayer)"
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr "Dither B (4x4 Spiral)"
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr "Dither C (4x4 Net Screen)"
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr "Dither D (8x4 Net Screen)"
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr "Технологи� за оконтра�тиране на тек�та"
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr "Свали де�ен B"
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr "Свали де�ен B"
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "Без корекци�"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr "По потребител�ка дефиници�"
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr "Матрични принтери"
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr "Лазерни принтери"
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "Ма�тилено�труйни принтери"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr "CRT монитори"
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "По подразбиране"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr "Принтиране � ви�ока гъ�тота"
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr "Принтиране � ни�ка гъ�тота"
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr "Принтиране � ви�ок контра�т"
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr "По потребител�ка дефиници� (Гама=1,0)"
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr "По потребител�ка дефиници� (Гама=1,8)"
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr "CD"
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr "A5 портрет"
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr "A5 пейзаж"
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr "Letter"
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr "A4"
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "Мак�."
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr "Режим на �каниране"
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr "Избира полутона"
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr "Dropout"
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr "Избира dropout-а."
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr "Избира �рко�тта."
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr "О�трота"
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr "Цветова корекци�."
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr ""
 "�агла�� таблицата за цветова корекци� на избраното изходно у�трой�тво."
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr "Коефициенти на цветова корекци�"
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr "Матрично умножаване на RGB"
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr "Изме�ти зелено към червено"
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr "Изме�ти зелено към �иньо"
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr "Изме�ти червено към зелено"
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr "Изме�ти червено към �иньо"
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr "Изме�ти �иньо към зелено"
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr "Изме�ти �иньо към червено"
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr "�агла�� �тепента на зелено"
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr "Добав� към червеното �поред �тепента на зелено"
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr "Добав� към �иньото �поред �тепента на зелено"
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr "Добав� към зеленото �поред �тепента на червено"
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr "�агла�� �тепента на червено"
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr "Добав� към �иньото �поред �тепента на червено"
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr "Добав� към зеленото �поред �тепента на �иньо"
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr "Добав� към червеното �поред �тепента на �иньо"
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, no-c-format
 msgid "Controls blue level"
 msgstr "�агла�� �тепента на �иньо"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr "�аправи огледален образ на изображението"
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr "Бързо превю"
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr "�втоматична �егментаци� на площ"
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr "Кратък �пи�ък резолюции"
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr "Покажи кратък �пи�ък � резолюции"
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr "Увеличение"
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr "Определ� фактора на увеличение за �кенера"
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr "Бързо форматиране"
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr "Оборудване по избор"
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr "Извади"
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr "Извади ли�та от ADF"
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr "�вто изваждане"
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr "Извади документа �лед �каниране"
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr ""
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr ""
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, fuzzy, no-c-format
 msgid "Bay"
 msgstr "Bay"
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, fuzzy, no-c-format
 msgid "Select bay to scan"
 msgstr "Избор на bay за �каниране"
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
@@ -2067,24 +2052,24 @@ msgstr ""
 "или таблицата, определена от потребител�, ко�то може да �е �вали на "
 "�кенера."
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr "Позици� на фоку�а"
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
 msgstr ""
 "�агла�� позици�та на фоку�а или върху �тъклото, или 2,5 мм над него"
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr "Изчакай нати�кане на бутона"
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
@@ -2093,366 +2078,1109 @@ msgstr ""
 "След изпращане на команда за �каниране, изчакай, докато бутонът на "
 "�кенера не е нати�нат, преди да започнеш �амото �каниране."
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr ""
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, fuzzy, no-c-format
 msgid "Positive Slide"
 msgstr "Позитивен екран"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, fuzzy, no-c-format
 msgid "Negative Slide"
 msgstr "�егативен филм"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr ""
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, fuzzy, no-c-format
 msgid "User defined CCT profile"
 msgstr "По потребител�ка дефиници�"
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr "Вкл."
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr "Изкл."
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr "Dither"
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, fuzzy, no-c-format
 msgid "Diffusion"
 msgstr "Раз�ейка на грешките"
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, fuzzy, no-c-format
 msgid "White"
 msgstr "Степен на б�лото"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, fuzzy, no-c-format
 msgid "Black"
 msgstr "Степен на черното"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, fuzzy, no-c-format
 msgid "Continue"
 msgstr "Кондиционално"
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr ""
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr "Хоризонтално"
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, fuzzy, no-c-format
 msgid "Horizontal bold"
 msgstr "Хоризонтално"
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, fuzzy, no-c-format
 msgid "Horizontal narrow"
 msgstr "Хоризонтално"
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr "8x8 вертикална черта"
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, fuzzy, no-c-format
 msgid "Vertical bold"
 msgstr "8x8 вертикална черта"
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr ""
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr ""
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, fuzzy, no-c-format
 msgid "Front"
 msgstr "Печат"
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr ""
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
+msgid "Gamma function exponent"
 msgstr ""
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
 #, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
+msgid "Changes intensity of midtones"
+msgstr ""
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr ""
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr ""
+
+#: backend/fujitsu.c:3165
+#, fuzzy, no-c-format
+msgid "Halftone type"
+msgstr "Полутон"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr ""
+
+#: backend/fujitsu.c:3210
+#, fuzzy, no-c-format
+msgid "Perform outline extraction"
+msgstr "Груба калибраци�"
+
+#: backend/fujitsu.c:3221
+#, fuzzy, no-c-format
+msgid "Emphasis"
+msgstr "Подчертаване на образа"
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr ""
+
+#: backend/fujitsu.c:3240
+#, fuzzy, no-c-format
+msgid "Separation"
+msgstr "�а�итено�т"
+
+#: backend/fujitsu.c:3241
+#, fuzzy, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr "Позвол�ва автоматично определ�не на прага за lineart �каниране."
+
+#: backend/fujitsu.c:3252
+#, fuzzy, no-c-format
+msgid "Mirroring"
+msgstr "Огледален образ"
+
+#: backend/fujitsu.c:3253
+#, fuzzy, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "Прави хоризонтален огледален образ."
+
+#: backend/fujitsu.c:3270
+#, fuzzy, no-c-format
+msgid "White level follower"
+msgstr "Степен на б�лото - �иньо"
+
+#: backend/fujitsu.c:3271
+#, fuzzy, no-c-format
+msgid "Control white level follower"
+msgstr "�агла�� �тепента на червено"
+
+#: backend/fujitsu.c:3289
+#, fuzzy, no-c-format
+msgid "BP filter"
+msgstr "Цветно Lineart"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr ""
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr "Изглаждане"
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr ""
+
+#: backend/fujitsu.c:3323
+#, fuzzy, no-c-format
+msgid "Gamma curve"
+msgstr "Стойно�т на гамата"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, fuzzy, no-c-format
+msgid "Threshold curve"
+msgstr "Праг"
+
+#: backend/fujitsu.c:3347
+#, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+
+#: backend/fujitsu.c:3369
+#, fuzzy, no-c-format
+msgid "Threshold white"
+msgstr "Праг"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr ""
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, fuzzy, no-c-format
+msgid "Noise removal"
+msgstr "Редуциране на шума"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr ""
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr ""
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr ""
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr ""
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr ""
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr ""
+
+#: backend/fujitsu.c:3508
+#, fuzzy, no-c-format
+msgid "Auto width detection"
+msgstr "Без корекци�"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr ""
+
+#: backend/fujitsu.c:3526
+#, fuzzy, no-c-format
+msgid "Auto length detection"
+msgstr "Без корекци�"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr ""
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr ""
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr ""
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr ""
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr ""
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr ""
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr ""
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
+msgstr ""
+
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3708
+#, fuzzy, no-c-format
+msgid "DF recovery mode"
+msgstr "Режим на захранване"
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr ""
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3748
+#, fuzzy, no-c-format
+msgid "Advanced paper protection"
+msgstr "Обнови опциите"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+
+#: backend/fujitsu.c:3768
+#, fuzzy, no-c-format
+msgid "Staple detection"
+msgstr "Без корекци�"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr ""
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+
+#: backend/fujitsu.c:3809
+#, fuzzy, no-c-format
+msgid "Dropout color"
+msgstr "Dropout"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+
+#: backend/fujitsu.c:3833
+#, fuzzy, no-c-format
+msgid "Buffer mode"
+msgstr "Режим на захранване"
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr ""
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr ""
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr ""
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+
+#: backend/fujitsu.c:3911
+#, fuzzy, no-c-format
+msgid "Off timer"
+msgstr "Изкл. лампа"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+
+#: backend/fujitsu.c:3930
+#, fuzzy, no-c-format
+msgid "Duplex offset"
+msgstr "Оф�ет - �иньо"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr ""
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "Оф�ет - зелено"
+
+#: backend/fujitsu.c:3949
+#, fuzzy, no-c-format
+msgid "Adjust green/red offset"
+msgstr "Оф�ет - зелено"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr "Оф�ет - �иньо"
+
+#: backend/fujitsu.c:3967
+#, fuzzy, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "�агла�� оф�ета на �ини� канал"
+
+#: backend/fujitsu.c:3980
+#, no-c-format
+msgid "Low Memory"
+msgstr ""
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+
+#: backend/fujitsu.c:3996
+#, fuzzy, no-c-format
+msgid "Duplex side"
+msgstr "Дуплек�но"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr ""
+
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr ""
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr ""
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
 msgstr ""
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr ""
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+
+#: backend/fujitsu.c:4095
+#, fuzzy, no-c-format
+msgid "Endorser Options"
+msgstr "Обнови опциите"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr ""
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr ""
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr ""
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr ""
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr ""
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr ""
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr ""
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr ""
+
+#: backend/fujitsu.c:4253
+#, fuzzy, no-c-format
+msgid "Endorser direction"
+msgstr "Редуциране на шума"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr ""
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr ""
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr ""
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr ""
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr ""
+
+#: backend/fujitsu.c:4344
+#, fuzzy, no-c-format
+msgid "A3 paper"
+msgstr "От харти�"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4356
+#, fuzzy, no-c-format
+msgid "B4 paper"
+msgstr "От харти�"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4368
+#, fuzzy, no-c-format
+msgid "A4 paper"
+msgstr "От харти�"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4380
+#, fuzzy, no-c-format
+msgid "B5 paper"
+msgstr "От харти�"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr ""
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr ""
+
+#: backend/fujitsu.c:4429
+#, no-c-format
+msgid "Scanner in power saving mode"
+msgstr ""
+
+#: backend/fujitsu.c:4452
+#, fuzzy, no-c-format
+msgid "Manual feed"
+msgstr "Ръчен предв. фоку�"
+
+#: backend/fujitsu.c:4453
+#, fuzzy, no-c-format
+msgid "Manual feed selected"
+msgstr "Ръчен предв. фоку�"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr ""
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr ""
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr ""
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr ""
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr ""
+
+#: backend/fujitsu.c:4513
+#, fuzzy, no-c-format
+msgid "Hardware error code"
+msgstr "Резолюци� на �каниране"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr ""
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr ""
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr ""
+
+#: backend/fujitsu.c:4537
+#, fuzzy, no-c-format
+msgid "Imprinter ink level"
+msgstr "Степен на б�лото"
+
+#: backend/fujitsu.c:4548
+#, fuzzy, no-c-format
+msgid "Density"
+msgstr "Интензитет - червено"
+
+#: backend/fujitsu.c:4549
+#, no-c-format
+msgid "Density dial"
+msgstr ""
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, fuzzy, no-c-format
+msgid "Duplex switch"
+msgstr "Дуплек�но"
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, fuzzy, no-c-format
 msgid "Extras"
 msgstr "Ек�тра бързо"
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, fuzzy, no-c-format
-msgid "Threshold curve"
-msgstr "Праг"
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr ""
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
 "instead on hardware lineart."
 msgstr ""
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, fuzzy, no-c-format
 msgid "Disable interpolation"
 msgstr "Забрани връщане на главата"
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
 "than the vertical resolution this disables horizontal interpolation."
 msgstr ""
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "Цветно Lineart"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "Калибраци�"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Дефинирай режима на калибраци�"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Режим калибраци�"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, fuzzy, no-c-format
 msgid "Lamp off time"
 msgstr "Изкл. лампа"
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
 "of 0 means, that the lamp won't be turned off."
 msgstr ""
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, fuzzy, no-c-format
 msgid "Lamp off during scan"
 msgstr "Груба калибраци�"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr ""
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, fuzzy, no-c-format
 msgid "File button"
 msgstr "Изчакай нати�кане на бутона"
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr ""
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, fuzzy, no-c-format
 msgid "Power button"
 msgstr "Изчакай нати�кане на бутона"
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "Изчакай нати�кане на бутона"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, fuzzy, no-c-format
 msgid "Need calibration"
 msgstr "Груба калибраци�"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, fuzzy, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr "Задължителна калибраци� преди �каниране"
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, no-c-format
 msgid "Buttons"
 msgstr ""
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr "Калибриране"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, fuzzy, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "Започване на калибраци�та."
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, fuzzy, no-c-format
 msgid "Clear calibration"
 msgstr "Груба калибраци�"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, fuzzy, no-c-format
 msgid "Clear calibration cache"
 msgstr "Режим калибраци�"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr "�даптиране на прозрачно�тта"
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr ""
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr "Опции за дебъг"
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "�втоматично загр�ване"
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -2461,12 +3189,12 @@ msgstr ""
 "Загр�вай, докато �рко�тта на лампата е по�то�нна, вме�то да на�то�ваш за "
 "60 �екундно загр�ване."
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "Ц�ло�тно �каниране"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
@@ -2475,12 +3203,12 @@ msgstr ""
 "Сканирай ц�лата площ за �каниране, вкл. парчето за калибраци�. "
 "Внимавайте. �е избирайте ц�лата ви�очина. Тази опци� е �амо за те�тване."
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Груба калибраци�"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2491,12 +3219,12 @@ msgstr ""
 "опци� е забранена, има опции за ръчната нагла�а на аналоговите параметри "
 "на фронтенда. Тази опци� е разрешена по подразбиране. Само за те�тване."
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "Груба калибраци� �амо за първото �каниране"
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2507,12 +3235,12 @@ msgstr ""
 "�кенери и пе�ти време. �ко �рко�тта на изображението е различна при "
 "в��ко �каниране, забранете тази опци�. Само за те�тване"
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, fuzzy, no-c-format
 msgid "Backtrack lines"
 msgstr "�аложи връщане на главата"
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2521,83 +3249,83 @@ msgid ""
 "omitting lines."
 msgstr ""
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Стойно�т на гамата"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr "�агла�� �тойно�тта на гамата за в�ички канали."
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, fuzzy, no-c-format
 msgid "Geometry Group"
 msgstr "Геометри�"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, fuzzy, no-c-format
 msgid "Scan Mode Group"
 msgstr "Режим на �каниране"
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr "Солидно б�ло"
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, fuzzy, no-c-format
 msgid "Scanner model"
 msgstr "Режим на �каниране"
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, fuzzy, no-c-format
 msgid "Disable gamma correction"
 msgstr "Корекци� на аналоговата гама"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, fuzzy, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "Корекци� на гамата"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, fuzzy, no-c-format
 msgid "Disable white shading correction"
 msgstr "Извърши �амо корекци� на от�енките"
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2605,12 +3333,12 @@ msgid ""
 "avoids depth emulation."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, fuzzy, no-c-format
 msgid "Emulate Grayscale"
 msgstr "В �ива �кала"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2618,368 +3346,362 @@ msgid ""
 "circumstances."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
 "analyze them."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, fuzzy, no-c-format
 msgid "Reset chipset"
 msgstr "�кенер � sheetfeed"
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, fuzzy, no-c-format
 msgid "Information"
 msgstr "Игнорирай калибраци�та"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, fuzzy, no-c-format
 msgid "Chipset name"
 msgstr "Име на файла"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Unknown"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, fuzzy, no-c-format
 msgid "Shows the chipset ID"
 msgstr "�кенер � sheetfeed"
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, fuzzy, no-c-format
 msgid "Scan counter"
 msgstr "Източник на �каниране"
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, fuzzy, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr "Избира номера на кадъра за �каниране"
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, fuzzy, no-c-format
 msgid "Update information"
 msgstr "Обнови опциите"
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr "Изображение"
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, fuzzy, no-c-format
 msgid "offset X"
 msgstr "Оф�ет"
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, fuzzy, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr "Горна л�ва x позици� на площта за �каниране."
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, fuzzy, no-c-format
 msgid "offset Y"
 msgstr "Оф�ет"
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, fuzzy, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr "Горна л�ва x позици� на площта за �каниране."
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr "Включва/изключва лампата."
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr ""
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr "ADF"
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, fuzzy, no-c-format
 msgid "TMA Slides"
 msgstr "Солидно б�ло"
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, fuzzy, no-c-format
 msgid "TMA Negatives"
 msgstr "�егатив"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, fuzzy, no-c-format
 msgid "Color (48 bits)"
 msgstr "Цв�т 48"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, fuzzy, no-c-format
 msgid "Extend lamp timeout"
 msgstr "Изкл. лампа"
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr ""
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr "Изчакай нати�кане на бутона"
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, fuzzy, no-c-format
 msgid "Waits for button before scanning"
 msgstr "Загрей лампата преди �каниране"
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, fuzzy, no-c-format
 msgid "Advanced Options"
 msgstr "Обнови опциите"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr "8х8 грубо"
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr "Име на файла"
 
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr "Bayer"
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr "8х8 по избор"
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "�вто"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr "NTSC RGB"
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr "XPA RGB"
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, fuzzy, no-c-format
 msgid "Pass-through"
 msgstr "Pass-through"
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "NTSC �иво"
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr "XPA �иво"
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "По-бавно"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr "�ормално"
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "По-бързо"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr "Ек�тра бързо"
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr "2-пик�елно"
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr "4-пик�елно"
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr "8-пик�елно"
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr "Печат"
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, no-c-format
 msgid "Film-strip"
 msgstr "Тип филм"
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr "XPA"
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr "Кондиционално"
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, fuzzy, no-c-format
 msgid "Experiment"
 msgstr "Време за ек�понаци�"
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, no-c-format
 msgid "Sharpening"
 msgstr "Изо�тр�не"
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr "�агла�и �тойно�тта за изо�тр�не."
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr "�втоматичен праг"
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr "Позвол�ва автоматично определ�не на прага за lineart �каниране."
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr "Изглаждане"
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr "Избира полутона"
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr "Отзареждане на меди�та �лед �каниране."
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, no-c-format
 msgid "Unloads the media after a scan."
 msgstr "Отзарежда меди�та �лед �каниране."
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, no-c-format
 msgid "Change document"
 msgstr "Смени документа"
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr "Смени документа."
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr "Отзареди"
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr "Отзареди документа."
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, no-c-format
 msgid "Start calibration process."
 msgstr "Започване на калибраци�та."
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, no-c-format
 msgid "Media"
 msgstr "Меди�"
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr "�агла�и типа меди�."
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr "Време за ек�понаци�"
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -2992,462 +3714,461 @@ msgstr ""
 "�лайдове и \"�егатив\" за негативен филм. За тъмни (подек�понирани) "
 "изображени� можете да завишите тази �тойно�т."
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, no-c-format
 msgid "Color Matrix"
 msgstr "Цветна матрица"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, no-c-format
 msgid "Set the scanners color matrix."
 msgstr "�агла�� цветната матрица на �кенера."
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr "Цветна матрица по избор."
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, no-c-format
 msgid "Mono Color Matrix"
 msgstr "Едноцветна матрица"
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr "Цветна матрица по избор за �каниране в �ива �кала."
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, no-c-format
 msgid "Mirror horizontal"
 msgstr "Огледало хоризонтално"
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, no-c-format
 msgid "Mirror image horizontally."
 msgstr "Прави хоризонтален огледален образ."
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, no-c-format
 msgid "Mirror vertical"
 msgstr "Огледало вертикално"
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, no-c-format
 msgid "Mirror image vertically."
 msgstr "Прави вертикален огледален образ"
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, no-c-format
 msgid "Update options"
 msgstr "Обнови опциите"
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, no-c-format
 msgid "Update options."
 msgstr "Обнови опциите."
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr "8-битово извеждане."
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr ""
 "Вътрешно използвай по-гол�ма дълбочина от о�ем бита, но извеждай �амо "
 "о�ем бита."
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr "Изчакай бутона"
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr "Изчакай за нати�кане на бутона преди �каниране."
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr "Изключи лампата"
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr "Изключва лампата на �кенера"
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "Размер на харти�та"
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr "�втоматично разделение"
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, fuzzy, no-c-format
 msgid "Landscape"
 msgstr "A5 пейзаж"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr ""
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, no-c-format
 msgid "Length control mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, fuzzy, no-c-format
 msgid "Manual feed mode"
 msgstr "Ръчен предв. фоку�"
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, fuzzy, no-c-format
 msgid "Manual feed timeout"
 msgstr "Ръчен предв. фоку�"
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr "Позволи дупрек�но (дву�транно) �каниране"
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr "Физиче�ки размер на харти�та в ADF"
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, fuzzy, no-c-format
 msgid "halftone"
 msgstr "Полутон"
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, fuzzy, no-c-format
 msgid "color"
 msgstr "Цв�т"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, fuzzy, no-c-format
 msgid "continuous"
 msgstr "Кондиционално"
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, fuzzy, no-c-format
 msgid "off"
 msgstr "Изкл."
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, fuzzy, no-c-format
 msgid "bayer_64"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, fuzzy, no-c-format
 msgid "bayer_16"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, fuzzy, no-c-format
 msgid "halftone_32"
 msgstr "Полутон"
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, fuzzy, no-c-format
 msgid "halftone_64"
 msgstr "Полутон"
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, fuzzy, no-c-format
 msgid "diffusion"
 msgstr "Раз�ейка на грешките"
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, fuzzy, no-c-format
 msgid "normal"
 msgstr "�ормално"
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, fuzzy, no-c-format
 msgid "light"
 msgstr "О�ветление"
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, fuzzy, no-c-format
 msgid "From scanner"
 msgstr "flatbed �кенер"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr "От харти�"
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, fuzzy, no-c-format
 msgid "default"
 msgstr "По подразбиране"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, fuzzy, no-c-format
 msgid "smooth"
 msgstr "Изглаждане"
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, fuzzy, no-c-format
 msgid "low"
 msgstr "По-бавно"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, fuzzy, no-c-format
 msgid "medium"
 msgstr "Средно"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, fuzzy, no-c-format
 msgid "red"
 msgstr "Червено"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, fuzzy, no-c-format
 msgid "green"
 msgstr "Зелено"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, fuzzy, no-c-format
 msgid "Sets the scan source"
 msgstr "Източник на �каниране"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr "Режим на захранване"
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr "�агла�� режима на захранване"
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, fuzzy, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr "Забрани предв. фоку�"
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, fuzzy, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr "Забрани предв. фоку�"
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, fuzzy, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "�агла�� режима на захранване"
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, fuzzy, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr "�агла�� режима на захранване"
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr "�втоматичен праг"
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
@@ -3456,515 +4177,502 @@ msgstr ""
 "�втоматично нагла�� �рко�тта, контра�та, нивото на б�ло, гамата, "
 "редукци�та на шума и подчертаването на образа"
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "Редуциране на шума"
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr "�амали изолирани� точков шум"
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr "Подчертаване на образа"
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr "�агла�� подчертаването на образа"
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr "Гама"
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, fuzzy, no-c-format
 msgid "Lamp color"
 msgstr "Вкл. лампа"
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, fuzzy, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr "Включва/изключва лампата."
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, fuzzy, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "Прави вертикален огледален образ"
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
 "length of actual paper or logical document length."
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "Корекци� на гамата"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, fuzzy, no-c-format
 msgid "High sensivity"
 msgstr "Принтиране � ви�ока гъ�тота"
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, fuzzy, no-c-format
 msgid "Low sensivity"
 msgstr "Принтиране � ни�ка гъ�тота"
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, fuzzy, no-c-format
 msgid "err_diffusion"
 msgstr "Раз�ейка на грешките"
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, fuzzy, no-c-format
 msgid "No detection"
 msgstr "Без корекци�"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, fuzzy, no-c-format
 msgid "Normal mode"
 msgstr "�ормално"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, fuzzy, no-c-format
 msgid "Enhanced mode"
 msgstr "Повишение"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
 "divides long paper by the length which is set in Document Size option."
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, fuzzy, no-c-format
 msgid "Automatic threshold mode"
 msgstr "�втоматичен праг"
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, fuzzy, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr "�втоматичен праг"
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, fuzzy, no-c-format
 msgid "Set chroma of red"
 msgstr "�агла�� поредно�тта на фреймовете."
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, fuzzy, no-c-format
 msgid "chroma of blue"
 msgstr "С�нка - �иньо"
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, fuzzy, no-c-format
 msgid "Set chroma of blue"
 msgstr "Изме�ти червено към �иньо"
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr "Diamond"
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr "8x8 груб Fatting"
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr "8x8 фин Fatting"
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr "8x8 Bayer"
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr "8x8 вертикална черта"
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr "Увеличение"
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr "�а�тройки по увеличение на цветните канали"
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, no-c-format
 msgid "Gray gain"
 msgstr "Увеличение - �иво"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr "�агла�� увеличение на �иви� канал"
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, no-c-format
 msgid "Red gain"
 msgstr "Увеличение - червено"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr "�агла�� увеличение на червени� канал"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, no-c-format
 msgid "Green gain"
 msgstr "Увеличение - зелено"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr "�агла�� увеличение на зелени� канал"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, no-c-format
 msgid "Blue gain"
 msgstr "Увеличение - �иньо"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr "�агла�� увеличение на �ини� канал"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr "Bayer Dither 16"
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr "Bayer Dither 64"
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr "Полутон Dot 32"
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr "Полутон Dot 64"
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr "Раз�ейка на грешките"
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr "Режим 1"
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr "Режим 2"
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr "Режим 3"
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr "От б�л"
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr "Изглаждане"
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr "�и�ко"
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr "Средно"
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr "Ви�око"
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr "CRT"
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "Една �траница"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "В�ички �траници"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, fuzzy, no-c-format
 msgid "sheetfed scanner"
 msgstr "�кенер � sheetfeed"
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr "Сива �кала 4 бита"
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr "Сива �кала 8 бита"
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr "Сенки, полутонове, �ветли тонове, време за ек�пониране"
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr "Специални опции"
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr "Цветови балан�"
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr "Забрани връщане на главата"
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr "При отм�тане, �кенерът не връща главата обратно"
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr "Превключи лампата на flatbed-а"
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr "Превключва лампата на flatbed-а"
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr "Калибраци� от бекенда"
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid ""
 "If checked the color calibration before a scan is done by the backend"
@@ -3972,42 +4680,42 @@ msgstr ""
 "�ко отметнете тук, цветовата калибраци� преди �канирането �е прави от "
 "бекенда"
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr "Използвай адаптера за 35мм �ветлинна капачка"
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr "Тази опци� изключва лампата на flatbed-а по време на �каниране"
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "Каче�твено �каниране"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr "�ай-ви�око каче�тво, по-ни�ка �коро�т"
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "Бързо �каниране"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr "�ай-ви�ока �коро�т, по-ни�ко каче�тво"
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr "�втоматично пригаждане на прага"
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
@@ -4016,67 +4724,67 @@ msgstr ""
 "�ко отметнете тук, бекендът автоматично ще потър�и оптимална �тойно�та "
 "за прага."
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr "Избира режима за корекци� на гамата."
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr "Вържи гамата"
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr "Използва �ъщите �тойно�ти за в�ички цветови канали."
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr "Скаларна гама"
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr "Избира �тойно�т за �каларната гама-корекци�."
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr "Скаларна гама - червено"
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr "Избира �тойно�т за �каларната гама-корекци� (червен канал)"
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr "Скаларна гама - зелено"
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr "Избира �тойно�т за �каларната гама-корекци� (зелен канал)."
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr "Скаларна гама - �иньо"
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr "Избира �тойно�т за �каларната гама-корекци� (�ин канал)."
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr "Канал"
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
@@ -4084,207 +4792,207 @@ msgstr ""
 "Избира цветовата лента. \"Master\" означава, че в�ички цветова �а "
 "за�егнати."
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr "Полутон"
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr "Избира кое ниво на о�ветено�т ще �е �м�та за \"50 % �иво\"."
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr "Полутон - червено"
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr "Избира кое ниво на о�ветено�т ще �е �м�та за \"50 % червено\"."
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr "Полутон - зелено"
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr "Избира кое ниво на о�ветено�т ще �е �м�та за \"50% зелено\"."
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr "Полутон - �иньо"
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr "Избира кое ниво на о�ветено�т ще �е �чита за \"50 % �иньо\"."
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr "Балан� - червено"
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr "Фактор за балан�иране на червеното. 100% означава без корекци�."
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr "Балан� - зелено"
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr "Фактор за балан�иране на зеленото. 100% означава без корекци�."
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr "Балан� - �иньо"
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr "Фактор за балан�иране на �иньото. 100% означава без корекци�."
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr "Балан� от фърмуера"
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr "�агла�� за �тойно�ти на цветови балан� предвидените от firmware-а."
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "�ай-бавно"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "По-бавно"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "По-бързо"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "�ай-бързо"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr "8х8 грубо"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr "8х8 нормално"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr "8х8 фино"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr "8х8 много фино"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr "6х6 нормално"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr "5х5 грубо"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr "5х5 фино"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr "4х4 грубо"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr "4х4 нормално"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr "4х4 фино"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr "3х3 нормално"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr "2х2 нормално"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr "8х8 по избор"
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr "6х6 по избор"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr "5х5 по избор"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr "4х4 по избор"
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr "3х3 по избор"
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr "2х2 по избор"
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr "Бърз �ив режим"
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr "Сканирай в бърз �ив режим (по-ни�ко каче�тво)."
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
@@ -4293,117 +5001,117 @@ msgstr ""
 "Пои�кай в�ички превюта да �е прав�т в най-бърз (ни�кокаче�твен) режим. "
 "Това може да е безцветен режим или режим � ни�ка резолюци�."
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, fuzzy, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr "Загрей лампата"
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr ""
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, fuzzy, no-c-format
 msgid "Turn lamp off"
 msgstr "Включва/изключва лампата"
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, fuzzy, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr "Превключва лампата на flatbed-а"
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr "Ярко�т - червено"
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr "�агла�� �рко�тта на червени� канал на полученото изображение."
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr "Ярко�т - зелено"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr "�агла�� �рко�тта на зелени� канал на полученото изображение."
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr "Ярко�т - �иньо"
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr "�агла�� �рко�тта на �ини� канал на полученото изображение."
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "Контра�т - червен канал"
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr "�агла�� контра�та на червени� канал на полученото изображение."
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "Контра�т - зелен канал"
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr "�агла�� контра�та на зелени� канал на полученото изображение."
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "Контра�т - �ин канал"
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr "�агла�� контра�та на �ини� канал на полученото изображение."
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr "Цв�т 48"
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr "Цв�т 24"
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr "Сиво 16"
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr "Сиво 8"
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, fuzzy, no-c-format
 msgid "Positive"
 msgstr "Позитивен екран"
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -4412,39 +5120,39 @@ msgstr ""
 "Загр�вай, докато �рко�тта на лампата е по�то�нна, вме�то да на�то�ваш за "
 "40 �екундно загр�ване."
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, fuzzy, no-c-format
 msgid "Negative color"
 msgstr "�егативен филм"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, fuzzy, no-c-format
 msgid "Negative gray"
 msgstr "�егатив"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, no-c-format
 msgid "48 bits color"
 msgstr ""
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
 "mode and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4452,248 +5160,239 @@ msgid ""
 "cancel, press \"GRAY\" button."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:143
+#: backend/pixma_sane_options.c:232
 #, no-c-format
-msgid "Gamma function exponent"
+msgid "Update button state"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:144
+#: backend/pixma_sane_options.c:244
 #, no-c-format
-msgid "Changes intensity of midtones"
+msgid "Button 1"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:258
 #, no-c-format
-msgid "Update button state"
+msgid "Button 2"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:272
 #, no-c-format
-msgid "Button 1"
+msgid "Type of original to scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:286
 #, no-c-format
-msgid "Button 2"
+msgid "Target operation type"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:348
 #, no-c-format
-msgid "Type of original to scan"
+msgid "ADF Waiting Time"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:349
 #, no-c-format
-msgid "Target operation type"
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
 msgstr ""
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr "Прозрачно�т"
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr ""
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr ""
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr ""
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, fuzzy, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "Груба калибраци�"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr ""
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, fuzzy, no-c-format
 msgid "Calibration data cache"
 msgstr "Режим калибраци�"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr ""
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, fuzzy, no-c-format
 msgid "Performs calibration"
 msgstr "Груба калибраци�"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr ""
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr ""
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, fuzzy, no-c-format
 msgid "Warmup-time"
 msgstr "Загрей лампата"
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, fuzzy, no-c-format
 msgid "Warmup-time in seconds."
 msgstr "Загрей лампата"
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, fuzzy, no-c-format
 msgid "Lampoff-time"
 msgstr "Изкл. лампа"
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, fuzzy, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr "Загрей лампата"
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, fuzzy, no-c-format
 msgid "Analog frontend"
 msgstr "�налогова гама - червено"
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr "Оф�ет - червено"
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr "Оф�ет - зелено"
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr "Оф�ет - �иньо"
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, fuzzy, no-c-format
 msgid "Red lamp off"
 msgstr "Включва/изключва лампата"
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, fuzzy, no-c-format
 msgid "Green lamp off"
 msgstr "Включва/изключва лампата"
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, fuzzy, no-c-format
 msgid "Blue lamp off"
 msgstr "Включва/изключва лампата"
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr ""
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr "Цв�т 36"
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr ""
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr ""
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr "�аправи произволно"
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr "Избор на източник"
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr "Подобрение на образа"
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr "По�иви"
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr "Зареди образа като �ива �кала."
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr "Симулаци� на тройно минаване"
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
@@ -4702,12 +5401,12 @@ msgstr ""
 "Симулира �кенер � тройно минаване, като връща 3 отделни пъти. Първо "
 "връща зелено, по�ле �иньо, а накра� - червено."
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr "Симулаци� на ръчен �кенер"
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4719,48 +5418,48 @@ msgstr ""
 "тази опци� позвол�ва да те�твате дали фронтендът може да �е �прави "
 "правилно � това."
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid ""
 "Set default values for enhancement controls (brightness & contrast)."
 msgstr "�агла�и ви��щите опции за подобрение (за �рко�тта и контра�та)."
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr "Те�т �амо за четене"
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr "Да видим дали фронтендовете ще �е �прав�т � това"
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr "Таблици за гамата"
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr "Симулаци� на �тату�-код"
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr "�е на�илвай �тату�-код"
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr "�е на�илвай бекенда да връща �тату�-код"
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr "Върни SANE_STATUS_EOF"
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
@@ -4769,12 +5468,12 @@ msgstr ""
 "�акарай бекенда да върне �тату�-кода SANE_STATUS_EOF �лед повикването на "
 "sane_read()."
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr "Върни SANE_STATUS_JAMMED"
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
@@ -4783,12 +5482,12 @@ msgstr ""
 "�акарай бекенда да върне �тату�-кода SANE_STATUS_JAMMED, �лед "
 "повикването на sane_read()."
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr "Върни SANE_STATUS_NO_DOCS"
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
@@ -4797,12 +5496,12 @@ msgstr ""
 "�акарай бекенда да върне �тату�-кода SANE_STATUS_NO_DOCS �лед "
 "повикването на sane_read()."
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr "Върни SANE_STATUS_COVER_OPEN"
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
@@ -4811,12 +5510,12 @@ msgstr ""
 "�акарай бекенда да върне �тату�-кода SANE_STATUS_COVER_OPEN �лед "
 "повикване на sane_read()."
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr "Върни SANE_STATUS_IO_ERROR"
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
@@ -4825,12 +5524,12 @@ msgstr ""
 "�акарай бекенда да върне �тату�-кода SANE_STATUS_IO_ERROR �лед повикване "
 "на sane_read()."
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr "Върни SANE_STATUS_NO_MEM"
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
@@ -4839,12 +5538,12 @@ msgstr ""
 "�акарай бекенда да върне �тату�-кода SANE_STATUS_NO_MEM �лед повикване "
 "на sane_read()."
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr "Върни SANE_STATUS_ACCESS_DENIED"
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
@@ -4853,85 +5552,82 @@ msgstr ""
 "�акарай бекенда да върне �тату�-кода SANE_STATUS_ACCESS_DENIED �лед "
 "повикване на sane_read()."
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr ""
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr "Вкл. лампа"
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr "Включи лампата на �кенера"
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr "Изкл. лампа"
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr "Изключва лампата на �кенера"
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, fuzzy, no-c-format
 msgid "Lamp timeout"
 msgstr "Изкл. лампа"
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr ""
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr "Feeder за документи"
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr "6x4 (инча)"
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr "8х10 (инча)"
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr "8,5х11 (инча)"
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr "��ма поддръжка на полутонове"
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr "DispersedDot8x8"
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr "DispersedDot16x16"
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -4947,27 +5643,27 @@ msgstr ""
 "ви�ок, X-базираните четци могат да �прат да отговар�т на �ъбити�та по X "
 "и �и�темата ви може да уви�не."
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr ""
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr ""
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, fuzzy, no-c-format
 msgid "Focus point for scanning."
 msgstr "Извади документа �лед �каниране"
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr "Режим на превю"
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
@@ -4976,12 +5672,12 @@ msgstr ""
 "Избира режима на превю. Превю по �ива �кала обикновено дава най-добро "
 "�ъотношение между �коро�т и детайлно�т."
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr "Предефинирани на�тройки"
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
@@ -4990,97 +5686,97 @@ msgstr ""
 "О�игур�ва �тандартни площи за �каниране за �нимки, принтирани �траници и "
 "подобни."
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr ""
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, fuzzy, no-c-format
 msgid "Frame to be scanned"
 msgstr "flatbed �кенер"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, no-c-format
 msgid "Focus-mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, fuzzy, no-c-format
 msgid "Auto or manual focus"
 msgstr "�вто изваждане"
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, fuzzy, no-c-format
 msgid "Focus-point"
 msgstr "Позици� на фоку�а"
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, fuzzy, no-c-format
 msgid "Focus point"
 msgstr "Позици� на фоку�а"
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr "Цветни линии на четене"
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr "Линии на четене по �ива �кала"
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr ""
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr "Цв�т RAW"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr "Цв�т RGB"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr "Цв�т RGB TEXT"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr "Солидно черно"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr "Солидно б�ло"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr "Цветови де�ен"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr "Решетка"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr "Първо въвеждане"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr "Второ въвеждане"
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
@@ -5089,12 +5785,12 @@ msgstr ""
 "Това е много дългото трето въвеждане. Може би фронтендът ще може да го "
 "покаже."
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr "Симулаци� на ръчен �кенер"
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5108,12 +5804,12 @@ msgstr ""
 "правилно да �е �прави � това. Също така, опци�та позвол�ва фик�ирана "
 "ширина от 11 �м."
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr "Симулаци� на тройно минаване"
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
@@ -5121,35 +5817,35 @@ msgid ""
 msgstr ""
 "Симулира �кенер � тройно минаване. В цветен режим �е предават три фрейма."
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr "�агла�� поредно�тта на фреймовете."
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr ""
 "�агла�� поредно�тта на фреймовете в цветен режим при тройно минаване."
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
 "after 10 scans."
 msgstr ""
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr "Специални опции"
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr "Избира картинка за те�тване"
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5167,12 +5863,12 @@ msgstr ""
 "Решетка: ри�ува черно-б�ла решетка � широчина и ви�очина от 10 мм на "
 "квадрат."
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr "Смени endianness"
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5184,24 +5880,24 @@ msgstr ""
 "фронтендовете, напр. дали фронтендът използва правилни� endianness "
 "(метод за запазване на данни в паметта на компютъра."
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr "Лимит на четене"
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 "Ограничава количе�твото данни, предадени � в��ко повикване на "
 "sane_read()."
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr "Размер на лимита на четене"
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
@@ -5209,33 +5905,33 @@ msgstr ""
 "(Мак�ималното) количе�тво данни, предадени � в��ко повикване на "
 "sane_read()."
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr "Забав�не при четене"
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr "Забав�не на тран�фера на данни по лини�та."
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr "Продължително�т на забав�нето при четене"
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
 msgstr "Колко дълго да �е чака �лед предаването на в�еки буфер данни."
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr "Връщана �тойно�т на sane_read"
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
@@ -5246,22 +5942,22 @@ msgstr ""
 "нормалната �тойно�т за �каниране. В�ички други �тату�-кодове �а за "
 "те�тване на това как �е �прав� фронтенда � т�х."
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr "Загуба на пик�ели на лини�"
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr "Бро�т пик�ели, които �е губ�т в кра� на в��ка лини�."
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr "Параметри за мъгл�во�т"
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
@@ -5270,23 +5966,23 @@ msgstr ""
 "Върни мъгл�ви линии и байтове на лини�, когато sane_parameters() е "
 "извикано преди sane_start()."
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr "Използвай неблокиращ IO"
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 "Използва неблокиращ IO порт за sane_read(), ако фронтенда го поддържа."
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr "Предложи select file descriptor"
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
@@ -5295,12 +5991,12 @@ msgstr ""
 "Предлага �пециален filedescriptor за детектване дали sane_read() ще "
 "върне данни."
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr "Позволи те�тови опции"
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
@@ -5310,27 +6006,27 @@ msgstr ""
 "�по�обно�тта на фронтендовете да виждат и модифицират в�ичките типове "
 "опции на SANE."
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr "Принт на опциите"
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr "Изважда разпечатка на в�ички опции."
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr "Булеви те�тови опции"
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr "(1/6) Булева мек избор мек детект"
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
@@ -5339,12 +6035,12 @@ msgstr ""
 "(1/6) Булева те�това опци� � мек избор и мек детект (и разширени) "
 "възможно�ти. Това е про�то нормална булева опци�."
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr "(2/6) Булева твърд избор и мек детект"
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
@@ -5356,12 +6052,12 @@ msgstr ""
 "фронтенда, а �амо от потребител� (напр. чрез нати�кане на бутон върху "
 "у�трой�твото)."
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr "(3/6) Булева твърд избор"
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5373,12 +6069,12 @@ msgstr ""
 "потребител� (напр. чрез нати�кане на бутон върху у�трой�твото) и "
 "фронтендът не може да � чете."
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr "(4/6) Булева мек детект"
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
@@ -5387,12 +6083,12 @@ msgstr ""
 "(4/6) Булева те�това опци� � мек детект (и разширени) възможно�ти. Това "
 "означава, че опци�та е �амо за четене (read-only)."
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr "(5/6) Булева мек избор мек детект емулирана"
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
@@ -5401,12 +6097,12 @@ msgstr ""
 "(5/6) Булева те�това опци� � мек избор, мек детект и емулирани (и "
 "разширени възможно�ти."
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr "(6/6) Булева мек избор мек детект авто"
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5417,27 +6113,27 @@ msgstr ""
 "разширени) възможно�ти. Тази опци� може автоматично да �е нагла�и от "
 "бекенда."
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr "Int те�тови опции"
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr "(1/6) Int"
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr "(1/6) Интегрална те�това опци� без ограничени� и единица."
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr "(2/6) Int ограничен обхват"
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
@@ -5446,24 +6142,24 @@ msgstr ""
 "(2/6) Интегрална те�това опци� � единица пик�ел и нагла�ен обхват на "
 "ограничение. Минимумът е 4, мак�имумът е 192, а �тъпката е 2."
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr "(3/6) Int ограничен word list"
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 "(3/6) Интегрална те�това опци� � единица бит и нагла�ен ограничен word "
 "list."
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr "(4/6) Int array"
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
@@ -5472,12 +6168,12 @@ msgstr ""
 "(4/6) Интегрална те�това опци� � единица мм; използва array без "
 "ограничени�."
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr "(5/6) Int array ограничен обхват"
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
@@ -5486,12 +6182,12 @@ msgstr ""
 "(5/6) Интегрална те�това опци� � единица dpi; използва array � ограничен "
 "обхват. Минимумът е 4, мак�имумът е 192, а �тъпката е 2."
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr "(6/6) Int array ограничен word list"
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
@@ -5500,27 +6196,27 @@ msgstr ""
 "(6/6) Интегрална те�това опци� � единица процент; използва array � "
 "ограничен word list."
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr "Фик�ирани те�тови опции"
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr "(1/3) Фик�ирана"
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr "(1/3) Фик�ирана те�това опци� без нагла�ена единица и ограничени�."
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr "(2/3) Фик�ирана ограничение обхват"
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
@@ -5530,49 +6226,49 @@ msgstr ""
 "ограничен обхват. Минимумът е -42,17, мак�имумът 32767,9999, а �тъпката "
 "е 2,0."
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr "(3/3) Фик�ирана ограничен word list"
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 "(3/3) Фик�ирана те�това опци� без нагла�ена единица и � ограничен word "
 "list."
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr "Стрингови те�тови опции"
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr "(1/3) String"
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr "(1/3) Стрингова те�това опци� без ограничение."
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr "(2/3) String ограничен string list"
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr "(2/3) Стрингова те�това опци� � ограничен string list."
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr "(3/3) String � ограничен long string list"
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
@@ -5581,156 +6277,160 @@ msgstr ""
 "(3/3) Стрингова те�това опци� � ограничителен string list. Съдържа "
 "повече �тойно�ти..."
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr "Бутонни те�тови опции"
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr "(1/1) Button"
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr "(1/1) Бутонна те�това опци�. Извежда н�какъв тек�т..."
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, no-c-format
 msgid "Color 36"
 msgstr "Цв�т 36"
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr "Използвай композици�та на изображението."
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr "Черно и б�ло в две нива (режим lineart)"
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr "Dither/полутон черно и б�ло (режим полутон)"
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr "Черно и б�ло в много нива (режим �ива �кала)"
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr "RGB цветно в много нива (� едно минаване)"
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr "Игнорирай калибраци�та"
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr "Забрани предв. фоку�"
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr "�е калибрирай фоку�а"
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr "Ръчен предв. фоку�"
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr "Фик�ирай позици� на фоку�а"
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr "Калибраци� на лещата в позици� документ"
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr "Калибрирай фоку�а на лещата в позици� документ"
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr "Позици� на holder фоку�а 0мм"
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr "Използвай 0мм позици� на holder фоку�а, вме�то 0,6мм"
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr "Режим калибраци�"
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr "Дефинирай режима на калибраци�"
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr "Включва/изключва лампата"
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr "UTA вкл."
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr "Включва/изключва UTA"
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr "Оф�ет"
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr "�а�тройки по оф�ета на цветните канали"
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, no-c-format
 msgid "Gray offset"
 msgstr "Оф�ет - �иво"
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr "�агла�� оф�ета на �иви� канал"
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr "�агла�� оф�ета на червени� канал"
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr "�агла�� оф�ета на зелени� канал"
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr "�агла�� оф�ета на �ини� канал"
 
+#, fuzzy
+#~ msgid "IPC mode"
+#~ msgstr "Режим на превю"
+
 #~ msgid "Grayscale"
 #~ msgstr "В �ива �кала"
 
diff --git a/po/boldquot.sed b/po/boldquot.sed
new file mode 100644
index 0000000..4b937aa
--- /dev/null
+++ b/po/boldquot.sed
@@ -0,0 +1,10 @@
+s/"\([^"]*\)"/“\1�/g
+s/`\([^`']*\)'/‘\1’/g
+s/ '\([^`']*\)' / ‘\1’ /g
+s/ '\([^`']*\)'$/ ‘\1’/g
+s/^'\([^`']*\)' /‘\1’ /g
+s/“�/""/g
+s/“/“/g
+s/�/�/g
+s/‘/‘/g
+s/’/’/g
diff --git a/po/cs.gmo b/po/cs.gmo
new file mode 100644
index 0000000..0a2dae8
--- /dev/null
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index c7c3e7c..0b350b6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,422 +4,416 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends.cs\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
 "PO-Revision-Date: 2007-12-17 22:59+0100\n"
 "Last-Translator: Josef  <joeprusa@volny.cz>\n"
 "Language-Team: \n"
-"Language: \n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr "Množství voleb"
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr ""
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "Vylepšení"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "Pokro�ilé"
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr ""
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "Náhled"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr "Vynutit monochromatický náhled"
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr "Bitová hloubka"
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Režim skenu"
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "Rychlost skenu"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr "Zdroj"
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr "Skenovat při zpětném chodu"
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "Levý horní roh x"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "Levý horní roh y"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "Pravý dolní roh x"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "Pravý dolní roh y"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Rozlišení"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "Rozlišení X"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Rozlišení Y"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr ""
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, fuzzy, no-c-format
 msgid "Page height"
 msgstr "Světlé body"
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr "Použít uživatelskou tabulku gama"
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr "Intenzita obrázku"
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr "Intenzita �ervené"
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr "Intenzita zelené"
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr "Intenzita modré"
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr "Jas"
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr "Rozměr zrna"
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr "Polotóny"
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "Úroveň �erné"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "Úroveň bílé"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr "Úroveň bílé �ervené"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
 msgstr "Úroveň bílé zelené"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr "Úroveň bílé modré"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "Stíny"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr "Stíny �ervené"
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr "Stíny zelené"
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr "Stíny modré"
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr "Světlé body"
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr "Světlé body �ervené"
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr "Světlé body zelené"
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr "Světlé body modré"
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr "Odstín"
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr "Sytost"
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "Jméno souboru"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr "Rozměr vzorku polotónu"
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "Vzorek polotónu"
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr "Svázat rozlišení X a Y"
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "Negativ"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "Kalibrace kvality"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr "Dvojnásobné optické rozlišení"
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr "Svázat RGB"
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr "Prahová hodnota"
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr "Analogová korekce gama"
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr "Analogová korekce gama pro �ervenou"
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr "Analogová korekce gama pro zelenou"
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr "Analogová korekce gama pro modrou"
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr "Svázat analogovou hodnotu gama"
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr "Zahřát lampu"
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr "Kalibr. expozi�ní �as"
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr "Kalibr. expozi�ní �as pro �ervenou"
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr "Kalibr. expozi�ní �as pro zelenou"
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr "Kalibr. expozi�ní �as pro modrou"
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr "Zjistit expozi�ní �as"
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr "Zjistit expozi�ní �as pro �ervenou"
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr "Zjistit expozi�ní �as pro zelenou"
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr "Zjistit expozi�ní �as pro modrou"
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr "Nastavit expozi�ní �as"
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr "Kalibrovat svítivost (density) lampy"
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr "Zjistit svítivost (density) lampy"
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr "Nastavit svítivost (density) lampy"
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr "Vypnout lampu při ukon�ení"
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
@@ -428,37 +422,37 @@ msgstr ""
 "Hodnota pouze pro �tení, která udává, kolik voleb dané zařízení "
 "podporuje."
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, fuzzy, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "Zkrácený seznam rozlišení"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr ""
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, fuzzy, no-c-format
 msgid "Image modification options"
 msgstr "Množství voleb"
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, fuzzy, no-c-format
 msgid "Hardware specific options"
 msgstr "Rozlišení"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr ""
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr "Požaduje sken v kvalitě náhledu."
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -470,7 +464,7 @@ msgstr ""
 "jednoprůchodovém skeneru to snižuje paměťové nároky a �as skenování "
 "náhledu."
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
@@ -479,74 +473,74 @@ msgstr ""
 "Po�et bitů na vzorek, typicky je 1 pro \"perokresbu\" a 8 pro vícebitové "
 "skeny."
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr "Zvolí režim skenování (tj. perokresba, stupně šedé nebo barva)."
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr "Ur�uje, jakou rychlostí se skenuje."
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr "Volí zdroj skenování (např. automatický podava�)."
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr "Nastavuje, zda je povolen ypětný průchod."
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "Levý horní roh x skenované plochy."
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "Levý horní roh y skenované plochy."
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "Pravý dolní roh x skenované plochy."
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "Pravý dolní roh y skenované plochy."
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr "Nastavuje rozlišení skenovaného obrázku."
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr "Nastavuje horizontální rozlišení skenovaného obrázku."
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr "Nastavuje vertikální rozlišení skenovaného obrázku."
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
 "sheet-fed scans."
 msgstr ""
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, fuzzy, no-c-format
 msgid "Specifies the height of the media."
 msgstr "Nastavuje rozlišení skenovaného obrázku."
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid ""
 "Determines whether a builtin or a custom gamma-table should be used."
@@ -554,7 +548,7 @@ msgstr ""
 "Volí, zda má být použita vestavěná nebo uživatelem definovaná tabulka "
 "gama korekcí."
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -564,32 +558,32 @@ msgstr ""
 "Tabluka gama korekcí. V barevném režimu ovlivňuje �ervený, zelený a "
 "modrý kanál sou�asně (tj. jde o tabulku gama korekcí intenzity)."
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr "Tabulka gama korekcí pro �ervené pásmo."
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr "Tabulka gama korekcí pro zelené pásmo."
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr "Tabulka gama korekcí pro modré pásmo."
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr "Ovládá jas naskenovaného obrázku."
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr "Ovládá kontrast naskenovaného obrázku."
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
@@ -598,79 +592,79 @@ msgstr ""
 "Ovládá \"zrnitost\" naskenovaného obrázku. Nižší hodnoty znamenají "
 "ostřejší obrázek."
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr ""
 "Volí, zda naskenovaný obrázek má být převeden na �ernobílý pomocí "
 "rozptylu."
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr "Nastavuje, jaká úroveň jasu má být považována za \"�ernou\"."
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr "Nastavuje, jaká úroveň jasu má být považována za \"bílou\"."
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr "Nastavuje, jaká úroveň �ervené má být považována za \"bílou\"."
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr "Nastavuje, jaká úroveň zelené má být považována za \"bílou\"."
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr "Nastavuje, jaká úroveň modré má být považována za \"bílou\"."
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr "Nastavuje, jaká úroveň �ervené má být považována za \"�ernou\"."
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr "Nastavuje, jaká úroveň zelené má být považována za \"�ernou\"."
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr "Nastavuje, jaká úroveň modré má být považována za \"�ernou\"."
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr ""
 "Nastavuje, jaká úroveň �ervené má být považována za \"zcela �ervenou\"."
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid ""
 "Selects what green radiance level should be considered \"full green\"."
 msgstr ""
 "Nastavuje, jaká úroveň zelené má být považována za \"zcela zelenou\"."
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid ""
 "Selects what blue radiance level should be considered \"full blue\"."
 msgstr ""
 "Nastavuje, jaká úroveň modré má být považována za \"zcela modrou\"."
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr "Nastavuje \"odstín\" (úroveň modré) naskenovaného obrázku."
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
@@ -679,12 +673,12 @@ msgstr ""
 "Úroveň nasycení ovládá úroveň \"sytosti\" barev, obzvláště patrné u "
 "fotografií. Vyšší hodnoty znamenají výraznější barvy."
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr "Jméno souboru obrázku, který bude na�ten."
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
@@ -693,294 +687,294 @@ msgstr ""
 "Nastaví rozměr polotónového (rozptylového) vzoru při skenování "
 "polotónových obrázků."
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
 msgstr ""
 "Definuje polotónový (rozptylový) vzor při skenování polotónových obrázků."
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr "Použít shodné rozlišení pro osu X a Y"
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr "Zaměnit �ernou a bílou"
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr "Provést kvalitní kalibraci bílé"
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr "Použít dvojité optické rozližení objektivu"
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr "V režimu RGB použít stejné hodnoty pro všechny barvy"
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr "Zvolit minimální jas pro bílý bod"
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr "Analogová korekce gama"
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr "Analogová korekce gama pro �ervenou"
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr "Analogová korekce gama pro zelenou"
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr "Analogová korekce gama pro modrou"
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr "Zahřát lampu před skenováním"
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr "Nastavit expozi�ní dobu pro kalibraci"
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr "Nastavit expozi�ní dobu pro kalibraci �ervené"
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr "Nastavit expozi�ní dobu pro kalibraci zelené"
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr "Nastavit expozi�ní dobu pro kalibraci modré"
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr "Nastavit expozi�ní dobu pro sken"
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr "Nastavit expozi�ní dobu pro sken �ervené"
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr "Nastavit expozi�ní dobu pro sken zelené"
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr "Nastavit expozi�ní dobu pro sken modré"
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr "Povolit volbu expozi�ních �asů"
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr "Definovat svítivost (density) lampy pro kalibraci"
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr "Definovat svítivost (density) lampy pro sken"
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr "Povolit volbu svítivosti (density) lampy"
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr "Vypnout lampu při ukon�ení programu"
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, fuzzy, no-c-format
 msgid "Scan button"
 msgstr "Rozlišení"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, fuzzy, no-c-format
 msgid "Email button"
 msgstr "Čekat na tla�ítko"
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, fuzzy, no-c-format
 msgid "Fax button"
 msgstr "Čekat na tla�ítko"
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, fuzzy, no-c-format
 msgid "Copy button"
 msgstr "Čekat na tla�ítko"
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr ""
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, fuzzy, no-c-format
 msgid "Cover open"
 msgstr "Barevný vzorek"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "Barva"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr "Barevná perokresba"
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr "Barevný polotón"
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "Šedá"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr "Polotóny"
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "Perokresba"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, fuzzy, no-c-format
 msgid "Operation not supported"
 msgstr "Polotón není podporován"
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, fuzzy, no-c-format
 msgid "Document feeder jammed"
 msgstr "Podava� dokumentů"
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, fuzzy, no-c-format
 msgid "Document feeder out of documents"
 msgstr "Podava� dokumentů"
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, no-c-format
 msgid "Scanner cover is open"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "Standardní nastavení"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr "Nastavit standardní hodnoty prvků pro vylepšení obrázku"
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "Kalibrace"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr "Kalibrovat před dalším skenem"
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
@@ -989,12 +983,12 @@ msgstr ""
 "Pokud je zvolena tato volba, je skener kalibrován před každým dalším "
 "skenem. Jinak se kalibruje pouze před prvním skenem."
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr "Provést pouze korekci stínů"
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -1005,1058 +999,1049 @@ msgstr ""
 "stínů. Pro zisk, odstup a expozici jsou použity standardní hodnoty - bu� "
 "vestavěné nebo z konfigura�ního souboru."
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr "Stav tla�ítek"
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr "Číslo polí�ka pro sken"
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr "Zvolí �íslo polí�ka, které bude naskenováno"
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, fuzzy, no-c-format
 msgid "Duplex scan"
 msgstr "OboustranÄ›"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid ""
 "Duplex scan provide a scan of the front and back side of the document"
 msgstr ""
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr "Kalibrovat skener"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr "Vynutit kalibraci skeneru před skenováním"
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr "Stupně šedé"
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr "Skenovat ve stupních šedé místo v barvě"
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr "Analogový zisk"
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr "Zvýšit nebo snížit analogový zisk CCD pole"
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "Korekce gama"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr "Nastaví gama korekci přenosové křivky"
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr ""
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr ""
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, fuzzy, no-c-format
 msgid "No transparency correction"
 msgstr "Barevná korekce"
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr ""
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr ""
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, fuzzy, no-c-format
 msgid "Negatives"
 msgstr "Negativ"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, fuzzy, no-c-format
 msgid "Slides"
 msgstr "Zcela bílá"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, fuzzy, no-c-format
 msgid "Normal speed"
 msgstr "Normální"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, fuzzy, no-c-format
 msgid "1/2 normal speed"
 msgstr "2x2 normální"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, fuzzy, no-c-format
 msgid "1/3 normal speed"
 msgstr "3x3 normální"
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, fuzzy, no-c-format
 msgid "rounded parameter"
 msgstr "Nepřesné (fuzzy) parametry"
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr ""
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, no-c-format
 msgid "ADF jam"
 msgstr ""
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr ""
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, fuzzy, no-c-format
 msgid "lamp failure"
 msgstr "Hodnota gama"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr ""
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr ""
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr ""
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr ""
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr ""
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, fuzzy, no-c-format
 msgid "transparency unit lamp failure"
 msgstr "Prosvětlovací jednotka"
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr ""
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr ""
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr ""
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr ""
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr ""
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr ""
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr ""
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr ""
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr ""
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr ""
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr ""
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr ""
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr ""
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr ""
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr ""
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr ""
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr ""
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr ""
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr ""
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, fuzzy, no-c-format
 msgid "transparency unit shading error"
 msgstr "Prosvětlovací jednotka"
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr ""
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, fuzzy, no-c-format
 msgid "film scanner"
 msgstr "Stolní skener"
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr "Stolní skener"
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr "Typ filmu"
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr ""
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, fuzzy, no-c-format
 msgid "Negative film type"
 msgstr "Negativní film"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, fuzzy, no-c-format
 msgid "Selects the negative film type"
 msgstr "Zvolit testovací obrázek"
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, fuzzy, no-c-format
 msgid "Hardware resolution"
 msgstr "Rozlišení"
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, fuzzy, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "Zobrazí zkrácený seznam rozlišení"
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr ""
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, fuzzy, no-c-format
 msgid "Auto focus"
 msgstr "Automaticky vysunout"
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, fuzzy, no-c-format
 msgid "Enable/disable auto focus"
 msgstr "Vyřadit předběžné zaostření"
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr ""
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr ""
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, fuzzy, no-c-format
 msgid "Manual focus position"
 msgstr "Pozice pevného zaostření"
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr ""
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr ""
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr ""
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "Zrcadlit obrázek"
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, fuzzy, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "Zrcadlit obrázek"
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, fuzzy, no-c-format
 msgid "Auto exposure"
 msgstr "Nastavit expozi�ní �as"
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, fuzzy, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr "Povolit volbu expozi�ních �asů"
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, fuzzy, no-c-format
 msgid "Calibration now"
 msgstr "Kalibrace"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, fuzzy, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Definovat režim kalibrace"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr ""
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr ""
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, fuzzy, no-c-format
 msgid "Reset scanner"
 msgstr "skener s podava�em"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, fuzzy, no-c-format
 msgid "Reset the scanner"
 msgstr "skener s podava�em"
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr ""
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, fuzzy, no-c-format
 msgid "Eject film after each scan"
 msgstr "Vysunout dokument po naskenování"
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr ""
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr ""
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr ""
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr ""
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr ""
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, fuzzy, no-c-format
 msgid "Document feeder extras"
 msgstr "Podava� dokumentů"
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, fuzzy, no-c-format
 msgid "Flatbed only"
 msgstr "Stolní"
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr ""
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, fuzzy, no-c-format
 msgid "Transparency unit"
 msgstr "Prosvětlovací jednotka"
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr ""
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, fuzzy, no-c-format
 msgid "Negative film"
 msgstr "Negativní film"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, fuzzy, no-c-format
 msgid "Positive or negative film"
 msgstr "Pozitivní film"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr ""
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr ""
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, fuzzy, no-c-format
 msgid "Transparency ratio"
 msgstr "Prosvětlovací jednotka"
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, fuzzy, no-c-format
 msgid "Select film type"
 msgstr "Typ filmu"
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, fuzzy, no-c-format
 msgid "Select the film type"
 msgstr "Zvolit polotóny"
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "Stolní"
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, no-c-format
 msgid "ADF Front"
 msgstr ""
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, no-c-format
 msgid "ADF Back"
 msgstr ""
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, fuzzy, no-c-format
 msgid "ADF Duplex"
 msgstr "OboustranÄ›"
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, no-c-format
 msgid "Card Front"
 msgstr ""
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, no-c-format
 msgid "Card Back"
 msgstr ""
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, fuzzy, no-c-format
 msgid "Card Duplex"
 msgstr "OboustranÄ›"
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "Červená"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "Zelená"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "Modrá"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, fuzzy, no-c-format
 msgid "Enhance Red"
 msgstr "Vylepšení"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, fuzzy, no-c-format
 msgid "Enhance Green"
 msgstr "Vylepšení"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, fuzzy, no-c-format
 msgid "Enhance Blue"
 msgstr "Vylepšení"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr "Žádné"
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr ""
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr ""
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr "JednostranÄ›"
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr "OboustranÄ›"
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr "Prosvětlovací jednotka"
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr "Automatický podava� dokumentů"
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "Pozitivní film"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "Negativní film"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr "Zaostření na sklo"
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr "Zaostření 2,5 mm nad sklo"
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr "Polotón A (ostrý)"
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr "Polotón B (měkký)"
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr "Polotón C (síť - \"Net Screen\")"
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr "Rozptyl A (4x4 Bayer)"
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr "Rozptyl B (4x4 Spirálový)"
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr "Rozptyl C (4x4 Síťový)"
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr "Rozptyl D (8x4 Síťový)"
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr "Technika vylepšení textu"
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr "Download vzor A"
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr "Download vzor B"
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "Bez korekce"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr "Uživatelské nastavení"
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr "Jehli�kové tiskárny"
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr "Teplocitlivé tiskárny"
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "Inkoustové tiskárny"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr "CRT monitory"
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "Standard"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr "Tisk ve vysoké kvalitě"
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr "Tisk v nízké kvalitě"
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr "Tisk s vysokým kontrastem"
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr "Uživatelsky definováno (Gama=1,0)"
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr "Uživatelsky definováno (Gama=1,8)"
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr "CD"
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr "A5 na výšku"
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr "A5 na šířku"
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr "Letter"
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr "A4"
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "Max"
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr "Režim skenování"
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr "Zvolit polotóny"
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr "Výpadek"
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr "Nastaví výpadek."
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr "Nastaví jas."
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr "Zaostření"
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr "Barevná korekce"
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr "Nastaví tabulku barevných korekcí pro vybrané výstupní zařízení."
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr "Koeficienty barevných korekcí"
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr "Násobící matice RGB"
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr "Posun zelená-�ervená"
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr "Posun zelená-modrá"
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr "Posun �ervená-zelená"
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr "Posun �ervená-modrá"
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr "Posun modrá-zelená"
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr "Posun modrá-�ervená"
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr "Ovládá úroveň zelené"
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr "Přidává �ervenou v závislosti na úrovni zelené"
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr "Přidává modrou v závislosti na úrovni zelené"
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr "Přidává zelenou v závislosti na úrovni �ervené"
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr "Ovládá úroveň �ervené"
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr "Přidává modrou v závislosti na úrovni �ervené"
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr "Přidává zelenou v závislosti na úrovni modré"
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr "Přidává �ervenou v závislosti na úrovni modré"
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, no-c-format
 msgid "Controls blue level"
 msgstr "Ovládá úroveň modré"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr "Zrcadlí obrázek."
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr "Rychlý náhled"
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr "Automatické rozložení plochy"
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr "Zkrácený seznam rozlišení"
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr "Zobrazí zkrácený seznam rozlišení"
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr "Přiblížení"
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr "Nastaví faktor přiblížení, který skener použije"
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr "Rychlý formát"
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr "Volitelné příslušenství"
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr "Vysunout"
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr "Vysunout papír z automatického podava�e"
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr "Automaticky vysunout"
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr "Vysunout dokument po naskenování"
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr ""
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr ""
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr "Pozice"
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr "Zvolte pozici pro sken"
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
@@ -2065,23 +2050,23 @@ msgstr ""
 "Zvolit gama korekci ze seznamu předdefinovaných zařízení nebo "
 "uživatelské tabulky, kterou lze nahrát do skeneru"
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr "Pozice zaostření"
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
 msgstr "Nastaví pozici zaostření bu� na sklo nebo 2,5 mm nad sklo"
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr "Čekat na tla�ítko"
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
@@ -2090,366 +2075,1109 @@ msgstr ""
 "Po odeslání příkazu ke skenování se s vlastním skenem �eká až na stisk "
 "tla�ítka na skeneru."
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr ""
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, fuzzy, no-c-format
 msgid "Positive Slide"
 msgstr "Pozitivní film"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, fuzzy, no-c-format
 msgid "Negative Slide"
 msgstr "Negativní film"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr ""
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, fuzzy, no-c-format
 msgid "User defined CCT profile"
 msgstr "Uživatelské nastavení"
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr ""
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr ""
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr "Rozptyl"
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, fuzzy, no-c-format
 msgid "Diffusion"
 msgstr "Chybový rozptyl"
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, fuzzy, no-c-format
 msgid "White"
 msgstr "Úroveň bílé"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, fuzzy, no-c-format
 msgid "Black"
 msgstr "Úroveň �erné"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, no-c-format
 msgid "Continue"
 msgstr ""
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr ""
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr "Horizontální"
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, fuzzy, no-c-format
 msgid "Horizontal bold"
 msgstr "Horizontální"
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, fuzzy, no-c-format
 msgid "Horizontal narrow"
 msgstr "Horizontální"
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr "Vertikální"
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, fuzzy, no-c-format
 msgid "Vertical bold"
 msgstr "Vertikální"
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr ""
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr ""
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, no-c-format
 msgid "Front"
 msgstr ""
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr ""
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
+msgid "Gamma function exponent"
 msgstr ""
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
 #, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
+msgid "Changes intensity of midtones"
+msgstr ""
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr ""
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr ""
+
+#: backend/fujitsu.c:3165
+#, fuzzy, no-c-format
+msgid "Halftone type"
+msgstr "Polotóny"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr ""
+
+#: backend/fujitsu.c:3210
+#, fuzzy, no-c-format
+msgid "Perform outline extraction"
+msgstr "Hrubá kalibrace"
+
+#: backend/fujitsu.c:3221
+#, fuzzy, no-c-format
+msgid "Emphasis"
+msgstr "Zvýraznění obrázku"
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr ""
+
+#: backend/fujitsu.c:3240
+#, fuzzy, no-c-format
+msgid "Separation"
+msgstr "Sytost"
+
+#: backend/fujitsu.c:3241
+#, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr ""
+
+#: backend/fujitsu.c:3252
+#, fuzzy, no-c-format
+msgid "Mirroring"
+msgstr "Zrcadlit obrázek"
+
+#: backend/fujitsu.c:3253
+#, fuzzy, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "Zrcadlit obrázek"
+
+#: backend/fujitsu.c:3270
+#, fuzzy, no-c-format
+msgid "White level follower"
+msgstr "Úroveň bílé modré"
+
+#: backend/fujitsu.c:3271
+#, fuzzy, no-c-format
+msgid "Control white level follower"
+msgstr "Ovládá úroveň �ervené"
+
+#: backend/fujitsu.c:3289
+#, fuzzy, no-c-format
+msgid "BP filter"
+msgstr "Barevná perokresba"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr ""
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, fuzzy, no-c-format
+msgid "Smoothing"
+msgstr "Jemný"
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr ""
+
+#: backend/fujitsu.c:3323
+#, fuzzy, no-c-format
+msgid "Gamma curve"
+msgstr "Hodnota gama"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, fuzzy, no-c-format
+msgid "Threshold curve"
+msgstr "Prahová hodnota"
+
+#: backend/fujitsu.c:3347
+#, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+
+#: backend/fujitsu.c:3369
+#, fuzzy, no-c-format
+msgid "Threshold white"
+msgstr "Prahová hodnota"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr ""
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, fuzzy, no-c-format
+msgid "Noise removal"
+msgstr "Redukce Å¡umu"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr ""
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr ""
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr ""
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr ""
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr ""
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr ""
+
+#: backend/fujitsu.c:3508
+#, fuzzy, no-c-format
+msgid "Auto width detection"
+msgstr "Bez korekce"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr ""
+
+#: backend/fujitsu.c:3526
+#, fuzzy, no-c-format
+msgid "Auto length detection"
+msgstr "Bez korekce"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr ""
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr ""
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr ""
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr ""
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr ""
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr ""
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr ""
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
+msgstr ""
+
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3708
+#, fuzzy, no-c-format
+msgid "DF recovery mode"
+msgstr "Režim podava�e"
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr ""
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3748
+#, fuzzy, no-c-format
+msgid "Advanced paper protection"
+msgstr "Zvláštní volby"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+
+#: backend/fujitsu.c:3768
+#, fuzzy, no-c-format
+msgid "Staple detection"
+msgstr "Bez korekce"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr ""
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+
+#: backend/fujitsu.c:3809
+#, fuzzy, no-c-format
+msgid "Dropout color"
+msgstr "Výpadek"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+
+#: backend/fujitsu.c:3833
+#, fuzzy, no-c-format
+msgid "Buffer mode"
+msgstr "Režim podava�e"
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr ""
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr ""
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr ""
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+
+#: backend/fujitsu.c:3911
+#, fuzzy, no-c-format
+msgid "Off timer"
+msgstr "Vypnout lampu"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+
+#: backend/fujitsu.c:3930
+#, fuzzy, no-c-format
+msgid "Duplex offset"
+msgstr "Odstup modré"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr ""
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "Odstup zelené"
+
+#: backend/fujitsu.c:3949
+#, fuzzy, no-c-format
+msgid "Adjust green/red offset"
+msgstr "Odstup zelené"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr "Odstup modré"
+
+#: backend/fujitsu.c:3967
+#, fuzzy, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "Nastavuje odstup modrého kanálu"
+
+#: backend/fujitsu.c:3980
+#, no-c-format
+msgid "Low Memory"
+msgstr ""
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+
+#: backend/fujitsu.c:3996
+#, fuzzy, no-c-format
+msgid "Duplex side"
+msgstr "OboustranÄ›"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
 msgstr ""
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr ""
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr ""
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
+msgstr ""
+
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr ""
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+
+#: backend/fujitsu.c:4095
+#, fuzzy, no-c-format
+msgid "Endorser Options"
+msgstr "Zvláštní volby"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr ""
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr ""
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr ""
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr ""
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr ""
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr ""
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr ""
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr ""
+
+#: backend/fujitsu.c:4253
+#, fuzzy, no-c-format
+msgid "Endorser direction"
+msgstr "Redukce Å¡umu"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr ""
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr ""
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr ""
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr ""
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr ""
+
+#: backend/fujitsu.c:4344
+#, fuzzy, no-c-format
+msgid "A3 paper"
+msgstr "Z papíru"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4356
+#, fuzzy, no-c-format
+msgid "B4 paper"
+msgstr "Z papíru"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4368
+#, fuzzy, no-c-format
+msgid "A4 paper"
+msgstr "Z papíru"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4380
+#, fuzzy, no-c-format
+msgid "B5 paper"
+msgstr "Z papíru"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr ""
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr ""
+
+#: backend/fujitsu.c:4429
+#, no-c-format
+msgid "Scanner in power saving mode"
+msgstr ""
+
+#: backend/fujitsu.c:4452
+#, fuzzy, no-c-format
+msgid "Manual feed"
+msgstr "Manuální předběžné zaostření"
+
+#: backend/fujitsu.c:4453
+#, fuzzy, no-c-format
+msgid "Manual feed selected"
+msgstr "Manuální předběžné zaostření"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr ""
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr ""
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr ""
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr ""
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr ""
+
+#: backend/fujitsu.c:4513
+#, fuzzy, no-c-format
+msgid "Hardware error code"
+msgstr "Rozlišení"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr ""
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr ""
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr ""
+
+#: backend/fujitsu.c:4537
+#, fuzzy, no-c-format
+msgid "Imprinter ink level"
+msgstr "Úroveň bílé"
+
+#: backend/fujitsu.c:4548
+#, fuzzy, no-c-format
+msgid "Density"
+msgstr "Intenzita �ervené"
+
+#: backend/fujitsu.c:4549
+#, no-c-format
+msgid "Density dial"
+msgstr ""
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, fuzzy, no-c-format
+msgid "Duplex switch"
+msgstr "OboustranÄ›"
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, fuzzy, no-c-format
 msgid "Extras"
 msgstr "Velmi rychlý"
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, fuzzy, no-c-format
-msgid "Threshold curve"
-msgstr "Prahová hodnota"
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr ""
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
 "instead on hardware lineart."
 msgstr ""
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, fuzzy, no-c-format
 msgid "Disable interpolation"
 msgstr "Vyřadit zpětný chod"
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
 "than the vertical resolution this disables horizontal interpolation."
 msgstr ""
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "Barevná perokresba"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "Kalibrace"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Definovat režim kalibrace"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Režim kalibrace"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, fuzzy, no-c-format
 msgid "Lamp off time"
 msgstr "Vypnout lampu"
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
 "of 0 means, that the lamp won't be turned off."
 msgstr ""
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, fuzzy, no-c-format
 msgid "Lamp off during scan"
 msgstr "Hrubá kalibrace"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr ""
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, fuzzy, no-c-format
 msgid "File button"
 msgstr "Čekat na tla�ítko"
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr ""
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, fuzzy, no-c-format
 msgid "Power button"
 msgstr "Čekat na tla�ítko"
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "Čekat na tla�ítko"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, fuzzy, no-c-format
 msgid "Need calibration"
 msgstr "Hrubá kalibrace"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, fuzzy, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr "Vynutit kalibraci skeneru před skenováním"
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, fuzzy, no-c-format
 msgid "Buttons"
 msgstr "Stav tla�ítek"
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr "Kalibrovat"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, fuzzy, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "Hrubá kalibrace"
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, fuzzy, no-c-format
 msgid "Clear calibration"
 msgstr "Hrubá kalibrace"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, fuzzy, no-c-format
 msgid "Clear calibration cache"
 msgstr "Režim kalibrace"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr "Prosvětlovací adaptér"
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr ""
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr "Volby pro ladění"
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "Automaticky zahřát"
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -2458,12 +3186,12 @@ msgstr ""
 "Zahřát lampu dokud její jas není konstantní namísto standardního 60ti "
 "sekundového zahřívání."
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "Plný sken"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
@@ -2472,12 +3200,12 @@ msgstr ""
 "Naskenovat kompletní skenovací plochu v�etně kalibra�ního proužku. "
 "Opatrně! Nenastavujte plnou výšku! Pouze pro testování!"
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Hrubá kalibrace"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2488,12 +3216,12 @@ msgstr ""
 "jsou zobrazeny ovádací prvky pro mauální nastavení. Tato volba je "
 "standardně zapnuta. Pouze pro testování!"
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "Hrubá kalibrace pouze pro první sken"
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2504,12 +3232,12 @@ msgstr ""
 "funguje a může zkrátit �as skenování. Pokud se obrázek s každým dalším "
 "skenem mění, vyřa�te tuto volbu. Pouze pro testování!"
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, fuzzy, no-c-format
 msgid "Backtrack lines"
 msgstr "Skenovat při zpětném chodu"
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2518,83 +3246,83 @@ msgid ""
 "omitting lines."
 msgstr ""
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Hodnota gama"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr "Nastavuje hodnotu gama pro všechny kanály."
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, fuzzy, no-c-format
 msgid "Geometry Group"
 msgstr "Geometrie"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, fuzzy, no-c-format
 msgid "Scan Mode Group"
 msgstr "Režim skenování"
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, fuzzy, no-c-format
 msgid "Slide"
 msgstr "Zcela bílá"
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, fuzzy, no-c-format
 msgid "Scanner model"
 msgstr "Režim skenu"
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, fuzzy, no-c-format
 msgid "Disable gamma correction"
 msgstr "Analogová korekce gama"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, fuzzy, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "Korekce gama"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, fuzzy, no-c-format
 msgid "Disable white shading correction"
 msgstr "Provést pouze korekci stínů"
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2602,12 +3330,12 @@ msgid ""
 "avoids depth emulation."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, fuzzy, no-c-format
 msgid "Emulate Grayscale"
 msgstr "Stupně šedé"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2615,368 +3343,362 @@ msgid ""
 "circumstances."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
 "analyze them."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, fuzzy, no-c-format
 msgid "Reset chipset"
 msgstr "skener s podava�em"
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, fuzzy, no-c-format
 msgid "Information"
 msgstr "Ignorovat kalibraci"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, fuzzy, no-c-format
 msgid "Chipset name"
 msgstr "Jméno souboru"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Unknown"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, fuzzy, no-c-format
 msgid "Shows the chipset ID"
 msgstr "skener s podava�em"
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, fuzzy, no-c-format
 msgid "Scan counter"
 msgstr "Zdroj"
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, fuzzy, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr "Zvolí �íslo polí�ka, které bude naskenováno"
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, fuzzy, no-c-format
 msgid "Update information"
 msgstr "Zvláštní volby"
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr "Obrázek"
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr "Různé"
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, fuzzy, no-c-format
 msgid "offset X"
 msgstr "Odstup"
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, fuzzy, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr "Levý horní roh x skenované plochy."
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, fuzzy, no-c-format
 msgid "offset Y"
 msgstr "Odstup"
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, fuzzy, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr "Levý horní roh x skenované plochy."
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr "Stav lampy"
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr "Zapíná a vypíná lampu."
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr "Kalibruje úrovně �erné a bílé."
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr ""
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, fuzzy, no-c-format
 msgid "TMA Slides"
 msgstr "Zcela bílá"
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, fuzzy, no-c-format
 msgid "TMA Negatives"
 msgstr "Negativ"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, fuzzy, no-c-format
 msgid "Color (48 bits)"
 msgstr "Barva 48"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, fuzzy, no-c-format
 msgid "Extend lamp timeout"
 msgstr "Vypnout lampu"
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr ""
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr "Čekat na tla�ítko"
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, fuzzy, no-c-format
 msgid "Waits for button before scanning"
 msgstr "Zahřát lampu před skenováním"
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, fuzzy, no-c-format
 msgid "Advanced Options"
 msgstr "Zvláštní volby"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr "Hrubý"
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr "Jemný"
 
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr "Bayer"
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr "Volitelný"
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "Automaticky"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr ""
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr ""
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr ""
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "NTSC šedá"
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr "XPA šedá"
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "Pomalý"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr "Normální"
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "Rychlý"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr "Velmi rychlý"
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr ""
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr ""
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr ""
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr ""
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, fuzzy, no-c-format
 msgid "Film-strip"
 msgstr "Typ filmu"
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr ""
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr ""
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, fuzzy, no-c-format
 msgid "Experiment"
 msgstr "Expozi�ní �as"
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, fuzzy, no-c-format
 msgid "Sharpening"
 msgstr "Zaostření"
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr ""
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr "Automatické nastavení prahových hodnot"
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr ""
 
-#: ../backend/hp-option.h:73
-#, fuzzy, no-c-format
-msgid "Smoothing"
-msgstr "Jemný"
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, fuzzy, no-c-format
 msgid "Select smoothing filter."
 msgstr "Zvolit polotóny"
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr ""
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, fuzzy, no-c-format
 msgid "Unloads the media after a scan."
 msgstr "Na�íst obrázek v úrovních šedé."
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, fuzzy, no-c-format
 msgid "Change document"
 msgstr "Vylepšení"
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr ""
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr ""
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr ""
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, fuzzy, no-c-format
 msgid "Start calibration process."
 msgstr "Hrubá kalibrace"
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, fuzzy, no-c-format
 msgid "Media"
 msgstr "Střední"
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr ""
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr "Expozi�ní �as"
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -2985,460 +3707,459 @@ msgid ""
 "value."
 msgstr ""
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, fuzzy, no-c-format
 msgid "Color Matrix"
 msgstr "Barevný vzorek"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, fuzzy, no-c-format
 msgid "Set the scanners color matrix."
 msgstr "Nastavuje kontrast �erveného kanálu"
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr ""
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, fuzzy, no-c-format
 msgid "Mono Color Matrix"
 msgstr "Barevný vzorek"
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr ""
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, fuzzy, no-c-format
 msgid "Mirror horizontal"
 msgstr "Zrcadlit obrázek"
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, fuzzy, no-c-format
 msgid "Mirror image horizontally."
 msgstr "Zrcadlit obrázek"
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, fuzzy, no-c-format
 msgid "Mirror vertical"
 msgstr "Zrcadlit obrázek"
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, fuzzy, no-c-format
 msgid "Mirror image vertically."
 msgstr "Zrcadlit obrázek"
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, fuzzy, no-c-format
 msgid "Update options"
 msgstr "Zvláštní volby"
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, fuzzy, no-c-format
 msgid "Update options."
 msgstr "Testovací volby s pevnou des. �árkou"
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr ""
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr ""
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr ""
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr ""
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr "Vypnout lampu"
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr "Vypnout lampu skeneru."
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "Rozměr papíru"
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr "Automatické oddělení"
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, fuzzy, no-c-format
 msgid "Landscape"
 msgstr "A5 na šířku"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr ""
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, no-c-format
 msgid "Length control mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, fuzzy, no-c-format
 msgid "Manual feed mode"
 msgstr "Manuální předběžné zaostření"
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, fuzzy, no-c-format
 msgid "Manual feed timeout"
 msgstr "Manuální předběžné zaostření"
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr "Zapnout oboustranné (duplexní) skenování"
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr "Fyzická velikost papíru v automatikém podava�i"
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, fuzzy, no-c-format
 msgid "halftone"
 msgstr "Polotóny"
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, fuzzy, no-c-format
 msgid "color"
 msgstr "Barva"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, no-c-format
 msgid "continuous"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, no-c-format
 msgid "off"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, fuzzy, no-c-format
 msgid "bayer_64"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, fuzzy, no-c-format
 msgid "bayer_16"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, fuzzy, no-c-format
 msgid "halftone_32"
 msgstr "Polotóny"
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, fuzzy, no-c-format
 msgid "halftone_64"
 msgstr "Polotóny"
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, fuzzy, no-c-format
 msgid "diffusion"
 msgstr "Chybový rozptyl"
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, fuzzy, no-c-format
 msgid "normal"
 msgstr "Normální"
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, fuzzy, no-c-format
 msgid "light"
 msgstr "Světlé body"
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, fuzzy, no-c-format
 msgid "From scanner"
 msgstr "Stolní skener"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr "Z papíru"
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, fuzzy, no-c-format
 msgid "default"
 msgstr "Standard"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, fuzzy, no-c-format
 msgid "smooth"
 msgstr "Jemný"
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, fuzzy, no-c-format
 msgid "low"
 msgstr "Pomalý"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, fuzzy, no-c-format
 msgid "medium"
 msgstr "Střední"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, fuzzy, no-c-format
 msgid "red"
 msgstr "Červená"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, fuzzy, no-c-format
 msgid "green"
 msgstr "Zelená"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, fuzzy, no-c-format
 msgid "Sets the scan source"
 msgstr "Zdroj"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr "Režim podava�e"
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr "Nastavuje režim podava�e"
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, fuzzy, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr "Vyřadit předběžné zaostření"
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, fuzzy, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr "Vyřadit předběžné zaostření"
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, fuzzy, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "Nastavuje režim podava�e"
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, fuzzy, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr "Nastavuje režim podava�e"
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr "Automatické nastavení prahových hodnot"
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
@@ -3447,556 +4168,543 @@ msgstr ""
 "Automaticky nastaví jas, kontrast, úroveň bílé, gama korekci, redukci "
 "šumu a zvýraznění obrázku"
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "Redukce Å¡umu"
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr "Redukuje izolovaný bodový šum"
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr "Zvýraznění obrázku"
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr "Nastaví zvýraznění obrázku"
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr "Gama"
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, fuzzy, no-c-format
 msgid "Lamp color"
 msgstr "Zapnout lampu"
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, fuzzy, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr "Zapíná a vypíná lampu."
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, fuzzy, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "Zrcadlit obrázek"
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
 "length of actual paper or logical document length."
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "Korekce gama"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, fuzzy, no-c-format
 msgid "High sensivity"
 msgstr "Tisk ve vysoké kvalitě"
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, fuzzy, no-c-format
 msgid "Low sensivity"
 msgstr "Tisk v nízké kvalitě"
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, fuzzy, no-c-format
 msgid "err_diffusion"
 msgstr "Chybový rozptyl"
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, fuzzy, no-c-format
 msgid "No detection"
 msgstr "Bez korekce"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, fuzzy, no-c-format
 msgid "Normal mode"
 msgstr "Normální"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, fuzzy, no-c-format
 msgid "Enhanced mode"
 msgstr "Vylepšení"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
 "divides long paper by the length which is set in Document Size option."
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, fuzzy, no-c-format
 msgid "Automatic threshold mode"
 msgstr "Automatické nastavení prahových hodnot"
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, fuzzy, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr "Automatické nastavení prahových hodnot"
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, fuzzy, no-c-format
 msgid "Set chroma of red"
 msgstr "Nastavit pořadí kanálů"
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, fuzzy, no-c-format
 msgid "chroma of blue"
 msgstr "Stíny modré"
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, fuzzy, no-c-format
 msgid "Set chroma of blue"
 msgstr "Posun �ervená-modrá"
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr "Diamant"
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr "8x8 hrubé zvýraznění (fatting)"
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr "8x8 jemné zvýranění (fatting)"
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr "8x8 Bayer"
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr "8x8 vertikála"
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr "Zisk"
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr "Nastavení zisku barevných kanálů"
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, no-c-format
 msgid "Gray gain"
 msgstr "Zisk šedé"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr "Nastavuje zisk šedého kanálu"
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, no-c-format
 msgid "Red gain"
 msgstr "Zisk �ervené"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr "Nastavuje zisk �erveného kanálu"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, no-c-format
 msgid "Green gain"
 msgstr "Zisk zelené"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr "Nastavuje zisk zeleného kanálu"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, no-c-format
 msgid "Blue gain"
 msgstr "Zisk modré"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr "Nastavuje zisk modrého kanálu"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr "Rozptyl 16 Bayer"
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr "Rozptyl 64 Bayer"
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr "Polotón - 32 bodů"
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr "Polotón 64 bodů"
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr "Chybový rozptyl"
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr "Režim 1"
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr "Režim 2"
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr "Režim 3"
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr "Z bílého bodu"
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr "Jemný"
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr "Nízká"
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr "Střední"
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr "Vysoká"
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr "CRT"
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "Jedna strana"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "VÅ¡echny strany"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr "skener s podava�em"
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr "Stupně šedé 4 bity"
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr "Stupně šedé 8 bitů"
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr "Stíny, polotóny, světlé body, expozice"
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr "Zvláštní volby"
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr "Barevné vyvážení"
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr "Vyřadit zpětný chod"
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr "Pokud je zvoleno, skener neskenuje při zpětném průchodu."
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr "Vypnout lampu plochého skeneru"
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr "Vypne lampu plochého skeneru"
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr "Kalibrace backendem"
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid ""
 "If checked the color calibration before a scan is done by the backend"
 msgstr "Pokud je zvoleno, kalibraci před skenováním provede backend"
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr "Použít prosvětlovací adaptér pro film 35mm"
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr "Tato volba vypne během skenu lampu plochého skeneru"
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "Sken v plné kvalitě"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr "Vysoká kvalita ale nižší rychlost"
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "Rychlý sken"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr "Nejvyšší rychlost ale nižší kvalita"
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr "Automatické nastavení prahových hodnot"
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
@@ -4004,67 +4712,67 @@ msgid ""
 msgstr ""
 "Pokud je zvoleno, optimální prahové hodnoty se pokusí nastavit backend."
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr "Zvolí režim gama korekce."
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr "Svázat hodnoty gama"
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr "Použít shodné hodnoty gama pro všechny �tyři barevné kanály."
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr "Skalární gama"
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr "Nastaví hodnotu skalární gama korekce."
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr "Skalární gama �ervené"
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr "Nastaví hodnotu skalární gama korekce pro �ervený kanál"
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr "Skalární gama zelené"
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr "Nastaví hodnotu skalární gama korekce pro zelený kanál"
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr "Skalární gama modré"
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr "Nastaví hodnotu skalární gama korekce pro modrý kanál"
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr "Kanál"
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
@@ -4072,207 +4780,207 @@ msgstr ""
 "Nastaví barevné pásmo, \"Spole�né\" znamená, že jsou ovlivněny všechny "
 "barvy."
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr "Polotóny"
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr "Nastaví, která úroveň jasu má být považována za \"50% šedou\"."
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr "Polotóny pro �ervenou"
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr "Nastaví, která úroveň jasu má být považována za \"50% �ervenou\"."
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr "Polotóny pro zelenou"
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr "Nastaví, která úroveň jasu má být považována za \"50% zelenou\"."
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr "Polotóny pro modrou"
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr "Nastaví, která úroveň jasu má být považována za \"50% modrou\"."
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr "Vyvážení �ervené"
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr "Vyvážení �ervené. Hodnota 100% znamená bez korekce."
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr "Vyvážení zelené"
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr "Vyvážení zelené. Hodnota 100% znamená bez korekce."
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr "Vyvážení modré"
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr "Vyvážení modré. Hodnota 100% znamená bez korekce."
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr "Vyvážení firmwarem"
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr "Nastaví barevné vyvážení na hodnoty poskytované firmwarem."
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "Nejpomalejší"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "Pomalejší"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "Rychlejší"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "Nejrychlejší"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr "8x8 hrubý"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr "8x8 normální"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr "8x8 jemný"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr "8x8 velmi jemný"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr "6x6 normální"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr "5x5 hrubý"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr "5x5 jemný"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr "4x4 hrubý"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr "4x4 normální"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr "4x4 jemný"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr "3x3 normální"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr "2x2 normální"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr "8x8 volitelný"
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr "6x6 volitelný"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr "5x5 volitelný"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr "4x4 volitelný"
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr "3x3 volitelný"
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr "2x2 volitelný"
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr "Stupně šedé - rychlý režim"
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr "Skenuje se ve stupních šedé v rychlé režimu (nižší kvalitě)"
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
@@ -4281,117 +4989,117 @@ msgstr ""
 "Požaduje, aby se všechny náhledy dělaly v nejrychleším režimu (s nízkou "
 "kvalitou). To může znamenat např. �ernobílý režim nebo nízké rozlišení."
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, fuzzy, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr "Zahřát lampu"
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr ""
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, fuzzy, no-c-format
 msgid "Turn lamp off"
 msgstr "Zapíná/vypíná lampu"
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, fuzzy, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr "Vypne lampu plochého skeneru"
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr "Jas �ervené"
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr "Nastavuje jas �erveného kanálu naskenovaného obrázku."
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr "Jas zelené"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr "Nastavuje jas zeleného kanálu naskenovaného obrázku."
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr "Jas modré"
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr "Nastavuje jas modrého kanálu naskenovaného obrázku."
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "Kontrast �erveného kanálu"
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr "Nastavuje kontrast �erveného kanálu naskenovaného obrázku."
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "Kontrast zeleného kanálu"
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr "Nastavuje kontrast zeleného kanálu naskenovaného obrázku."
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "Kontrast modrého kanálu"
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr "Nastavuje kontrast modrého kanálu naskenovaného obrázku."
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr "Barva 48"
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr "Barva 24"
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr "Šedá 16"
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr "Šedá 8"
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, fuzzy, no-c-format
 msgid "Positive"
 msgstr "Pozitivní film"
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -4400,39 +5108,39 @@ msgstr ""
 "Zahřát lampu dokud její jas není konstantní namísto standardního 40ti "
 "sekundového zahřívání."
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, fuzzy, no-c-format
 msgid "Negative color"
 msgstr "Negativní film"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, fuzzy, no-c-format
 msgid "Negative gray"
 msgstr "Negativ"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, no-c-format
 msgid "48 bits color"
 msgstr ""
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
 "mode and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4440,248 +5148,239 @@ msgid ""
 "cancel, press \"GRAY\" button."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:143
-#, no-c-format
-msgid "Gamma function exponent"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:144
-#, no-c-format
-msgid "Changes intensity of midtones"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:232
 #, fuzzy, no-c-format
 msgid "Update button state"
 msgstr "Stav tla�ítek"
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:244
 #, fuzzy, no-c-format
 msgid "Button 1"
 msgstr "Stav tla�ítek"
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:258
 #, fuzzy, no-c-format
 msgid "Button 2"
 msgstr "Stav tla�ítek"
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr ""
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr ""
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr "Průsvitná předloha"
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr ""
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr ""
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr ""
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, fuzzy, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "Hrubá kalibrace"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr ""
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, fuzzy, no-c-format
 msgid "Calibration data cache"
 msgstr "Režim kalibrace"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr ""
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, fuzzy, no-c-format
 msgid "Performs calibration"
 msgstr "Hrubá kalibrace"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr ""
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr ""
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, fuzzy, no-c-format
 msgid "Warmup-time"
 msgstr "Zahřát lampu"
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, fuzzy, no-c-format
 msgid "Warmup-time in seconds."
 msgstr "Zahřát lampu"
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, fuzzy, no-c-format
 msgid "Lampoff-time"
 msgstr "Vypnout lampu"
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, fuzzy, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr "Zahřát lampu"
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, fuzzy, no-c-format
 msgid "Analog frontend"
 msgstr "Analogová korekce gama pro �ervenou"
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr "Odstup �ervené"
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr "Odstup zelené"
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr "Odstup modré"
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, fuzzy, no-c-format
 msgid "Red lamp off"
 msgstr "Zapíná/vypíná lampu"
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, fuzzy, no-c-format
 msgid "Green lamp off"
 msgstr "Zapíná/vypíná lampu"
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, fuzzy, no-c-format
 msgid "Blue lamp off"
 msgstr "Zapíná/vypíná lampu"
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr ""
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr "Barva 36"
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr "Rozptyl 1"
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr "Rozptyl 2"
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr "Náhodný"
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr "Volba zdroje"
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr "Vylepšení obrázku"
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr "Převod do úrovní šedé"
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr "Na�íst obrázek v úrovních šedé."
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr "Simulace trojitého průchodu"
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
@@ -4690,12 +5389,12 @@ msgstr ""
 "Simuluje trojprůchodový skener tak, že vrací 3 oddělené obrázky. Pro ty "
 "pomalejší z vás to znamená zelený, modrý a pak �ervený."
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr "Simulace ru�ního skeneru"
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4706,49 +5405,49 @@ msgstr ""
 "předem. Proto vracejí výšku 1. Tato volba umožnuje otestovat, jestli se "
 "s tím frontend vyrovná."
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid ""
 "Set default values for enhancement controls (brightness & contrast)."
 msgstr ""
 "Nastaví standardní hodnoty prvků vylepšení obrázku (jas a kontrast)"
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr "Volba testu pouhého �tení"
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr "Uvidíme, jestli se s tím frontend vyrovná"
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr "Tabulky gama"
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr "Simulace stavových kódů"
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr "Netla�it stavový kód"
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr "Nenutit backend, aby vrátil stavový kód."
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr "Vrátit SANE_STATUS_EOF"
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
@@ -4757,12 +5456,12 @@ msgstr ""
 "Přinutit backend, aby po volání sane_read() vrátil stavový kód "
 "SANE_STATUS_EOF."
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr "Vrátit SANE_STATUS_JAMMED"
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
@@ -4771,12 +5470,12 @@ msgstr ""
 "Přinutit backend, aby po volání sane_read() vrátil stavový kód "
 "SANE_STATUS_JAMMED."
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr "Vrátit SANE_STATUS_NO_DOCS"
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
@@ -4785,12 +5484,12 @@ msgstr ""
 "Přinutit backend, aby po volání sane_read() vrátil stavový kód "
 "SANE_STATUS_NO_DOCS."
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr "Vrátit SANE_STATUS_COVER_OPEN"
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
@@ -4799,12 +5498,12 @@ msgstr ""
 "Přinutit backend, aby po volání sane_read() vrátil stavový kód "
 "SANE_STATUS_COVER_OPEN."
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr "Vrátit SANE_STATUS_IO_ERROR"
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
@@ -4813,12 +5512,12 @@ msgstr ""
 "Přinutit backend, aby po volání sane_read() vrátil stavový kód "
 "SANE_STATUS_IO_ERROR."
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr "Vrátit SANE_STATUS_NO_MEM"
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
@@ -4827,12 +5526,12 @@ msgstr ""
 "Přinutit backend, aby po volání sane_read() vrátil stavový kód "
 "SANE_STATUS_NO_MEM."
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr "Vrátit SANE_STATUS_ACCESS_DENIED"
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
@@ -4841,85 +5540,82 @@ msgstr ""
 "Přinutit backend, aby po volání sane_read() vrátil stavový kód "
 "SANE_STATUS_ACCESS_DENIED."
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr ""
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr "Zapnout lampu"
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr "Zapnout lampu skeneru"
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr "Vypnout lampu"
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr "Vypnout lampu skeneru"
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, fuzzy, no-c-format
 msgid "Lamp timeout"
 msgstr "Vypnout lampu"
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr ""
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr "Podava� dokumentů"
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr "15 x 10 (cm)"
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr "20x24 (cm)"
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr "22x28 (cm)"
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr "Polotón není podporován"
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr "Bodový rozptyl 8x8"
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr "Bodový rozptyl 16x16"
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -4934,27 +5630,27 @@ msgstr ""
 "skenování zastavovat, pokud je příliš vysoké, skenovací rozhraní v "
 "prostředí X mohou přestat reagovat a systém může zkolabovat."
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr ""
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr ""
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, fuzzy, no-c-format
 msgid "Focus point for scanning."
 msgstr "Vysunout dokument po naskenování"
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr "Režim náhledu"
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
@@ -4963,12 +5659,12 @@ msgstr ""
 "Volí režim náhledu. Náhled ve stupních šedé obvykle nabízí nejlepší "
 "kombinaci rychlosti a detailu."
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr "Přednastavené hodnoty"
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
@@ -4977,97 +5673,97 @@ msgstr ""
 "Poskytuje standardní skenovací plochu pro fotografie, vytištěné stránky "
 "apod."
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr ""
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, fuzzy, no-c-format
 msgid "Frame to be scanned"
 msgstr "Stolní skener"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, no-c-format
 msgid "Focus-mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, fuzzy, no-c-format
 msgid "Auto or manual focus"
 msgstr "Automaticky vysunout"
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, fuzzy, no-c-format
 msgid "Focus-point"
 msgstr "Pozice zaostření"
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, fuzzy, no-c-format
 msgid "Focus point"
 msgstr "Pozice zaostření"
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr "Po�et barevných �ar na jedno �tení"
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr "Po�et �ar ve stupních šedi na jedno �tení"
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr ""
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr "Barva RAW"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr "Barva RGB"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr "Barva RGB TEXT"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr "Zcela �erná"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr "Zcela bílá"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr "Barevný vzorek"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr "Mřížka"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr "První položka"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr "Druhá položka"
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
@@ -5076,12 +5772,12 @@ msgstr ""
 "Toto je velice dlouhá třetí položka. Doufejme, že frontend tuší, jak ji "
 "správně zobrazit"
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr "Simulace ru�ního skeneru"
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5093,46 +5789,46 @@ msgstr ""
 "předem. Proto vracejí výšku 1. Tato volba umožnuje otestovat, jestli se "
 "s tím frontend vyrovná."
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr "Simulace trojitého průchodu"
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
 "transmitted."
 msgstr "Simuluje trojprůchodový skener tak, že vrací 3 oddělené obrázky."
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr "Nastavit pořadí kanálů"
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr "Nastavit pořadí kanálů v trojprůchodovém barevném režimu."
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
 "after 10 scans."
 msgstr ""
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr "Zvláštní volby"
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr "Zvolit testovací obrázek"
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5149,12 +5845,12 @@ msgstr ""
 "režimu.\n"
 "Mřížka: vykreslí �ernobílou mřížku o šířce a výšce 10 mm / �tvere�ek."
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr "Převrátit endian (invert endianness)"
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5165,55 +5861,55 @@ msgstr ""
 "volbu lze použít k testu 16-bitových režimů frontendů, např. zda "
 "frontend používá správný endian."
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr "Limit �tení"
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr "Omezit množství dat, přenášených každým voláním sane_read()."
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr "Velikost limitu �tení"
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
 msgstr ""
 "Maximální velikost dat, přenášených při kaýždém volání sane_read()."
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr "Prodleva �tení"
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr "Prodleva pro přenos dat do roury."
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr "Doba prodlevy �tení"
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
 msgstr "Jak dlouho se má �ekat po přenesení každé dávky dat rourou."
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr "Návratová hodnota sane_read"
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
@@ -5224,22 +5920,22 @@ msgstr ""
 "zpracování při skenování. Všechny ostatní stavové hodnoty jsou pro "
 "testování, jak si s nimi frontend poradí."
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr "Ztráta bodů na řádku"
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr "Po�et bodů na konci každé řádky, které nejsou využity."
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr "Nepřesné (fuzzy) parametry"
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
@@ -5248,23 +5944,23 @@ msgstr ""
 "Vrátit nepřesné (fuzzy) řádky bajty na řádku, pokud je volána funkce "
 "sane_parameters() před sane_start()"
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr "Použít neblokující V/V"
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 "Použít neblokující V/V pro sane_read(), pokud to frontend podporuje."
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr "Nabídnout select file descriptor"
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
@@ -5272,12 +5968,12 @@ msgid ""
 msgstr ""
 "Nabídnout select file descriptor pro detekci, zda sane_read() vrátí data."
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr "Povolit testovací volby"
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
@@ -5286,27 +5982,27 @@ msgstr ""
 "Povoluje různé testovací volby. Je tu pro testování schopností frontendů "
 "zobrazit a změnit všechny možné typy voleb SANE."
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr "Tisk voleb"
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr "Vytisknout seznam všech voleb"
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr "Boolovské (ano/ne) testovací volby"
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr "(1/6) Boolovská softwarová volba, softwarová detekce"
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
@@ -5315,12 +6011,12 @@ msgstr ""
 "(1/6) Boolovská volba, která umožňuje softwarovou volbu a softwarovou "
 "detekci (a pokro�ilejší). Je to v podstatě normální boolovská volba."
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr "(2/6) Boolovská s hardwarovým výběrem a softwarovou detekcí"
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
@@ -5331,12 +6027,12 @@ msgstr ""
 "detekci (a pokro�ilejší). To znamená, že volbu nelze nastavit frontendem "
 "ale je nastavena uživatelem (např. stisknutím tla�ítka na zařízení)."
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr "(3/6) Boolovská volba s hardwarovým výběrem"
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5348,12 +6044,12 @@ msgstr ""
 "jen uživatelem (např. stiskem tla�ítka na zařízení) a frontend ji nemůže "
 "ani na�íst."
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr "(4/6) Boolovská volba se softwarovou detekcí"
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
@@ -5362,12 +6058,12 @@ msgstr ""
 "(4/6) Boolovská testovací volba podporující softwarovou detekci (a "
 "pokro�ilejší). To znamená, že jde o volbu pouze ke �tení."
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr "(5/6) Boolovská volba s emulací softwarové volby"
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
@@ -5376,14 +6072,14 @@ msgstr ""
 "(5/6) Boolovská testovací volba, která podporuje softwarovou volbu, "
 "detekci a emulaci (plus pokro�ilejší)."
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr ""
 "(6/6) Boolovská volba se softwarovou volbou a automatickou softwarovou "
 "detekcí"
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5394,28 +6090,28 @@ msgstr ""
 "softwarovou detekci (a pokro�ilejší). Tato volba může být automaticky "
 "nastavena backendem."
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr "Celo�íselné (Int) testovací volby"
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr "(1/6) Celo�íselná"
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr ""
 "(1/6) Celo�íselná testovací volba bez jednotek a nastavených omezení."
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr "(2/6) Celo�íselná volba s omezením rozsahu"
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
@@ -5424,24 +6120,24 @@ msgstr ""
 "(2/6) Celo�íselná testovací volba s jednotkou bod a omezením rozsahu. "
 "Minimum is 4, maximum 192, krok je 2."
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr "(3/6) Celo�íselný seznam s omezením"
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 "(3/6) Celo�íselná testovací volba s jednokou bit a omezením množinou "
 "slov."
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr "(4/6) Celo�íselné pole"
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
@@ -5449,12 +6145,12 @@ msgid ""
 msgstr ""
 "(4/6) Celo�íselné testovací pole s jednotkou mm a polem bez omezení."
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr "(5/6) Celo�íselné pole s omezením rozsahu"
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
@@ -5463,12 +6159,12 @@ msgstr ""
 "(5/6) Celo�íselné testovací pole s jednotkou dpi a omezením rozsahu. "
 "Minimum je 4, maximum 192, krok 2."
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr "(6/6) Celo�íselné pole s omezením množinou slov"
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
@@ -5477,28 +6173,28 @@ msgstr ""
 "(6/6) Celo�íselné testovací pole s jednotkou procenta a omezením rozsahu "
 "pomocí množiny slov."
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr "Testovací volby s pevnou des. �árkou"
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr "(1/3) Číslo s pevnou des. �árkou"
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr ""
 "(1/3) Číslo s pevnou desetinnou �árkou, bez jednotek a bez omezení."
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr "(2/3) Číslo s pevnou des. �árkou a omezeným rozsahem"
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
@@ -5507,49 +6203,49 @@ msgstr ""
 "(2/3) Číslo s pevnou des. �árkou, jednotkou mikrosekundy a omezením "
 "rozsahu. Minimum je -42,17, maximum 32767,9999, krok 2,0."
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr "(3/3) Číslo s pevnou desetinnou �árkou s omezením seznamem slov"
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 "(3/3) Číslo s pevnou desetinnou �árkou bez jednotky a s omezením "
 "seznamem slov."
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr "Testovací volby řetězcové"
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr "(1/3) Řetězec"
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr "(1/3) Řetězcová volba bez omezení."
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr "(2/3) Řetězcová volba s omezením seznamem"
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr "(2/3) Řetězcová volba s omezením seznamem."
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr "(3/3) Řetězcová volba s omezením dlouhým seznamem"
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
@@ -5558,156 +6254,160 @@ msgstr ""
 "(3/3) Řetězcová volba s dlouhými řetězci s omezením seznamem. Obsahuje "
 "poněkud více položek..."
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr "Testovací volby tla�ítkové"
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr "(1/1) Tla�ítko"
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr "(1/1) Testovací tla�ítková volba. Vytiskne nějaký text..."
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, fuzzy, no-c-format
 msgid "Color 36"
 msgstr "Barva 36"
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr "Uživatelské nastavení obrázku"
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr "Dvouúrovňová �ernobílá (perokresba)"
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr "Polotónová �ernobílá s rozptylem (polotón)"
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr "Víceúrovňová �ernobílá (úrovně šedé)"
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr "Víceúrovňová RGB barva (jednoprůchodová barva)"
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr "Ignorovat kalibraci"
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr "Vyřadit předběžné zaostření"
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr "Nekalibrovat zaostření"
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr "Manuální předběžné zaostření"
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr "Pozice pevného zaostření"
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr "Kalibrace �o�ky na pozici dokumentu"
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr "Kalibrovat zaostření �o�ky na pozici dokumentu"
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr "Pozice zaostření podava�e 0mm"
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr "Použít pozici 0mm zaostření podava�e místo 0,6mm"
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr "Režim kalibrace"
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr "Definovat režim kalibrace"
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr "Zapíná/vypíná lampu"
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr "UTA zapnuto"
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr "Zapíná/vypíná UTA"
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr "Odstup"
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr "Nastavení odstupu barevných kanálů"
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, no-c-format
 msgid "Gray offset"
 msgstr "Odstup šedé"
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr "Nastavuje odstup šedého kanálu"
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr "Nastavuje odstup �erveného kanálu"
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr "Nastavuje odstup zeleného kanálu"
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr "Nastavuje odstup modrého kanálu"
 
+#, fuzzy
+#~ msgid "IPC mode"
+#~ msgstr "Režim náhledu"
+
 #~ msgid "Grayscale"
 #~ msgstr "Stupně šedé"
 
diff --git a/po/da.gmo b/po/da.gmo
new file mode 100644
index 0000000..f0e9386
--- /dev/null
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 8d0a644..7113097 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends 1.0.17\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
 "PO-Revision-Date: 2007-12-17 22:59+0100\n"
 "Last-Translator: Mogens Jaeger <mogensjaeger@get2net.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -20,411 +20,405 @@ msgstr ""
 "X-Poedit-Country: DENMARK\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr "Antal af indstillingsmuligheder"
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr ""
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "Skanområde"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "Forbedring"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr ""
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "Smugkig"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr "Gennemtving monokrom smugkig"
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr "Bit dybde"
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Skannertilstand"
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "Skanningshastighed"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr "Skanningskilde"
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr "Gennemtving bagudrettet sporing"
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "Øverst-venstre x"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "Øverst-venstre y"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "Nederst-højre x"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "Nederst-højre y"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Skanningsopløsning"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "X-opløsning"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Y-opløsning"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr ""
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, fuzzy, no-c-format
 msgid "Page height"
 msgstr "Højlys"
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr "Brug tilpasset gammatabel"
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr "Billedeintensitet"
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr "Rød intensitet"
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr "Grøn intensitet"
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr "Blå intensitet"
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr "Lyshed"
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr "Kornstørrelse"
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr "Halvtone"
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "Sort niveau"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "Hvid niveau"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr "Hvid niveau for rød"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
 msgstr "Hvid niveau for grøn"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr "Hvid niveau for blå"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "Skygge"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr "Skygge for rød"
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr "Skygge for grøn"
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr "Skygge for blå"
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr "Højlys"
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr "Højlys for rød"
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr "Højlys for grøn"
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr "Højlys for blå"
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr "Farvetone"
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr "Mætning"
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "Filnavn"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr "Halvtonemønster størrelse"
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "Halvtonemønster"
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr "Sammenbind X- og Y-opløsning"
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "Negativ"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "Kvalitetskalibrering"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr "Dobbelt optisk opløsning"
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr "Sammenbind RGB"
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr "Tærskelværdi"
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr "Analog gammakorrektion"
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr "Analog gamma rød"
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr "Analog gamma grøn"
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr "Analog gamma blå"
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr "Sammenbind analoge gammaværdier"
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr "Varmer lampen op"
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr "Kalibrér eksponeringstid"
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr "Kalibrér eksponeringstid for rød"
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr "Kalibrér eksponeringstid for grøn"
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr "Kalibrér eksponeringstid for blå"
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr "Eksponeringstid til skanning"
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr "Eksponeringstid til skanning for rød"
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr "Eksponeringstid til skanning for grøn"
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr "Eksponeringstid til skanning for blå"
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr "Fastsæt eksponeringstid"
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr "Kalibrér lampe densitet"
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr "Skanner lampe densitet"
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr "Fastsæt lampe densitet"
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr "Lampe slukkes ved afslutning"
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
@@ -433,37 +427,37 @@ msgstr ""
 "Skrivebeskyttet indstilling der specificerer hvor mange indstillinger en "
 "bestemt enhed understøtter."
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, fuzzy, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "Kort opløsningsliste"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr ""
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, fuzzy, no-c-format
 msgid "Image modification options"
 msgstr "Antal af indstillingsmuligheder"
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, fuzzy, no-c-format
 msgid "Hardware specific options"
 msgstr "Skanningsopløsning"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr ""
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr "Forlang et skan i smugkigkvalitet."
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -474,7 +468,7 @@ msgstr ""
 "skanner, reduceres antal gennemløb til et, og på en en-gennemløbs "
 "skanner reducerer det hukommelsesforbruget og tidsforbruget."
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
@@ -483,82 +477,82 @@ msgstr ""
 "Antal bit pr. farve, typisk bruges værdien 1 for \"stregtegning\" og 8 "
 "for multibit skanninger."
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr ""
 "Vælger skanningstilstand (f.eks. stregtegning, monokrom eller farve)."
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr "Fastlægger hastigheden for skanningen."
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr "Vælger skanningskilde (som f.eks. en dokument-føder)."
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr "Fastsætter om bagudrettet sporing er gennemtvunget."
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "Øverste-venstre x position af skanområde."
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "Øverste-venstre y position af skanområde."
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "Nederste-højre x position af skanområde."
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "Nederste-højre y position af skanområde."
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr "Fastsætter opløsningen af det skannede billede."
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr "Fastsætter den vandrette opløsning af det skannede billede."
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr "Fastsætter den lodrette opløsning af det skannede billede."
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
 "sheet-fed scans."
 msgstr ""
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, fuzzy, no-c-format
 msgid "Specifies the height of the media."
 msgstr "Fastsætter opløsningen af det skannede billede."
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid ""
 "Determines whether a builtin or a custom gamma-table should be used."
 msgstr ""
 "Fastlægger om en indbygget eller en tilpasset gamma-tabel skal bruges."
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -568,32 +562,32 @@ msgstr ""
 "Gamma korrektionstabel. I farve tilstand påvirker denne indstilling de "
 "røde, blå og grønne kanaler ens (dvs., der er en intensitets gammatabel)."
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr "Gamma korrektionstabel for rød kanal."
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr "Gamma korrektionstabel for grøn kanal."
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr "Gamma korrektionstabel for blå kanal."
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr "Fastsætter lyshed for det rekvirerede billede."
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr "Fastsætter kontrast for det rekvirerede billede."
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
@@ -602,77 +596,77 @@ msgstr ""
 "Vælger \"kornethed\" for det rekvirerede billede. Mindre værdier giver "
 "et skarpere billeder."
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr ""
 "Vælger om det rekvirerede billede skal skannes i halvtoneindstilling "
 "(dithering)."
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr "Vælger hvilket glansniveau der skal anses for \"sort\"."
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr "Vælger hvilket glansniveau der skal anses for \"hvid\"."
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr "Vælger hvilket rødt glansniveau der skal anses for \"hvidt\"."
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr "Vælger hvilket grønt glansniveau der skal anses for \"hvidt\"."
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr "Vælger hvilket blåt glansniveau der skal anses for \"hvidt\"."
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr "Vælger hvilket rødt glansniveau der skal anses for \"sort\"."
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr "Vælger hvilket grønt glansniveau der skal anses for \"sort\"."
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr "Vælger hvilket blåt glansniveau der skal anses for \"sort\"."
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr "Vælger hvilket rødt glansniveau der skal anses for \"helt rødt\"."
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid ""
 "Selects what green radiance level should be considered \"full green\"."
 msgstr ""
 "Vælger hvilket grønt glansniveau der skal anses for \"helt grønt\"."
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid ""
 "Selects what blue radiance level should be considered \"full blue\"."
 msgstr "Vælger hvilket blåt glansniveau der skal anses for \"helt blåt\"."
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr "Fastsætter farvetone (blåt niveau) for det rekvirerede billede."
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
@@ -681,12 +675,12 @@ msgstr ""
 "Mætningsgraden styrer belysningen af ethvert enkeltbillede taget med et "
 "kamera. Højere værdier sørger for en stærkere belysning."
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr "Filnavnet på det billede der skal hentes."
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
@@ -695,7 +689,7 @@ msgstr ""
 "Fastsætter størrelsen på det halvtonegitter (dithering) der skal bruges "
 "ved skanning af halvtonebilleder."
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
@@ -703,287 +697,287 @@ msgstr ""
 "Angiver det halvtonegitter (dithering) der skal anvendes ved skanning af "
 "halvtonebilleder."
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr "Brug samme værdier for X og Y opløsning."
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr "Invertér farver, f.eks. byt om på sort og hvid."
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr "Foretag en kvalitets hvid-kalibrering."
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr "Brug linse, der fordobler den optiske opløsning."
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr "Anvend samme værdi for hver farve i RGB indstilling."
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr "Vælg minimum-lyshed, der skal betragtes som hvidt."
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr "Analog gammakorrektion"
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr "Analog gammakorrektion for rød"
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr "Analog gammakorrektion for grøn"
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr "Analog gammakorrektion for blå"
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr "Varm lampen op før skanning"
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr "Angiv belysningstid for kalibrering"
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr "Angiv belysningstid for kalibrering af rød farvedel"
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr "Angiv belysningstid for kalibrering af grøn farvedel"
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr "Angiv belysningstid for kalibrering af blå farvedel"
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr "Angiv belysningstid for skanning"
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr "Angiv belysningstid for skanning af rød farvedel"
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr "Angiv belysningstid for skanning af grøn farvedel"
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr "Angiv belysningstid for skanning af blå farvedel"
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr "Aktiver valg af belysningstid"
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr "Angiv lampe densitet for kalibrering"
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr "Angiv lampe densitet for skanning"
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr "Aktiver valg af lampe densitet"
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr "Slukker for skannerens lampe, når programmet stoppes."
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, fuzzy, no-c-format
 msgid "Scan button"
 msgstr "Skanningsopløsning"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, fuzzy, no-c-format
 msgid "Email button"
 msgstr "Vent på knap"
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, fuzzy, no-c-format
 msgid "Fax button"
 msgstr "Vent på knap"
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, fuzzy, no-c-format
 msgid "Copy button"
 msgstr "Vent på knap"
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr ""
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, fuzzy, no-c-format
 msgid "Cover open"
 msgstr "Farvemønster"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "Farve"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr "Farve stregtegning"
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr "Farve halvtone"
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "Gråtone"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr "Halvtone"
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "Stregtegning"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, fuzzy, no-c-format
 msgid "Operation not supported"
 msgstr "Halvtone er ikke understøttet"
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, fuzzy, no-c-format
 msgid "Document feeder jammed"
 msgstr "Dokument føder"
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, fuzzy, no-c-format
 msgid "Document feeder out of documents"
 msgstr "Dokument føder"
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, no-c-format
 msgid "Scanner cover is open"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "Standard"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr "Anvend standardværdier for forbedringskontroller."
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "Kalibrering"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr "Kalibrér før næste skanning"
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
@@ -992,12 +986,12 @@ msgstr ""
 "Hvis denne indstilling er sat til, vil enheden blive kalibreret før "
 "næste scanning. Ellers foretages kalibreringen kun før første skanning."
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr "Udfør kun skyggekorrektion"
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -1009,1058 +1003,1049 @@ msgstr ""
 "eksponeringstid, enten indbygget eller fra konfigurationsfilen, bliver "
 "brugt."
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr "Knap tilstand"
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr "Billednummer der skal skannes"
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr "Vælger nummeret på det billede der skal skannes"
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, no-c-format
 msgid "Duplex scan"
 msgstr "Duplex skan"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid ""
 "Duplex scan provide a scan of the front and back side of the document"
 msgstr "Duplex skan, skanner begge sider af dokumentet"
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr "Kalibrér skanner"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr "Gennemtving kalibrering før skanning"
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr "Gråskalaskanning"
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr "Udfør en gråskalaskanning fremfor en farveskanning"
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr "Analog forstærkning"
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr "Forøg eller formindsk CCD sensorens analoge forstærkning"
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "Gammakorrektion"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr "Vælger gammakorrigeret overføringskurve"
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr ""
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr ""
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, fuzzy, no-c-format
 msgid "No transparency correction"
 msgstr "Farvekorrektion"
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr ""
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr ""
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, fuzzy, no-c-format
 msgid "Negatives"
 msgstr "Negativ"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, fuzzy, no-c-format
 msgid "Slides"
 msgstr "Diapositiv"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, fuzzy, no-c-format
 msgid "Normal speed"
 msgstr "Normal"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, fuzzy, no-c-format
 msgid "1/2 normal speed"
 msgstr "2x2 normal"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, fuzzy, no-c-format
 msgid "1/3 normal speed"
 msgstr "3x3 normal"
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, fuzzy, no-c-format
 msgid "rounded parameter"
 msgstr "Uklare parametre"
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr ""
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, fuzzy, no-c-format
 msgid "ADF jam"
 msgstr "ADF"
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr ""
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, fuzzy, no-c-format
 msgid "lamp failure"
 msgstr "Gamma værdi"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr ""
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr ""
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr ""
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr ""
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr ""
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, fuzzy, no-c-format
 msgid "transparency unit lamp failure"
 msgstr "Filmenhed"
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr ""
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr ""
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr ""
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr ""
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr ""
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr ""
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr ""
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr ""
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr ""
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr ""
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr ""
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr ""
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr ""
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr ""
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr ""
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr ""
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr ""
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr ""
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr ""
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, fuzzy, no-c-format
 msgid "transparency unit shading error"
 msgstr "Filmenhed"
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr ""
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, fuzzy, no-c-format
 msgid "film scanner"
 msgstr "Flatbed skanner"
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr "Flatbed skanner"
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr "Filmtype"
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr ""
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, fuzzy, no-c-format
 msgid "Negative film type"
 msgstr "Negativ film"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, fuzzy, no-c-format
 msgid "Selects the negative film type"
 msgstr "Vælg testbillede"
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, fuzzy, no-c-format
 msgid "Hardware resolution"
 msgstr "Skanningsopløsning"
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, fuzzy, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "Vis kort liste med mulige opløsninger"
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr ""
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, fuzzy, no-c-format
 msgid "Auto focus"
 msgstr "Automatisk skub ud"
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, fuzzy, no-c-format
 msgid "Enable/disable auto focus"
 msgstr "Deaktiver pre-fokusering"
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr ""
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr ""
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, fuzzy, no-c-format
 msgid "Manual focus position"
 msgstr "Fast fokusposition"
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr ""
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr ""
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr ""
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "Spejl billedet"
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, fuzzy, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "Spejlvend billedet vandret."
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, fuzzy, no-c-format
 msgid "Auto exposure"
 msgstr "Fastsæt eksponeringstid"
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, fuzzy, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr "Aktiver valg af belysningstid"
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, fuzzy, no-c-format
 msgid "Calibration now"
 msgstr "Kalibrering"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, fuzzy, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Definer kalibreringstilstand"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr ""
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr ""
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, fuzzy, no-c-format
 msgid "Reset scanner"
 msgstr "arkføder skanner"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, fuzzy, no-c-format
 msgid "Reset the scanner"
 msgstr "arkføder skanner"
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr ""
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, fuzzy, no-c-format
 msgid "Eject film after each scan"
 msgstr "Skub dokumentet ud efter skanning"
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr ""
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr ""
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr ""
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr ""
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr ""
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, fuzzy, no-c-format
 msgid "Document feeder extras"
 msgstr "Dokument føder"
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, fuzzy, no-c-format
 msgid "Flatbed only"
 msgstr "Flatbed"
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr ""
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, fuzzy, no-c-format
 msgid "Transparency unit"
 msgstr "Filmenhed"
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr ""
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, fuzzy, no-c-format
 msgid "Negative film"
 msgstr "Negativ film"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, fuzzy, no-c-format
 msgid "Positive or negative film"
 msgstr "Positiv film"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr ""
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr ""
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, fuzzy, no-c-format
 msgid "Transparency ratio"
 msgstr "Filmenhed"
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, fuzzy, no-c-format
 msgid "Select film type"
 msgstr "Filmtype"
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, fuzzy, no-c-format
 msgid "Select the film type"
 msgstr "Vælger halvtone."
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "Flatbed"
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, no-c-format
 msgid "ADF Front"
 msgstr ""
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, fuzzy, no-c-format
 msgid "ADF Back"
 msgstr "ADF"
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, fuzzy, no-c-format
 msgid "ADF Duplex"
 msgstr "Dobbeltsidet"
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, fuzzy, no-c-format
 msgid "Card Front"
 msgstr "Print"
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, no-c-format
 msgid "Card Back"
 msgstr ""
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, fuzzy, no-c-format
 msgid "Card Duplex"
 msgstr "Dobbeltsidet"
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "Rød"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "Grøn"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "Blå"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, fuzzy, no-c-format
 msgid "Enhance Red"
 msgstr "Forbedring"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, fuzzy, no-c-format
 msgid "Enhance Green"
 msgstr "Forbedring"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, fuzzy, no-c-format
 msgid "Enhance Blue"
 msgstr "Forbedring"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr "Ingen"
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr ""
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr ""
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr "Enkeltsidet"
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr "Dobbeltsidet"
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr "Filmenhed"
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr "Automatisk dokumentføder"
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "Positiv film"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "Negativ film"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr "Fokusér på glaspladen"
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr "Fokusér 2,5 mm over glaspladen"
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr "Halvtone A (hård tone)"
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr "Halvtone B (blød tone)"
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr "Halvtone C (net/skærm)"
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr "Dithering A (4x4 Bayer)"
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr "Dithering B (4x4 spiral)"
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr "Dithering C (4x4 net/skærm)"
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr "Dithering D (8x4 net/skærm)"
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr "Tekstforbedringsteknologi"
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr "Hent mønster A"
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr "Hent mønster B"
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "Ingen korrektion"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr "Brugerdefineret"
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr "Matrix printere"
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr "Termo printere"
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "Blæk printere"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr "CRT skærme"
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "Standard"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr "Udskrift med høj opløsning"
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr "Udskrift med lav opløsning"
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr "Udskrift med høj kontrast"
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr "Brugerdefineret (gamma=1,0)"
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr "Brugerdefineret (gamma=1,8)"
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr "CD"
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr "A5 portræt"
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr "A5 tværformat"
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr "Letter"
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr "A4"
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "Maks"
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr "Skanner tilstand"
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr "Vælger halvtone."
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr "Udfald"
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr "Vælger udfaldet."
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr "Vælger lyshed."
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr "Skarphed"
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr "Farvekorrektion"
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr "Fastsætter farvekorrektiontabellen for den valgte uddataenhed."
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr "Farvekorrektionskoefficienter"
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr "Matrix multiplikation af RGB"
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr "Forskyder grøn mod rød"
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr "Forskyder grøn mod blå"
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr "Forskyder rød mod grøn"
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr "Forskyder rød mod blå"
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr "Forskyder blå mod grøn"
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr "Forskyder blå mod rød"
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr "Kontrollerer grønt niveau"
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr "Øger det røde, baseret på grønt niveau"
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr "Øger det blå, baseret på grønt niveau"
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr "Øger det grønne, baseret på rødt niveau"
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr "Fastsætter rødt niveau"
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr "Øger det blå, baseret på rødt niveau"
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr "Øger det grønne, baseret på blåt niveau"
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr "Øger det røde, baseret på blåt niveau"
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, no-c-format
 msgid "Controls blue level"
 msgstr "Fastsætter blåt niveau"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr "Spejlvend billedet."
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr "Hurtig forhåndsvisning"
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr "Automatisk områdeopdeling"
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr "Kort opløsningsliste"
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr "Vis kort liste med mulige opløsninger"
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr "Forstørrelse"
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr "Angiver zoomfaktoren som skanneren skal bruge"
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr "Hurtig format"
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr "Tilvalgsudstyr"
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr "Skub ud"
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr "Skub arket i den automatiske arkføder ud"
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr "Automatisk skub ud"
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr "Skub dokumentet ud efter skanning"
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr "ADF-tilstand"
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr "Vælger ADF tilstand (enkeltsidet/dobbeltsidet)"
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr "Skuffe"
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr "Vælg fra hvilken skuffe der skal skannes"
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
@@ -2069,24 +2054,24 @@ msgstr ""
 "Vælger gammakorrektionsværdi fra en liste med foruddefinerede enheder "
 "eller en brugerdefineret tabel, som kan hentes til skanneren"
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr "Fokuseringspunkt"
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
 msgstr ""
 "Fastsætter fokuseringen enten på glaspladen eller 2,5 mm over denne"
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr "Vent på knap"
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
@@ -2095,263 +2080,1010 @@ msgstr ""
 "Når skankommando er sendt, starter skanningen først når der er trykket "
 "på knappen på skanneren."
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr ""
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, fuzzy, no-c-format
 msgid "Positive Slide"
 msgstr "Positiv film"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, fuzzy, no-c-format
 msgid "Negative Slide"
 msgstr "Negativ film"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr ""
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, fuzzy, no-c-format
 msgid "User defined CCT profile"
 msgstr "Brugerdefineret"
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr "Tændt"
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr "Slukket"
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr "Dither"
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, fuzzy, no-c-format
 msgid "Diffusion"
 msgstr "Fejlspredning"
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, fuzzy, no-c-format
 msgid "White"
 msgstr "Hvid niveau"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, fuzzy, no-c-format
 msgid "Black"
 msgstr "Sort niveau"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, fuzzy, no-c-format
 msgid "Continue"
 msgstr "Betinget"
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr ""
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr "Vandret"
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, fuzzy, no-c-format
 msgid "Horizontal bold"
 msgstr "Vandret"
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, fuzzy, no-c-format
 msgid "Horizontal narrow"
 msgstr "Vandret"
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr "Lodret"
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, fuzzy, no-c-format
 msgid "Vertical bold"
 msgstr "Lodret"
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr ""
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr ""
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, fuzzy, no-c-format
 msgid "Front"
 msgstr "Print"
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr ""
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
+msgid "Gamma function exponent"
 msgstr ""
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
 #, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
+msgid "Changes intensity of midtones"
+msgstr ""
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr ""
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr ""
+
+#: backend/fujitsu.c:3165
+#, fuzzy, no-c-format
+msgid "Halftone type"
+msgstr "Halvtone"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr ""
+
+#: backend/fujitsu.c:3210
+#, fuzzy, no-c-format
+msgid "Perform outline extraction"
+msgstr "Grovkalibrering"
+
+#: backend/fujitsu.c:3221
+#, fuzzy, no-c-format
+msgid "Emphasis"
+msgstr "Billedbetoning"
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr ""
+
+#: backend/fujitsu.c:3240
+#, fuzzy, no-c-format
+msgid "Separation"
+msgstr "Mætning"
+
+#: backend/fujitsu.c:3241
+#, fuzzy, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr ""
+"Aktiver automatisk fastsættelse af tærskelværdi for "
+"stregtegningsskanninger."
+
+#: backend/fujitsu.c:3252
+#, fuzzy, no-c-format
+msgid "Mirroring"
+msgstr "Spejl billedet"
+
+#: backend/fujitsu.c:3253
+#, fuzzy, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "Spejlvend billedet vandret."
+
+#: backend/fujitsu.c:3270
+#, fuzzy, no-c-format
+msgid "White level follower"
+msgstr "Hvid niveau for blå"
+
+#: backend/fujitsu.c:3271
+#, fuzzy, no-c-format
+msgid "Control white level follower"
+msgstr "Fastsætter rødt niveau"
+
+#: backend/fujitsu.c:3289
+#, fuzzy, no-c-format
+msgid "BP filter"
+msgstr "Farve stregtegning"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr ""
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr "Udglatning"
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr ""
+
+#: backend/fujitsu.c:3323
+#, fuzzy, no-c-format
+msgid "Gamma curve"
+msgstr "Gamma værdi"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, fuzzy, no-c-format
+msgid "Threshold curve"
+msgstr "Tærskelværdi"
+
+#: backend/fujitsu.c:3347
+#, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+
+#: backend/fujitsu.c:3369
+#, fuzzy, no-c-format
+msgid "Threshold white"
+msgstr "Tærskelværdi"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr ""
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, fuzzy, no-c-format
+msgid "Noise removal"
+msgstr "Støjreduktion"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr ""
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr ""
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr ""
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr ""
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr ""
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr ""
+
+#: backend/fujitsu.c:3508
+#, fuzzy, no-c-format
+msgid "Auto width detection"
+msgstr "Ingen korrektion"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr ""
+
+#: backend/fujitsu.c:3526
+#, fuzzy, no-c-format
+msgid "Auto length detection"
+msgstr "Ingen korrektion"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr ""
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr ""
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr ""
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr ""
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr ""
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr ""
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr ""
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
+msgstr ""
+
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3708
+#, fuzzy, no-c-format
+msgid "DF recovery mode"
+msgstr "Arkføder tilstand"
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr ""
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3748
+#, fuzzy, no-c-format
+msgid "Advanced paper protection"
+msgstr "Avancerede indstillinger"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+
+#: backend/fujitsu.c:3768
+#, fuzzy, no-c-format
+msgid "Staple detection"
+msgstr "Ingen korrektion"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr ""
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+
+#: backend/fujitsu.c:3809
+#, fuzzy, no-c-format
+msgid "Dropout color"
+msgstr "Udfald"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+
+#: backend/fujitsu.c:3833
+#, fuzzy, no-c-format
+msgid "Buffer mode"
+msgstr "Arkføder tilstand"
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr ""
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr ""
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr ""
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+
+#: backend/fujitsu.c:3911
+#, fuzzy, no-c-format
+msgid "Off timer"
+msgstr "Sluk-lampe tid"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+
+#: backend/fujitsu.c:3930
+#, fuzzy, no-c-format
+msgid "Duplex offset"
+msgstr "Blå forskydning"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr ""
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "Grøn forskydning"
+
+#: backend/fujitsu.c:3949
+#, fuzzy, no-c-format
+msgid "Adjust green/red offset"
+msgstr "Grøn forskydning"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr "Blå forskydning"
+
+#: backend/fujitsu.c:3967
+#, fuzzy, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "Indstillinger for blå-kanals forskydning"
+
+#: backend/fujitsu.c:3980
+#, no-c-format
+msgid "Low Memory"
+msgstr ""
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+
+#: backend/fujitsu.c:3996
+#, fuzzy, no-c-format
+msgid "Duplex side"
+msgstr "Duplex skan"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr ""
+
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr ""
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr ""
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
 msgstr ""
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr ""
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+
+#: backend/fujitsu.c:4095
+#, fuzzy, no-c-format
+msgid "Endorser Options"
+msgstr "Avancerede indstillinger"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr ""
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr ""
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr ""
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr ""
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr ""
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr ""
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr ""
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr ""
+
+#: backend/fujitsu.c:4253
+#, fuzzy, no-c-format
+msgid "Endorser direction"
+msgstr "Støjreduktion"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr ""
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr ""
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr ""
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr ""
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr ""
+
+#: backend/fujitsu.c:4344
+#, fuzzy, no-c-format
+msgid "A3 paper"
+msgstr "Fra papir"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4356
+#, fuzzy, no-c-format
+msgid "B4 paper"
+msgstr "Fra papir"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4368
+#, fuzzy, no-c-format
+msgid "A4 paper"
+msgstr "Fra papir"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4380
+#, fuzzy, no-c-format
+msgid "B5 paper"
+msgstr "Fra papir"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr ""
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr ""
+
+#: backend/fujitsu.c:4429
+#, no-c-format
+msgid "Scanner in power saving mode"
+msgstr ""
+
+#: backend/fujitsu.c:4452
+#, fuzzy, no-c-format
+msgid "Manual feed"
+msgstr "Manuel pre-fokus"
+
+#: backend/fujitsu.c:4453
+#, fuzzy, no-c-format
+msgid "Manual feed selected"
+msgstr "Manuel pre-fokus"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr ""
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr ""
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr ""
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr ""
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr ""
+
+#: backend/fujitsu.c:4513
+#, fuzzy, no-c-format
+msgid "Hardware error code"
+msgstr "Skanningsopløsning"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr ""
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr ""
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr ""
+
+#: backend/fujitsu.c:4537
+#, fuzzy, no-c-format
+msgid "Imprinter ink level"
+msgstr "Hvid niveau"
+
+#: backend/fujitsu.c:4548
+#, fuzzy, no-c-format
+msgid "Density"
+msgstr "Rød intensitet"
+
+#: backend/fujitsu.c:4549
+#, no-c-format
+msgid "Density dial"
+msgstr ""
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, fuzzy, no-c-format
+msgid "Duplex switch"
+msgstr "Duplex skan"
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, no-c-format
 msgid "Extras"
 msgstr "Ekstra"
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, fuzzy, no-c-format
-msgid "Threshold curve"
-msgstr "Tærskelværdi"
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr ""
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
 "instead on hardware lineart."
 msgstr ""
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, fuzzy, no-c-format
 msgid "Disable interpolation"
 msgstr "Deaktiver bagudrettet sporing"
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
 "than the vertical resolution this disables horizontal interpolation."
 msgstr ""
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "Farve stregtegning"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "Kalibrering"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Definer kalibreringstilstand"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Kalibreringsdatacache"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, no-c-format
 msgid "Lamp off time"
 msgstr "Sluk-lampe tid"
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
@@ -2360,105 +3092,103 @@ msgstr ""
 "Lampen bliver slukket efter den angivne tid (i minutter). Værdien 0 "
 "bevirker, at lampen ikke bliver slukket."
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, fuzzy, no-c-format
 msgid "Lamp off during scan"
 msgstr "Grovkalibrering"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr ""
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, fuzzy, no-c-format
 msgid "File button"
 msgstr "Vent på knap"
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr ""
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, fuzzy, no-c-format
 msgid "Power button"
 msgstr "Vent på knap"
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "Vent på knap"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, fuzzy, no-c-format
 msgid "Need calibration"
 msgstr "Grovkalibrering"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, fuzzy, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr "Gennemtving kalibrering før skanning"
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, no-c-format
 msgid "Buttons"
 msgstr "Knapper"
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr "Kalibrering"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, fuzzy, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "Begynd kalibreringsprocessen."
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, fuzzy, no-c-format
 msgid "Clear calibration"
 msgstr "Grovkalibrering"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, fuzzy, no-c-format
 msgid "Clear calibration cache"
 msgstr "Kalibreringsdatacache"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr "Filmadapter"
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr "Farve ved gråtone tilstand"
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 "Vælger hvilken skan farve der bruges i gråtone tilstand (standard er "
 "grøn)."
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr "Fejlsøgningsindstillinger"
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "Automatisk opvarmning"
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -2467,12 +3197,12 @@ msgstr ""
 "Varm op indtil lampens lyshed er konstant, i stedet for at insistere på "
 "60 sekunders opvarmningstid."
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "Fuld skanning"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
@@ -2481,12 +3211,12 @@ msgstr ""
 "Skan hele skanningsarealet inklsive kalibreringsstriben. Vær forsigtig. "
 "Vælg ikke fuld højde. Kun til test formål."
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Grovkalibrering"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2497,12 +3227,12 @@ msgstr ""
 "er fravalgt, kan de analoge brugerfladeparametre manuelt indstilles. "
 "Denne indstilling er forvalgt. Kun til testformål."
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "Grovkalibrering kun for første skan."
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2513,12 +3243,12 @@ msgstr ""
 "skannere og kan spare skanningstid. Hvis billedets lyshed er forskellig "
 "for hvert skan, fravælg denne indstilling. Kun til testformål."
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, no-c-format
 msgid "Backtrack lines"
 msgstr "Bagudrettede linier"
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2531,83 +3261,83 @@ msgstr ""
 "modtage dataene. Små værdier giver hurtigere skanninger, men øger "
 "risikoen for at linier bliver sprunget over."
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Gamma værdi"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr "Fastsætter gamma værdien for alle kanaler."
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, fuzzy, no-c-format
 msgid "Geometry Group"
 msgstr "Skanområde"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, fuzzy, no-c-format
 msgid "Scan Mode Group"
 msgstr "Skanner tilstand"
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr "Diapositiv"
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, fuzzy, no-c-format
 msgid "Scanner model"
 msgstr "Skannertilstand"
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, fuzzy, no-c-format
 msgid "Disable gamma correction"
 msgstr "Analog gammakorrektion"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, fuzzy, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "Gammakorrektion"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, fuzzy, no-c-format
 msgid "Disable white shading correction"
 msgstr "Udfør kun skyggekorrektion"
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2615,12 +3345,12 @@ msgid ""
 "avoids depth emulation."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, fuzzy, no-c-format
 msgid "Emulate Grayscale"
 msgstr "Gråskala"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2628,370 +3358,364 @@ msgid ""
 "circumstances."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
 "analyze them."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, fuzzy, no-c-format
 msgid "Reset chipset"
 msgstr "arkføder skanner"
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, fuzzy, no-c-format
 msgid "Information"
 msgstr "Ignorer kalibrering"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, fuzzy, no-c-format
 msgid "Chipset name"
 msgstr "Filnavn"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Unknown"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, fuzzy, no-c-format
 msgid "Shows the chipset ID"
 msgstr "arkføder skanner"
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, fuzzy, no-c-format
 msgid "Scan counter"
 msgstr "Skanningskilde"
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, fuzzy, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr "Vælger nummeret på det billede der skal skannes"
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, fuzzy, no-c-format
 msgid "Update information"
 msgstr "Opdatér indstillinger"
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, fuzzy, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr "Denne indstilling reflekterer skannerknappernes status."
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr "Billede"
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, fuzzy, no-c-format
 msgid "offset X"
 msgstr "Forskydning"
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, fuzzy, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr "Øverste-venstre x position af skanområde."
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, fuzzy, no-c-format
 msgid "offset Y"
 msgstr "Forskydning"
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, fuzzy, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr "Øverste-venstre x position af skanområde."
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr "Lampe status"
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr "Tænder/slukker for lampen"
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr "Kalibrerer for sort og hvidt niveau."
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr "ADF"
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, fuzzy, no-c-format
 msgid "TMA Slides"
 msgstr "Diapositiv"
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, fuzzy, no-c-format
 msgid "TMA Negatives"
 msgstr "Negativ"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, fuzzy, no-c-format
 msgid "Color (48 bits)"
 msgstr "Farve 48"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, fuzzy, no-c-format
 msgid "Extend lamp timeout"
 msgstr "Sluk-lampe tid"
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr ""
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr "Vent på knap"
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, fuzzy, no-c-format
 msgid "Waits for button before scanning"
 msgstr "Varm lampen op før skanning"
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, no-c-format
 msgid "Advanced Options"
 msgstr "Avancerede indstillinger"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr "Grov"
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr "Fin"
 
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr "Bayer"
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr "Tilpasset"
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "Automatisk"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr "NTSC RGB"
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr "XPA RGB"
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr "Uforandret"
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "NTSC grå"
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr "XPA Grå"
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "Langsom"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "Hurtig"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr "Meget hurtig"
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr "2-pixel"
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr "4-pixel"
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr "8-pixel"
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr "Print"
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, no-c-format
 msgid "Film-strip"
 msgstr "Film-stribe"
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr "XPA"
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr "Betinget"
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, no-c-format
 msgid "Experiment"
 msgstr "Eksperiment"
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, no-c-format
 msgid "Sharpening"
 msgstr "Gør skarpere"
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr "Angiv niveau for skærpning"
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr "Automatisk tærskelværdi"
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr ""
 "Aktiver automatisk fastsættelse af tærskelværdi for "
 "stregtegningsskanninger."
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr "Udglatning"
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr "Vælg udglatningsfilter."
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr "Skub mediet ud efter skanning"
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, no-c-format
 msgid "Unloads the media after a scan."
 msgstr "Skubber mediet ud efter gennemført skanning."
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, no-c-format
 msgid "Change document"
 msgstr "Skift dokument"
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr "Skift dokument."
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr "Skub ud"
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr "Skubber dokumentet ud."
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, no-c-format
 msgid "Start calibration process."
 msgstr "Begynd kalibreringsprocessen."
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, no-c-format
 msgid "Media"
 msgstr "Medie"
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr "Vælg medietype."
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr "Eksponeringstid"
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -3003,460 +3727,459 @@ msgstr ""
 "brug er 175% for papirbilleder, 150% for diapositiver og \"Negativ\" for "
 "negativer. Ved mørke (undereksponerede) billeder, kan denne værdi øges."
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, no-c-format
 msgid "Color Matrix"
 msgstr "Farve matrix"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, no-c-format
 msgid "Set the scanners color matrix."
 msgstr "Fastlægger skannerens farve matrix."
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr "Tilpasset farve matrix."
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, no-c-format
 msgid "Mono Color Matrix"
 msgstr "En farve matrix"
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr "Tilpasset farve matrix for gråtoneskanning."
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, no-c-format
 msgid "Mirror horizontal"
 msgstr "Spejlvend vandret"
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, no-c-format
 msgid "Mirror image horizontally."
 msgstr "Spejlvend billedet vandret."
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, no-c-format
 msgid "Mirror vertical"
 msgstr "Spejlvend lodret"
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, no-c-format
 msgid "Mirror image vertically."
 msgstr "Spejlvend billedet lodret."
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, no-c-format
 msgid "Update options"
 msgstr "Opdatér indstillinger"
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, no-c-format
 msgid "Update options."
 msgstr "Opdatér indstillinger."
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr "8 bit uddata"
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr "Brug bit dybde større end 8 internt, men uddata kun 8 bit."
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr "Vent på frontknap"
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr "Vent med at begynde skanning, til frontknappen trykkes."
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr "Sluk lampen"
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr "Slukker for skannerens lampe."
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "Papirstørrelse"
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr "Automatisk separering"
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, fuzzy, no-c-format
 msgid "Landscape"
 msgstr "A5 tværformat"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr ""
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, no-c-format
 msgid "Length control mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, fuzzy, no-c-format
 msgid "Manual feed mode"
 msgstr "Manuel pre-fokus"
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, fuzzy, no-c-format
 msgid "Manual feed timeout"
 msgstr "Manuel pre-fokus"
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr "Aktiver Duplex (dobbeltsidet) skanning"
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr "Reel størrelse af papiret i ADF'en"
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, fuzzy, no-c-format
 msgid "halftone"
 msgstr "Halvtone"
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, fuzzy, no-c-format
 msgid "color"
 msgstr "Farve"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, fuzzy, no-c-format
 msgid "continuous"
 msgstr "Betinget"
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, fuzzy, no-c-format
 msgid "off"
 msgstr "Slukket"
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, fuzzy, no-c-format
 msgid "bayer_64"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, fuzzy, no-c-format
 msgid "bayer_16"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, fuzzy, no-c-format
 msgid "halftone_32"
 msgstr "Halvtone"
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, fuzzy, no-c-format
 msgid "halftone_64"
 msgstr "Halvtone"
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, fuzzy, no-c-format
 msgid "diffusion"
 msgstr "Fejlspredning"
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, fuzzy, no-c-format
 msgid "normal"
 msgstr "Normal"
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, fuzzy, no-c-format
 msgid "light"
 msgstr "Højlys"
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, fuzzy, no-c-format
 msgid "From scanner"
 msgstr "Flatbed skanner"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr "Fra papir"
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, fuzzy, no-c-format
 msgid "default"
 msgstr "Standard"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, fuzzy, no-c-format
 msgid "smooth"
 msgstr "Udglat"
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, fuzzy, no-c-format
 msgid "low"
 msgstr "Langsom"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, fuzzy, no-c-format
 msgid "medium"
 msgstr "Mellem"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, fuzzy, no-c-format
 msgid "red"
 msgstr "Rød"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, fuzzy, no-c-format
 msgid "green"
 msgstr "Grøn"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, fuzzy, no-c-format
 msgid "Sets the scan source"
 msgstr "Skanningskilde"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr "Arkføder tilstand"
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr "Fastætter fødningstilstanden"
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, fuzzy, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr "Deaktiver pre-fokusering"
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, fuzzy, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr "Deaktiver pre-fokusering"
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, fuzzy, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "Fastætter fødningstilstanden"
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, fuzzy, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr "Fastætter fødningstilstanden"
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr "Automatisk tærskelværdi"
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
@@ -3465,556 +4188,543 @@ msgstr ""
 "Automatisk indstilling af lyshed, kontrast, hvid balance, gamma, "
 "støjreduktion og billedbetoning"
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "Støjreduktion"
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr "Reducer støj fra enkelt punkter"
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr "Billedbetoning"
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr "Fastsætter billedbetoning"
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, fuzzy, no-c-format
 msgid "Lamp color"
 msgstr "Lampe tændt"
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, fuzzy, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr "Tænder/slukker for lampen"
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, fuzzy, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "Spejlvend billedet lodret."
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
 "length of actual paper or logical document length."
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "Gammakorrektion"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, fuzzy, no-c-format
 msgid "High sensivity"
 msgstr "Udskrift med høj opløsning"
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, fuzzy, no-c-format
 msgid "Low sensivity"
 msgstr "Udskrift med lav opløsning"
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, fuzzy, no-c-format
 msgid "err_diffusion"
 msgstr "Fejlspredning"
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, fuzzy, no-c-format
 msgid "No detection"
 msgstr "Ingen korrektion"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, fuzzy, no-c-format
 msgid "Normal mode"
 msgstr "Normal"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, fuzzy, no-c-format
 msgid "Enhanced mode"
 msgstr "Forbedring"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
 "divides long paper by the length which is set in Document Size option."
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, fuzzy, no-c-format
 msgid "Automatic threshold mode"
 msgstr "Automatisk tærskelværdi"
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, fuzzy, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr "Automatisk tærskelværdi"
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, fuzzy, no-c-format
 msgid "Set chroma of red"
 msgstr "Fastsætter billedrammernes rækkefølge"
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, fuzzy, no-c-format
 msgid "chroma of blue"
 msgstr "Skygge for blå"
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, fuzzy, no-c-format
 msgid "Set chroma of blue"
 msgstr "Forskyder rød mod blå"
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr "Diamant"
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr "8x8 grov fortykning"
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr "8x8 fin fortykning"
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr "8x8 Bayer"
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr "8x8 lodret linie"
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr "Forstærk"
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr "Farvekanalforstærkningsindstillinger"
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, no-c-format
 msgid "Gray gain"
 msgstr "Grå-forstærkning"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr "Fastsætter grå-kanals forstærkning"
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, no-c-format
 msgid "Red gain"
 msgstr "Rød forstærkning"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr "Fastsætter rød-kanals forstærkning"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, no-c-format
 msgid "Green gain"
 msgstr "Grøn forstærkning"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr "Fastsætter grøn-kanals forstærkning"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, no-c-format
 msgid "Blue gain"
 msgstr "Blå forstærkning"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr "Fastsætter blå-kanals forstærkning"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr "Bayer dither 16"
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr "Bayer dither 64"
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr "Halvtone punkt 32"
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr "Halvtone punkt 64"
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr "Fejlspredning"
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr "Tilstand 1"
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr "Tilstand 2"
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr "Tilstand 3"
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr "Fra kalibreringsstriber"
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr "Udglat"
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr "Lav"
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr "Mellem"
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr "Høj"
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr "CRT skærm"
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "En side"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "Alle sider"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr "arkføder skanner"
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr "4 bit gråskala"
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr "8 bit gråskala"
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr "Skygge, mellemtone, højlys, eksponeringstid"
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr "Specialindstillinger"
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr "Farvebalance"
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr "Deaktiver bagudrettet sporing"
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr "Hvis aktiveret udfører skanneren ikke en bagudrettet sporing."
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr "Tænd/sluk lampen"
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr "Tænder/slukker lampen i flatbed'en"
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr "Kalibrering ved bagende"
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid ""
 "If checked the color calibration before a scan is done by the backend"
 msgstr "Hvis valgt, udføres farvekalibreringen før et skan af bagenden"
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr "Anvend lightlid-35 mm-adapteren"
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr "Denne indstilling slukker lampen i flatbed'en under skanning"
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "Kvalitets skanning"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr "Højeste kvalitet men lavere hastighed"
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "Hurtig skanning"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr "Højeste hastighed men lavere kvalitet"
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr "Automatisk justering af tærskelværdier"
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
@@ -4023,275 +4733,275 @@ msgstr ""
 "Hvis aktiveret prøver bagenden automatisk at bestemme en optimal "
 "tærskelværdi."
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr "Vælger gammakorrektionstilstand."
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr "Fælles gamma"
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr "Anvend samme gammaværdi for alle farvekanaler."
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr "Skalær gamma"
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr "Vælger værdi for skalær gammakorrektion."
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr "Skalær gamma rød"
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr "Vælger værdi for skalær gammakorrektion (rød kanal)"
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr "Skalær gamma grøn"
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr "Vælger værdi for skalær gammakorrektion (grøn kanal)"
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr "Skalær gamma blå"
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr "Vælger værdi for skalær gammakorrektion (blå kanal)"
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
 msgstr ""
 "Vælger farvekanal, \"Master\" betyder at alle farvekanaler påvirkes."
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr "Mellemtone"
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr "Vælger hvilket glansniveau der skal anses for \"50% grå\"."
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr "Mellemtone for rød"
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr "Vælger hvilket glansniveau der skal anses for \"50 % rød\"."
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr "Mellemtone for grønt"
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr "Vælger hvilket glansniveau der skal anses for \"50% grøn\"."
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr "Mellemtone for blå"
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr "Vælger hvilket glansniveau der skal anses for \"50% blå\"."
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr "Rød balance"
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr "Balancefaktor for rød. 100 % giver ingen korrektion."
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr "Grøn balance"
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr "Balancefaktor for grøn. 100% giver ingen korrektion."
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr "Blå balance"
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr "Balancefaktor for blå. 100% giver ingen korrektion."
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr "Fastprogram balance"
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr ""
 "Fastsætter farvebalanceværdierne til værdierne fra det faste program."
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "Langsomste"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "Langsommere"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "Hurtigere"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "Hurtigst"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr "8x8 grov"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr "8x8 normal"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr "8x8 fin"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr "8x8 meget fin"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr "6x6 normal"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr "5x5 grov"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr "5x5 fin"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr "4x4 grov"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr "4x4 normal"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr "4x4 fin"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr "3x3 normal"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr "2x2 normal"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr "8x8 tilpasset"
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr "6x6 tilpasset"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr "5x5 tilpasset"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr "4x4 tilpasset"
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr "3x3 tilpasset"
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr "2x2 tilpasset"
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr "Hurtig gråtonetilstand"
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr "Skan i hurtig gråtonetilstand (lavere kvalitet)"
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
@@ -4300,118 +5010,118 @@ msgstr ""
 "Forlang at alle forhåndsvisninger udføres i hurtigste (lav kvalitet) "
 "tilstand. Dette kan være gråtone, eller lav-opløsning."
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr "Lampe slukkes efter (minutter)"
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr "Angiv efter hvor lang tid (i minutter) lampen skal slukkes."
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, no-c-format
 msgid "Turn lamp off"
 msgstr "Sluk lampen"
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr "Sluk lampen med det samme."
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr "Rød lyshed"
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr "Fastsætter lysheden i den røde kanal i det rekvirerede billede."
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr "Grøn lyshed"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr "Fastsætter lysheden i den grønne kanal i det rekvirerede billede."
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr "Blå lyshed"
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr "Fastsætter lysheden i den blå kanal i det rekvirerede billede."
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "Kontrast rød kanal"
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr "Fastsætter kontrasten i den røde kanal i det rekvirerede billede."
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "Kontrast grøn kanal"
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr ""
 "Fastsætter kontrasten i den grønne kanal i det rekvirerede billede."
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "Kontrast blå kanal"
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr "Fastsætter kontrasten i den blå kanal i det rekvirerede billede."
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr "Farve 48"
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr "Farve 24"
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr "Grå 16"
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr "Grå 8"
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, fuzzy, no-c-format
 msgid "Positive"
 msgstr "Positiv film"
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -4420,39 +5130,39 @@ msgstr ""
 "Varm op indtil lampens lyshed er konstant, i stedet for at insistere på "
 "40 sekunders opvarmningstid."
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, fuzzy, no-c-format
 msgid "Negative color"
 msgstr "Negativ film"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, fuzzy, no-c-format
 msgid "Negative gray"
 msgstr "Negativ"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, no-c-format
 msgid "48 bits color"
 msgstr ""
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
 "mode and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4460,248 +5170,239 @@ msgid ""
 "cancel, press \"GRAY\" button."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:143
-#, no-c-format
-msgid "Gamma function exponent"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:144
-#, no-c-format
-msgid "Changes intensity of midtones"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:232
 #, fuzzy, no-c-format
 msgid "Update button state"
 msgstr "Knap tilstand"
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:244
 #, no-c-format
 msgid "Button 1"
 msgstr "Knap 1"
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:258
 #, no-c-format
 msgid "Button 2"
 msgstr "Knap 2"
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr ""
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr ""
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr "Film"
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr "Enhedsindstillinger"
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr "Lampe afbryder"
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr "Manuelt tænd/sluk for lampen(lamperne)."
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, fuzzy, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "Grovkalibrering"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr ""
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, no-c-format
 msgid "Calibration data cache"
 msgstr "Kalibreringsdatacache"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr "Aktivér eller deaktivér kalibreringsdatacache."
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, fuzzy, no-c-format
 msgid "Performs calibration"
 msgstr "Grovkalibrering"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr "Hastighedsøgnings sensor"
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr "Til/fra for øgning af sensors hastighed."
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, no-c-format
 msgid "Warmup-time"
 msgstr "Opvarmningstid"
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, no-c-format
 msgid "Warmup-time in seconds."
 msgstr "Opvarmningstid i sekunder."
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, no-c-format
 msgid "Lampoff-time"
 msgstr "Sluk lampe tid"
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr "Sluk lampe tid i sekunder."
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, no-c-format
 msgid "Analog frontend"
 msgstr "Analog forende"
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr "Rød forstærkningsværdi for den analoge forende"
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr "Rød forskydning"
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr "Rød forskydningsværdi for den analoge forende"
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr "Grøn forstærkningsværdi for den analoge forende"
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr "Grøn forskydning"
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr "Grøn forskydningsværdi for den analoge forende"
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr "Blå forstærkningsværdi for den analoge forende"
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr "Blå forskydning"
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr "Blå forskydningsværdi for den analoge forende"
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, no-c-format
 msgid "Red lamp off"
 msgstr "Rød lampe slukket"
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr "Fastsætter parametre for slukning af rød lampe"
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, no-c-format
 msgid "Green lamp off"
 msgstr "Grøn lampe slukket"
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr "Fastsætter parametre for slukning af grøn lampe"
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, no-c-format
 msgid "Blue lamp off"
 msgstr "Blå lampe slukket"
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr "Fastsætter parametre for slukning af blå lampe"
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr "Denne indstilling reflekterer skannerknappernes status."
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr "Farve 36"
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr "Ditheringsmønster 1"
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr "Ditheringsmønster 2"
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr "Udvælge tilfældigt"
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr "Kildevalg"
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr "Billedforbedring"
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr "Gøre grå"
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr "Hent billedet som gråskala."
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr "Tre-gennemløbs simulering"
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
@@ -4710,12 +5411,12 @@ msgstr ""
 "Simuler en tre-gennemløbs skanner ved at returnere 3 separate "
 "billedrammer, én for hver grundfarve. Rækkefølgen er: grøn, blå og rød."
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr "HÃ¥ndskanner simulering"
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4726,49 +5427,49 @@ msgstr ""
 "i forvejen. I stedet for returnerer de en højde på -1. Sættes denne "
 "indstilling tillades test af, om en forende kan håndtere dette korrekt."
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid ""
 "Set default values for enhancement controls (brightness & contrast)."
 msgstr ""
 "Sæt standardværdier for forbedringskontroller (lyshed og kontrast)."
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr "Skrivebeskyttet test-indstilling"
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr "Lad os se om forenderne kan håndtere dette rigtigt"
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr "Gamma tabeller"
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr "Status kode simulering"
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr "Gennemtving ikke status kode"
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr "Tving ikke bagenden til at returnere en status kode."
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr "Returner SANE_STATUS_EOF"
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
@@ -4777,12 +5478,12 @@ msgstr ""
 "Tving bagenden til at returnere statuskoden SANE_STATUS_EOF efter "
 "sane_read() er blevet kaldt."
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr "Returner SANE_STATUS_JAMMED"
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
@@ -4791,12 +5492,12 @@ msgstr ""
 "Tving bagenden til at returnere statuskoden SANE_STATUS_JAMMED efter "
 "sane_read() er blevet kaldt."
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr "Returner SANE_STATUS_NO_DOCS"
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
@@ -4805,12 +5506,12 @@ msgstr ""
 "Tving bagenden til at returnere statuskoden SANE_STATUS_NO_DOCS efter "
 "sane_read() er blevet kaldt."
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr "Returner SANE_STATUS_COVER_OPEN"
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
@@ -4819,12 +5520,12 @@ msgstr ""
 "Tving bagenden til at returnere statuskoden SANE_STATUS_COVER_OPEN efter "
 "sane_read() er blevet kaldt."
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr "Returner SANE_STATUS_IO_ERROR"
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
@@ -4833,12 +5534,12 @@ msgstr ""
 "Tving bagenden til at returnere statuskoden SANE_STATUS_IO_ERROR efter "
 "sane_read() er blevet kaldt."
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr "Returner SANE_STATUS_NO_MEM"
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
@@ -4847,12 +5548,12 @@ msgstr ""
 "Tving bagenden til at returnere statuskoden SANE_STATUS_NO_MEM efter "
 "sane_read() er blevet kaldt."
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr "Returner SANE_STATUS_ACCESS_DENIED"
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
@@ -4861,85 +5562,82 @@ msgstr ""
 "Tving bagenden til at returnere statuskoden SANE_STATUS_ACCESS_DENIED "
 "efter sane_read() er blevet kaldt."
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, fuzzy, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr "Denne indstilling reflekterer skannerknappernes status."
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr "Lampe tændt"
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr "Tænd for skannerlampen"
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr "Sluk lampe"
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr "Sluk for skannerens lampe"
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, fuzzy, no-c-format
 msgid "Lamp timeout"
 msgstr "Sluk-lampe tid"
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr ""
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr "Dokument føder"
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr "6x4 (tommer)"
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr "8x10 (tommer)"
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr "8.5x11 (tommer)"
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr "Halvtone er ikke understøttet"
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr "Spredte punkter 8x8"
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr "Spredte punkter 16x16"
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -4955,27 +5653,27 @@ msgstr ""
 "baserede forender stoppe med at reagere på X begivenheder, og dit system "
 "går ned."
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr ""
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr ""
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, fuzzy, no-c-format
 msgid "Focus point for scanning."
 msgstr "Skub dokumentet ud efter skanning"
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr "Smugkigtilstand"
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
@@ -4984,109 +5682,109 @@ msgstr ""
 "Vælg tilstand for forhåndsvisning. Gråskala smugkig er normalt det "
 "bedste kompromis mellem hastighed og detaljerigdom."
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr "Foruddefinerede indstillinger"
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
 "like."
 msgstr "Giver standard skanområde for fotografier, tryk o.l."
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr ""
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, fuzzy, no-c-format
 msgid "Frame to be scanned"
 msgstr "Flatbed skanner"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, no-c-format
 msgid "Focus-mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, fuzzy, no-c-format
 msgid "Auto or manual focus"
 msgstr "Automatisk skub ud"
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, fuzzy, no-c-format
 msgid "Focus-point"
 msgstr "Fokuseringspunkt"
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, fuzzy, no-c-format
 msgid "Focus point"
 msgstr "Fokuseringspunkt"
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr "Farvelinier pr. læsning"
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr "Gråskalalinier pr. læsning"
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr ""
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr "Farve RAW"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr "Farve RGB"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr "Farve RGB TEKST"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr "Helt sort"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr "Helt hvidt"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr "Farvemønster"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr "Gitter"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr "Første angivelse"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr "Anden angivelse"
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
@@ -5095,12 +5793,12 @@ msgstr ""
 "Dette er den meget lange tredie angivelse. MÃ¥ske har forenden en ide om "
 "hvordan det skal vises"
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr "HÃ¥ndskanner simulering"
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5113,12 +5811,12 @@ msgstr ""
 "test af forenden, om den kan håndtere dette korrekt. Indstillingen giver "
 "også en fast bredde på 11 cm."
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr "Tre-gennemløbs simulering"
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
@@ -5127,34 +5825,34 @@ msgstr ""
 "Simuler en tre-gennemløbs skanner. I farvetilstand overføres tre "
 "billedrammer."
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr "Fastsætter billedrammernes rækkefølge"
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr "Fastsætter billedrammernes rækkefølge i tre-gennemløbs tilstand."
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
 "after 10 scans."
 msgstr ""
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr "Specialindstillinger"
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr "Vælg testbillede"
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5171,12 +5869,12 @@ msgstr ""
 "Gitter: tegner et sort/hvidt gitter med en bredde og højde af de enkelte "
 "felter på 10 mm."
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr "Invertér endianness"
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5187,44 +5885,44 @@ msgstr ""
 "indstilling kan bruges til at teste forendens 16 bit tilstand, d.v.s. om "
 "forenden anvender en korrekt endianness."
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr "Læsebegrænsning"
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr "Begræns mængden af overført data ved hvert kald af sane_read()."
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr "Størrelsen af læsebegrænsning"
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
 msgstr ""
 "Den (maksimale) mængde data overført, ved hvert kald af sane_read()."
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr "Læseforsinkelse"
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr "Forsink overførsel af data til røret."
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr "Varighed af læseforsinkelse"
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
@@ -5232,12 +5930,12 @@ msgstr ""
 "Fastlægger, hvor længe der skal ventes efter overførsel af hver "
 "databuffer gennem røret."
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr "Retur værdi af sane_read"
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
@@ -5248,22 +5946,22 @@ msgstr ""
 "indstilling ved skanning. Alle andre returværdier er til for at teste "
 "hvordan forenden håndterer dem."
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr "Tab af pixler pr. linie"
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr "Antal pixler, der er ubenyttede ved enden af hver linie."
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr "Uklare parametre"
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
@@ -5272,24 +5970,24 @@ msgstr ""
 "Returner uafklarede linier og bytes pr. linie når sane_parameters() "
 "kaldes før sane_start()."
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr "Brug ikke blokerende IO"
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 "Brug ikke blokerende IO for sane_read(), hvis det er understøttet af "
 "forenden."
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr "Tilbyd en vælg fil beskriver"
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
@@ -5298,12 +5996,12 @@ msgstr ""
 "Tilbyd en vælg fil beskriver for at bestemme om sane_read() vil "
 "returnere data."
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr "Aktivér testindstillinger"
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
@@ -5312,27 +6010,27 @@ msgstr ""
 "Aktivér forskellige testindstillinger. Dette er til at afprøve om "
 "forenderne kan vise og ændre alle de forskellige SANE indstillingstyper."
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr "Udskriv indstillinger"
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr "Udskriv en liste med alle indstillinger."
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr "Boolske testindstillinger"
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr "(1/6) Boolsk soft select soft detect"
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
@@ -5342,12 +6040,12 @@ msgstr ""
 "\"soft detect\" (og \"avanceret\"). Dette er en normal boolsk "
 "indstilling."
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr "(2/6) Boolsk hard select soft detect"
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
@@ -5359,12 +6057,12 @@ msgstr ""
 "kan ændres fra forenden, men af brugeren (f.eks. ved at trykke på en "
 "knap på enheden)."
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr "(3/6) Boolsk hard select"
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5376,12 +6074,12 @@ msgstr ""
 "forenden, men af brugeren (f.eks. ved at trykke på en knap på enheden), "
 "og at det ikke kan læses af forenden."
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr "(4/6) Boolsk soft detect"
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
@@ -5390,12 +6088,12 @@ msgstr ""
 "(4/6) Dette er en boolsk testindstilling, som er \"soft detect\" (og "
 "\"avanceret\"). Dette betyder, at indstillingen er skrivebeskyttet."
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr "(5/6) Boolsk soft select soft detect emulered"
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
@@ -5404,12 +6102,12 @@ msgstr ""
 "(5/6) Dette er en boolsk testindstilling, som er \"soft select\" ,\"soft "
 "detect\"og \"emulated\" (og \"avanceret\")."
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr "(6/6) Boolsk soft select soft detect auto"
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5420,27 +6118,27 @@ msgstr ""
 "detect\"og \"automatic\" (og \"avanceret\"). Denne indstilling kan "
 "sættes automatisk fra bagenden."
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr "Heltalsindstillinger"
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr "(1/6) Heltal"
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr "(1/6) Heltal testindstilling uden enhed og uden begrænsninger."
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr "(2/6) Heltalsbegrænsningsområde"
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
@@ -5449,24 +6147,24 @@ msgstr ""
 "(2/6) Heltal testindstilling med enheden \"pixel\" og et "
 "begrænsningsområde. Minimum er 4, maksimum 192, og skridtlængden er 2."
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr "(3/6) Heltalsbegrænsningsordliste"
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 "(3/6) Heltal testindstilling med enheden \"bit\" og en "
 "ordlistebegrænsning."
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr "(4/6) Heltal tabel"
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
@@ -5475,12 +6173,12 @@ msgstr ""
 "(4/6) Heltal testindstilling med enheden \"mm\" og en tabel uden "
 "indskrænkninger."
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr "(5/6) Heltal tabel med begrænset område"
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
@@ -5489,12 +6187,12 @@ msgstr ""
 "(5/6) Heltal testindstilling med enheden \"dpi\" og en tabel med et "
 "begrænset område. minimum er 4, og maksimum 192, og skridtlængden er 2."
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr "(6/6) Heltal tabel med begrænset ordliste"
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
@@ -5503,28 +6201,28 @@ msgstr ""
 "(6/6) Heltal testindstilling med enheden \"procent\" og en tabel med en "
 "begrænset ordliste."
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr "Faste testindstillinger"
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr "(1/3) Faste"
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr ""
 "(1/3) Faste testindstillinger uden enhed og ingen restriktioner sat."
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr "(2/3) Fast restriktionsområde"
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
@@ -5534,48 +6232,48 @@ msgstr ""
 "restriktionsområde sat. Minimalt er -42.17, og maksimalt 32767.9999, og "
 "mængde er 2.0."
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr "(3/3) Fast restriktions ordliste"
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 "(3/3) Fast testindstilling uden enheder og restriktions ordliste sat."
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr "Streng testindstillinger"
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr "(1/3) Streng"
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr "(1/3) Streng testindstillinger uden restriktioner."
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr "(2/3) Streng restriktioner strengliste"
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr "(2/3) Streng testindstillinger med strengliste restriktioner."
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr "(3/3) Streng restriktioner lang strengliste"
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
@@ -5584,156 +6282,160 @@ msgstr ""
 "(3/3) Streng testindstillinger med strengliste restriktioner. Indeholder "
 "nogle flere indgange..."
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr "Knap testindstillinger"
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr "(1/1) Knap"
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr "(1/1) Knap testindstilling. Udskriver noget tekst..."
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, no-c-format
 msgid "Color 36"
 msgstr "Farve 36"
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr "Anvend billedkomposition"
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr "2 niveau sort/hvid (stregtegningstilstand)"
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr "Dithered/halvtone sort/hvid (halvtonetilstand)"
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr "Flerniveau sort/hvid (gråskalatilstand)"
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr "Flerniveau RGB farve (et-gennemløb farve)"
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr "Ignorer kalibrering"
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr "Deaktiver pre-fokusering"
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr "Kalibrér ikke fokus"
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr "Manuel pre-fokus"
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr "Fast fokusposition"
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr "Linsekalibrering på dokumentposition"
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr "Kalibrér linsefokus på dokumentposition"
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr "Holder fokusposition 0mm"
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr "Anvend 0mm holder fokusposition i stedet for 0,6mm"
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr "Kalibreringstilstand"
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr "Definer kalibreringstilstand"
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr "Tænder/slukker for lampen"
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr "UTA tændt"
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr "Tænder/slukker for UTA'en"
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr "Forskydning"
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr "Indstillinger for farvekanalernes forskydning"
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, no-c-format
 msgid "Gray offset"
 msgstr "Grå-forskydning"
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr "Indstillinger for grå-kanals forskydning"
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr "Indstillinger for rød-kanals forskydning"
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr "Indstillinger for grøn-kanals forskydning"
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr "Indstillinger for blå-kanals forskydning"
 
+#, fuzzy
+#~ msgid "IPC mode"
+#~ msgstr "Smugkigtilstand"
+
 #~ msgid "Grayscale"
 #~ msgstr "Gråskala"
 
diff --git a/po/de.gmo b/po/de.gmo
new file mode 100644
index 0000000..9ca0930
--- /dev/null
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 11be186..1d99f95 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
 "PO-Revision-Date: 2010-08-06 17:17+0100\n"
 "Last-Translator: Rolf Bensch <rolf at bensch hyphen online dot de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -25,411 +25,405 @@ msgstr ""
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr "Anzahl der Optionen"
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr "Standard"
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "Scanbereich"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "Farbverbesserung"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr "Sensoren"
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr "Vorschauscan in grau"
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr "Bittiefe"
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Scanmodus"
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "Scangeschwindigkeit"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr "Scanquelle"
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr "Erzwinge Backtracking"
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "Links"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "Oben"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "Rechts"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "Unten"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Scanauflösung"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "X-Auflösung"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Y-Auflösung"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr "Seitenbreite"
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, no-c-format
 msgid "Page height"
 msgstr "Seitenhöhe"
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr "Verwende benutzerdefinierte Gammatabelle"
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr "Bildintensität"
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr "Intensität Rot"
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr "Intensität Grün"
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr "Intensität Blau"
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr "Helligkeit"
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr "Korngröße"
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr "Halbtonmodus"
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "Wert für Schwarz"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "Weißwert"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr "Weißwert für Rot"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
 msgstr "Weißwert für Grün"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr "Weißwert für Blau"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "Schatten"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr "Schatten Rot"
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr "Schatten Grün"
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr "Schatten Blau"
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr "Licht"
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr "Licht Rot"
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr "Licht Grün"
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr "Licht Blau"
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr "Farbton"
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr "Sättigung"
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "Dateiname"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr "Größe der Halbton-Matrix"
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "Halbton-Matrix"
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr "Verbinde X- und Y-Auflösung"
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "Negativ"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "Qualitäts-Weißabgleich"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr "Verdoppelte optische Auflösung"
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr "Verbinde RGB"
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr "Schwellwert"
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr "Analoge Gammakorrektur"
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr "Analoger Gammawert Rot"
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr "Analoger Gammawert Grün"
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr "Analoger Gammawert Blau"
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr "Verbinde analoge Gammawerte"
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr "Lampe aufwärmen"
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr "Beleuchtungszeit zum Kalibrieren"
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr "Beleuchtungszeit zum Kalibrieren von Rot"
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr "Beleuchtungszeit zum Kalibrieren von Grün"
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr "Beleuchtungszeit zum Kalibrieren von Blau"
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr "Beleuchtungszeit zum Scannen"
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr "Beleuchtungszeit zum Scannen von Rot"
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr "Beleuchtungszeit zum Scannen von Grün"
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr "Beleuchtungszeit zum Scannen von Blau"
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr "Definiere Beleuchtungszeit"
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr "Lichtwert für Kalibrierung"
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr "Lichtwert beim Scannen"
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr "Definiere Lichtwert"
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr "Lampe beim Beenden ausschalten"
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
@@ -438,37 +432,37 @@ msgstr ""
 "Nur-Lese-Option, die angibt, wieviele Optionen ein bestimmtes Gerät "
 "unterstützt."
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "Optionen für Zuführung, Modus und Auflösung"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr "Optionen für den Scanbereich und für Medienformate"
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, no-c-format
 msgid "Image modification options"
 msgstr "Optionen für Bildbearbeitung"
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, no-c-format
 msgid "Hardware specific options"
 msgstr "Hardware-spezifische Optionen"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr "Scanner-Sensoren und -Knöpfe"
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr "Fordere einen Scan in Vorschauqualität an."
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -480,7 +474,7 @@ msgstr ""
 "bei einem Single-Pass-Scanner wird der Speicherverbrauch und die "
 "Scanzeit verringert."
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
@@ -489,62 +483,62 @@ msgstr ""
 "Anzahl der Bits pro Farbwert, typische Werte sind 1 für Lineart- und 8 "
 "für Multibit-Scans"
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr "Wählt den Scanmodus aus (z.B. Strichzeichnung, Grau oder Farbe)."
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr "Legt die Scangeschwindigkeit fest."
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr "Legt die Scanquelle fest (wie z.B. Dokumenteneinzug)."
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr "Legt fest, dass Backtracking verwendet wird."
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "Linke Kante des zu scannenden Bereichs."
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "Obere Kante des zu scannenden Bereichs."
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "Rechte Kante des zu scannenden Bereichs."
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "Untere Kante des zu scannenden Bereichs."
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr "Legt die Auflösung des Bildes fest."
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr "Bestimmt die horizontale Auflösung des Bildes."
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr "Bestimmt die vertikale Auflösung des Bildes."
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
@@ -553,12 +547,12 @@ msgstr ""
 "Legt die Breite des Mediums fest. Erforderlich für die automatische "
 "Zentrierung bei Einzelblatt-Scans."
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, no-c-format
 msgid "Specifies the height of the media."
 msgstr "Legt die Höhe der Medien fest."
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid ""
 "Determines whether a builtin or a custom gamma-table should be used."
@@ -566,7 +560,7 @@ msgstr ""
 "Bestimmt ob die scannerinterne oder eine benutzerdefinierte Gammatabelle "
 "verwendet wird."
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -577,32 +571,32 @@ msgstr ""
 "rote, grüne und blaue Farbkomponente aus. Es ist also eine Helligkeits-"
 "Gammatabelle."
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr "Gamma-Korrekturtabelle für die rote Komponente."
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr "Gamma-Korrekturtabelle für die grüne Komponente."
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr "Gamma-Korrekturtabelle für die blaue Komponente."
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr "Stellt die Helligkeit des Bildes ein."
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr "Stellt den Kontrast des Bildes ein."
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
@@ -611,72 +605,72 @@ msgstr ""
 "Legt die \"Körnigkeit\" des gescannten Bildes fest. Kleinere Werte "
 "ergeben schärfere Bilder."
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr "Legt fest, ob das Bild im Halbtonmodus (Dithering) gescannt wird."
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr ""
 "Bestimmt, welcher Helligkeitswert als Schwarz angesehen werden soll."
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr "Bestimmt, welcher Helligkeitswert als Weiß angesehen werden soll."
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr ""
 "Bestimmt, welcher Helligkeitswert der roten Komponente als \"Weiß\" "
 "angesehen werden soll."
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr ""
 "Bestimmt, welcher Helligkeitswert der grünen Komponente als \"Weiß\" "
 "angesehen werden soll."
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr ""
 "Bestimmt, welcher Helligkeitswert der blauen Komponente als \"Weiß\" "
 "angesehen werden soll."
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr ""
 "Bestimmt, welcher Helligkeitswert der roten Komponente als Schwarz "
 "angesehen werden soll."
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr ""
 "Bestimmt, welcher Helligkeitswert der grünen Komponente als Schwarz "
 "angesehen werden soll."
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr ""
 "Bestimmt, welcher Helligkeitswert der blauen Komponente als Schwarz "
 "angesehen werden soll."
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr ""
 "Bestimmt, welcher Helligkeitswert der roten Komponente als Weiß "
 "angesehen werden soll."
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid ""
 "Selects what green radiance level should be considered \"full green\"."
@@ -684,7 +678,7 @@ msgstr ""
 "Bestimmt, welcher Helligkeitswert der grünen Komponente als Weiß "
 "angesehen werden soll."
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid ""
 "Selects what blue radiance level should be considered \"full blue\"."
@@ -692,12 +686,12 @@ msgstr ""
 "Bestimmt, welcher Helligkeitswert der blauen Komponente als Weiß "
 "angesehen werden soll."
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr "Legt den Farbwert (Blauwert) des gescannten Bildes fest."
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
@@ -706,12 +700,12 @@ msgstr ""
 "Der Sättigungsgrad steuert die Belichtung einesmit einer Kamera "
 "aufgenommenen Bildes. Höhere Werte sorgen für eine stärkere Belichtung."
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr "Der Dateiname des zu ladenden Bildes."
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
@@ -719,297 +713,297 @@ msgid ""
 msgstr ""
 "Legt die Größe der für den Scanvorgang verwendeten Halbtonmatrix fest."
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
 msgstr "Definiert die für den Scanvorgang zu verwendende Halbton-Matrix."
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr "Benutze die gleichen Auflösungen für X und Y."
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr "Invertiere die Farben, z.B. tausche Schwarz gegen Weiß."
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr "Führe einen Qualitätsweißabgleich durch."
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr "Benutze die Linse, mit der die optische Auflösung verdoppelt wird."
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr "Benutze die gleichen Wert für alle Farben im RGB Modus."
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr ""
 "Wähle die minimale Helligkeit, die als Weiß betrachtet werden soll."
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr "Analoge Gammakorrektur."
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr "Analoge Gammakorrektur für Rot."
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr "Analoge Gammakorrektur für Grün."
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr "Analoge Gammakorrektur für Blau."
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr "Wärme die Lampe vor dem Scannen auf."
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr "Bestimmt die Beleuchtungszeit für die Kalibrierung."
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr ""
 "Bestimmt die Beleuchtungszeit für die Kalibrierung der roten Komponente."
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr ""
 "Bestimmt die Beleuchtungszeit für die Kalibrierung der grünen Komponente."
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr ""
 "Bestimmt die Beleuchtungszeit für die Kalibrierung der blauen Komponente."
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr "Bestimmt die Beleuchtungszeit für den Scan."
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr "Bestimmt die Beleuchtungszeit für den Scan der roten Komponente."
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr "Bestimmt die Beleuchtungszeit für den Scan der grünen Komponente."
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr "Bestimmt die Beleuchtungszeit für den Scan der blauen Komponente."
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr "Ermögliche Einstellung der Beleuchtungszeiten."
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr "Definiere die Lichtwerte beim Kalibrieren."
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr "Definiere die Lichtwerte beim Scannen."
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr "Ermögliche Auswahl der Lichtwerte."
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr "Schalte Lampe beim Beenden des Programms aus"
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, no-c-format
 msgid "Scan button"
 msgstr "Scanknopf"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, no-c-format
 msgid "Email button"
 msgstr "E-Mail-Knopf"
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, no-c-format
 msgid "Fax button"
 msgstr "Fax-Knopf"
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, no-c-format
 msgid "Copy button"
 msgstr "Kopieren-Knopf"
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr "PDF-Knopf"
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr "Abbrechen-Knopf"
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr "Seite geladen"
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, no-c-format
 msgid "Cover open"
 msgstr "Abdeckung offen"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "Farbe"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr "Farb-Strichzeichnung"
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr "Farb-Halbton"
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "Graustufen"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr "Halbton"
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "Strichzeichnung"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr "Erfolgreich"
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, no-c-format
 msgid "Operation not supported"
 msgstr "Operation nicht unterstützt"
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr "Operation wurde abgebrochen"
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr "Gerät nicht bereit"
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr "Ungültiges Argument"
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr "Ende der Datei ist erreicht"
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, no-c-format
 msgid "Document feeder jammed"
 msgstr "Automatischer Dokumenteinzug blockiert"
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, no-c-format
 msgid "Document feeder out of documents"
 msgstr "Automatischer Dokumenteinzug leer"
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, no-c-format
 msgid "Scanner cover is open"
 msgstr "Die Abdeckung des Scanners ist offen"
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr "\tCopy text \tFehler während der Datenübermittlung des Geräts"
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr "Nicht genügend Speicher"
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr "Der Zugriff auf die Ressource wurde abgelehnt"
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr "Die Lampe ist nicht bereit, bitte wiederholen"
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr "Mechanik des Scanners für den Transport verriegelt"
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "Defaulteinstellungen"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr "Auf Voreinstellungen für Verbesserungen zurücksetzen."
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "Kalibrierung"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr "Vor dem nächsten Scan kalibrieren"
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
@@ -1019,12 +1013,12 @@ msgstr ""
 "Kalibrierung durchgeführt. Ansonsten findet die Kalibrierung nur vor dem "
 "ersten Scan statt."
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr "Nur Shading-Korrektur durchführen"
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -1036,27 +1030,27 @@ msgstr ""
 "der Konfigurationsdatei oder aus den Voreinstellungen des Backends "
 "übernommen."
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr "Schalter Status"
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr "Nummer des zu scannenden Bildes"
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr "Wählt die Nummer des zu scannenden Bildes aus"
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, no-c-format
 msgid "Duplex scan"
 msgstr "Duplexscan"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid ""
 "Duplex scan provide a scan of the front and back side of the document"
@@ -1064,1035 +1058,1026 @@ msgstr ""
 "Duplex Scan ermöglicht das Scannen der Vorder- und Rückseite eines "
 "Dokuments."
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr "Scanner kalibrieren"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr "Erzwinge Scannerkalibrierung vor dem Scannen"
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr "Graustufen-Scan"
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr "Führe einen Graustufen-Scan statt eines Farb-Scans durch"
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr "Analoge Verstärkung"
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr ""
 "Vergrößere oder verkleinere die analoge Verstärkung des CCD-Sensors"
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "Gammakorrektur"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr "Wählt die korrigierte Gammakurve aus."
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr "Rohdaten"
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr ""
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, no-c-format
 msgid "No transparency correction"
 msgstr "Keine Transparenzkorrektur"
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr "Korrektur entsprechend des Filmtyps"
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr "Korrektur entsprechend des Seitenverhältnisses"
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, no-c-format
 msgid "Negatives"
 msgstr "Negative"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, no-c-format
 msgid "Slides"
 msgstr "Dias"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, no-c-format
 msgid "Normal speed"
 msgstr "Normalgeschwindigkeit"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/2 normal speed"
 msgstr "1/2 Normalgeschwindigkeit"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/3 normal speed"
 msgstr "1/3 Normalgeschwindigkeit"
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, no-c-format
 msgid "rounded parameter"
 msgstr "Gerundete Parameter"
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr "unbekannt"
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, no-c-format
 msgid "ADF jam"
 msgstr "Papierstau im automatischem Einzug"
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr "Abdeckung des automatischen Einzuges offen"
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, no-c-format
 msgid "lamp failure"
 msgstr "Lampenfehler"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr "Fehler beim Positionieren des Scannerkopfes"
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr "Fehler bei der CPU-Überprüfung"
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr "Fehler bei der Arbeitsspeicher-Überprüfung"
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr "Fehler bei der ROM-Überprüfung"
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr "Hardwareüberprüfungsfehler"
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, no-c-format
 msgid "transparency unit lamp failure"
 msgstr "Lampe der Durchlichteinheit defekt"
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr "Positionsfehler der Durchlichteinheit beim Scankopf"
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr "Falsche Länge bei der Parameterliste"
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr "Ungültiger Befehlsausführungs-Code"
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr "Ungültiges Feld in CDB"
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr "LUN nicht unterstützt"
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr "Ungültiges Feld in der Parameterliste"
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr "Falsche Reihenfolge der Befehle"
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr "Zu viele Fenster angegeben"
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr "Kein Medium eingelegt"
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr "ungültiger Teil der IDENTIFY Nachricht"
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr "Option nicht verbunden"
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr "Netzschalter Reset / Bus-Gerät Reset"
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr "Parameter von einem anderen Initator geändert"
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr "keine zusätzliche Sinnesinformation"
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr "Wiederauswahlfehler"
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr "SCSI-Paritätsfehler"
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr "vom Initiator bemerkte Fehlermeldung empfangen"
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr "ungültige Fehlernachricht"
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr "Zeitüberschreitung"
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, no-c-format
 msgid "transparency unit shading error"
 msgstr "Durchlichtaufsatzabschattungsfehler"
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr "Lampe nicht stabilisiert"
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, no-c-format
 msgid "film scanner"
 msgstr "Filmscanner"
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr "Flachbettscanner"
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr "Filmtyp"
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr "Auswahl des Film-Typs (z. B. Negativ oder Dia)"
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, no-c-format
 msgid "Negative film type"
 msgstr "Negativ Filmtyp"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, no-c-format
 msgid "Selects the negative film type"
 msgstr "Wählt den Typ des Negativfilms"
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, no-c-format
 msgid "Hardware resolution"
 msgstr "Hardwareauflösung"
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "Nur Hardwareauflösungen verwenden"
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr "Fokus"
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, no-c-format
 msgid "Auto focus"
 msgstr "Automatischer Fokus"
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, no-c-format
 msgid "Enable/disable auto focus"
 msgstr "Aktiviere/Deaktiviere automatischen Fokus\t\t"
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr "Automatischen Fokus nur einmal aktivieren"
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr "Auto-Fokus nur einmal zwischen den Auswürfen"
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, no-c-format
 msgid "Manual focus position"
 msgstr "Manuelle Einstellung des Fokus"
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr ""
 "Setzt die Fokusposition des optischen System von Hand (Standard: 128)."
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr "Scan Seitenrand"
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr "Erweiterte Farbeinstellungen"
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "Bild spiegeln"
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "Bild horizontal spiegeln"
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, no-c-format
 msgid "Auto exposure"
 msgstr "Automatische Belichtung"
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr "Aktiviert/Deaktiviert die automatische Belichtung"
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, no-c-format
 msgid "Calibration now"
 msgstr "Jetzt kalibrieren"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Kalibrierung *jetzt* ausführen"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr "Selbsttest"
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr "Führt einen Selbsttest des Scanners durch"
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, no-c-format
 msgid "Reset scanner"
 msgstr "Scanner zurücksetzen"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, no-c-format
 msgid "Reset the scanner"
 msgstr "Scanner zurücksetzen"
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr "Handhabung der Medien"
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, no-c-format
 msgid "Eject film after each scan"
 msgstr "Film nach jedem Scannen auswerfen"
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr "Wirft den Film automatisch nach jedem Scannen aus dem Gerät aus"
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr "Film vor Beenden auswerfen"
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr ""
 "Den Film automatisch aus dem Gerät auswerfen bevor das Programm schließt"
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr "Film jetzt auswerfen"
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr "Film *jetzt* auswerfen"
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, no-c-format
 msgid "Document feeder extras"
 msgstr "Automatischer Dokumenteinzug"
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, no-c-format
 msgid "Flatbed only"
 msgstr "Nur Flachbett"
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr "Automatischen Dokumenteinzug abschalten und nur Flachbett benutzen"
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, no-c-format
 msgid "Transparency unit"
 msgstr "Durchlichtaufsatz"
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr "Die Durchlichteinheit (FAU, film adapter unit) an/ausschalten"
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, no-c-format
 msgid "Negative film"
 msgstr "Negativfilm"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, no-c-format
 msgid "Positive or negative film"
 msgstr "Positiv- oder Negativfilm"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr "Dichte Einstellung"
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr "Dichte Einstellungsmodus setzen"
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, no-c-format
 msgid "Transparency ratio"
 msgstr "Transparenzgrad"
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, no-c-format
 msgid "Select film type"
 msgstr "Filmtyp auswählen"
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, no-c-format
 msgid "Select the film type"
 msgstr "Wählt den Filmtyp aus"
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "Flachbett"
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, no-c-format
 msgid "ADF Front"
 msgstr "Automatischer Dokumenteneinzug vorne"
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, no-c-format
 msgid "ADF Back"
 msgstr "Automatischer Dokumenteneinzug hinten"
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, no-c-format
 msgid "ADF Duplex"
 msgstr "ADF-Duplex"
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, fuzzy, no-c-format
 msgid "Card Front"
 msgstr "Vorne"
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, fuzzy, no-c-format
 msgid "Card Back"
 msgstr "Hinten"
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, fuzzy, no-c-format
 msgid "Card Duplex"
 msgstr "Duplex"
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "Rot"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "Grün"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "Blau"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, no-c-format
 msgid "Enhance Red"
 msgstr "Rot verstärken"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, no-c-format
 msgid "Enhance Green"
 msgstr "Grün verstärken"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, no-c-format
 msgid "Enhance Blue"
 msgstr "Blau verstärken"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr "Kein"
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr "JPEG"
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr ""
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr ""
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr "Einseitig"
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr "Duplex"
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr "Durchlichtaufsatz"
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr "Autom. Dokumenteneinzug"
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "Filmpositiv"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "Filmnegativ"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr "Fokus auf dem Glas"
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr "Fokus 2.5mm über dem Glas"
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr "Halbton A (hart)"
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr "Halbton B (weich)"
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr "Halbton C"
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr "Dithering A (4x4 Bayer)"
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr "Dithering B (4x4 Spiral)"
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr "Dithering C (4x4 Net Screen)"
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr "Dithering D (8x4 Net Screen)"
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr "Technik zur Textverbesserung"
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr "Ãœbertrage Muster A"
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr "Ãœbertrage Muster B"
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "Keine Korrektur"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr "Benutzerdefiniert"
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr "Nadeldrucker"
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr "Thermische Drucker"
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "Tintenstrahldrucker"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr "CRT-Monitore"
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "Standardeinstellung"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr "Drucken mit hoher Auflösung"
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr "Drucken mit geringer Auflösung"
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr "Drucken mit hohem Kontrast"
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr "Benutzerdefiniert (Gamma=1.0)"
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr "Benutzerdefiniert (Gamma=1.8)"
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr "CD"
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr "A5 hoch"
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr "A5 quer"
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr "Letter"
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr "A4"
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "Maximal"
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr "Scanmodus"
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr "Wählt den Halbton aus."
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr "Blindfarbe"
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr "Wählt die Blindfarbe."
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr "Wählt die Helligkeit."
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr "Schärfe"
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr "Farbkorrektur"
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr "Setzt die Farbkorrekturtabelle für das ausgewählte Ausgabegerät"
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr "Farbkorrekturkoeffizienten"
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr "Matritzenmultiplikation der RGB-Werte"
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr "Verschiebt Grün nach Rot"
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr "Verschiebt Grün nach Blau"
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr "Verschiebt Rot nach Grün"
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr "Verschiebt Rot nach Blau"
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr "Verschiebt Blau nach Grün"
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr "Verschiebt Blau nach Rot"
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr "Legt den den Grünanteil fest"
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr "Erhöhe den Rotanteil basierend auf dem Grünwert"
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr "Erhöhe den Blauanteil basierend auf dem Grünwert"
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr "Erhöhe den Grünanteil basierend auf dem Rotwert"
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr "Legt den Rotanteil fest"
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr "Erhöhe den Blauanteil basierend auf dem Rotwert"
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr "Erhöhe den Grünanteil basierend auf dem Blauwert"
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr "Erhöhe den Rotanteil basierend auf dem Blauwert"
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, no-c-format
 msgid "Controls blue level"
 msgstr "Legt den Blauwert fest"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr "Das Bild spiegeln"
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr "Schnelle Vorschau"
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr "Automatische Auswahl des Scanbereichs"
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr "Kurze Auflösungsliste"
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr "Zeige eine kurze Auflösungsliste an"
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr "Vergrösserung"
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr "Definiert den Vergrösserungsfaktor, der vom Scanner benutzt wird"
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr "Schnellformat"
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr "Optionales Zubehör"
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr "auswerfen"
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr "Wirft das Blatt aus dem automatischen Dokumenteinzug aus"
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr "Automatischer Auswurf"
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr "Auswurf des Dokuments nach dem Scannen"
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr "ADF-Modus"
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr "Wählt den ADF-Modus aus (einseitig/doppelseitig)"
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr "Schacht"
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr "Wähle den Schacht zum Scannen aus"
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
@@ -2102,23 +2087,23 @@ msgstr ""
 "oder eine benutzerdefinierte Tabelle, die in den Scanner geladen werden "
 "kann"
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr "Fokus Position"
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
 msgstr "Setzt den Fokus entweder auf das Glas oder 2.5mm darüber"
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr "Warte auf Knopfdruck"
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
@@ -2127,208 +2112,956 @@ msgstr ""
 "Beginne mit dem Scannen erst, wenn nach dem Senden des Scankommandos der "
 "Knopf am Scanner gedrückt wird."
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr "Infrarot"
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, no-c-format
 msgid "Positive Slide"
 msgstr "Diapositiv"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, no-c-format
 msgid "Negative Slide"
 msgstr "Dianegativ"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr "Eingebautes CCT-Profil"
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, no-c-format
 msgid "User defined CCT profile"
 msgstr "Benutzerdefiniertes CCT-Profil"
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr "An"
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr "Aus"
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr "DTC"
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr "SDTC"
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr "Halbton"
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, no-c-format
 msgid "Diffusion"
 msgstr "Diffusion"
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, no-c-format
 msgid "White"
 msgstr "Weiß"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, no-c-format
 msgid "Black"
 msgstr "Schwarz"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, no-c-format
 msgid "Continue"
 msgstr "Fortfahren"
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr "10mm"
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr "15mm"
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr "20mm"
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, no-c-format
 msgid "Horizontal bold"
 msgstr "horizontal breit"
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, no-c-format
 msgid "Horizontal narrow"
 msgstr "horizontal schmal"
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, no-c-format
 msgid "Vertical bold"
 msgstr "vertikal breit"
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr "Oben nach unten"
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr "Unten nach oben"
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, no-c-format
 msgid "Front"
 msgstr "Vorne"
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr "Hinten"
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
+msgid "Gamma function exponent"
+msgstr "Gamma-Exponent"
+
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
+#, no-c-format
+msgid "Changes intensity of midtones"
+msgstr "Verändert die Intensität der mittleren Farbtöne"
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
 msgstr ""
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3148
 #, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
+msgid "Reverse image format"
+msgstr ""
+
+#: backend/fujitsu.c:3165
+#, fuzzy, no-c-format
+msgid "Halftone type"
+msgstr "Halbton"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr ""
+
+#: backend/fujitsu.c:3210
+#, fuzzy, no-c-format
+msgid "Perform outline extraction"
+msgstr "Führt Kalibrierung durch"
+
+#: backend/fujitsu.c:3221
+#, fuzzy, no-c-format
+msgid "Emphasis"
+msgstr "Bildgewichtung"
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr ""
+
+#: backend/fujitsu.c:3240
+#, fuzzy, no-c-format
+msgid "Separation"
+msgstr "Sättigung"
+
+#: backend/fujitsu.c:3241
+#, fuzzy, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr ""
+"Schaltet die automatische Bestimmung des Schwellwerts für den Schwarz-"
+"Weiß-Modus ein."
+
+#: backend/fujitsu.c:3252
+#, fuzzy, no-c-format
+msgid "Mirroring"
+msgstr "Bild spiegeln"
+
+#: backend/fujitsu.c:3253
+#, fuzzy, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "Bild horizontal spiegeln."
+
+#: backend/fujitsu.c:3270
+#, fuzzy, no-c-format
+msgid "White level follower"
+msgstr "Weißwert für Blau"
+
+#: backend/fujitsu.c:3271
+#, fuzzy, no-c-format
+msgid "Control white level follower"
+msgstr "Legt den Rotanteil fest"
+
+#: backend/fujitsu.c:3289
+#, fuzzy, no-c-format
+msgid "BP filter"
+msgstr "Farbfilter"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr ""
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr "Glätten"
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr ""
+
+#: backend/fujitsu.c:3323
+#, fuzzy, no-c-format
+msgid "Gamma curve"
+msgstr "Gammawert"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, no-c-format
+msgid "Threshold curve"
+msgstr "Schwellwertkurve"
+
+#: backend/fujitsu.c:3347
+#, fuzzy, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+"Dynamische Schwellwertkurve, von hell zu dunkel, nomalerweise 50-65"
+
+#: backend/fujitsu.c:3369
+#, fuzzy, no-c-format
+msgid "Threshold white"
+msgstr "Schwellwert"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr ""
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, fuzzy, no-c-format
+msgid "Noise removal"
+msgstr "Rauschunterdrückung"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr ""
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr ""
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr ""
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr ""
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
 msgstr ""
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr ""
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr ""
+
+#: backend/fujitsu.c:3508
+#, fuzzy, no-c-format
+msgid "Auto width detection"
+msgstr "Keine Korrektur"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr ""
+
+#: backend/fujitsu.c:3526
+#, fuzzy, no-c-format
+msgid "Auto length detection"
+msgstr "Keine Korrektur"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr ""
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr ""
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr ""
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr ""
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr ""
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr ""
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr ""
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
+msgstr ""
+
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3708
+#, fuzzy, no-c-format
+msgid "DF recovery mode"
+msgstr "Abdeckung des automatischen Einzuges offen"
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr ""
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3748
+#, fuzzy, no-c-format
+msgid "Advanced paper protection"
+msgstr "Erweiterte Optionen"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+
+#: backend/fujitsu.c:3768
+#, fuzzy, no-c-format
+msgid "Staple detection"
+msgstr "Keine Korrektur"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr ""
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+
+#: backend/fujitsu.c:3809
+#, fuzzy, no-c-format
+msgid "Dropout color"
+msgstr "Blindfarbe"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+
+#: backend/fujitsu.c:3833
+#, fuzzy, no-c-format
+msgid "Buffer mode"
+msgstr "Einzugsmodus"
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr ""
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr ""
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr ""
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+
+#: backend/fujitsu.c:3911
+#, fuzzy, no-c-format
+msgid "Off timer"
+msgstr "Lampenausschaltzeit"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+
+#: backend/fujitsu.c:3930
+#, fuzzy, no-c-format
+msgid "Duplex offset"
+msgstr "Offset blauer Kanal"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr ""
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "Offset grüner Kanal"
+
+#: backend/fujitsu.c:3949
+#, fuzzy, no-c-format
+msgid "Adjust green/red offset"
+msgstr "Offset grüner Kanal"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr "Offset blauer Kanal"
+
+#: backend/fujitsu.c:3967
+#, fuzzy, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "Legt den Offset des blauen Kanals fest"
+
+#: backend/fujitsu.c:3980
+#, fuzzy, no-c-format
+msgid "Low Memory"
+msgstr "Nicht genügend Speicher"
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+
+#: backend/fujitsu.c:3996
+#, fuzzy, no-c-format
+msgid "Duplex side"
+msgstr "Duplexscan"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr ""
+
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr ""
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr ""
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
+msgstr ""
+
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr ""
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+
+#: backend/fujitsu.c:4095
+#, fuzzy, no-c-format
+msgid "Endorser Options"
+msgstr "Erweiterte Optionen"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr ""
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr ""
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr ""
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr ""
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr ""
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr ""
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr ""
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr ""
+
+#: backend/fujitsu.c:4253
+#, fuzzy, no-c-format
+msgid "Endorser direction"
+msgstr "Rauschunterdrückung"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr ""
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr ""
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr ""
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr ""
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr ""
+
+#: backend/fujitsu.c:4344
+#, fuzzy, no-c-format
+msgid "A3 paper"
+msgstr "Vom Papier"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4356
+#, fuzzy, no-c-format
+msgid "B4 paper"
+msgstr "Vom Papier"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4368
+#, fuzzy, no-c-format
+msgid "A4 paper"
+msgstr "Vom Papier"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4380
+#, fuzzy, no-c-format
+msgid "B5 paper"
+msgstr "Vom Papier"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr ""
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr ""
+
+#: backend/fujitsu.c:4429
+#, fuzzy, no-c-format
+msgid "Scanner in power saving mode"
+msgstr "Die Abdeckung des Scanners ist offen"
+
+#: backend/fujitsu.c:4452
+#, fuzzy, no-c-format
+msgid "Manual feed"
+msgstr "Manueller Pre-Focus"
+
+#: backend/fujitsu.c:4453
+#, fuzzy, no-c-format
+msgid "Manual feed selected"
+msgstr "Manueller Pre-Focus"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr ""
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr ""
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr ""
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr ""
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr ""
+
+#: backend/fujitsu.c:4513
+#, fuzzy, no-c-format
+msgid "Hardware error code"
+msgstr "Hardwareüberprüfungsfehler"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr ""
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr ""
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr ""
+
+#: backend/fujitsu.c:4537
+#, fuzzy, no-c-format
+msgid "Imprinter ink level"
+msgstr "Weißwert"
+
+#: backend/fujitsu.c:4548
+#, fuzzy, no-c-format
+msgid "Density"
+msgstr "Dichte Einstellung"
+
+#: backend/fujitsu.c:4549
+#, fuzzy, no-c-format
+msgid "Density dial"
+msgstr "Dichte Einstellung"
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, fuzzy, no-c-format
+msgid "Duplex switch"
+msgstr "Duplexscan"
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, no-c-format
 msgid "Extras"
 msgstr "Extras"
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, no-c-format
-msgid "Threshold curve"
-msgstr "Schwellwertkurve"
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
 "Dynamische Schwellwertkurve, von hell zu dunkel, nomalerweise 50-65"
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr "dynamische Strichzeichnung abschalten"
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, fuzzy, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
@@ -2337,12 +3070,12 @@ msgstr ""
 "Abschalten um einen Software angepassten Algorithmus zur Erstellung von "
 "Strichzeichnungen zu verwenden anstatt die Hardwarefunktion zu nutzen"
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, no-c-format
 msgid "Disable interpolation"
 msgstr "Interpolation abschalten"
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
@@ -2352,46 +3085,46 @@ msgstr ""
 "kleiner ist als die vertikale, schaltet dies die horizontale "
 "Interpolation aus"
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "Farbfilter"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 "Wenn Graustufen oder Strichzeichnung verwendet wird, wählt diese Option "
 "die Farbe"
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "Kalibrierung"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Kalibriermodus definieren"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Kalibrierungsdatenspeicher"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, no-c-format
 msgid "Lamp off time"
 msgstr "Lampenausschaltzeit"
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
@@ -2400,106 +3133,104 @@ msgstr ""
 "Die Lampe wird nach der angegebenen Zeit (in Minuten) ausgeschaltet. Ein "
 "Wert von 0 bedeutet, dass die Lampe nich ausgeschaltet wird."
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, fuzzy, no-c-format
 msgid "Lamp off during scan"
 msgstr "Lampe aus während Schwarzkalibrierung"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, fuzzy, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr "Anzahl der Minuten, bis die Lampe nach dem Scan ausgeschaltet wird"
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, no-c-format
 msgid "File button"
 msgstr "Datei-Knopf"
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr "OCR-Knopf"
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, no-c-format
 msgid "Power button"
 msgstr "Einschaltknopf"
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "E-Mail-Knopf"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, no-c-format
 msgid "Need calibration"
 msgstr "benötigt Kalibirierung"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr ""
 "Der Scanner benötigt eine Kalibrierung für die momentanen Einstellungen"
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, no-c-format
 msgid "Buttons"
 msgstr "Knöpfe"
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr "Kalibrierung"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "Starte den Kalibrierungsprozess mit einem Spezialblatt"
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, no-c-format
 msgid "Clear calibration"
 msgstr "Kalibrierung zurücksetzen"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, no-c-format
 msgid "Clear calibration cache"
 msgstr "Löscht den Kalibrierungsspeicher"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr "Durchlichteinheit"
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr "Graustufen-Farbe"
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 "Legt fest, welche SCanfarbe im Garustufen-Modus verwendet wird "
 "(Standardwert: Grün)."
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr "Optionen zur Fehlersuche"
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "Automatisches Aufwärmen"
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -2508,12 +3239,12 @@ msgstr ""
 "Warte solange, bis die Helligkeit der Lampe konstant ist anstatt einfach "
 "60 Sekunden zu warten."
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "Kompletter Scan"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
@@ -2523,12 +3254,12 @@ msgstr ""
 "Kalibrierungsstreifens. Vorsicht, keine zu große Länge auswählen. Nur "
 "für Testzwecke."
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Grobkalibrierung"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2540,12 +3271,12 @@ msgstr ""
 "manuell eingestellt werden. Diese Option is standardmäßig an. Nur für "
 "Testzwecke."
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "Grobkalibrierung nur für ersten Scan"
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2557,12 +3288,12 @@ msgstr ""
 "sparen. Wenn die Helligkeit der Bilder von Scan zu Scan schwankt, sollte "
 "diese Option ausgeschaltet werden. Nur für Testzwecke."
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, no-c-format
 msgid "Backtrack lines"
 msgstr "Backtrack-Zeilen"
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2575,84 +3306,84 @@ msgstr ""
 "Computer die Daten aufnehmen kann. Niedrigere Werte sorgen für "
 "schnellere Scans, erhöhen jedoch das Risiko, Zeilen zu überspringen."
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Gammawert"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr "Legt den Gammawert für alle Kanäle fest."
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, no-c-format
 msgid "Geometry Group"
 msgstr "Geometrie"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, no-c-format
 msgid "Scan Mode Group"
 msgstr "Scanmodus"
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr "Dia"
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, no-c-format
 msgid "Scanner model"
 msgstr "Scannermodell"
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, fuzzy, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr ""
 "Erlaubt Geräteverhalten mit anderen unterstützten Modellen zu testen"
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr "Bildfarben werden invertiert"
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, no-c-format
 msgid "Disable gamma correction"
 msgstr "Gammakorrektur abschalten"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "Die Gammakorrektur wird abgeschaltet"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, no-c-format
 msgid "Disable white shading correction"
 msgstr "Weißabgleichskorrektur abschalten"
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr "Weißabgleichkorrektur wird abgeschaltet"
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr "Aufwärmprozess überspringen"
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr "Der Aufwärmprozess wird überspungen"
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr "erzwinge echte Tiefe"
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2663,12 +3394,12 @@ msgstr ""
 "ausgeführt und danach in die gewählte Farbtiefe umgewandelt, um die "
 "Bildqualität zu verbessern. Diese Option verhindert Farbtiefen-Emulation."
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, no-c-format
 msgid "Emulate Grayscale"
 msgstr "Graustufen emulieren"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2679,12 +3410,12 @@ msgstr ""
 "Software in Graustufen umgewandelt. Unter manchen Umständen verbessert "
 "dies die Bildqualität."
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr "Debugging Bilder abspeichern"
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
@@ -2693,358 +3424,352 @@ msgstr ""
 "Wenn aktiviert werden einige Bilder im Scanprozess gespeichert um sie zu "
 "analysieren."
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, no-c-format
 msgid "Reset chipset"
 msgstr "Chipsatz zurücksetzen"
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr "Setzt die Daten des Chipsatzes zurück"
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, no-c-format
 msgid "Information"
 msgstr "Information"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, no-c-format
 msgid "Chipset name"
 msgstr "Name des Chipsatzes"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr "Zeigt den im Gerät verwendeten Chipsatz an."
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr "Chipsatz-ID"
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, no-c-format
 msgid "Shows the chipset ID"
 msgstr "Zeigt die ID des Chipsatzes an"
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, no-c-format
 msgid "Scan counter"
 msgstr "Scanzähler"
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr "Zeigt die Anzahl der Scans an"
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, no-c-format
 msgid "Update information"
 msgstr "Information aktualisieren"
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr "Aktualisiert alle Informationnen über das Gerät"
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr "Diese Option spiegelt den vorderen Scannerknopf wieder"
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr "Bild"
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, no-c-format
 msgid "offset X"
 msgstr "X-Abstand"
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr "hardwareinterne X-Position des Scanbereichs"
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, no-c-format
 msgid "offset Y"
 msgstr "Y-Abstand"
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr "hardwareinterne Y-Position des Scanbereichs"
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr "Lampenstatus"
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr "Schaltet die Lampe an oder aus"
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr "Kalibriert Schwarz- und Weisswert."
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr "ADF"
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, no-c-format
 msgid "TMA Slides"
 msgstr "TMA-Dias"
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, no-c-format
 msgid "TMA Negatives"
 msgstr "TMA-Negative"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, no-c-format
 msgid "Color (48 bits)"
 msgstr "Farbe (48 Bit)"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, no-c-format
 msgid "Extend lamp timeout"
 msgstr "Lampenausschaltzeit verlängern"
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr "Verländert die Lampenausschaltzeit (von 15 Minuten bis 1 Stunde)"
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr "Warten auf Knopfdruck"
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, no-c-format
 msgid "Waits for button before scanning"
 msgstr "Scannen beginnt erst mit Knopfdruck"
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, no-c-format
 msgid "Advanced Options"
 msgstr "Erweiterte Optionen"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr "Grob"
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr "Fein"
 
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr "Bayer"
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr "NTSC RGB"
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr "XPA RGB"
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr "Unverändert"
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "NTSC Grau"
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr "XPA Grau"
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "Langsam"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "Schnell"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr "Besonders schnell"
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr "2 Pixel"
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr "4 Pixel"
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr "8 Pixel"
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr "Foto"
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, no-c-format
 msgid "Film-strip"
 msgstr "Film-Streifen"
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr "XPA"
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr "Bedingt"
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, no-c-format
 msgid "Experiment"
 msgstr "Experiment"
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, no-c-format
 msgid "Sharpening"
 msgstr "Schärfe"
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr "Legt den Wert für die Schärfe fest."
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr "Automatischer Schwellwert"
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr ""
 "Schaltet die automatische Bestimmung des Schwellwerts für den Schwarz-"
 "Weiß-Modus ein."
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr "Glätten"
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr "Wählt den Glättungs-Filter aus."
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr "Medium nach dem Scannen auswerfen"
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, no-c-format
 msgid "Unloads the media after a scan."
 msgstr "Wirft das Medium nach dem Scan aus."
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, no-c-format
 msgid "Change document"
 msgstr "Dokument wechseln"
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr "Dokument wechseln."
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr "Auswerfen"
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr "Dokument auswerfen."
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, no-c-format
 msgid "Start calibration process."
 msgstr "Startet den Kalibrierungsprozess."
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, no-c-format
 msgid "Media"
 msgstr "Medium"
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr "Legt den Typ des Mediums fest."
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr "Belichtungszeit"
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -3057,461 +3782,460 @@ msgstr ""
 "\"Negativ\" für Negativ-Filme. Für dunkle (unterentwickelte) Bilder kann "
 "dieser Wert vergrößert werden."
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, no-c-format
 msgid "Color Matrix"
 msgstr "Farbmatrix"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, no-c-format
 msgid "Set the scanners color matrix."
 msgstr "Legt die Farbmatrix für den Scanner fest."
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr "Benutzerdefinierte Farbmatrix."
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, no-c-format
 msgid "Mono Color Matrix"
 msgstr "Graue Farbmatrix"
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr "Benutzerdefinierte Farbmatrix für Graustufenscans."
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, no-c-format
 msgid "Mirror horizontal"
 msgstr "Horizontal spiegeln"
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, no-c-format
 msgid "Mirror image horizontally."
 msgstr "Bild horizontal spiegeln."
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, no-c-format
 msgid "Mirror vertical"
 msgstr "Vertikal spiegeln"
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, no-c-format
 msgid "Mirror image vertically."
 msgstr "Bild vertikal spiegeln."
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, no-c-format
 msgid "Update options"
 msgstr "Optionen aktualisieren"
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, no-c-format
 msgid "Update options."
 msgstr "Optionen aktualisieren."
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr "8-Bit-Ausgabe"
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr ""
 "Benutze intern eine Frabtiefe von mehr als 8 Bit, extern aber nur 8 Bit."
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr "Warten auf vorderen Knopf"
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr "Warte mit dem Scan aud das Drücken des vorderen Knopfes."
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr "Lampe ausschalten"
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr "Schalte Scannerlampe aus."
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "Papiergröße"
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr "Automatische Trennung"
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, fuzzy, no-c-format
 msgid "Landscape"
 msgstr "A5 quer"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr ""
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, fuzzy, no-c-format
 msgid "Length control mode"
 msgstr "Dichte Einstellungsmodus setzen"
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, fuzzy, no-c-format
 msgid "Manual feed mode"
 msgstr "Manueller Pre-Focus"
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, fuzzy, no-c-format
 msgid "Manual feed timeout"
 msgstr "Manueller Pre-Focus"
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr "Schalte Duplex- (zweiseitiges) Scannen ein"
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr "Tatsächliche Größe des Papiers im ADF"
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, fuzzy, no-c-format
 msgid "halftone"
 msgstr "Halbton"
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, fuzzy, no-c-format
 msgid "color"
 msgstr "Farbe"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, fuzzy, no-c-format
 msgid "continuous"
 msgstr "Fortfahren"
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, fuzzy, no-c-format
 msgid "off"
 msgstr "Aus"
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, fuzzy, no-c-format
 msgid "bayer_64"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, fuzzy, no-c-format
 msgid "bayer_16"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, fuzzy, no-c-format
 msgid "halftone_32"
 msgstr "Halbton"
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, fuzzy, no-c-format
 msgid "halftone_64"
 msgstr "Halbton"
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, fuzzy, no-c-format
 msgid "diffusion"
 msgstr "Diffusion"
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, fuzzy, no-c-format
 msgid "normal"
 msgstr "Normal"
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, fuzzy, no-c-format
 msgid "light"
 msgstr "Licht"
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, fuzzy, no-c-format
 msgid "From scanner"
 msgstr "Filmscanner"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr "Vom Papier"
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, fuzzy, no-c-format
 msgid "default"
 msgstr "Standardeinstellung"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, fuzzy, no-c-format
 msgid "smooth"
 msgstr "Glatt"
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, fuzzy, no-c-format
 msgid "low"
 msgstr "Langsam"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, fuzzy, no-c-format
 msgid "medium"
 msgstr "Mittel"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, fuzzy, no-c-format
 msgid "red"
 msgstr "Rot"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, fuzzy, no-c-format
 msgid "green"
 msgstr "Grün"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, fuzzy, no-c-format
 msgid "Sets the scan source"
 msgstr "Scanquelle"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr "Einzugsmodus"
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr "Legt den Einzugsmodus fest"
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, fuzzy, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr "Aktiviere/Deaktiviere automatischen Fokus\t\t"
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, fuzzy, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr "Dichte Einstellungsmodus setzen"
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, fuzzy, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "Legt den Einzugsmodus fest"
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, fuzzy, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr "Legt den Einzugsmodus fest"
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr "Automatischer Schwellwert"
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
@@ -3520,517 +4244,504 @@ msgstr ""
 "Legt automatisch Helligkeit, Kontrast, Weißwert, Gamma, "
 "Rauschunterdrückung und Bildgewichtung fest"
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "Rauschunterdrückung"
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr "Reduziert das Rauschen einzelner Punkte"
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr "Bildgewichtung"
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr "Wählt die Bildgewichtung."
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, fuzzy, no-c-format
 msgid "Lamp color"
 msgstr "Lampe an"
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, fuzzy, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr "Schaltet die Lampe an oder aus"
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, fuzzy, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "Bild vertikal spiegeln."
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
 "length of actual paper or logical document length."
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "Gammakorrektur"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, fuzzy, no-c-format
 msgid "High sensivity"
 msgstr "Drucken mit hoher Auflösung"
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, fuzzy, no-c-format
 msgid "Low sensivity"
 msgstr "Drucken mit geringer Auflösung"
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, fuzzy, no-c-format
 msgid "err_diffusion"
 msgstr "Diffusion"
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, fuzzy, no-c-format
 msgid "No detection"
 msgstr "Keine Korrektur"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, fuzzy, no-c-format
 msgid "Normal mode"
 msgstr "Normal"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, fuzzy, no-c-format
 msgid "Enhanced mode"
 msgstr "Farbverbesserung"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
 "divides long paper by the length which is set in Document Size option."
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, fuzzy, no-c-format
 msgid "Automatic threshold mode"
 msgstr "Automatischer Schwellwert"
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, fuzzy, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr "Automatischer Schwellwert"
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, fuzzy, no-c-format
 msgid "Set chroma of red"
 msgstr "Legt die Reihenfolge der Frames fest"
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, fuzzy, no-c-format
 msgid "chroma of blue"
 msgstr "Schatten Blau"
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, fuzzy, no-c-format
 msgid "Set chroma of blue"
 msgstr "Verschiebt Rot nach Blau"
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr "Diamant"
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr ""
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr ""
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr "8x8 Bayer"
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr "8x8 Vertikale Linie"
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr "Verstärkung"
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr "Farbkanal Verstärkungseinstellungen"
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, no-c-format
 msgid "Gray gain"
 msgstr "Verstärkung grauer Kanal"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr "Legt die Verstärkung des grauen Kanals fest"
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, no-c-format
 msgid "Red gain"
 msgstr "Verstärkung roter Kanal"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr "Legt die Verstärkung des roten Kanals fest"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, no-c-format
 msgid "Green gain"
 msgstr "Verstärkung grüner Kanal"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr "Legt die Verstärkung des grünen Kanals fest"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, no-c-format
 msgid "Blue gain"
 msgstr "Verstärkung blauer Kanal"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr "Legt die Verstärkung des blauen Kanals fest"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr "Bayer Halbton 16"
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr "Bayer Halbton 64"
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr "Halbton Punkt 32"
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr "Halbton Punkt 64"
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr "Fehlerstreuung"
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr "Modus 1"
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr "Modus 2"
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr "Modus 3"
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr "Vom Kalibrierungstreifen"
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr "Glatt"
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr "Niedrig"
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr "Mittel"
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr "Hoch"
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr "Röhrenmonitor"
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "Eine Seite"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "Alle Seiten"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr "Einzugsscanner"
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr "4 Bit Graustufen"
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr "8 Bit Graustufen"
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr "Lichtwerte"
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr "Spezialoptionen"
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr "Farbbalance"
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr "kein Backtracking"
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr ""
 "wenn aktiviert, erfolgt kein Rücklauf des Scankopfes während der "
 "Datenübertragung"
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr "Lampe ein/ausschalten"
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr "Schaltet die Lampe des Flachbettscanners ein bzw. aus"
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr "Software - Kalibrierung"
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid ""
 "If checked the color calibration before a scan is done by the backend"
@@ -4038,12 +4749,12 @@ msgstr ""
 "einige Scanner benötigen eine Kalibrierung durch die Software, sonst "
 "entstehen senkrechte Streifen im Bild"
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr "Benutzung des LIGHTLID 35"
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr ""
@@ -4051,32 +4762,32 @@ msgstr ""
 "Scans die Flachbett - Lampe ausgeschaltet um besseren Kontrast zu "
 "erreichen"
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "Hohe Qualität"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr "Hohe Qualität bei geringer Geschwindigkeit"
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "Hohe Geschwindigkeit"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr "Hohe Geschwindigkeit bei geringerer Qualität"
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr "Automatische schwarz/weiß - Schwelle"
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
@@ -4085,67 +4796,67 @@ msgstr ""
 "Bei einem Strichzeichnungsscan versucht die Software einen optimalen "
 "Wert für die schwarz/weiß- Schwelle zu bestimmen"
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr "Modus der Gammakorrektur."
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr "Verbinde Gammawerte"
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr "Alle Farben benutzen dieselbe Gammakorrektur."
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr "Gamma - Zahlenwert"
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr "Gibt einen Gamma - Zahlenwert an"
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr "Gamma - Wert für Rot"
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr "Gamma - Wert für Rot"
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr "Gamma - Wert für Grün"
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr "Gamma - Wert für Grün"
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr "Gamma - Wert für Blau"
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr "Gamma - Wert für Blau"
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr "Farbkanal"
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
@@ -4153,207 +4864,207 @@ msgstr ""
 "Wählt den Farbkanal; \"Master\" bedeutet, dass alle Farben beeinflusst "
 "werden"
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr "Mittelgrauwert"
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr "Bestimmt, welcher Helligkeitswert als 50% Grau angenommen wird"
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr "Mittelwert für Rot"
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr "Bestimmt, welcher Helligkeitswert als 50% Rot angenommen wird"
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr "Mittelwert für Grün"
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr "Bestimmt, welcher Helligkeitswert als 50% Grün angenommen wird"
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr "Mittelwert für Blau"
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr "Bestimmt, welcher Helligkeitswert als 50% Blau angenommen wird"
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr "Rot - Balance"
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr "Farbbalance-Faktor für Rot: 100% bedeutet keine Farbkorrektur"
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr "Grün - Balance"
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr "Farbbalance-Faktor für Grün: 100% bedeutet keine Farbkorrektur"
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr "Blau - Balance"
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr "Farbbalance-Faktor für Blau: 100% bedeutet keine Farbkorrektur"
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr "Standard - Balance"
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr "Setzt die Farbbalance auf die vom Hersteller vorgegebenen Werte"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "Sehr langsam"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "Langsam"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "Schnell"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "Sehr schnell"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr "8x8 grob"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr "8x8 normal"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr "8x8 fein"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr "8x8 sehr fein"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr "6x6 grob"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr "5x5 grob"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr "5x5 fein"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr "4x4 grob"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr "4x4 normal"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr "4x4 fein"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr "3x3 normal"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr "2x2 normal"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr "8x8 benutzerdefiniert"
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr "6x6 benutzerdefiniert"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr "5x5 benutzerdefiniert"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr "4x4 benutzerdefiniert"
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr "3x3 benutzerdefiniert"
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr "2x2 benutzerdefiniert"
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr "Schneller Graumodus"
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr "Scanne im schnellen Graumodus (geringere Bildqualität)."
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
@@ -4363,124 +5074,124 @@ msgstr ""
 "Qualität) durchgeführt werden. Das kann ein Schwarzweißmodus oder ein "
 "Modus mit niedriger Auflösung sein."
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr "Lampenausschaltzeit (Minuten)."
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr ""
 "Legt die Zeit (in Minuten) fest, nach der die Lampe ausgeschaltet wird."
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, no-c-format
 msgid "Turn lamp off"
 msgstr "Schalte die Lampe aus"
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr "Schaltet die Lampe sofort aus."
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr "Helligkeit des Rotwerts"
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr ""
 "Stellt die Helligkeit der roten Komponente des gescannten Bildes ein."
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr "Helligkeit des Grünwerts"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr ""
 "Stellt die Helligkeit der grünen Komponente des gescannten Bildes ein."
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr "Helligkeit des Blauwerts"
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr ""
 "Stellt die Helligkeit der blauen Komponente des gescannten Bildes ein."
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "Kontrast der grünen Komponente"
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr ""
 "Stellt den Kontrast der roten Komponente des gescannten Bildes ein."
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "Kontrast der grünen Komponente"
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr ""
 "Stellt den Kontrast der grünen Komponente des gescannten Bildes ein."
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "Kontrast der blauen Komponente"
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr ""
 "Stellt den Kontrast der blauen Komponente des gescannten Bildes ein."
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr "Farbe 48"
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr "Farbe 24"
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr "Grau 16"
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr "Grau 8"
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr "Aufsicht"
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, no-c-format
 msgid "Positive"
 msgstr "Positiv"
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -4489,27 +5200,27 @@ msgstr ""
 "Warte solange, bis die Helligkeit der Lampe konstant ist anstatt einfach "
 "40 Sekunden zu warten."
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, no-c-format
 msgid "Negative color"
 msgstr "Negativfilm Farbe"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, no-c-format
 msgid "Negative gray"
 msgstr "Negativfilm Graustufen"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, no-c-format
 msgid "48 bits color"
 msgstr "48 Bit Farbe"
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr "16 Bit Graustufen"
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
@@ -4519,12 +5230,12 @@ msgstr ""
 "muss vor Scanmodus und Scanauflösung ausgewählt werden. Setzt die "
 "Einstellungen für Scanmodus und Scanauflösung zurück."
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr "Scanen auf Knopfdruck"
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4535,248 +5246,241 @@ msgstr ""
 "drücken Sie die Taste \"SCAN\" beim MP1500 oder \"COLOR\" bei anderen "
 "Modellen. Zum Abbrechen drücken Sie die Taste \"GRAY\"."
 
-#: ../backend/pixma_sane_options.c:143
-#, no-c-format
-msgid "Gamma function exponent"
-msgstr "Gamma-Exponent"
-
-#: ../backend/pixma_sane_options.c:144
-#, no-c-format
-msgid "Changes intensity of midtones"
-msgstr "Verändert die Intensität der mittleren Farbtöne"
-
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:232
 #, no-c-format
 msgid "Update button state"
 msgstr "Knopfstatus aktualisieren"
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:244
 #, no-c-format
 msgid "Button 1"
 msgstr "Knopf 1"
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:258
 #, no-c-format
 msgid "Button 2"
 msgstr "Knopf 2"
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr "Vorlagentyp"
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr "Scanziel"
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr "ADF Wartezeit"
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+"Der Scanner sucht während der Wartezeit (in Sekunden) nach einem "
+"Dokument, welches in den Scanschacht eingelegt wird."
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr "Durchlicht"
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr "Geräteeinstellungen"
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr "Lampenschalter"
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr "Lampe(n) ein-/ausschalten."
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "Lampe aus während Schwarzkalibrierung"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr "Schaltet die Lampe immer während der Schwarzkalibrierung aus."
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, no-c-format
 msgid "Calibration data cache"
 msgstr "Kalibrierungsdatenspeicher"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr "Schaltet Kalibrierungsdatenspeicher ein oder aus."
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, no-c-format
 msgid "Performs calibration"
 msgstr "Führt Kalibrierung durch"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr "Sensorbeschleunigung"
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr "Schaltet Sensorbeschleunigung an oder ab."
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, no-c-format
 msgid "Warmup-time"
 msgstr "Aufwärmzeit"
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, no-c-format
 msgid "Warmup-time in seconds."
 msgstr "Aufwärmzeit in Sekunden."
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, no-c-format
 msgid "Lampoff-time"
 msgstr "Lampenausschaltzeit"
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr "Lampenausschaltzeit in Sekunden."
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, no-c-format
 msgid "Analog frontend"
 msgstr "Analog Frontend"
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr "Verstärkung roter Kanal des AD-Wandlers."
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr "Offset roter Kanal"
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr "Offset roter Kanal des AD-Wandlers."
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr "Verstärkung grüner Kanal des AD-Wandlers."
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr "Offset grüner Kanal"
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr "Offset grüner Kanal des AD-Wandlers."
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr "Verstärkung blauer Kanal des AD-Wandlers."
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr "Offset blauer Kanal"
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr "Offset blauer Kanal des AD-Wandlers."
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, no-c-format
 msgid "Red lamp off"
 msgstr "Ausschaltzeitpunkt rote Lampe"
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr "Definiert den Ausschaltzeitpunkt der roten Lampe."
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, no-c-format
 msgid "Green lamp off"
 msgstr "Ausschaltzeitpunkt grüne Lampe"
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr "Definiert den Ausschaltzeitpunkt der grünen Lampe."
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, no-c-format
 msgid "Blue lamp off"
 msgstr "Ausschaltzeitpunkt blaue Lampe"
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr "Definiert den Ausschaltzeitpunkt der blauen Lampe."
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr "Diese Option spiegelt den Zustand der Scannerknöpfe wider."
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr "Farbe36"
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr "Halbtonmuster 1"
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr "Halbtonmuster 2"
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr "Zufallsmuster"
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr "Dateiauswahl"
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr "Bildkorrektur"
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr "Graustufen"
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr "Bild in Graustufen laden."
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr "Three-Pass Simulation"
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
@@ -4785,12 +5489,12 @@ msgstr ""
 "Simuliere einen Three-Pass Scanner, indem hintereinander je ein Frame "
 "für jede Grundfarbe übertragen wird. Die Reihenfolge ist grün-blau-rot."
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr "Handscanner Simulation"
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4802,7 +5506,7 @@ msgstr ""
 "-1 zurück. Mit dieser Option kann man prüfen, ob das Frontend damit "
 "richtig umgehen kann."
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid ""
 "Set default values for enhancement controls (brightness & contrast)."
@@ -4810,42 +5514,42 @@ msgstr ""
 "Stellt die Farbverbesserungseinstellungen (Helligkeit und Kontrast) auf "
 "Defaultwerte."
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr "Nur-Lese-Testoption"
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr "Mal sehen, ob das Frontend damit umgehen kann."
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr "Gammatabellen"
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr "Statuscode Simulation"
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr "Keinen Statuscode erzwingen"
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr "Zwinge das Backend nicht dazu, einen Statuscode zurückzuliefern."
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr "Liefere SANE_STATUS_EOF zurück"
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
@@ -4854,12 +5558,12 @@ msgstr ""
 "Zwinge das Backend dazu, nach einem Aufruf von sane_read() den "
 "Statuscode SANE_STATUS_EOF zurückzuliefern."
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr "Liefere SANE_STATUS_JAMMED zurück"
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
@@ -4868,12 +5572,12 @@ msgstr ""
 "Zwinge das Backend dazu, nach einem Aufruf von sane_read() den "
 "Statuscode SANE_STATUS_JAMMED zurückzuliefern."
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr "Liefere SANE_STATUS_NO_DOCS zurück"
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
@@ -4882,12 +5586,12 @@ msgstr ""
 "Zwinge das Backend dazu, nach einem Aufruf von sane_read() den "
 "Statuscode SANE_STATUS_NO_DOCS zurückzuliefern."
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr "Liefere SANE_STATUS_COVER_OPEN zurück"
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
@@ -4896,12 +5600,12 @@ msgstr ""
 "Zwinge das Backend dazu, nach einem Aufruf von sane_read() den "
 "Statuscode SANE_STATUS_COVER_OPEN zurückzuliefern."
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr "Liefere SANE_STATUS_IO_ERROR zurück"
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
@@ -4910,12 +5614,12 @@ msgstr ""
 "Zwinge das Backend dazu, nach einem Aufruf von sane_read() den "
 "Statuscode SANE_STATUS_IO_ERROR zurückzuliefern."
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr "Liefere SANE_STATUS_NO_MEM zurück"
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
@@ -4924,12 +5628,12 @@ msgstr ""
 "Zwinge das Backend dazu, nach einem Aufruf von sane_read() den "
 "Statuscode SANE_STATUS_NO_MEM zurückzuliefern."
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr "Liefere SANE_STATUS_ACCESS_DENIED zurück"
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
@@ -4938,85 +5642,82 @@ msgstr ""
 "Zwinge das Backend dazu, nach einem Aufruf von sane_read() den "
 "Statuscode SANE_STATUS_ACCESS_DENIED zurückzuliefern."
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr "Diese Option zeigt den Zustand eines Scannerknopfes an."
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr "Lampe an"
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr "Schalte Scannerlampe ein"
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr "Lampe aus"
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr "Schalte Scannerlampe aus"
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, no-c-format
 msgid "Lamp timeout"
 msgstr "Lampenausschaltzeit"
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr "Anzahl der Minuten, bis die Lampe nach dem Scan ausgeschaltet wird"
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr "Schwellenwert für den Strichzeichnungsmodus"
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr "Automatischer Dokumenteinzug"
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr "6x4 (Zoll)"
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr "8x10 (Zoll)"
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr "8.5x11 (Zoll)"
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr "Halbton nicht unterstützt"
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr "DispersedDot8x8"
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr "DispersedDot16x16"
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -5033,27 +5734,27 @@ msgstr ""
 "reagiert die Scan-Anwendung möglicherweise nicht mehr auf Eingaben und "
 "das System kann unbenutzbar werden."
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr ""
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr ""
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, fuzzy, no-c-format
 msgid "Focus point for scanning."
 msgstr "Auswurf des Dokuments nach dem Scannen"
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr "Vorschaumodus"
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
@@ -5062,12 +5763,12 @@ msgstr ""
 "Wählt den Scanmodus für die Vorschau aus. Vorschau in Graustufen ist "
 "normalerweise der beste Kompromiss aus Geschwindigkeit und Detailtreue."
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr "Vordefinierte Einstellungen"
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
@@ -5076,97 +5777,97 @@ msgstr ""
 "Stellt Standardgrößen für Fotographien, bedruckte Seiten etc. zur "
 "Verfügung."
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr ""
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, fuzzy, no-c-format
 msgid "Frame to be scanned"
 msgstr "Flachbettscanner"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, fuzzy, no-c-format
 msgid "Focus-mode"
 msgstr "Fokus"
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, fuzzy, no-c-format
 msgid "Auto or manual focus"
 msgstr "Automatischer Fokus"
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, fuzzy, no-c-format
 msgid "Focus-point"
 msgstr "Fokus Position"
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, fuzzy, no-c-format
 msgid "Focus point"
 msgstr "Fokus Position"
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr "Farbzeilen pro Lesevorgang"
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr "Graustufenzeilen pro Lesevorgang"
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr "Webcam"
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr "Farbe RAW"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr "Farbe RGB"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr "Farbe RGB TEXT"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr "Komplett schwarz"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr "Komplett weiß"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr "Farbmuster"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr "Gitter"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr "Erster Eintrag"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr "Zweiter Eintrag"
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
@@ -5175,12 +5876,12 @@ msgstr ""
 "Dies ist der sehr lange dritte Eintrag. Vielleicht weiß das Frontend, "
 "wie man ihn darstellen kann."
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr "Handscanner-Simulation"
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5193,12 +5894,12 @@ msgstr ""
 "-1 zurück. Mit dieser Option kann man prüfen, ob das Frontend damit "
 "richtig umgehen kann."
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr "Three-Pass-Simulation"
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
@@ -5207,17 +5908,17 @@ msgstr ""
 "Simuliere einen Three-Pass-Scanner. Im Farbmodus werden drei Frames "
 "übertragen."
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr "Legt die Reihenfolge der Frames fest"
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr "Legt die Reihenfolge der Frames im Three-Pass-Modus fest."
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
@@ -5226,17 +5927,17 @@ msgstr ""
 "Falls der automatische Vorlageneinzug ausgewählt ist, meldet der Einzug "
 "\"leer\" nach 10 Scans."
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr "Spezialoptionen"
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr "Wählt das Testbild aus"
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5254,12 +5955,12 @@ msgstr ""
 "Gitter: zeichnet ein Schwarz-Weiß-Gitter mit einer Höhe und Breite der "
 "einzelnen Felder von jeweils 10 mm."
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr "Kehre Endianness um"
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5271,24 +5972,24 @@ msgstr ""
 "testen, beispielsweise um festzustellen, ob das Frontend die richtige "
 "Endianness verwendet."
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr "Lesebegrenzung"
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 "Begrenzt die Menge an Daten, die mit jedem Aufruf von sane_read() "
 "übertragen wird."
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr "Größe der Lesebegrenzung"
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
@@ -5296,22 +5997,22 @@ msgstr ""
 "Die (maximale) Menge and Daten, die bei jedem Aufruf von sane_read() "
 "übertragen wird."
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr "Leseverzögerung"
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr "Verzögere die Datenübertragung durch die Pipe."
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr "Dauer der Leseverzögerung."
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
@@ -5319,12 +6020,12 @@ msgstr ""
 "Legt fest, wie lange nach der Ãœbertragung eines Datenpuffers durch die "
 "Pipe gewartet wird."
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr "Rückgabewert von sane_read"
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
@@ -5335,22 +6036,22 @@ msgstr ""
 "Einstellung für's Scannen. Alle anderen Rückgabewerte dienen dazu, das "
 "Verhalten des Frontends festzustellen."
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr "Pixelverlust pro Zeile"
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr "Die Anzahl der Pixel, die am Ende der Zeile ungenutzt sind."
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr "Ungenaue Parameter"
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
@@ -5359,24 +6060,24 @@ msgstr ""
 "Gebe ungenaue Werte für die Anzahl der Zeilen und die Bytes pro Zeile "
 "zurück, wenn sane_parameters() vor sane_start() aufgerufen wird."
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr "Nichtblockierendes IO"
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 "Verwende nichtblockierndes IO für sane_read(), wenn das durch das "
 "Frontend unterstützt wird."
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr "Biete Select-Dateideskriptor an"
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
@@ -5385,12 +6086,12 @@ msgstr ""
 "Biete einen Select-Dateideskriptor an, damit das Frontend erkennen kann, "
 "ob sane_read() Daten zurückliefern würde."
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr "Test-Optionen einschalten"
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
@@ -5400,27 +6101,27 @@ msgstr ""
 "Fähigkeit des Frontends feststellen, die verschiedenen Typen von SANE-"
 "Optionen darzustellen und zu ändern."
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr "Gebe Optionen aus"
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr "Gibt eine Liste aller Optionen aus."
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr "Bool-Testoptionen"
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr "(1/6) Bool soft select soft detect"
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
@@ -5430,12 +6131,12 @@ msgstr ""
 "\" und \"soft detect\" (und \"advanced\") hat. Also eine ganz normale "
 "Bool-Option."
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr "(2/6) Bool hard select soft detect"
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
@@ -5447,12 +6148,12 @@ msgstr ""
 "Option nicht vom Frontend geändert werden kann, sondern vom Benutzer (z. "
 "B. indem er einen Knopf am Gerät drückt)."
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr "(3/6) Bool hard select"
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5465,12 +6166,12 @@ msgstr ""
 "werden kann, sondern vom Benutzer (z. B. indem er einen Knopf am "
 "Gerät drückt). Außerdem kann sie nicht vom Frontend gelesen werden."
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr "(4/6) Bool soft detect"
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
@@ -5479,12 +6180,12 @@ msgstr ""
 "(4/6) Die ist eine Bool-Testoption, welche die Fähigkeiten \"soft detect"
 "\" (und \"advanced\") hat. Das heißt, dass dies eine Nur-Lese-Option ist."
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr "(5/6) Bool soft select soft detect emulated"
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
@@ -5493,12 +6194,12 @@ msgstr ""
 "(5/6) Dies ist eine Bool-Testoption, welche die Fähigkeiten \"soft select"
 "\", \"soft detect\", und \"emulated\" (und \"advanced\") hat."
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr "(6/6) Bool soft select soft detect auto"
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5509,27 +6210,27 @@ msgstr ""
 "\", \"soft detect\", und \"automatic\" (und \"advanced\") hat. Diese "
 "Option kann vom Backend automatisch gesetzt werden."
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr "Int-Testoptionen"
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr "(1/6) Int"
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr "(1/6) Int-Testoption ohne Einheit und Beschränkung."
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr "(2/6) Int constraint range"
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
@@ -5539,24 +6240,24 @@ msgstr ""
 "Bereichsbeschränkung. Das Minimum ist 4, das Maximum 192, und die "
 "Schrittweite ist 2."
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr "(3/6) Int constraint word list"
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 "(3/6) Int-Testoption mit der Einheit \"Bits\" und einer Wortlisten-"
 "Beschränkung."
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr "(4/6) Int array"
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
@@ -5565,12 +6266,12 @@ msgstr ""
 "(4/6) Int-Testoption mit der Einheit \"mm\" und einem Feld ohne "
 "Beschränkung."
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr "(5/6) Int array constraint range"
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
@@ -5580,12 +6281,12 @@ msgstr ""
 "Bereichsbeschränkung. Das Minimum ist 4, das Maximum 192, und die "
 "Schrittweite ist 2."
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr "(6/6) Int array constraint word list"
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
@@ -5594,27 +6295,27 @@ msgstr ""
 "(6/6) Int-Testoption mit der Einheit \"Prozent\" und einem Feld mit "
 "einer Wort-Beschränkung."
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr "Fixed-Testoptionen"
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr "(1/3) Fixed"
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr "(1/3) Fixed-Testoption ohne Einheit und ohne Beschränkung."
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr "(2/3) Fixed constraint range"
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
@@ -5624,49 +6325,49 @@ msgstr ""
 "Bereichsbeschränkung. Das Minimum ist -42.17, das Maximum 32767.9999, "
 "und die Schrittweite ist 2.0."
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr "(3/3) Fixed constraint word list"
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 "(3/3) Fixed-Testoption ohne Einheit und mit einer Wortlisten-"
 "Beschränkung."
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr "String-Testoptionen"
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr "(1/3) String"
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr "(1/3) String-Testoption ohne Beschränkung."
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr "(2/3) String constraint string list"
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr "(2/3) String-Testoption mit einer Stringlisten-Beschränkung."
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr "(3/3) String constraint long string list"
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
@@ -5675,155 +6376,159 @@ msgstr ""
 "(3/3) String-Testoption mit einer Stringlisten-Beschränkung. Enthält ein "
 "paar mehr Einträge..."
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr "Button-Testoptionen"
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr "(1/1) Button"
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr "(1/1) Button-Testoption. Gibt etwas Text aus..."
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, no-c-format
 msgid "Color 36"
 msgstr "Farbe 36"
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr "Benutze Bildzusammensetzung"
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr "2 Level schwarz/weiss (Strichzeichnungs Modus)"
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr "Halbton schwarz/weiss (Halbton Modus)"
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr "Multi-Level schwarz&weiss (Graustufen Modus)"
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr "Multi-Level RGB Farbe (ein-Pass-Farbe)"
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr "Kalibrierung ignorieren"
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr "Pre-Focus ausschalten"
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr "Focus nicht kalibrieren"
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr "Manueller Pre-Focus"
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr "Feste Focus-Position"
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr "Linse auf Dokument kalibrieren"
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr "Focus der Linse auf dem Dokument kalibrieren"
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr "Halter Focus Position 0mm"
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr "Benutze 0mm Halter Focus Position anstatt 0.6mm"
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr "Kalibrierungs Modus"
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr "Kalibriermodus definieren"
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr "Schaltet die Lampe an/aus"
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr "UTA ein"
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr "Schaltet den UTA ein/aus"
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr "Offset"
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr "Einstellungen des Offsets der Farbkanäle"
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, no-c-format
 msgid "Gray offset"
 msgstr "Offset grüner Kanal"
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr "Legt den Offset des grauen Kanals fest"
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr "Legt den Offset des roten Kanals fest"
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr "Legt den Offset des grünen Kanals fest"
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr "Legt den Offset des blauen Kanals fest"
 
+#, fuzzy
+#~ msgid "IPC mode"
+#~ msgstr "Vorschaumodus"
+
 #~ msgid "problem not analyzed (unknown SCSI class)"
 #~ msgstr "Problem nicht analysiert (unbekannte SCSI-Klasse)"
diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo
new file mode 100644
index 0000000..0711598
--- /dev/null
+++ b/po/en@boldquot.gmo
diff --git a/po/en@boldquot.header b/po/en@boldquot.header
new file mode 100644
index 0000000..fedb6a0
--- /dev/null
+++ b/po/en@boldquot.header
@@ -0,0 +1,25 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+# This catalog furthermore displays the text between the quotation marks in
+# bold face, assuming the VT100/XTerm escape sequences.
+#
diff --git a/po/en@boldquot.po b/po/en@boldquot.po
new file mode 100644
index 0000000..d22038d
--- /dev/null
+++ b/po/en@boldquot.po
@@ -0,0 +1,6506 @@
+# English translations for sane-backends package.
+# Copyright (C) 2017 The SANE developers
+# This file is distributed under the same license as the sane-backends package.
+# Automatically generated, 2017.
+#
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+# This catalog furthermore displays the text between the quotation marks in
+# bold face, assuming the VT100/XTerm escape sequences.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sane-backends 1.0.27\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
+"PO-Revision-Date: 2017-05-22 11:18-0400\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: en@boldquot\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: include/sane/saneopts.h:154
+#, no-c-format
+msgid "Number of options"
+msgstr "Number of options"
+
+#: include/sane/saneopts.h:156
+#, no-c-format
+msgid "Standard"
+msgstr "Standard"
+
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
+#, no-c-format
+msgid "Geometry"
+msgstr "Geometry"
+
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
+#, no-c-format
+msgid "Enhancement"
+msgstr "Enhancement"
+
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
+#, no-c-format
+msgid "Advanced"
+msgstr "Advanced"
+
+#: include/sane/saneopts.h:160
+#, no-c-format
+msgid "Sensors"
+msgstr "Sensors"
+
+#: include/sane/saneopts.h:162
+#, no-c-format
+msgid "Preview"
+msgstr "Preview"
+
+#: include/sane/saneopts.h:163
+#, no-c-format
+msgid "Force monochrome preview"
+msgstr "Force monochrome preview"
+
+#: include/sane/saneopts.h:164
+#, no-c-format
+msgid "Bit depth"
+msgstr "Bit depth"
+
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
+#, no-c-format
+msgid "Scan mode"
+msgstr "Scan mode"
+
+#: include/sane/saneopts.h:166
+#, no-c-format
+msgid "Scan speed"
+msgstr "Scan speed"
+
+#: include/sane/saneopts.h:167
+#, no-c-format
+msgid "Scan source"
+msgstr "Scan source"
+
+#: include/sane/saneopts.h:168
+#, no-c-format
+msgid "Force backtracking"
+msgstr "Force backtracking"
+
+#: include/sane/saneopts.h:169
+#, no-c-format
+msgid "Top-left x"
+msgstr "Top-left x"
+
+#: include/sane/saneopts.h:170
+#, no-c-format
+msgid "Top-left y"
+msgstr "Top-left y"
+
+#: include/sane/saneopts.h:171
+#, no-c-format
+msgid "Bottom-right x"
+msgstr "Bottom-right x"
+
+#: include/sane/saneopts.h:172
+#, no-c-format
+msgid "Bottom-right y"
+msgstr "Bottom-right y"
+
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
+#, no-c-format
+msgid "Scan resolution"
+msgstr "Scan resolution"
+
+#: include/sane/saneopts.h:174
+#, no-c-format
+msgid "X-resolution"
+msgstr "X-resolution"
+
+#: include/sane/saneopts.h:175
+#, no-c-format
+msgid "Y-resolution"
+msgstr "Y-resolution"
+
+#: include/sane/saneopts.h:176
+#, no-c-format
+msgid "Page width"
+msgstr "Page width"
+
+#: include/sane/saneopts.h:177
+#, no-c-format
+msgid "Page height"
+msgstr "Page height"
+
+#: include/sane/saneopts.h:178
+#, no-c-format
+msgid "Use custom gamma table"
+msgstr "Use custom gamma table"
+
+#: include/sane/saneopts.h:179
+#, no-c-format
+msgid "Image intensity"
+msgstr "Image intensity"
+
+#: include/sane/saneopts.h:180
+#, no-c-format
+msgid "Red intensity"
+msgstr "Red intensity"
+
+#: include/sane/saneopts.h:181
+#, no-c-format
+msgid "Green intensity"
+msgstr "Green intensity"
+
+#: include/sane/saneopts.h:182
+#, no-c-format
+msgid "Blue intensity"
+msgstr "Blue intensity"
+
+#: include/sane/saneopts.h:183
+#, no-c-format
+msgid "Brightness"
+msgstr "Brightness"
+
+#: include/sane/saneopts.h:184
+#, no-c-format
+msgid "Contrast"
+msgstr "Contrast"
+
+#: include/sane/saneopts.h:185
+#, no-c-format
+msgid "Grain size"
+msgstr "Grain size"
+
+#: include/sane/saneopts.h:186
+#, no-c-format
+msgid "Halftoning"
+msgstr "Halftoning"
+
+#: include/sane/saneopts.h:187
+#, no-c-format
+msgid "Black level"
+msgstr "Black level"
+
+#: include/sane/saneopts.h:188
+#, no-c-format
+msgid "White level"
+msgstr "White level"
+
+#: include/sane/saneopts.h:189
+#, no-c-format
+msgid "White level for red"
+msgstr "White level for red"
+
+#: include/sane/saneopts.h:190
+#, no-c-format
+msgid "White level for green"
+msgstr "White level for green"
+
+#: include/sane/saneopts.h:191
+#, no-c-format
+msgid "White level for blue"
+msgstr "White level for blue"
+
+#: include/sane/saneopts.h:192
+#, no-c-format
+msgid "Shadow"
+msgstr "Shadow"
+
+#: include/sane/saneopts.h:193
+#, no-c-format
+msgid "Shadow for red"
+msgstr "Shadow for red"
+
+#: include/sane/saneopts.h:194
+#, no-c-format
+msgid "Shadow for green"
+msgstr "Shadow for green"
+
+#: include/sane/saneopts.h:195
+#, no-c-format
+msgid "Shadow for blue"
+msgstr "Shadow for blue"
+
+#: include/sane/saneopts.h:196
+#, no-c-format
+msgid "Highlight"
+msgstr "Highlight"
+
+#: include/sane/saneopts.h:197
+#, no-c-format
+msgid "Highlight for red"
+msgstr "Highlight for red"
+
+#: include/sane/saneopts.h:198
+#, no-c-format
+msgid "Highlight for green"
+msgstr "Highlight for green"
+
+#: include/sane/saneopts.h:199
+#, no-c-format
+msgid "Highlight for blue"
+msgstr "Highlight for blue"
+
+#: include/sane/saneopts.h:200
+#, no-c-format
+msgid "Hue"
+msgstr "Hue"
+
+#: include/sane/saneopts.h:201
+#, no-c-format
+msgid "Saturation"
+msgstr "Saturation"
+
+#: include/sane/saneopts.h:202
+#, no-c-format
+msgid "Filename"
+msgstr "Filename"
+
+#: include/sane/saneopts.h:203
+#, no-c-format
+msgid "Halftone pattern size"
+msgstr "Halftone pattern size"
+
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
+#, no-c-format
+msgid "Halftone pattern"
+msgstr "Halftone pattern"
+
+#: include/sane/saneopts.h:205
+#, no-c-format
+msgid "Bind X and Y resolution"
+msgstr "Bind X and Y resolution"
+
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
+#, no-c-format
+msgid "Negative"
+msgstr "Negative"
+
+#: include/sane/saneopts.h:207
+#, no-c-format
+msgid "Quality calibration"
+msgstr "Quality calibration"
+
+#: include/sane/saneopts.h:208
+#, no-c-format
+msgid "Double Optical Resolution"
+msgstr "Double Optical Resolution"
+
+#: include/sane/saneopts.h:209
+#, no-c-format
+msgid "Bind RGB"
+msgstr "Bind RGB"
+
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
+#, no-c-format
+msgid "Threshold"
+msgstr "Threshold"
+
+#: include/sane/saneopts.h:211
+#, no-c-format
+msgid "Analog gamma correction"
+msgstr "Analog gamma correction"
+
+#: include/sane/saneopts.h:212
+#, no-c-format
+msgid "Analog gamma red"
+msgstr "Analog gamma red"
+
+#: include/sane/saneopts.h:213
+#, no-c-format
+msgid "Analog gamma green"
+msgstr "Analog gamma green"
+
+#: include/sane/saneopts.h:214
+#, no-c-format
+msgid "Analog gamma blue"
+msgstr "Analog gamma blue"
+
+#: include/sane/saneopts.h:215
+#, no-c-format
+msgid "Bind analog gamma"
+msgstr "Bind analog gamma"
+
+#: include/sane/saneopts.h:216
+#, no-c-format
+msgid "Warmup lamp"
+msgstr "Warmup lamp"
+
+#: include/sane/saneopts.h:217
+#, no-c-format
+msgid "Cal. exposure-time"
+msgstr "Cal. exposure-time"
+
+#: include/sane/saneopts.h:218
+#, no-c-format
+msgid "Cal. exposure-time for red"
+msgstr "Cal. exposure-time for red"
+
+#: include/sane/saneopts.h:219
+#, no-c-format
+msgid "Cal. exposure-time for green"
+msgstr "Cal. exposure-time for green"
+
+#: include/sane/saneopts.h:221
+#, no-c-format
+msgid "Cal. exposure-time for blue"
+msgstr "Cal. exposure-time for blue"
+
+#: include/sane/saneopts.h:222
+#, no-c-format
+msgid "Scan exposure-time"
+msgstr "Scan exposure-time"
+
+#: include/sane/saneopts.h:223
+#, no-c-format
+msgid "Scan exposure-time for red"
+msgstr "Scan exposure-time for red"
+
+#: include/sane/saneopts.h:224
+#, no-c-format
+msgid "Scan exposure-time for green"
+msgstr "Scan exposure-time for green"
+
+#: include/sane/saneopts.h:226
+#, no-c-format
+msgid "Scan exposure-time for blue"
+msgstr "Scan exposure-time for blue"
+
+#: include/sane/saneopts.h:227
+#, no-c-format
+msgid "Set exposure-time"
+msgstr "Set exposure-time"
+
+#: include/sane/saneopts.h:228
+#, no-c-format
+msgid "Cal. lamp density"
+msgstr "Cal. lamp density"
+
+#: include/sane/saneopts.h:229
+#, no-c-format
+msgid "Scan lamp density"
+msgstr "Scan lamp density"
+
+#: include/sane/saneopts.h:230
+#, no-c-format
+msgid "Set lamp density"
+msgstr "Set lamp density"
+
+#: include/sane/saneopts.h:231 backend/umax.c:5829
+#, no-c-format
+msgid "Lamp off at exit"
+msgstr "Lamp off at exit"
+
+#: include/sane/saneopts.h:245
+#, no-c-format
+msgid ""
+"Read-only option that specifies how many options a specific devices "
+"supports."
+msgstr ""
+"Read-only option that specifies how many options a specific devices "
+"supports."
+
+#: include/sane/saneopts.h:248
+#, no-c-format
+msgid "Source, mode and resolution options"
+msgstr "Source, mode and resolution options"
+
+#: include/sane/saneopts.h:249
+#, no-c-format
+msgid "Scan area and media size options"
+msgstr "Scan area and media size options"
+
+#: include/sane/saneopts.h:250
+#, no-c-format
+msgid "Image modification options"
+msgstr "Image modification options"
+
+#: include/sane/saneopts.h:251
+#, no-c-format
+msgid "Hardware specific options"
+msgstr "Hardware specific options"
+
+#: include/sane/saneopts.h:252
+#, no-c-format
+msgid "Scanner sensors and buttons"
+msgstr "Scanner sensors and buttons"
+
+#: include/sane/saneopts.h:255
+#, no-c-format
+msgid "Request a preview-quality scan."
+msgstr "Request a preview-quality scan."
+
+#: include/sane/saneopts.h:258
+#, no-c-format
+msgid ""
+"Request that all previews are done in monochrome mode.  On a three-pass "
+"scanner this cuts down the number of passes to one and on a one-pass "
+"scanner, it reduces the memory requirements and scan-time of the preview."
+msgstr ""
+"Request that all previews are done in monochrome mode.  On a three-pass "
+"scanner this cuts down the number of passes to one and on a one-pass "
+"scanner, it reduces the memory requirements and scan-time of the preview."
+
+#: include/sane/saneopts.h:264
+#, no-c-format
+msgid ""
+"Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
+"for multibit scans."
+msgstr ""
+"Number of bits per sample, typical values are 1 for “line-art� and "
+"8 for multibit scans."
+
+#: include/sane/saneopts.h:268
+#, no-c-format
+msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
+msgstr "Selects the scan mode (e.g., lineart, monochrome, or color)."
+
+#: include/sane/saneopts.h:271
+#, no-c-format
+msgid "Determines the speed at which the scan proceeds."
+msgstr "Determines the speed at which the scan proceeds."
+
+#: include/sane/saneopts.h:274
+#, no-c-format
+msgid "Selects the scan source (such as a document-feeder)."
+msgstr "Selects the scan source (such as a document-feeder)."
+
+#: include/sane/saneopts.h:277
+#, no-c-format
+msgid "Controls whether backtracking is forced."
+msgstr "Controls whether backtracking is forced."
+
+#: include/sane/saneopts.h:280
+#, no-c-format
+msgid "Top-left x position of scan area."
+msgstr "Top-left x position of scan area."
+
+#: include/sane/saneopts.h:283
+#, no-c-format
+msgid "Top-left y position of scan area."
+msgstr "Top-left y position of scan area."
+
+#: include/sane/saneopts.h:286
+#, no-c-format
+msgid "Bottom-right x position of scan area."
+msgstr "Bottom-right x position of scan area."
+
+#: include/sane/saneopts.h:289
+#, no-c-format
+msgid "Bottom-right y position of scan area."
+msgstr "Bottom-right y position of scan area."
+
+#: include/sane/saneopts.h:292
+#, no-c-format
+msgid "Sets the resolution of the scanned image."
+msgstr "Sets the resolution of the scanned image."
+
+#: include/sane/saneopts.h:295
+#, no-c-format
+msgid "Sets the horizontal resolution of the scanned image."
+msgstr "Sets the horizontal resolution of the scanned image."
+
+#: include/sane/saneopts.h:298
+#, no-c-format
+msgid "Sets the vertical resolution of the scanned image."
+msgstr "Sets the vertical resolution of the scanned image."
+
+#: include/sane/saneopts.h:301
+#, no-c-format
+msgid ""
+"Specifies the width of the media.  Required for automatic centering of "
+"sheet-fed scans."
+msgstr ""
+"Specifies the width of the media.  Required for automatic centering of "
+"sheet-fed scans."
+
+#: include/sane/saneopts.h:305
+#, no-c-format
+msgid "Specifies the height of the media."
+msgstr "Specifies the height of the media."
+
+#: include/sane/saneopts.h:308
+#, no-c-format
+msgid ""
+"Determines whether a builtin or a custom gamma-table should be used."
+msgstr ""
+"Determines whether a builtin or a custom gamma-table should be used."
+
+#: include/sane/saneopts.h:312
+#, no-c-format
+msgid ""
+"Gamma-correction table.  In color mode this option equally affects the "
+"red, green, and blue channels simultaneously (i.e., it is an intensity "
+"gamma table)."
+msgstr ""
+"Gamma-correction table.  In color mode this option equally affects the "
+"red, green, and blue channels simultaneously (i.e., it is an intensity "
+"gamma table)."
+
+#: include/sane/saneopts.h:317
+#, no-c-format
+msgid "Gamma-correction table for the red band."
+msgstr "Gamma-correction table for the red band."
+
+#: include/sane/saneopts.h:320
+#, no-c-format
+msgid "Gamma-correction table for the green band."
+msgstr "Gamma-correction table for the green band."
+
+#: include/sane/saneopts.h:323
+#, no-c-format
+msgid "Gamma-correction table for the blue band."
+msgstr "Gamma-correction table for the blue band."
+
+#: include/sane/saneopts.h:326
+#, no-c-format
+msgid "Controls the brightness of the acquired image."
+msgstr "Controls the brightness of the acquired image."
+
+#: include/sane/saneopts.h:329
+#, no-c-format
+msgid "Controls the contrast of the acquired image."
+msgstr "Controls the contrast of the acquired image."
+
+#: include/sane/saneopts.h:332
+#, no-c-format
+msgid ""
+"Selects the \"graininess\" of the acquired image.  Smaller values result "
+"in sharper images."
+msgstr ""
+"Selects the “graininess� of the acquired image.  Smaller values "
+"result in sharper images."
+
+#: include/sane/saneopts.h:336
+#, no-c-format
+msgid "Selects whether the acquired image should be halftoned (dithered)."
+msgstr "Selects whether the acquired image should be halftoned (dithered)."
+
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
+#, no-c-format
+msgid "Selects what radiance level should be considered \"black\"."
+msgstr "Selects what radiance level should be considered “black�."
+
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
+#, no-c-format
+msgid "Selects what radiance level should be considered \"white\"."
+msgstr "Selects what radiance level should be considered “white�."
+
+#: include/sane/saneopts.h:345
+#, no-c-format
+msgid "Selects what red radiance level should be considered \"white\"."
+msgstr ""
+"Selects what red radiance level should be considered “white�."
+
+#: include/sane/saneopts.h:348
+#, no-c-format
+msgid "Selects what green radiance level should be considered \"white\"."
+msgstr ""
+"Selects what green radiance level should be considered “white�."
+
+#: include/sane/saneopts.h:351
+#, no-c-format
+msgid "Selects what blue radiance level should be considered \"white\"."
+msgstr ""
+"Selects what blue radiance level should be considered “white�."
+
+#: include/sane/saneopts.h:356
+#, no-c-format
+msgid "Selects what red radiance level should be considered \"black\"."
+msgstr ""
+"Selects what red radiance level should be considered “black�."
+
+#: include/sane/saneopts.h:358
+#, no-c-format
+msgid "Selects what green radiance level should be considered \"black\"."
+msgstr ""
+"Selects what green radiance level should be considered “black�."
+
+#: include/sane/saneopts.h:360
+#, no-c-format
+msgid "Selects what blue radiance level should be considered \"black\"."
+msgstr ""
+"Selects what blue radiance level should be considered “black�."
+
+#: include/sane/saneopts.h:365
+#, no-c-format
+msgid "Selects what red radiance level should be considered \"full red\"."
+msgstr ""
+"Selects what red radiance level should be considered “full red�."
+
+#: include/sane/saneopts.h:367
+#, no-c-format
+msgid ""
+"Selects what green radiance level should be considered \"full green\"."
+msgstr ""
+"Selects what green radiance level should be considered “full "
+"green�."
+
+#: include/sane/saneopts.h:370
+#, no-c-format
+msgid ""
+"Selects what blue radiance level should be considered \"full blue\"."
+msgstr ""
+"Selects what blue radiance level should be considered “full blue�."
+
+#: include/sane/saneopts.h:374
+#, no-c-format
+msgid "Controls the \"hue\" (blue-level) of the acquired image."
+msgstr "Controls the “hue� (blue-level) of the acquired image."
+
+#: include/sane/saneopts.h:377
+#, no-c-format
+msgid ""
+"The saturation level controls the amount of \"blooming\" that occurs "
+"when acquiring an image with a camera. Larger values cause more blooming."
+msgstr ""
+"The saturation level controls the amount of “blooming� that occurs "
+"when acquiring an image with a camera. Larger values cause more blooming."
+
+#: include/sane/saneopts.h:382
+#, no-c-format
+msgid "The filename of the image to be loaded."
+msgstr "The filename of the image to be loaded."
+
+#: include/sane/saneopts.h:385
+#, no-c-format
+msgid ""
+"Sets the size of the halftoning (dithering) pattern used when scanning "
+"halftoned images."
+msgstr ""
+"Sets the size of the halftoning (dithering) pattern used when scanning "
+"halftoned images."
+
+#: include/sane/saneopts.h:389
+#, no-c-format
+msgid ""
+"Defines the halftoning (dithering) pattern for scanning halftoned images."
+msgstr ""
+"Defines the halftoning (dithering) pattern for scanning halftoned images."
+
+#: include/sane/saneopts.h:393
+#, no-c-format
+msgid "Use same values for X and Y resolution"
+msgstr "Use same values for X and Y resolution"
+
+#: include/sane/saneopts.h:395
+#, no-c-format
+msgid "Swap black and white"
+msgstr "Swap black and white"
+
+#: include/sane/saneopts.h:397
+#, no-c-format
+msgid "Do a quality white-calibration"
+msgstr "Do a quality white-calibration"
+
+#: include/sane/saneopts.h:399
+#, no-c-format
+msgid "Use lens that doubles optical resolution"
+msgstr "Use lens that doubles optical resolution"
+
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
+#, no-c-format
+msgid "In RGB-mode use same values for each color"
+msgstr "In RGB-mode use same values for each color"
+
+#: include/sane/saneopts.h:403
+#, no-c-format
+msgid "Select minimum-brightness to get a white point"
+msgstr "Select minimum-brightness to get a white point"
+
+#: include/sane/saneopts.h:405
+#, no-c-format
+msgid "Analog gamma-correction"
+msgstr "Analog gamma-correction"
+
+#: include/sane/saneopts.h:407
+#, no-c-format
+msgid "Analog gamma-correction for red"
+msgstr "Analog gamma-correction for red"
+
+#: include/sane/saneopts.h:409
+#, no-c-format
+msgid "Analog gamma-correction for green"
+msgstr "Analog gamma-correction for green"
+
+#: include/sane/saneopts.h:411
+#, no-c-format
+msgid "Analog gamma-correction for blue"
+msgstr "Analog gamma-correction for blue"
+
+#: include/sane/saneopts.h:415
+#, no-c-format
+msgid "Warmup lamp before scanning"
+msgstr "Warmup lamp before scanning"
+
+#: include/sane/saneopts.h:417
+#, no-c-format
+msgid "Define exposure-time for calibration"
+msgstr "Define exposure-time for calibration"
+
+#: include/sane/saneopts.h:419
+#, no-c-format
+msgid "Define exposure-time for red calibration"
+msgstr "Define exposure-time for red calibration"
+
+#: include/sane/saneopts.h:421
+#, no-c-format
+msgid "Define exposure-time for green calibration"
+msgstr "Define exposure-time for green calibration"
+
+#: include/sane/saneopts.h:423
+#, no-c-format
+msgid "Define exposure-time for blue calibration"
+msgstr "Define exposure-time for blue calibration"
+
+#: include/sane/saneopts.h:425
+#, no-c-format
+msgid "Define exposure-time for scan"
+msgstr "Define exposure-time for scan"
+
+#: include/sane/saneopts.h:427
+#, no-c-format
+msgid "Define exposure-time for red scan"
+msgstr "Define exposure-time for red scan"
+
+#: include/sane/saneopts.h:429
+#, no-c-format
+msgid "Define exposure-time for green scan"
+msgstr "Define exposure-time for green scan"
+
+#: include/sane/saneopts.h:431
+#, no-c-format
+msgid "Define exposure-time for blue scan"
+msgstr "Define exposure-time for blue scan"
+
+#: include/sane/saneopts.h:433
+#, no-c-format
+msgid "Enable selection of exposure-time"
+msgstr "Enable selection of exposure-time"
+
+#: include/sane/saneopts.h:435
+#, no-c-format
+msgid "Define lamp density for calibration"
+msgstr "Define lamp density for calibration"
+
+#: include/sane/saneopts.h:437
+#, no-c-format
+msgid "Define lamp density for scan"
+msgstr "Define lamp density for scan"
+
+#: include/sane/saneopts.h:439
+#, no-c-format
+msgid "Enable selection of lamp density"
+msgstr "Enable selection of lamp density"
+
+#: include/sane/saneopts.h:441 backend/umax.c:5830
+#, no-c-format
+msgid "Turn off lamp when program exits"
+msgstr "Turn off lamp when program exits"
+
+#: include/sane/saneopts.h:444
+#, no-c-format
+msgid "Scan button"
+msgstr "Scan button"
+
+#: include/sane/saneopts.h:445
+#, no-c-format
+msgid "Email button"
+msgstr "Email button"
+
+#: include/sane/saneopts.h:446
+#, no-c-format
+msgid "Fax button"
+msgstr "Fax button"
+
+#: include/sane/saneopts.h:447
+#, no-c-format
+msgid "Copy button"
+msgstr "Copy button"
+
+#: include/sane/saneopts.h:448
+#, no-c-format
+msgid "PDF button"
+msgstr "PDF button"
+
+#: include/sane/saneopts.h:449
+#, no-c-format
+msgid "Cancel button"
+msgstr "Cancel button"
+
+#: include/sane/saneopts.h:450
+#, no-c-format
+msgid "Page loaded"
+msgstr "Page loaded"
+
+#: include/sane/saneopts.h:451
+#, no-c-format
+msgid "Cover open"
+msgstr "Cover open"
+
+#: include/sane/saneopts.h:454
+#, no-c-format
+msgid "Color"
+msgstr "Color"
+
+#: include/sane/saneopts.h:455
+#, no-c-format
+msgid "Color Lineart"
+msgstr "Color Lineart"
+
+#: include/sane/saneopts.h:456
+#, no-c-format
+msgid "Color Halftone"
+msgstr "Color Halftone"
+
+#: include/sane/saneopts.h:457
+#, no-c-format
+msgid "Gray"
+msgstr "Gray"
+
+#: include/sane/saneopts.h:458
+#, no-c-format
+msgid "Halftone"
+msgstr "Halftone"
+
+#: include/sane/saneopts.h:459
+#, no-c-format
+msgid "Lineart"
+msgstr "Lineart"
+
+#: backend/sane_strstatus.c:59
+#, no-c-format
+msgid "Success"
+msgstr "Success"
+
+#: backend/sane_strstatus.c:62
+#, no-c-format
+msgid "Operation not supported"
+msgstr "Operation not supported"
+
+#: backend/sane_strstatus.c:65
+#, no-c-format
+msgid "Operation was cancelled"
+msgstr "Operation was cancelled"
+
+#: backend/sane_strstatus.c:68
+#, no-c-format
+msgid "Device busy"
+msgstr "Device busy"
+
+#: backend/sane_strstatus.c:71
+#, no-c-format
+msgid "Invalid argument"
+msgstr "Invalid argument"
+
+#: backend/sane_strstatus.c:74
+#, no-c-format
+msgid "End of file reached"
+msgstr "End of file reached"
+
+#: backend/sane_strstatus.c:77
+#, no-c-format
+msgid "Document feeder jammed"
+msgstr "Document feeder jammed"
+
+#: backend/sane_strstatus.c:80
+#, no-c-format
+msgid "Document feeder out of documents"
+msgstr "Document feeder out of documents"
+
+#: backend/sane_strstatus.c:83
+#, no-c-format
+msgid "Scanner cover is open"
+msgstr "Scanner cover is open"
+
+#: backend/sane_strstatus.c:86
+#, no-c-format
+msgid "Error during device I/O"
+msgstr "Error during device I/O"
+
+#: backend/sane_strstatus.c:89
+#, no-c-format
+msgid "Out of memory"
+msgstr "Out of memory"
+
+#: backend/sane_strstatus.c:92
+#, no-c-format
+msgid "Access to resource has been denied"
+msgstr "Access to resource has been denied"
+
+#: backend/sane_strstatus.c:96
+#, no-c-format
+msgid "Lamp not ready, please retry"
+msgstr "Lamp not ready, please retry"
+
+#: backend/sane_strstatus.c:101
+#, no-c-format
+msgid "Scanner mechanism locked for transport"
+msgstr "Scanner mechanism locked for transport"
+
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
+#, no-c-format
+msgid "Defaults"
+msgstr "Defaults"
+
+#: backend/artec_eplus48u.c:2876
+#, no-c-format
+msgid "Set default values for enhancement controls."
+msgstr "Set default values for enhancement controls."
+
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
+#, no-c-format
+msgid "Calibration"
+msgstr "Calibration"
+
+#: backend/artec_eplus48u.c:2941
+#, no-c-format
+msgid "Calibrate before next scan"
+msgstr "Calibrate before next scan"
+
+#: backend/artec_eplus48u.c:2943
+#, no-c-format
+msgid ""
+"If enabled, the device will be calibrated before the next scan. "
+"Otherwise, calibration is performed only before the first start."
+msgstr ""
+"If enabled, the device will be calibrated before the next scan. "
+"Otherwise, calibration is performed only before the first start."
+
+#: backend/artec_eplus48u.c:2954
+#, no-c-format
+msgid "Only perform shading-correction"
+msgstr "Only perform shading-correction"
+
+#: backend/artec_eplus48u.c:2956
+#, no-c-format
+msgid ""
+"If enabled, only the shading correction is performed during calibration. "
+"The default values for gain, offset and exposure time, either build-in "
+"or from the configuration file, are used."
+msgstr ""
+"If enabled, only the shading correction is performed during calibration. "
+"The default values for gain, offset and exposure time, either build-in "
+"or from the configuration file, are used."
+
+#: backend/artec_eplus48u.c:2967
+#, no-c-format
+msgid "Button state"
+msgstr "Button state"
+
+#: backend/avision.h:778
+#, no-c-format
+msgid "Number of the frame to scan"
+msgstr "Number of the frame to scan"
+
+#: backend/avision.h:779
+#, no-c-format
+msgid "Selects the number of the frame to scan"
+msgstr "Selects the number of the frame to scan"
+
+#: backend/avision.h:782
+#, no-c-format
+msgid "Duplex scan"
+msgstr "Duplex scan"
+
+#: backend/avision.h:783
+#, no-c-format
+msgid ""
+"Duplex scan provide a scan of the front and back side of the document"
+msgstr ""
+"Duplex scan provide a scan of the front and back side of the document"
+
+#: backend/canon630u.c:159
+#, no-c-format
+msgid "Calibrate Scanner"
+msgstr "Calibrate Scanner"
+
+#: backend/canon630u.c:160
+#, no-c-format
+msgid "Force scanner calibration before scan"
+msgstr "Force scanner calibration before scan"
+
+#: backend/canon630u.c:259 backend/umax1220u.c:208
+#, no-c-format
+msgid "Grayscale scan"
+msgstr "Grayscale scan"
+
+#: backend/canon630u.c:260 backend/umax1220u.c:209
+#, no-c-format
+msgid "Do a grayscale rather than color scan"
+msgstr "Do a grayscale rather than color scan"
+
+#: backend/canon630u.c:306
+#, no-c-format
+msgid "Analog Gain"
+msgstr "Analog Gain"
+
+#: backend/canon630u.c:307
+#, no-c-format
+msgid "Increase or decrease the analog gain of the CCD array"
+msgstr "Increase or decrease the analog gain of the CCD array"
+
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
+#, no-c-format
+msgid "Gamma Correction"
+msgstr "Gamma Correction"
+
+#: backend/canon630u.c:348
+#, no-c-format
+msgid "Selects the gamma corrected transfer curve"
+msgstr "Selects the gamma corrected transfer curve"
+
+#: backend/canon.c:149 backend/canon-sane.c:1318
+#, no-c-format
+msgid "Raw"
+msgstr "Raw"
+
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
+#, no-c-format
+msgid "Fine color"
+msgstr "Fine color"
+
+#: backend/canon.c:169
+#, no-c-format
+msgid "No transparency correction"
+msgstr "No transparency correction"
+
+#: backend/canon.c:170 backend/canon-sane.c:680
+#, no-c-format
+msgid "Correction according to film type"
+msgstr "Correction according to film type"
+
+#: backend/canon.c:171 backend/canon-sane.c:674
+#, no-c-format
+msgid "Correction according to transparency ratio"
+msgstr "Correction according to transparency ratio"
+
+#: backend/canon.c:176 backend/canon-sane.c:776
+#, no-c-format
+msgid "Negatives"
+msgstr "Negatives"
+
+#: backend/canon.c:176
+#, no-c-format
+msgid "Slides"
+msgstr "Slides"
+
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
+#, no-c-format
+msgid "Automatic"
+msgstr "Automatic"
+
+#: backend/canon.c:186
+#, no-c-format
+msgid "Normal speed"
+msgstr "Normal speed"
+
+#: backend/canon.c:187
+#, no-c-format
+msgid "1/2 normal speed"
+msgstr "1/2 normal speed"
+
+#: backend/canon.c:187
+#, no-c-format
+msgid "1/3 normal speed"
+msgstr "1/3 normal speed"
+
+#: backend/canon.c:365
+#, no-c-format
+msgid "rounded parameter"
+msgstr "rounded parameter"
+
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
+#, no-c-format
+msgid "unknown"
+msgstr "unknown"
+
+#: backend/canon.c:378
+#, no-c-format
+msgid "ADF jam"
+msgstr "ADF jam"
+
+#: backend/canon.c:381
+#, no-c-format
+msgid "ADF cover open"
+msgstr "ADF cover open"
+
+#: backend/canon.c:394
+#, no-c-format
+msgid "lamp failure"
+msgstr "lamp failure"
+
+#: backend/canon.c:397
+#, no-c-format
+msgid "scan head positioning error"
+msgstr "scan head positioning error"
+
+#: backend/canon.c:400
+#, no-c-format
+msgid "CPU check error"
+msgstr "CPU check error"
+
+#: backend/canon.c:403
+#, no-c-format
+msgid "RAM check error"
+msgstr "RAM check error"
+
+#: backend/canon.c:406
+#, no-c-format
+msgid "ROM check error"
+msgstr "ROM check error"
+
+#: backend/canon.c:409
+#, no-c-format
+msgid "hardware check error"
+msgstr "hardware check error"
+
+#: backend/canon.c:412
+#, no-c-format
+msgid "transparency unit lamp failure"
+msgstr "transparency unit lamp failure"
+
+#: backend/canon.c:415
+#, no-c-format
+msgid "transparency unit scan head positioning failure"
+msgstr "transparency unit scan head positioning failure"
+
+#: backend/canon.c:429
+#, no-c-format
+msgid "parameter list length error"
+msgstr "parameter list length error"
+
+#: backend/canon.c:433
+#, no-c-format
+msgid "invalid command operation code"
+msgstr "invalid command operation code"
+
+#: backend/canon.c:437
+#, no-c-format
+msgid "invalid field in CDB"
+msgstr "invalid field in CDB"
+
+#: backend/canon.c:441
+#, no-c-format
+msgid "unsupported LUN"
+msgstr "unsupported LUN"
+
+#: backend/canon.c:445
+#, no-c-format
+msgid "invalid field in parameter list"
+msgstr "invalid field in parameter list"
+
+#: backend/canon.c:449
+#, no-c-format
+msgid "command sequence error"
+msgstr "command sequence error"
+
+#: backend/canon.c:453
+#, no-c-format
+msgid "too many windows specified"
+msgstr "too many windows specified"
+
+#: backend/canon.c:457
+#, no-c-format
+msgid "medium not present"
+msgstr "medium not present"
+
+#: backend/canon.c:461
+#, no-c-format
+msgid "invalid bit IDENTIFY message"
+msgstr "invalid bit IDENTIFY message"
+
+#: backend/canon.c:465
+#, no-c-format
+msgid "option not connect"
+msgstr "option not connect"
+
+#: backend/canon.c:479
+#, no-c-format
+msgid "power on reset / bus device reset"
+msgstr "power on reset / bus device reset"
+
+#: backend/canon.c:483
+#, no-c-format
+msgid "parameter changed by another initiator"
+msgstr "parameter changed by another initiator"
+
+#: backend/canon.c:497
+#, no-c-format
+msgid "no additional sense information"
+msgstr "no additional sense information"
+
+#: backend/canon.c:501
+#, no-c-format
+msgid "reselect failure"
+msgstr "reselect failure"
+
+#: backend/canon.c:505
+#, no-c-format
+msgid "SCSI parity error"
+msgstr "SCSI parity error"
+
+#: backend/canon.c:509
+#, no-c-format
+msgid "initiator detected error message received"
+msgstr "initiator detected error message received"
+
+#: backend/canon.c:514
+#, no-c-format
+msgid "invalid message error"
+msgstr "invalid message error"
+
+#: backend/canon.c:518
+#, no-c-format
+msgid "timeout error"
+msgstr "timeout error"
+
+#: backend/canon.c:522
+#, no-c-format
+msgid "transparency unit shading error"
+msgstr "transparency unit shading error"
+
+#: backend/canon.c:526
+#, no-c-format
+msgid "lamp not stabilized"
+msgstr "lamp not stabilized"
+
+#: backend/canon.c:852 backend/canon.c:867
+#, no-c-format
+msgid "film scanner"
+msgstr "film scanner"
+
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
+#, no-c-format
+msgid "flatbed scanner"
+msgstr "flatbed scanner"
+
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
+#, no-c-format
+msgid "Film type"
+msgstr "Film type"
+
+#: backend/canon.c:1184
+#, no-c-format
+msgid "Selects the film type, i.e. negatives or slides"
+msgstr "Selects the film type, i.e. negatives or slides"
+
+#: backend/canon.c:1196
+#, no-c-format
+msgid "Negative film type"
+msgstr "Negative film type"
+
+#: backend/canon.c:1197
+#, no-c-format
+msgid "Selects the negative film type"
+msgstr "Selects the negative film type"
+
+#: backend/canon.c:1236
+#, no-c-format
+msgid "Hardware resolution"
+msgstr "Hardware resolution"
+
+#: backend/canon.c:1237
+#, no-c-format
+msgid "Use only hardware resolutions"
+msgstr "Use only hardware resolutions"
+
+#: backend/canon.c:1318
+#, no-c-format
+msgid "Focus"
+msgstr "Focus"
+
+#: backend/canon.c:1328
+#, no-c-format
+msgid "Auto focus"
+msgstr "Auto focus"
+
+#: backend/canon.c:1329
+#, no-c-format
+msgid "Enable/disable auto focus"
+msgstr "Enable/disable auto focus"
+
+#: backend/canon.c:1336
+#, no-c-format
+msgid "Auto focus only once"
+msgstr "Auto focus only once"
+
+#: backend/canon.c:1337
+#, no-c-format
+msgid "Do auto focus only once between ejects"
+msgstr "Do auto focus only once between ejects"
+
+#: backend/canon.c:1345
+#, no-c-format
+msgid "Manual focus position"
+msgstr "Manual focus position"
+
+#: backend/canon.c:1346
+#, no-c-format
+msgid "Set the optical system's focus position by hand (default: 128)."
+msgstr "Set the optical system's focus position by hand (default: 128)."
+
+#: backend/canon.c:1356
+#, no-c-format
+msgid "Scan margins"
+msgstr "Scan margins"
+
+#: backend/canon.c:1403
+#, no-c-format
+msgid "Extra color adjustments"
+msgstr "Extra color adjustments"
+
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
+#, no-c-format
+msgid "Mirror image"
+msgstr "Mirror image"
+
+#: backend/canon.c:1539
+#, no-c-format
+msgid "Mirror the image horizontally"
+msgstr "Mirror the image horizontally"
+
+#: backend/canon.c:1608
+#, no-c-format
+msgid "Auto exposure"
+msgstr "Auto exposure"
+
+#: backend/canon.c:1609
+#, no-c-format
+msgid "Enable/disable the auto exposure feature"
+msgstr "Enable/disable the auto exposure feature"
+
+#: backend/canon.c:1625
+#, no-c-format
+msgid "Calibration now"
+msgstr "Calibration now"
+
+#: backend/canon.c:1626
+#, no-c-format
+msgid "Execute calibration *now*"
+msgstr "Execute calibration *now*"
+
+#: backend/canon.c:1636
+#, no-c-format
+msgid "Self diagnosis"
+msgstr "Self diagnosis"
+
+#: backend/canon.c:1637
+#, no-c-format
+msgid "Perform scanner self diagnosis"
+msgstr "Perform scanner self diagnosis"
+
+#: backend/canon.c:1648
+#, no-c-format
+msgid "Reset scanner"
+msgstr "Reset scanner"
+
+#: backend/canon.c:1649
+#, no-c-format
+msgid "Reset the scanner"
+msgstr "Reset the scanner"
+
+#: backend/canon.c:1659
+#, no-c-format
+msgid "Medium handling"
+msgstr "Medium handling"
+
+#: backend/canon.c:1668
+#, no-c-format
+msgid "Eject film after each scan"
+msgstr "Eject film after each scan"
+
+#: backend/canon.c:1669
+#, no-c-format
+msgid "Automatically eject the film from the device after each scan"
+msgstr "Automatically eject the film from the device after each scan"
+
+#: backend/canon.c:1680
+#, no-c-format
+msgid "Eject film before exit"
+msgstr "Eject film before exit"
+
+#: backend/canon.c:1681
+#, no-c-format
+msgid ""
+"Automatically eject the film from the device before exiting the program"
+msgstr ""
+"Automatically eject the film from the device before exiting the program"
+
+#: backend/canon.c:1690
+#, no-c-format
+msgid "Eject film now"
+msgstr "Eject film now"
+
+#: backend/canon.c:1691
+#, no-c-format
+msgid "Eject the film *now*"
+msgstr "Eject the film *now*"
+
+#: backend/canon.c:1700
+#, no-c-format
+msgid "Document feeder extras"
+msgstr "Document feeder extras"
+
+#: backend/canon.c:1707
+#, no-c-format
+msgid "Flatbed only"
+msgstr "Flatbed only"
+
+#: backend/canon.c:1708
+#, no-c-format
+msgid "Disable auto document feeder and use flatbed only"
+msgstr "Disable auto document feeder and use flatbed only"
+
+#: backend/canon.c:1718 backend/canon.c:1728
+#, no-c-format
+msgid "Transparency unit"
+msgstr "Transparency unit"
+
+#: backend/canon.c:1729
+#, no-c-format
+msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
+msgstr "Switch on/off the transparency unit (FAU, film adapter unit)"
+
+#: backend/canon.c:1739
+#, no-c-format
+msgid "Negative film"
+msgstr "Negative film"
+
+#: backend/canon.c:1740
+#, no-c-format
+msgid "Positive or negative film"
+msgstr "Positive or negative film"
+
+#: backend/canon.c:1749
+#, no-c-format
+msgid "Density control"
+msgstr "Density control"
+
+#: backend/canon.c:1750
+#, no-c-format
+msgid "Set density control mode"
+msgstr "Set density control mode"
+
+#: backend/canon.c:1761
+#, no-c-format
+msgid "Transparency ratio"
+msgstr "Transparency ratio"
+
+#: backend/canon.c:1775
+#, no-c-format
+msgid "Select film type"
+msgstr "Select film type"
+
+#: backend/canon.c:1776
+#, no-c-format
+msgid "Select the film type"
+msgstr "Select the film type"
+
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
+#, no-c-format
+msgid "Flatbed"
+msgstr "Flatbed"
+
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
+#, no-c-format
+msgid "ADF Front"
+msgstr "ADF Front"
+
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
+#, no-c-format
+msgid "ADF Back"
+msgstr "ADF Back"
+
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
+#, no-c-format
+msgid "ADF Duplex"
+msgstr "ADF Duplex"
+
+#: backend/canon_dr.c:412
+#, no-c-format
+msgid "Card Front"
+msgstr "Card Front"
+
+#: backend/canon_dr.c:413
+#, no-c-format
+msgid "Card Back"
+msgstr "Card Back"
+
+#: backend/canon_dr.c:414
+#, no-c-format
+msgid "Card Duplex"
+msgstr "Card Duplex"
+
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
+#, no-c-format
+msgid "Red"
+msgstr "Red"
+
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
+#, no-c-format
+msgid "Green"
+msgstr "Green"
+
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
+#, no-c-format
+msgid "Blue"
+msgstr "Blue"
+
+#: backend/canon_dr.c:424
+#, no-c-format
+msgid "Enhance Red"
+msgstr "Enhance Red"
+
+#: backend/canon_dr.c:425
+#, no-c-format
+msgid "Enhance Green"
+msgstr "Enhance Green"
+
+#: backend/canon_dr.c:426
+#, no-c-format
+msgid "Enhance Blue"
+msgstr "Enhance Blue"
+
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
+#, no-c-format
+msgid "None"
+msgstr "None"
+
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
+#, no-c-format
+msgid "JPEG"
+msgstr "JPEG"
+
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr "Software blank skip percentage"
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr "Request driver to discard pages with low percentage of dark pixels"
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
+#, no-c-format
+msgid "Simplex"
+msgstr "Simplex"
+
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
+#, no-c-format
+msgid "Duplex"
+msgstr "Duplex"
+
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
+#, no-c-format
+msgid "Transparency Unit"
+msgstr "Transparency Unit"
+
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
+#, no-c-format
+msgid "Automatic Document Feeder"
+msgstr "Automatic Document Feeder"
+
+#: backend/epson.c:523 backend/epson2.c:134
+#, no-c-format
+msgid "Positive Film"
+msgstr "Positive Film"
+
+#: backend/epson.c:524 backend/epson2.c:135
+#, no-c-format
+msgid "Negative Film"
+msgstr "Negative Film"
+
+#: backend/epson.c:529 backend/epson2.c:142
+#, no-c-format
+msgid "Focus on glass"
+msgstr "Focus on glass"
+
+#: backend/epson.c:530 backend/epson2.c:143
+#, no-c-format
+msgid "Focus 2.5mm above glass"
+msgstr "Focus 2.5mm above glass"
+
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
+#, no-c-format
+msgid "Halftone A (Hard Tone)"
+msgstr "Halftone A (Hard Tone)"
+
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
+#, no-c-format
+msgid "Halftone B (Soft Tone)"
+msgstr "Halftone B (Soft Tone)"
+
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
+#, no-c-format
+msgid "Halftone C (Net Screen)"
+msgstr "Halftone C (Net Screen)"
+
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
+#, no-c-format
+msgid "Dither A (4x4 Bayer)"
+msgstr "Dither A (4x4 Bayer)"
+
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
+#, no-c-format
+msgid "Dither B (4x4 Spiral)"
+msgstr "Dither B (4x4 Spiral)"
+
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
+#, no-c-format
+msgid "Dither C (4x4 Net Screen)"
+msgstr "Dither C (4x4 Net Screen)"
+
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
+#, no-c-format
+msgid "Dither D (8x4 Net Screen)"
+msgstr "Dither D (8x4 Net Screen)"
+
+#: backend/epson.c:584 backend/epson2.c:193
+#, no-c-format
+msgid "Text Enhanced Technology"
+msgstr "Text Enhanced Technology"
+
+#: backend/epson.c:585 backend/epson2.c:194
+#, no-c-format
+msgid "Download pattern A"
+msgstr "Download pattern A"
+
+#: backend/epson.c:586 backend/epson2.c:195
+#, no-c-format
+msgid "Download pattern B"
+msgstr "Download pattern B"
+
+#: backend/epson.c:631
+#, no-c-format
+msgid "No Correction"
+msgstr "No Correction"
+
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
+#, no-c-format
+msgid "User defined"
+msgstr "User defined"
+
+#: backend/epson.c:633
+#, no-c-format
+msgid "Impact-dot printers"
+msgstr "Impact-dot printers"
+
+#: backend/epson.c:634
+#, no-c-format
+msgid "Thermal printers"
+msgstr "Thermal printers"
+
+#: backend/epson.c:635
+#, no-c-format
+msgid "Ink-jet printers"
+msgstr "Ink-jet printers"
+
+#: backend/epson.c:636
+#, no-c-format
+msgid "CRT monitors"
+msgstr "CRT monitors"
+
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
+#, no-c-format
+msgid "Default"
+msgstr "Default"
+
+#: backend/epson.c:658 backend/epson2.c:256
+#, no-c-format
+msgid "High density printing"
+msgstr "High density printing"
+
+#: backend/epson.c:659 backend/epson2.c:257
+#, no-c-format
+msgid "Low density printing"
+msgstr "Low density printing"
+
+#: backend/epson.c:660 backend/epson2.c:258
+#, no-c-format
+msgid "High contrast printing"
+msgstr "High contrast printing"
+
+#: backend/epson.c:678 backend/epson2.c:276
+#, no-c-format
+msgid "User defined (Gamma=1.0)"
+msgstr "User defined (Gamma=1.0)"
+
+#: backend/epson.c:679 backend/epson2.c:277
+#, no-c-format
+msgid "User defined (Gamma=1.8)"
+msgstr "User defined (Gamma=1.8)"
+
+#: backend/epson.c:757
+#, no-c-format
+msgid "CD"
+msgstr "CD"
+
+#: backend/epson.c:758
+#, no-c-format
+msgid "A5 portrait"
+msgstr "A5 portrait"
+
+#: backend/epson.c:759
+#, no-c-format
+msgid "A5 landscape"
+msgstr "A5 landscape"
+
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
+#, no-c-format
+msgid "Letter"
+msgstr "Letter"
+
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
+#, no-c-format
+msgid "A4"
+msgstr "A4"
+
+#: backend/epson.c:762
+#, no-c-format
+msgid "Max"
+msgstr "Max"
+
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
+#, no-c-format
+msgid "Scan Mode"
+msgstr "Scan Mode"
+
+#: backend/epson.c:2845 backend/epson2.c:1012
+#, no-c-format
+msgid "Selects the halftone."
+msgstr "Selects the halftone."
+
+#: backend/epson.c:2867 backend/epson2.c:1033
+#, no-c-format
+msgid "Dropout"
+msgstr "Dropout"
+
+#: backend/epson.c:2868 backend/epson2.c:1034
+#, no-c-format
+msgid "Selects the dropout."
+msgstr "Selects the dropout."
+
+#: backend/epson.c:2880 backend/epson2.c:1046
+#, no-c-format
+msgid "Selects the brightness."
+msgstr "Selects the brightness."
+
+#: backend/epson.c:2895 backend/epson2.c:1059
+#, no-c-format
+msgid "Sharpness"
+msgstr "Sharpness"
+
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
+#, no-c-format
+msgid "Color correction"
+msgstr "Color correction"
+
+#: backend/epson.c:3034 backend/epson2.c:1177
+#, no-c-format
+msgid "Sets the color correction table for the selected output device."
+msgstr "Sets the color correction table for the selected output device."
+
+#: backend/epson.c:3075
+#, no-c-format
+msgid "Color correction coefficients"
+msgstr "Color correction coefficients"
+
+#: backend/epson.c:3076
+#, no-c-format
+msgid "Matrix multiplication of RGB"
+msgstr "Matrix multiplication of RGB"
+
+#: backend/epson.c:3093
+#, no-c-format
+msgid "Shift green to red"
+msgstr "Shift green to red"
+
+#: backend/epson.c:3094
+#, no-c-format
+msgid "Shift green to blue"
+msgstr "Shift green to blue"
+
+#: backend/epson.c:3095
+#, no-c-format
+msgid "Shift red to green"
+msgstr "Shift red to green"
+
+#: backend/epson.c:3097
+#, no-c-format
+msgid "Shift red to blue"
+msgstr "Shift red to blue"
+
+#: backend/epson.c:3098
+#, no-c-format
+msgid "Shift blue to green"
+msgstr "Shift blue to green"
+
+#: backend/epson.c:3099
+#, no-c-format
+msgid "Shift blue to red"
+msgstr "Shift blue to red"
+
+#: backend/epson.c:3102
+#, no-c-format
+msgid "Controls green level"
+msgstr "Controls green level"
+
+#: backend/epson.c:3103
+#, no-c-format
+msgid "Adds to red based on green level"
+msgstr "Adds to red based on green level"
+
+#: backend/epson.c:3104
+#, no-c-format
+msgid "Adds to blue based on green level"
+msgstr "Adds to blue based on green level"
+
+#: backend/epson.c:3105
+#, no-c-format
+msgid "Adds to green based on red level"
+msgstr "Adds to green based on red level"
+
+#: backend/epson.c:3106
+#, no-c-format
+msgid "Controls red level"
+msgstr "Controls red level"
+
+#: backend/epson.c:3107
+#, no-c-format
+msgid "Adds to blue based on red level"
+msgstr "Adds to blue based on red level"
+
+#: backend/epson.c:3108
+#, no-c-format
+msgid "Adds to green based on blue level"
+msgstr "Adds to green based on blue level"
+
+#: backend/epson.c:3109
+#, no-c-format
+msgid "Adds to red based on blue level"
+msgstr "Adds to red based on blue level"
+
+#: backend/epson.c:3110
+#, no-c-format
+msgid "Controls blue level"
+msgstr "Controls blue level"
+
+#: backend/epson.c:3206 backend/epson2.c:1256
+#, no-c-format
+msgid "Mirror the image."
+msgstr "Mirror the image."
+
+#: backend/epson.c:3232 backend/mustek.c:4332
+#, no-c-format
+msgid "Fast preview"
+msgstr "Fast preview"
+
+#: backend/epson.c:3245 backend/epson2.c:1266
+#, no-c-format
+msgid "Auto area segmentation"
+msgstr "Auto area segmentation"
+
+#: backend/epson.c:3258
+#, no-c-format
+msgid "Short resolution list"
+msgstr "Short resolution list"
+
+#: backend/epson.c:3260
+#, no-c-format
+msgid "Display short resolution list"
+msgstr "Display short resolution list"
+
+#: backend/epson.c:3267
+#, no-c-format
+msgid "Zoom"
+msgstr "Zoom"
+
+#: backend/epson.c:3269
+#, no-c-format
+msgid "Defines the zoom factor the scanner will use"
+msgstr "Defines the zoom factor the scanner will use"
+
+#: backend/epson.c:3349
+#, no-c-format
+msgid "Quick format"
+msgstr "Quick format"
+
+#: backend/epson.c:3360 backend/epson2.c:1341
+#, no-c-format
+msgid "Optional equipment"
+msgstr "Optional equipment"
+
+#: backend/epson.c:3431 backend/epson2.c:1394
+#, no-c-format
+msgid "Eject"
+msgstr "Eject"
+
+#: backend/epson.c:3432 backend/epson2.c:1395
+#, no-c-format
+msgid "Eject the sheet in the ADF"
+msgstr "Eject the sheet in the ADF"
+
+#: backend/epson.c:3444 backend/epson2.c:1405
+#, no-c-format
+msgid "Auto eject"
+msgstr "Auto eject"
+
+#: backend/epson.c:3445 backend/epson2.c:1407
+#, no-c-format
+msgid "Eject document after scanning"
+msgstr "Eject document after scanning"
+
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
+#, no-c-format
+msgid "ADF Mode"
+msgstr "ADF Mode"
+
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
+#, no-c-format
+msgid "Selects the ADF mode (simplex/duplex)"
+msgstr "Selects the ADF mode (simplex/duplex)"
+
+#: backend/epson.c:3473 backend/epson2.c:1431
+#, no-c-format
+msgid "Bay"
+msgstr "Bay"
+
+#: backend/epson.c:3474 backend/epson2.c:1432
+#, no-c-format
+msgid "Select bay to scan"
+msgstr "Select bay to scan"
+
+#: backend/epson.h:69 backend/epson2.h:68
+#, no-c-format
+msgid ""
+"Selects the gamma correction value from a list of pre-defined devices or "
+"the user defined table, which can be downloaded to the scanner"
+msgstr ""
+"Selects the gamma correction value from a list of pre-defined devices or "
+"the user defined table, which can be downloaded to the scanner"
+
+#: backend/epson.h:72 backend/epson2.h:71
+#, no-c-format
+msgid "Focus Position"
+msgstr "Focus Position"
+
+#: backend/epson.h:73 backend/epson2.h:72
+#, no-c-format
+msgid ""
+"Sets the focus position to either the glass or 2.5mm above the glass"
+msgstr ""
+"Sets the focus position to either the glass or 2.5mm above the glass"
+
+#: backend/epson.h:75 backend/epson2.h:74
+#, no-c-format
+msgid "Wait for Button"
+msgstr "Wait for Button"
+
+#: backend/epson.h:76 backend/epson2.h:75
+#, no-c-format
+msgid ""
+"After sending the scan command, wait until the button on the scanner is "
+"pressed to actually start the scan process."
+msgstr ""
+"After sending the scan command, wait until the button on the scanner is "
+"pressed to actually start the scan process."
+
+#: backend/epson2.c:102 backend/pixma.c:390
+#, no-c-format
+msgid "Infrared"
+msgstr "Infrared"
+
+#: backend/epson2.c:117
+#, no-c-format
+msgid "TPU8x10"
+msgstr "TPU8x10"
+
+#: backend/epson2.c:136
+#, no-c-format
+msgid "Positive Slide"
+msgstr "Positive Slide"
+
+#: backend/epson2.c:137
+#, no-c-format
+msgid "Negative Slide"
+msgstr "Negative Slide"
+
+#: backend/epson2.c:215
+#, no-c-format
+msgid "Built in CCT profile"
+msgstr "Built in CCT profile"
+
+#: backend/epson2.c:216
+#, no-c-format
+msgid "User defined CCT profile"
+msgstr "User defined CCT profile"
+
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
+#, no-c-format
+msgid "On"
+msgstr "On"
+
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
+#, no-c-format
+msgid "Off"
+msgstr "Off"
+
+#: backend/fujitsu.c:686
+#, no-c-format
+msgid "DTC"
+msgstr "DTC"
+
+#: backend/fujitsu.c:687
+#, no-c-format
+msgid "SDTC"
+msgstr "SDTC"
+
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
+#, no-c-format
+msgid "Dither"
+msgstr "Dither"
+
+#: backend/fujitsu.c:690
+#, no-c-format
+msgid "Diffusion"
+msgstr "Diffusion"
+
+#: backend/fujitsu.c:695
+#, no-c-format
+msgid "White"
+msgstr "White"
+
+#: backend/fujitsu.c:696
+#, no-c-format
+msgid "Black"
+msgstr "Black"
+
+#: backend/fujitsu.c:701
+#, no-c-format
+msgid "Continue"
+msgstr "Continue"
+
+#: backend/fujitsu.c:702
+#, no-c-format
+msgid "Stop"
+msgstr "Stop"
+
+#: backend/fujitsu.c:704
+#, no-c-format
+msgid "10mm"
+msgstr "10mm"
+
+#: backend/fujitsu.c:705
+#, no-c-format
+msgid "15mm"
+msgstr "15mm"
+
+#: backend/fujitsu.c:706
+#, no-c-format
+msgid "20mm"
+msgstr "20mm"
+
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
+#, no-c-format
+msgid "Horizontal"
+msgstr "Horizontal"
+
+#: backend/fujitsu.c:709
+#, no-c-format
+msgid "Horizontal bold"
+msgstr "Horizontal bold"
+
+#: backend/fujitsu.c:710
+#, no-c-format
+msgid "Horizontal narrow"
+msgstr "Horizontal narrow"
+
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
+#, no-c-format
+msgid "Vertical"
+msgstr "Vertical"
+
+#: backend/fujitsu.c:712
+#, no-c-format
+msgid "Vertical bold"
+msgstr "Vertical bold"
+
+#: backend/fujitsu.c:714
+#, no-c-format
+msgid "Top to bottom"
+msgstr "Top to bottom"
+
+#: backend/fujitsu.c:715
+#, no-c-format
+msgid "Bottom to top"
+msgstr "Bottom to top"
+
+#: backend/fujitsu.c:717
+#, no-c-format
+msgid "Front"
+msgstr "Front"
+
+#: backend/fujitsu.c:718
+#, no-c-format
+msgid "Back"
+msgstr "Back"
+
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
+#, no-c-format
+msgid "Gamma function exponent"
+msgstr "Gamma function exponent"
+
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
+#, no-c-format
+msgid "Changes intensity of midtones"
+msgstr "Changes intensity of midtones"
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr "RIF"
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr "Reverse image format"
+
+#: backend/fujitsu.c:3165
+#, no-c-format
+msgid "Halftone type"
+msgstr "Halftone type"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr "Control type of halftone filter"
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr "Control pattern of halftone filter"
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr "Outline"
+
+#: backend/fujitsu.c:3210
+#, no-c-format
+msgid "Perform outline extraction"
+msgstr "Perform outline extraction"
+
+#: backend/fujitsu.c:3221
+#, no-c-format
+msgid "Emphasis"
+msgstr "Emphasis"
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr "Negative to smooth or positive to sharpen image"
+
+#: backend/fujitsu.c:3240
+#, no-c-format
+msgid "Separation"
+msgstr "Separation"
+
+#: backend/fujitsu.c:3241
+#, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr "Enable automatic separation of image and text"
+
+#: backend/fujitsu.c:3252
+#, no-c-format
+msgid "Mirroring"
+msgstr "Mirroring"
+
+#: backend/fujitsu.c:3253
+#, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "Reflect output image horizontally"
+
+#: backend/fujitsu.c:3270
+#, no-c-format
+msgid "White level follower"
+msgstr "White level follower"
+
+#: backend/fujitsu.c:3271
+#, no-c-format
+msgid "Control white level follower"
+msgstr "Control white level follower"
+
+#: backend/fujitsu.c:3289
+#, no-c-format
+msgid "BP filter"
+msgstr "BP filter"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr "Improves quality of high resolution ball-point pen text"
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr "Smoothing"
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr "Enable smoothing for improved OCR"
+
+#: backend/fujitsu.c:3323
+#, no-c-format
+msgid "Gamma curve"
+msgstr "Gamma curve"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr "Gamma curve, from light to dark, but upper two may not work"
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, no-c-format
+msgid "Threshold curve"
+msgstr "Threshold curve"
+
+#: backend/fujitsu.c:3347
+#, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+
+#: backend/fujitsu.c:3369
+#, no-c-format
+msgid "Threshold white"
+msgstr "Threshold white"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr "Set pixels equal to threshold to white instead of black"
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, no-c-format
+msgid "Noise removal"
+msgstr "Noise removal"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr "Matrix 5x5"
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr "Remove 5 pixel square noise"
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr "Matrix 4x4"
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr "Remove 4 pixel square noise"
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr "Matrix 3x3"
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr "Remove 3 pixel square noise"
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr "Matrix 2x2"
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr "Remove 2 pixel square noise"
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr "Variance"
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr "Set SDTC variance rate (sensitivity), 0 equals 127"
+
+#: backend/fujitsu.c:3508
+#, no-c-format
+msgid "Auto width detection"
+msgstr "Auto width detection"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr "Scanner detects paper sides. May reduce scanning speed."
+
+#: backend/fujitsu.c:3526
+#, no-c-format
+msgid "Auto length detection"
+msgstr "Auto length detection"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr "Scanner detects paper lower edge. May confuse some frontends."
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr "Compression"
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr "Enable compressed data. May crash your front-end program"
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr "Compression argument"
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr "DF action"
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr "Action following double feed error"
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr "DF skew"
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr "Enable double feed error due to skew"
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr "DF thickness"
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr "Enable double feed error due to paper thickness"
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr "DF length"
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr "Enable double feed error due to paper length"
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
+msgstr "DF length difference"
+
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr "Difference in page length to trigger double feed error"
+
+#: backend/fujitsu.c:3708
+#, no-c-format
+msgid "DF recovery mode"
+msgstr "DF recovery mode"
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr "Request scanner to reverse feed on paper jam"
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr "Paper protection"
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr "Request scanner to predict jams in the ADF"
+
+#: backend/fujitsu.c:3748
+#, no-c-format
+msgid "Advanced paper protection"
+msgstr "Advanced paper protection"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr "Request scanner to predict jams in the ADF using improved sensors"
+
+#: backend/fujitsu.c:3768
+#, no-c-format
+msgid "Staple detection"
+msgstr "Staple detection"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr "Request scanner to detect jams in the ADF caused by staples"
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr "Background color"
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+"Set color of background for scans. May conflict with overscan option"
+
+#: backend/fujitsu.c:3809
+#, no-c-format
+msgid "Dropout color"
+msgstr "Dropout color"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+
+#: backend/fujitsu.c:3833
+#, no-c-format
+msgid "Buffer mode"
+msgstr "Buffer mode"
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+"Request scanner to read pages quickly from ADF into internal memory"
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr "Prepick"
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr "Request scanner to grab next page from ADF"
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr "Overscan"
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr "Sleep timer"
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+"Time in minutes until the internal power supply switches to sleep mode"
+
+#: backend/fujitsu.c:3911
+#, no-c-format
+msgid "Off timer"
+msgstr "Off timer"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+
+#: backend/fujitsu.c:3930
+#, no-c-format
+msgid "Duplex offset"
+msgstr "Duplex offset"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr "Adjust front/back offset"
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "Green offset"
+
+#: backend/fujitsu.c:3949
+#, no-c-format
+msgid "Adjust green/red offset"
+msgstr "Adjust green/red offset"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr "Blue offset"
+
+#: backend/fujitsu.c:3967
+#, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "Adjust blue/red offset"
+
+#: backend/fujitsu.c:3980
+#, no-c-format
+msgid "Low Memory"
+msgstr "Low Memory"
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option ‘side’ can be used to determine correct image. This option "
+"should only be used with custom front-end software."
+
+#: backend/fujitsu.c:3996
+#, no-c-format
+msgid "Duplex side"
+msgstr "Duplex side"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr "Hardware deskew and crop"
+
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr "Request scanner to rotate and crop pages digitally."
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr "Software deskew"
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr "Request driver to rotate skewed pages digitally."
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr "Software despeckle diameter"
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
+msgstr "Maximum diameter of lone dots to remove from scan."
+
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
+#, no-c-format
+msgid "Software crop"
+msgstr "Software crop"
+
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr "Request driver to remove border from pages digitally."
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr "Halt on Cancel"
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+
+#: backend/fujitsu.c:4095
+#, no-c-format
+msgid "Endorser Options"
+msgstr "Endorser Options"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr "Controls for endorser unit"
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr "Endorser"
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr "Enable endorser unit"
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr "Endorser bits"
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr "Determines maximum endorser counter value."
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr "Endorser value"
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr "Initial endorser counter value."
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr "Endorser step"
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr "Change endorser counter value by this much for each page."
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr "Endorser Y"
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr "Endorser print offset from top of paper."
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr "Endorser font"
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr "Endorser printing font."
+
+#: backend/fujitsu.c:4253
+#, no-c-format
+msgid "Endorser direction"
+msgstr "Endorser direction"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr "Endorser printing direction."
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr "Endorser side"
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr "Endorser printing side, requires hardware support to change"
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr "Endorser string"
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr "Top edge"
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr "Paper is pulled partly into adf"
+
+#: backend/fujitsu.c:4344
+#, no-c-format
+msgid "A3 paper"
+msgstr "A3 paper"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr "A3 paper detected"
+
+#: backend/fujitsu.c:4356
+#, no-c-format
+msgid "B4 paper"
+msgstr "B4 paper"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr "B4 paper detected"
+
+#: backend/fujitsu.c:4368
+#, no-c-format
+msgid "A4 paper"
+msgstr "A4 paper"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr "A4 paper detected"
+
+#: backend/fujitsu.c:4380
+#, no-c-format
+msgid "B5 paper"
+msgstr "B5 paper"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr "B5 paper detected"
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr "OMR or DF"
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr "OMR or double feed detected"
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr "Power saving"
+
+#: backend/fujitsu.c:4429
+#, no-c-format
+msgid "Scanner in power saving mode"
+msgstr "Scanner in power saving mode"
+
+#: backend/fujitsu.c:4452
+#, no-c-format
+msgid "Manual feed"
+msgstr "Manual feed"
+
+#: backend/fujitsu.c:4453
+#, no-c-format
+msgid "Manual feed selected"
+msgstr "Manual feed selected"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr "Function"
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr "Function character on screen"
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr "Ink low"
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr "Imprinter ink running low"
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr "Double feed"
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr "Double feed detected"
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr "Error code"
+
+#: backend/fujitsu.c:4513
+#, no-c-format
+msgid "Hardware error code"
+msgstr "Hardware error code"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr "Skew angle"
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr "Requires black background for scanning"
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr "Ink remaining"
+
+#: backend/fujitsu.c:4537
+#, no-c-format
+msgid "Imprinter ink level"
+msgstr "Imprinter ink level"
+
+#: backend/fujitsu.c:4548
+#, no-c-format
+msgid "Density"
+msgstr "Density"
+
+#: backend/fujitsu.c:4549
+#, no-c-format
+msgid "Density dial"
+msgstr "Density dial"
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, no-c-format
+msgid "Duplex switch"
+msgstr "Duplex switch"
+
+#: backend/genesys.c:5761
+#, no-c-format
+msgid "Request backend to remove border from pages digitally"
+msgstr "Request backend to remove border from pages digitally"
+
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
+#, no-c-format
+msgid "Request driver to discard pages with low numbers of dark pixels"
+msgstr "Request driver to discard pages with low numbers of dark pixels"
+
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
+#, no-c-format
+msgid "Software derotate"
+msgstr "Software derotate"
+
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
+#, no-c-format
+msgid "Request driver to detect and correct 90 degree image rotation"
+msgstr "Request driver to detect and correct 90 degree image rotation"
+
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
+#, no-c-format
+msgid "Extras"
+msgstr "Extras"
+
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
+#, no-c-format
+msgid "Dynamic threshold curve, from light to dark, normally 50-65"
+msgstr "Dynamic threshold curve, from light to dark, normally 50-65"
+
+#: backend/genesys.c:5842
+#, no-c-format
+msgid "Disable dynamic lineart"
+msgstr "Disable dynamic lineart"
+
+#: backend/genesys.c:5844
+#, no-c-format
+msgid ""
+"Disable use of a software adaptive algorithm to generate lineart relying "
+"instead on hardware lineart."
+msgstr ""
+"Disable use of a software adaptive algorithm to generate lineart relying "
+"instead on hardware lineart."
+
+#: backend/genesys.c:5860
+#, no-c-format
+msgid "Disable interpolation"
+msgstr "Disable interpolation"
+
+#: backend/genesys.c:5863
+#, no-c-format
+msgid ""
+"When using high resolutions where the horizontal resolution is smaller "
+"than the vertical resolution this disables horizontal interpolation."
+msgstr ""
+"When using high resolutions where the horizontal resolution is smaller "
+"than the vertical resolution this disables horizontal interpolation."
+
+#: backend/genesys.c:5872
+#, no-c-format
+msgid "Color filter"
+msgstr "Color filter"
+
+#: backend/genesys.c:5875
+#, no-c-format
+msgid "When using gray or lineart this option selects the used color."
+msgstr "When using gray or lineart this option selects the used color."
+
+#: backend/genesys.c:5901
+#, no-c-format
+msgid "Calibration file"
+msgstr "Calibration file"
+
+#: backend/genesys.c:5902
+#, no-c-format
+msgid "Specify the calibration file to use"
+msgstr "Specify the calibration file to use"
+
+#: backend/genesys.c:5919
+#, no-c-format
+msgid "Calibration cache expiration time"
+msgstr "Calibration cache expiration time"
+
+#: backend/genesys.c:5920
+#, no-c-format
+msgid ""
+"Time (in minutes) before a cached calibration expires. A value of 0 "
+"means cache is not used. A negative value means cache never expires."
+msgstr ""
+"Time (in minutes) before a cached calibration expires. A value of 0 "
+"means cache is not used. A negative value means cache never expires."
+
+#: backend/genesys.c:5930
+#, no-c-format
+msgid "Lamp off time"
+msgstr "Lamp off time"
+
+#: backend/genesys.c:5933
+#, no-c-format
+msgid ""
+"The lamp will be turned off after the given time (in minutes). A value "
+"of 0 means, that the lamp won't be turned off."
+msgstr ""
+"The lamp will be turned off after the given time (in minutes). A value "
+"of 0 means, that the lamp won't be turned off."
+
+#: backend/genesys.c:5943
+#, no-c-format
+msgid "Lamp off during scan"
+msgstr "Lamp off during scan"
+
+#: backend/genesys.c:5944
+#, no-c-format
+msgid "The lamp will be turned off during scan. "
+msgstr "The lamp will be turned off during scan. "
+
+#: backend/genesys.c:5972 backend/genesys.c:5973
+#, no-c-format
+msgid "File button"
+msgstr "File button"
+
+#: backend/genesys.c:6025 backend/genesys.c:6026
+#, no-c-format
+msgid "OCR button"
+msgstr "OCR button"
+
+#: backend/genesys.c:6039 backend/genesys.c:6040
+#, no-c-format
+msgid "Power button"
+msgstr "Power button"
+
+#: backend/genesys.c:6053 backend/genesys.c:6054
+#, no-c-format
+msgid "Extra button"
+msgstr "Extra button"
+
+#: backend/genesys.c:6067 backend/gt68xx.c:762
+#, no-c-format
+msgid "Need calibration"
+msgstr "Need calibration"
+
+#: backend/genesys.c:6068 backend/gt68xx.c:763
+#, no-c-format
+msgid "The scanner needs calibration for the current settings"
+msgstr "The scanner needs calibration for the current settings"
+
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
+#, no-c-format
+msgid "Buttons"
+msgstr "Buttons"
+
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
+#, no-c-format
+msgid "Calibrate"
+msgstr "Calibrate"
+
+#: backend/genesys.c:6091 backend/gt68xx.c:796
+#, no-c-format
+msgid "Start calibration using special sheet"
+msgstr "Start calibration using special sheet"
+
+#: backend/genesys.c:6105 backend/gt68xx.c:809
+#, no-c-format
+msgid "Clear calibration"
+msgstr "Clear calibration"
+
+#: backend/genesys.c:6106 backend/gt68xx.c:810
+#, no-c-format
+msgid "Clear calibration cache"
+msgstr "Clear calibration cache"
+
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
+#, no-c-format
+msgid "Transparency Adapter"
+msgstr "Transparency Adapter"
+
+#: backend/gt68xx.c:477
+#, no-c-format
+msgid "Gray mode color"
+msgstr "Gray mode color"
+
+#: backend/gt68xx.c:479
+#, no-c-format
+msgid "Selects which scan color is used gray mode (default: green)."
+msgstr "Selects which scan color is used gray mode (default: green)."
+
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
+#, no-c-format
+msgid "Debugging Options"
+msgstr "Debugging Options"
+
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
+#, no-c-format
+msgid "Automatic warmup"
+msgstr "Automatic warmup"
+
+#: backend/gt68xx.c:573
+#, no-c-format
+msgid ""
+"Warm-up until the lamp's brightness is constant instead of insisting on "
+"60 seconds warm-up time."
+msgstr ""
+"Warm-up until the lamp's brightness is constant instead of insisting on "
+"60 seconds warm-up time."
+
+#: backend/gt68xx.c:585
+#, no-c-format
+msgid "Full scan"
+msgstr "Full scan"
+
+#: backend/gt68xx.c:587
+#, no-c-format
+msgid ""
+"Scan the complete scanning area including calibration strip. Be careful. "
+"Don't select the full height. For testing only."
+msgstr ""
+"Scan the complete scanning area including calibration strip. Be careful. "
+"Don't select the full height. For testing only."
+
+#: backend/gt68xx.c:598
+#, no-c-format
+msgid "Coarse calibration"
+msgstr "Coarse calibration"
+
+#: backend/gt68xx.c:600
+#, no-c-format
+msgid ""
+"Setup gain and offset for scanning automatically. If this option is "
+"disabled, options for setting the analog frontend parameters manually "
+"are provided. This option is enabled by default. For testing only."
+msgstr ""
+"Setup gain and offset for scanning automatically. If this option is "
+"disabled, options for setting the analog frontend parameters manually "
+"are provided. This option is enabled by default. For testing only."
+
+#: backend/gt68xx.c:619
+#, no-c-format
+msgid "Coarse calibration for first scan only"
+msgstr "Coarse calibration for first scan only"
+
+#: backend/gt68xx.c:621
+#, no-c-format
+msgid ""
+"Coarse calibration is only done for the first scan. Works with most "
+"scanners and can save scanning time. If the image brightness is "
+"different with each scan, disable this option. For testing only."
+msgstr ""
+"Coarse calibration is only done for the first scan. Works with most "
+"scanners and can save scanning time. If the image brightness is "
+"different with each scan, disable this option. For testing only."
+
+#: backend/gt68xx.c:654
+#, no-c-format
+msgid "Backtrack lines"
+msgstr "Backtrack lines"
+
+#: backend/gt68xx.c:656
+#, no-c-format
+msgid ""
+"Number of lines the scan slider moves back when backtracking occurs. "
+"That happens when the scanner scans faster than the computer can receive "
+"the data. Low values cause faster scans but increase the risk of "
+"omitting lines."
+msgstr ""
+"Number of lines the scan slider moves back when backtracking occurs. "
+"That happens when the scanner scans faster than the computer can receive "
+"the data. Low values cause faster scans but increase the risk of "
+"omitting lines."
+
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
+#, no-c-format
+msgid "Gamma value"
+msgstr "Gamma value"
+
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
+#, no-c-format
+msgid "Sets the gamma value of all channels."
+msgstr "Sets the gamma value of all channels."
+
+#: backend/hp3500.c:1020
+#, no-c-format
+msgid "Geometry Group"
+msgstr "Geometry Group"
+
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
+#, no-c-format
+msgid "Scan Mode Group"
+msgstr "Scan Mode Group"
+
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
+#, no-c-format
+msgid "Slide"
+msgstr "Slide"
+
+#: backend/hp3900_sane.c:1405
+#, no-c-format
+msgid "Scanner model"
+msgstr "Scanner model"
+
+#: backend/hp3900_sane.c:1408
+#, no-c-format
+msgid "Allows one to test device behaviour with other supported models"
+msgstr "Allows one to test device behaviour with other supported models"
+
+#: backend/hp3900_sane.c:1422
+#, no-c-format
+msgid "Image colours will be inverted"
+msgstr "Image colours will be inverted"
+
+#: backend/hp3900_sane.c:1436
+#, no-c-format
+msgid "Disable gamma correction"
+msgstr "Disable gamma correction"
+
+#: backend/hp3900_sane.c:1437
+#, no-c-format
+msgid "Gamma correction will be disabled"
+msgstr "Gamma correction will be disabled"
+
+#: backend/hp3900_sane.c:1451
+#, no-c-format
+msgid "Disable white shading correction"
+msgstr "Disable white shading correction"
+
+#: backend/hp3900_sane.c:1453
+#, no-c-format
+msgid "White shading correction will be disabled"
+msgstr "White shading correction will be disabled"
+
+#: backend/hp3900_sane.c:1467
+#, no-c-format
+msgid "Skip warmup process"
+msgstr "Skip warmup process"
+
+#: backend/hp3900_sane.c:1468
+#, no-c-format
+msgid "Warmup process will be disabled"
+msgstr "Warmup process will be disabled"
+
+#: backend/hp3900_sane.c:1482
+#, no-c-format
+msgid "Force real depth"
+msgstr "Force real depth"
+
+#: backend/hp3900_sane.c:1485
+#, no-c-format
+msgid ""
+"If gamma is enabled, scans are always made in 16 bits depth to improve "
+"image quality and then converted to the selected depth. This option "
+"avoids depth emulation."
+msgstr ""
+"If gamma is enabled, scans are always made in 16 bits depth to improve "
+"image quality and then converted to the selected depth. This option "
+"avoids depth emulation."
+
+#: backend/hp3900_sane.c:1499
+#, no-c-format
+msgid "Emulate Grayscale"
+msgstr "Emulate Grayscale"
+
+#: backend/hp3900_sane.c:1502
+#, no-c-format
+msgid ""
+"If enabled, image will be scanned in color mode and then converted to "
+"grayscale by software. This may improve image quality in some "
+"circumstances."
+msgstr ""
+"If enabled, image will be scanned in color mode and then converted to "
+"grayscale by software. This may improve image quality in some "
+"circumstances."
+
+#: backend/hp3900_sane.c:1516
+#, no-c-format
+msgid "Save debugging images"
+msgstr "Save debugging images"
+
+#: backend/hp3900_sane.c:1519
+#, no-c-format
+msgid ""
+"If enabled, some images involved in scanner processing are saved to "
+"analyze them."
+msgstr ""
+"If enabled, some images involved in scanner processing are saved to "
+"analyze them."
+
+#: backend/hp3900_sane.c:1533
+#, no-c-format
+msgid "Reset chipset"
+msgstr "Reset chipset"
+
+#: backend/hp3900_sane.c:1534
+#, no-c-format
+msgid "Resets chipset data"
+msgstr "Resets chipset data"
+
+#: backend/hp3900_sane.c:1547
+#, no-c-format
+msgid "Information"
+msgstr "Information"
+
+#: backend/hp3900_sane.c:1560
+#, no-c-format
+msgid "Chipset name"
+msgstr "Chipset name"
+
+#: backend/hp3900_sane.c:1561
+#, no-c-format
+msgid "Shows chipset name used in device."
+msgstr "Shows chipset name used in device."
+
+#: backend/hp3900_sane.c:1565
+#, no-c-format
+msgid "Unknown"
+msgstr "Unknown"
+
+#: backend/hp3900_sane.c:1571
+#, no-c-format
+msgid "Chipset ID"
+msgstr "Chipset ID"
+
+#: backend/hp3900_sane.c:1572
+#, no-c-format
+msgid "Shows the chipset ID"
+msgstr "Shows the chipset ID"
+
+#: backend/hp3900_sane.c:1582
+#, no-c-format
+msgid "Scan counter"
+msgstr "Scan counter"
+
+#: backend/hp3900_sane.c:1584
+#, no-c-format
+msgid "Shows the number of scans made by scanner"
+msgstr "Shows the number of scans made by scanner"
+
+#: backend/hp3900_sane.c:1594
+#, no-c-format
+msgid "Update information"
+msgstr "Update information"
+
+#: backend/hp3900_sane.c:1595
+#, no-c-format
+msgid "Updates information about device"
+msgstr "Updates information about device"
+
+#: backend/hp3900_sane.c:1635
+#, no-c-format
+msgid "This option reflects a front panel scanner button"
+msgstr "This option reflects a front panel scanner button"
+
+#: backend/hp5400_sane.c:313 backend/niash.c:678
+#, no-c-format
+msgid "Image"
+msgstr "Image"
+
+#: backend/hp5400_sane.c:352 backend/niash.c:709
+#, no-c-format
+msgid "Miscellaneous"
+msgstr "Miscellaneous"
+
+#: backend/hp5400_sane.c:358
+#, no-c-format
+msgid "offset X"
+msgstr "offset X"
+
+#: backend/hp5400_sane.c:359
+#, no-c-format
+msgid "Hardware internal X position of the scanning area."
+msgstr "Hardware internal X position of the scanning area."
+
+#: backend/hp5400_sane.c:368
+#, no-c-format
+msgid "offset Y"
+msgstr "offset Y"
+
+#: backend/hp5400_sane.c:369
+#, no-c-format
+msgid "Hardware internal Y position of the scanning area."
+msgstr "Hardware internal Y position of the scanning area."
+
+#: backend/hp5400_sane.c:381 backend/niash.c:716
+#, no-c-format
+msgid "Lamp status"
+msgstr "Lamp status"
+
+#: backend/hp5400_sane.c:382 backend/niash.c:717
+#, no-c-format
+msgid "Switches the lamp on or off."
+msgstr "Switches the lamp on or off."
+
+#: backend/hp5400_sane.c:393 backend/niash.c:727
+#, no-c-format
+msgid "Calibrates for black and white level."
+msgstr "Calibrates for black and white level."
+
+#: backend/hp5590.c:86 backend/hp-option.c:3253
+#, no-c-format
+msgid "ADF"
+msgstr "ADF"
+
+#: backend/hp5590.c:88
+#, no-c-format
+msgid "TMA Slides"
+msgstr "TMA Slides"
+
+#: backend/hp5590.c:89
+#, no-c-format
+msgid "TMA Negatives"
+msgstr "TMA Negatives"
+
+#: backend/hp5590.c:92
+#, no-c-format
+msgid "Color (48 bits)"
+msgstr "Color (48 bits)"
+
+#: backend/hp5590.c:95
+#, no-c-format
+msgid "Extend lamp timeout"
+msgstr "Extend lamp timeout"
+
+#: backend/hp5590.c:96
+#, no-c-format
+msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
+msgstr "Extends lamp timeout (from 15 minutes to 1 hour)"
+
+#: backend/hp5590.c:98
+#, no-c-format
+msgid "Wait for button"
+msgstr "Wait for button"
+
+#: backend/hp5590.c:99
+#, no-c-format
+msgid "Waits for button before scanning"
+msgstr "Waits for button before scanning"
+
+#: backend/hp-option.c:2984
+#, no-c-format
+msgid "Advanced Options"
+msgstr "Advanced Options"
+
+#: backend/hp-option.c:3041
+#, no-c-format
+msgid "Coarse"
+msgstr "Coarse"
+
+#: backend/hp-option.c:3042
+#, no-c-format
+msgid "Fine"
+msgstr "Fine"
+
+#: backend/hp-option.c:3043
+#, no-c-format
+msgid "Bayer"
+msgstr "Bayer"
+
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
+#, no-c-format
+msgid "Custom"
+msgstr "Custom"
+
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
+#, no-c-format
+msgid "Auto"
+msgstr "Auto"
+
+#: backend/hp-option.c:3088
+#, no-c-format
+msgid "NTSC RGB"
+msgstr "NTSC RGB"
+
+#: backend/hp-option.c:3089
+#, no-c-format
+msgid "XPA RGB"
+msgstr "XPA RGB"
+
+#: backend/hp-option.c:3090
+#, no-c-format
+msgid "Pass-through"
+msgstr "Pass-through"
+
+#: backend/hp-option.c:3091
+#, no-c-format
+msgid "NTSC Gray"
+msgstr "NTSC Gray"
+
+#: backend/hp-option.c:3092
+#, no-c-format
+msgid "XPA Gray"
+msgstr "XPA Gray"
+
+#: backend/hp-option.c:3144
+#, no-c-format
+msgid "Slow"
+msgstr "Slow"
+
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
+#, no-c-format
+msgid "Normal"
+msgstr "Normal"
+
+#: backend/hp-option.c:3146
+#, no-c-format
+msgid "Fast"
+msgstr "Fast"
+
+#: backend/hp-option.c:3147
+#, no-c-format
+msgid "Extra Fast"
+msgstr "Extra Fast"
+
+#: backend/hp-option.c:3160
+#, no-c-format
+msgid "2-pixel"
+msgstr "2-pixel"
+
+#: backend/hp-option.c:3161
+#, no-c-format
+msgid "4-pixel"
+msgstr "4-pixel"
+
+#: backend/hp-option.c:3162
+#, no-c-format
+msgid "8-pixel"
+msgstr "8-pixel"
+
+#: backend/hp-option.c:3173
+#, no-c-format
+msgid "Print"
+msgstr "Print"
+
+#: backend/hp-option.c:3175
+#, no-c-format
+msgid "Film-strip"
+msgstr "Film-strip"
+
+#: backend/hp-option.c:3254
+#, no-c-format
+msgid "XPA"
+msgstr "XPA"
+
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
+#, no-c-format
+msgid "Conditional"
+msgstr "Conditional"
+
+#: backend/hp-option.c:3414
+#, no-c-format
+msgid "Experiment"
+msgstr "Experiment"
+
+#: backend/hp-option.h:60
+#, no-c-format
+msgid "Sharpening"
+msgstr "Sharpening"
+
+#: backend/hp-option.h:61
+#, no-c-format
+msgid "Set sharpening value."
+msgstr "Set sharpening value."
+
+#: backend/hp-option.h:66
+#, no-c-format
+msgid "Auto Threshold"
+msgstr "Auto Threshold"
+
+#: backend/hp-option.h:68
+#, no-c-format
+msgid "Enable automatic determination of threshold for line-art scans."
+msgstr "Enable automatic determination of threshold for line-art scans."
+
+#: backend/hp-option.h:74
+#, no-c-format
+msgid "Select smoothing filter."
+msgstr "Select smoothing filter."
+
+#: backend/hp-option.h:79
+#, no-c-format
+msgid "Unload media after scan"
+msgstr "Unload media after scan"
+
+#: backend/hp-option.h:80
+#, no-c-format
+msgid "Unloads the media after a scan."
+msgstr "Unloads the media after a scan."
+
+#: backend/hp-option.h:85
+#, no-c-format
+msgid "Change document"
+msgstr "Change document"
+
+#: backend/hp-option.h:86
+#, no-c-format
+msgid "Change Document."
+msgstr "Change Document."
+
+#: backend/hp-option.h:91
+#, no-c-format
+msgid "Unload"
+msgstr "Unload"
+
+#: backend/hp-option.h:92
+#, no-c-format
+msgid "Unload Document."
+msgstr "Unload Document."
+
+#: backend/hp-option.h:98
+#, no-c-format
+msgid "Start calibration process."
+msgstr "Start calibration process."
+
+#: backend/hp-option.h:103
+#, no-c-format
+msgid "Media"
+msgstr "Media"
+
+#: backend/hp-option.h:104
+#, no-c-format
+msgid "Set type of media."
+msgstr "Set type of media."
+
+#: backend/hp-option.h:109
+#, no-c-format
+msgid "Exposure time"
+msgstr "Exposure time"
+
+#: backend/hp-option.h:111
+#, no-c-format
+msgid ""
+"A longer exposure time lets the scanner collect more light. Suggested "
+"use is 175% for prints, 150% for normal slides and \"Negative\" for "
+"negative film. For dark (underexposed) images you can increase this "
+"value."
+msgstr ""
+"A longer exposure time lets the scanner collect more light. Suggested "
+"use is 175% for prints, 150% for normal slides and “Negative� for "
+"negative film. For dark (underexposed) images you can increase this "
+"value."
+
+#: backend/hp-option.h:119 backend/hp-option.h:126
+#, no-c-format
+msgid "Color Matrix"
+msgstr "Color Matrix"
+
+#: backend/hp-option.h:121
+#, no-c-format
+msgid "Set the scanners color matrix."
+msgstr "Set the scanners color matrix."
+
+#: backend/hp-option.h:127
+#, no-c-format
+msgid "Custom color matrix."
+msgstr "Custom color matrix."
+
+#: backend/hp-option.h:132
+#, no-c-format
+msgid "Mono Color Matrix"
+msgstr "Mono Color Matrix"
+
+#: backend/hp-option.h:133
+#, no-c-format
+msgid "Custom color matrix for grayscale scans."
+msgstr "Custom color matrix for grayscale scans."
+
+#: backend/hp-option.h:138
+#, no-c-format
+msgid "Mirror horizontal"
+msgstr "Mirror horizontal"
+
+#: backend/hp-option.h:139
+#, no-c-format
+msgid "Mirror image horizontally."
+msgstr "Mirror image horizontally."
+
+#: backend/hp-option.h:144
+#, no-c-format
+msgid "Mirror vertical"
+msgstr "Mirror vertical"
+
+#: backend/hp-option.h:145
+#, no-c-format
+msgid "Mirror image vertically."
+msgstr "Mirror image vertically."
+
+#: backend/hp-option.h:150
+#, no-c-format
+msgid "Update options"
+msgstr "Update options"
+
+#: backend/hp-option.h:151
+#, no-c-format
+msgid "Update options."
+msgstr "Update options."
+
+#: backend/hp-option.h:156
+#, no-c-format
+msgid "8 bit output"
+msgstr "8 bit output"
+
+#: backend/hp-option.h:158
+#, no-c-format
+msgid "Use bit depth greater eight internally, but output only eight bits."
+msgstr ""
+"Use bit depth greater eight internally, but output only eight bits."
+
+#: backend/hp-option.h:164
+#, no-c-format
+msgid "Front button wait"
+msgstr "Front button wait"
+
+#: backend/hp-option.h:165
+#, no-c-format
+msgid "Wait to scan for front-panel button push."
+msgstr "Wait to scan for front-panel button push."
+
+#: backend/hp-option.h:172
+#, no-c-format
+msgid "Shut off lamp"
+msgstr "Shut off lamp"
+
+#: backend/hp-option.h:173
+#, no-c-format
+msgid "Shut off scanner lamp."
+msgstr "Shut off scanner lamp."
+
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
+#, no-c-format
+msgid "Paper size"
+msgstr "Paper size"
+
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
+#, no-c-format
+msgid "Automatic separation"
+msgstr "Automatic separation"
+
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
+#, no-c-format
+msgid "Landscape"
+msgstr "Landscape"
+
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
+#, no-c-format
+msgid "Inverse Image"
+msgstr "Inverse Image"
+
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
+#, no-c-format
+msgid "Long paper mode"
+msgstr "Long paper mode"
+
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
+#, no-c-format
+msgid "Length control mode"
+msgstr "Length control mode"
+
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
+#, no-c-format
+msgid "Manual feed mode"
+msgstr "Manual feed mode"
+
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
+#, no-c-format
+msgid "Manual feed timeout"
+msgstr "Manual feed timeout"
+
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
+#, no-c-format
+msgid "Double feed detection"
+msgstr "Double feed detection"
+
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
+#, no-c-format
+msgid "Enable Duplex (Dual-Sided) Scanning"
+msgstr "Enable Duplex (Dual-Sided) Scanning"
+
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
+#, no-c-format
+msgid "Physical size of the paper in the ADF"
+msgstr "Physical size of the paper in the ADF"
+
+#: backend/kvs1025_opt.c:39
+#, no-c-format
+msgid "bw"
+msgstr "bw"
+
+#: backend/kvs1025_opt.c:40
+#, no-c-format
+msgid "halftone"
+msgstr "halftone"
+
+#: backend/kvs1025_opt.c:41
+#, no-c-format
+msgid "gray"
+msgstr "gray"
+
+#: backend/kvs1025_opt.c:42
+#, no-c-format
+msgid "color"
+msgstr "color"
+
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
+#, no-c-format
+msgid "adf"
+msgstr "adf"
+
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
+#, no-c-format
+msgid "fb"
+msgstr "fb"
+
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
+#, no-c-format
+msgid "single"
+msgstr "single"
+
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
+#, no-c-format
+msgid "continuous"
+msgstr "continuous"
+
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
+#, no-c-format
+msgid "off"
+msgstr "off"
+
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
+#, no-c-format
+msgid "wait_doc"
+msgstr "wait_doc"
+
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
+#, no-c-format
+msgid "wait_key"
+msgstr "wait_key"
+
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
+#, no-c-format
+msgid "user_def"
+msgstr "user_def"
+
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
+#, no-c-format
+msgid "business_card"
+msgstr "business_card"
+
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
+#, no-c-format
+msgid "Check"
+msgstr "Check"
+
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
+#, no-c-format
+msgid "A5"
+msgstr "A5"
+
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
+#, no-c-format
+msgid "A6"
+msgstr "A6"
+
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
+#, no-c-format
+msgid "B5"
+msgstr "B5"
+
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
+#, no-c-format
+msgid "B6"
+msgstr "B6"
+
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
+#, no-c-format
+msgid "Legal"
+msgstr "Legal"
+
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
+#, no-c-format
+msgid "bayer_64"
+msgstr "bayer_64"
+
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
+#, no-c-format
+msgid "bayer_16"
+msgstr "bayer_16"
+
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
+#, no-c-format
+msgid "halftone_32"
+msgstr "halftone_32"
+
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
+#, no-c-format
+msgid "halftone_64"
+msgstr "halftone_64"
+
+#: backend/kvs1025_opt.c:153
+#, no-c-format
+msgid "diffusion"
+msgstr "diffusion"
+
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
+#, no-c-format
+msgid "normal"
+msgstr "normal"
+
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
+#, no-c-format
+msgid "light"
+msgstr "light"
+
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
+#, no-c-format
+msgid "dark"
+msgstr "dark"
+
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
+#, no-c-format
+msgid "From scanner"
+msgstr "From scanner"
+
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
+#, no-c-format
+msgid "From paper"
+msgstr "From paper"
+
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
+#, no-c-format
+msgid "default"
+msgstr "default"
+
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
+#, no-c-format
+msgid "smooth"
+msgstr "smooth"
+
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
+#, no-c-format
+msgid "none"
+msgstr "none"
+
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
+#, no-c-format
+msgid "low"
+msgstr "low"
+
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
+#, no-c-format
+msgid "medium"
+msgstr "medium"
+
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
+#, no-c-format
+msgid "high"
+msgstr "high"
+
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
+#, no-c-format
+msgid "crt"
+msgstr "crt"
+
+#: backend/kvs1025_opt.c:230
+#, no-c-format
+msgid "linier"
+msgstr "linier"
+
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
+#, no-c-format
+msgid "red"
+msgstr "red"
+
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
+#, no-c-format
+msgid "green"
+msgstr "green"
+
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
+#, no-c-format
+msgid "blue"
+msgstr "blue"
+
+#: backend/kvs1025_opt.c:562
+#, no-c-format
+msgid "Sets the scan source"
+msgstr "Sets the scan source"
+
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
+#, no-c-format
+msgid "Feeder mode"
+msgstr "Feeder mode"
+
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
+#, no-c-format
+msgid "Sets the feeding mode"
+msgstr "Sets the feeding mode"
+
+#: backend/kvs1025_opt.c:584
+#, no-c-format
+msgid "Enable/Disable long paper mode"
+msgstr "Enable/Disable long paper mode"
+
+#: backend/kvs1025_opt.c:593
+#, no-c-format
+msgid "Enable/Disable length control mode"
+msgstr "Enable/Disable length control mode"
+
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
+#, no-c-format
+msgid "Sets the manual feed mode"
+msgstr "Sets the manual feed mode"
+
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
+#, no-c-format
+msgid "Sets the manual feed timeout in seconds"
+msgstr "Sets the manual feed timeout in seconds"
+
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
+#, no-c-format
+msgid "Enable/Disable double feed detection"
+msgstr "Enable/Disable double feed detection"
+
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
+#, no-c-format
+msgid "fit-to-page"
+msgstr "fit-to-page"
+
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
+#, no-c-format
+msgid "Fit to page"
+msgstr "Fit to page"
+
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
+#, no-c-format
+msgid "Scanner shrinks image to fit scanned page"
+msgstr "Scanner shrinks image to fit scanned page"
+
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
+#, no-c-format
+msgid "Set paper position : true for landscape, false for portrait"
+msgstr "Set paper position : true for landscape, false for portrait"
+
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
+#, no-c-format
+msgid "Automatic threshold"
+msgstr "Automatic threshold"
+
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
+#, no-c-format
+msgid ""
+"Automatically sets brightness, contrast, white level, gamma, noise "
+"reduction and image emphasis"
+msgstr ""
+"Automatically sets brightness, contrast, white level, gamma, noise "
+"reduction and image emphasis"
+
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
+#, no-c-format
+msgid "Noise reduction"
+msgstr "Noise reduction"
+
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
+#, no-c-format
+msgid "Reduce the isolated dot noise"
+msgstr "Reduce the isolated dot noise"
+
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
+#, no-c-format
+msgid "Image emphasis"
+msgstr "Image emphasis"
+
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
+#, no-c-format
+msgid "Sets the image emphasis"
+msgstr "Sets the image emphasis"
+
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
+#, no-c-format
+msgid "Gamma"
+msgstr "Gamma"
+
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
+#, no-c-format
+msgid "Lamp color"
+msgstr "Lamp color"
+
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
+#, no-c-format
+msgid "Sets the lamp color (color dropout)"
+msgstr "Sets the lamp color (color dropout)"
+
+#: backend/kvs1025_opt.c:832
+#, no-c-format
+msgid "Inverse image in B/W or halftone mode"
+msgstr "Inverse image in B/W or halftone mode"
+
+#: backend/kvs1025_opt.c:840
+#, no-c-format
+msgid "Mirror image (left/right flip)"
+msgstr "Mirror image (left/right flip)"
+
+#: backend/kvs1025_opt.c:847
+#, no-c-format
+msgid "jpeg compression"
+msgstr "jpeg compression"
+
+#: backend/kvs1025_opt.c:850
+#, no-c-format
+msgid "JPEG Image Compression with Q parameter, '0' - no compression"
+msgstr ""
+"JPEG Image Compression with Q parameter, ‘0’ - no compression"
+
+#: backend/kvs1025_opt.c:860
+#, no-c-format
+msgid "Rotate image clockwise"
+msgstr "Rotate image clockwise"
+
+#: backend/kvs1025_opt.c:862
+#, no-c-format
+msgid "Request driver to rotate pages by a fixed amount"
+msgstr "Request driver to rotate pages by a fixed amount"
+
+#: backend/kvs1025_opt.c:874
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally"
+msgstr "Request driver to rotate skewed pages digitally"
+
+#: backend/kvs1025_opt.c:883
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan"
+msgstr "Maximum diameter of lone dots to remove from scan"
+
+#: backend/kvs1025_opt.c:902
+#, no-c-format
+msgid "Software automatic cropping"
+msgstr "Software automatic cropping"
+
+#: backend/kvs1025_opt.c:904
+#, no-c-format
+msgid "Request driver to remove border from pages digitally"
+msgstr "Request driver to remove border from pages digitally"
+
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
+#, no-c-format
+msgid ""
+"Length Control Mode is a mode that the scanner reads up to the shorter "
+"length of actual paper or logical document length."
+msgstr ""
+"Length Control Mode is a mode that the scanner reads up to the shorter "
+"length of actual paper or logical document length."
+
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
+#, no-c-format
+msgid "Gamma correction"
+msgstr "Gamma correction"
+
+#: backend/kvs40xx_opt.c:117
+#, no-c-format
+msgid "wait_doc_hopper_up"
+msgstr "wait_doc_hopper_up"
+
+#: backend/kvs40xx_opt.c:127
+#, no-c-format
+msgid "A3"
+msgstr "A3"
+
+#: backend/kvs40xx_opt.c:132
+#, no-c-format
+msgid "Double letter 11x17 in"
+msgstr "Double letter 11x17 in"
+
+#: backend/kvs40xx_opt.c:133
+#, no-c-format
+msgid "B4"
+msgstr "B4"
+
+#: backend/kvs40xx_opt.c:231
+#, no-c-format
+msgid "High sensivity"
+msgstr "High sensivity"
+
+#: backend/kvs40xx_opt.c:232
+#, no-c-format
+msgid "Low sensivity"
+msgstr "Low sensivity"
+
+#: backend/kvs40xx_opt.c:243
+#, no-c-format
+msgid "err_diffusion"
+msgstr "err_diffusion"
+
+#: backend/kvs40xx_opt.c:249
+#, no-c-format
+msgid "No detection"
+msgstr "No detection"
+
+#: backend/kvs40xx_opt.c:250
+#, no-c-format
+msgid "Normal mode"
+msgstr "Normal mode"
+
+#: backend/kvs40xx_opt.c:251
+#, no-c-format
+msgid "Enhanced mode"
+msgstr "Enhanced mode"
+
+#: backend/kvs40xx_opt.c:405
+#, no-c-format
+msgid ""
+"Long Paper Mode is a mode that the scanner reads the image after it "
+"divides long paper by the length which is set in Document Size option."
+msgstr ""
+"Long Paper Mode is a mode that the scanner reads the image after it "
+"divides long paper by the length which is set in Document Size option."
+
+#: backend/kvs40xx_opt.c:449
+#, no-c-format
+msgid "Double feed detector sensitivity"
+msgstr "Double feed detector sensitivity"
+
+#: backend/kvs40xx_opt.c:450
+#, no-c-format
+msgid "Set the double feed detector sensitivity"
+msgstr "Set the double feed detector sensitivity"
+
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
+#, no-c-format
+msgid "Do not stop after double feed detection"
+msgstr "Do not stop after double feed detection"
+
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
+#, no-c-format
+msgid "Ignore left double feed sensor"
+msgstr "Ignore left double feed sensor"
+
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
+#, no-c-format
+msgid "Ignore center double feed sensor"
+msgstr "Ignore center double feed sensor"
+
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
+#, no-c-format
+msgid "Ignore right double feed sensor"
+msgstr "Ignore right double feed sensor"
+
+#: backend/kvs40xx_opt.c:642
+#, no-c-format
+msgid "Automatic threshold mode"
+msgstr "Automatic threshold mode"
+
+#: backend/kvs40xx_opt.c:643
+#, no-c-format
+msgid "Sets the automatic threshold mode"
+msgstr "Sets the automatic threshold mode"
+
+#: backend/kvs40xx_opt.c:694
+#, no-c-format
+msgid "Inverse image in B/W mode"
+msgstr "Inverse image in B/W mode"
+
+#: backend/kvs40xx_opt.c:715
+#, no-c-format
+msgid "JPEG compression"
+msgstr "JPEG compression"
+
+#: backend/kvs40xx_opt.c:718
+#, no-c-format
+msgid "JPEG compression (yours application must be able to uncompress)"
+msgstr "JPEG compression (yours application must be able to uncompress)"
+
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
+#, no-c-format
+msgid "Detect stapled document"
+msgstr "Detect stapled document"
+
+#: backend/kvs40xx_opt.c:776
+#, no-c-format
+msgid "chroma of red"
+msgstr "chroma of red"
+
+#: backend/kvs40xx_opt.c:777
+#, no-c-format
+msgid "Set chroma of red"
+msgstr "Set chroma of red"
+
+#: backend/kvs40xx_opt.c:787
+#, no-c-format
+msgid "chroma of blue"
+msgstr "chroma of blue"
+
+#: backend/kvs40xx_opt.c:788
+#, no-c-format
+msgid "Set chroma of blue"
+msgstr "Set chroma of blue"
+
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
+#, no-c-format
+msgid "Skew adjustment"
+msgstr "Skew adjustment"
+
+#: backend/kvs40xx_opt.c:808
+#, no-c-format
+msgid "Stop scanner when a paper have been skewed"
+msgstr "Stop scanner when a paper have been skewed"
+
+#: backend/kvs40xx_opt.c:809
+#, no-c-format
+msgid "Scanner will be stop  when a paper have been skewed"
+msgstr "Scanner will be stop  when a paper have been skewed"
+
+#: backend/kvs40xx_opt.c:816
+#, no-c-format
+msgid "Crop actual image area"
+msgstr "Crop actual image area"
+
+#: backend/kvs40xx_opt.c:817
+#, no-c-format
+msgid "Scanner automatically detect image area and crop it"
+msgstr "Scanner automatically detect image area and crop it"
+
+#: backend/kvs40xx_opt.c:827
+#, no-c-format
+msgid "It is right and left reversing"
+msgstr "It is right and left reversing"
+
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
+#, no-c-format
+msgid "Addition of space in top position"
+msgstr "Addition of space in top position"
+
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
+#, no-c-format
+msgid "Addition of space in bottom position"
+msgstr "Addition of space in bottom position"
+
+#: backend/leo.c:110
+#, no-c-format
+msgid "Diamond"
+msgstr "Diamond"
+
+#: backend/leo.c:111
+#, no-c-format
+msgid "8x8 Coarse Fatting"
+msgstr "8x8 Coarse Fatting"
+
+#: backend/leo.c:112
+#, no-c-format
+msgid "8x8 Fine Fatting"
+msgstr "8x8 Fine Fatting"
+
+#: backend/leo.c:113
+#, no-c-format
+msgid "8x8 Bayer"
+msgstr "8x8 Bayer"
+
+#: backend/leo.c:114
+#, no-c-format
+msgid "8x8 Vertical Line"
+msgstr "8x8 Vertical Line"
+
+#: backend/lexmark.c:273 backend/umax_pp.c:715
+#, no-c-format
+msgid "Gain"
+msgstr "Gain"
+
+#: backend/lexmark.c:274 backend/umax_pp.c:716
+#, no-c-format
+msgid "Color channels gain settings"
+msgstr "Color channels gain settings"
+
+#: backend/lexmark.c:283 backend/umax_pp.c:723
+#, no-c-format
+msgid "Gray gain"
+msgstr "Gray gain"
+
+#: backend/lexmark.c:284 backend/umax_pp.c:724
+#, no-c-format
+msgid "Sets gray channel gain"
+msgstr "Sets gray channel gain"
+
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
+#, no-c-format
+msgid "Red gain"
+msgstr "Red gain"
+
+#: backend/lexmark.c:298 backend/umax_pp.c:736
+#, no-c-format
+msgid "Sets red channel gain"
+msgstr "Sets red channel gain"
+
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
+#, no-c-format
+msgid "Green gain"
+msgstr "Green gain"
+
+#: backend/lexmark.c:312 backend/umax_pp.c:748
+#, no-c-format
+msgid "Sets green channel gain"
+msgstr "Sets green channel gain"
+
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
+#, no-c-format
+msgid "Blue gain"
+msgstr "Blue gain"
+
+#: backend/lexmark.c:326 backend/umax_pp.c:760
+#, no-c-format
+msgid "Sets blue channel gain"
+msgstr "Sets blue channel gain"
+
+#: backend/matsushita.c:139
+#, no-c-format
+msgid "Bayer Dither 16"
+msgstr "Bayer Dither 16"
+
+#: backend/matsushita.c:140
+#, no-c-format
+msgid "Bayer Dither 64"
+msgstr "Bayer Dither 64"
+
+#: backend/matsushita.c:141
+#, no-c-format
+msgid "Halftone Dot 32"
+msgstr "Halftone Dot 32"
+
+#: backend/matsushita.c:142
+#, no-c-format
+msgid "Halftone Dot 64"
+msgstr "Halftone Dot 64"
+
+#: backend/matsushita.c:143
+#, no-c-format
+msgid "Error Diffusion"
+msgstr "Error Diffusion"
+
+#: backend/matsushita.c:160
+#, no-c-format
+msgid "Mode 1"
+msgstr "Mode 1"
+
+#: backend/matsushita.c:161
+#, no-c-format
+msgid "Mode 2"
+msgstr "Mode 2"
+
+#: backend/matsushita.c:162
+#, no-c-format
+msgid "Mode 3"
+msgstr "Mode 3"
+
+#: backend/matsushita.c:176
+#, no-c-format
+msgid "From white stick"
+msgstr "From white stick"
+
+#: backend/matsushita.c:212
+#, no-c-format
+msgid "Smooth"
+msgstr "Smooth"
+
+#: backend/matsushita.c:214 backend/matsushita.c:229
+#, no-c-format
+msgid "Low"
+msgstr "Low"
+
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
+#, no-c-format
+msgid "Medium"
+msgstr "Medium"
+
+#: backend/matsushita.c:216 backend/matsushita.c:231
+#, no-c-format
+msgid "High"
+msgstr "High"
+
+#: backend/matsushita.c:245
+#, no-c-format
+msgid "CRT"
+msgstr "CRT"
+
+#: backend/matsushita.c:257
+#, no-c-format
+msgid "One page"
+msgstr "One page"
+
+#: backend/matsushita.c:258
+#, no-c-format
+msgid "All pages"
+msgstr "All pages"
+
+#: backend/matsushita.c:1034 backend/plustek.c:1333
+#, no-c-format
+msgid "sheetfed scanner"
+msgstr "sheetfed scanner"
+
+#: backend/matsushita.h:209
+#, no-c-format
+msgid "Grayscale 4 bits"
+msgstr "Grayscale 4 bits"
+
+#: backend/matsushita.h:210
+#, no-c-format
+msgid "Grayscale 8 bits"
+msgstr "Grayscale 8 bits"
+
+#: backend/microtek2.h:601
+#, no-c-format
+msgid "Shadow, midtone, highlight, exposure time"
+msgstr "Shadow, midtone, highlight, exposure time"
+
+#: backend/microtek2.h:603
+#, no-c-format
+msgid "Special options"
+msgstr "Special options"
+
+#: backend/microtek2.h:604
+#, no-c-format
+msgid "Color balance"
+msgstr "Color balance"
+
+#: backend/microtek2.h:607
+#, no-c-format
+msgid "Disable backtracking"
+msgstr "Disable backtracking"
+
+#: backend/microtek2.h:608
+#, no-c-format
+msgid "If checked the scanner does not perform backtracking"
+msgstr "If checked the scanner does not perform backtracking"
+
+#: backend/microtek2.h:612
+#, no-c-format
+msgid "Toggle lamp of flatbed"
+msgstr "Toggle lamp of flatbed"
+
+#: backend/microtek2.h:613
+#, no-c-format
+msgid "Toggles the lamp of the flatbed"
+msgstr "Toggles the lamp of the flatbed"
+
+#: backend/microtek2.h:616
+#, no-c-format
+msgid "Calibration by backend"
+msgstr "Calibration by backend"
+
+#: backend/microtek2.h:617
+#, no-c-format
+msgid ""
+"If checked the color calibration before a scan is done by the backend"
+msgstr ""
+"If checked the color calibration before a scan is done by the backend"
+
+#: backend/microtek2.h:621
+#, no-c-format
+msgid "Use the lightlid-35mm adapter"
+msgstr "Use the lightlid-35mm adapter"
+
+#: backend/microtek2.h:622
+#, no-c-format
+msgid "This option turns off the lamp of the flatbed during a scan"
+msgstr "This option turns off the lamp of the flatbed during a scan"
+
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
+#, no-c-format
+msgid "Quality scan"
+msgstr "Quality scan"
+
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
+#, no-c-format
+msgid "Highest quality but lower speed"
+msgstr "Highest quality but lower speed"
+
+#: backend/microtek2.h:630
+#, no-c-format
+msgid "Fast scan"
+msgstr "Fast scan"
+
+#: backend/microtek2.h:631
+#, no-c-format
+msgid "Highest speed but lower quality"
+msgstr "Highest speed but lower quality"
+
+#: backend/microtek2.h:634
+#, no-c-format
+msgid "Automatic adjustment of threshold"
+msgstr "Automatic adjustment of threshold"
+
+#: backend/microtek2.h:635
+#, no-c-format
+msgid ""
+"If checked the backend automatically tries to determine an optimal value "
+"for the threshold."
+msgstr ""
+"If checked the backend automatically tries to determine an optimal value "
+"for the threshold."
+
+#: backend/microtek2.h:641
+#, no-c-format
+msgid "Selects the gamma correction mode."
+msgstr "Selects the gamma correction mode."
+
+#: backend/microtek2.h:644
+#, no-c-format
+msgid "Bind gamma"
+msgstr "Bind gamma"
+
+#: backend/microtek2.h:645
+#, no-c-format
+msgid "Use same gamma values for all colour channels."
+msgstr "Use same gamma values for all colour channels."
+
+#: backend/microtek2.h:649
+#, no-c-format
+msgid "Scalar gamma"
+msgstr "Scalar gamma"
+
+#: backend/microtek2.h:650
+#, no-c-format
+msgid "Selects a value for scalar gamma correction."
+msgstr "Selects a value for scalar gamma correction."
+
+#: backend/microtek2.h:654
+#, no-c-format
+msgid "Scalar gamma red"
+msgstr "Scalar gamma red"
+
+#: backend/microtek2.h:655
+#, no-c-format
+msgid "Selects a value for scalar gamma correction (red channel)"
+msgstr "Selects a value for scalar gamma correction (red channel)"
+
+#: backend/microtek2.h:659
+#, no-c-format
+msgid "Scalar gamma green"
+msgstr "Scalar gamma green"
+
+#: backend/microtek2.h:660
+#, no-c-format
+msgid "Selects a value for scalar gamma correction (green channel)"
+msgstr "Selects a value for scalar gamma correction (green channel)"
+
+#: backend/microtek2.h:664
+#, no-c-format
+msgid "Scalar gamma blue"
+msgstr "Scalar gamma blue"
+
+#: backend/microtek2.h:665
+#, no-c-format
+msgid "Selects a value for scalar gamma correction (blue channel)"
+msgstr "Selects a value for scalar gamma correction (blue channel)"
+
+#: backend/microtek2.h:669
+#, no-c-format
+msgid "Channel"
+msgstr "Channel"
+
+#: backend/microtek2.h:670
+#, no-c-format
+msgid ""
+"Selects the colour band, \"Master\" means that all colours are affected."
+msgstr ""
+"Selects the colour band, “Master� means that all colours are "
+"affected."
+
+#: backend/microtek2.h:674
+#, no-c-format
+msgid "Midtone"
+msgstr "Midtone"
+
+#: backend/microtek2.h:675
+#, no-c-format
+msgid "Selects which radiance level should be considered \"50 % gray\"."
+msgstr ""
+"Selects which radiance level should be considered “50 % gray�."
+
+#: backend/microtek2.h:679
+#, no-c-format
+msgid "Midtone for red"
+msgstr "Midtone for red"
+
+#: backend/microtek2.h:680
+#, no-c-format
+msgid "Selects which radiance level should be considered \"50 % red\"."
+msgstr ""
+"Selects which radiance level should be considered “50 % red�."
+
+#: backend/microtek2.h:684
+#, no-c-format
+msgid "Midtone for green"
+msgstr "Midtone for green"
+
+#: backend/microtek2.h:685
+#, no-c-format
+msgid "Selects which radiance level should be considered \"50 % green\"."
+msgstr ""
+"Selects which radiance level should be considered “50 % green�."
+
+#: backend/microtek2.h:689
+#, no-c-format
+msgid "Midtone for blue"
+msgstr "Midtone for blue"
+
+#: backend/microtek2.h:690
+#, no-c-format
+msgid "Selects which radiance level should be considered \"50 % blue\"."
+msgstr ""
+"Selects which radiance level should be considered “50 % blue�."
+
+#: backend/microtek2.h:694
+#, no-c-format
+msgid "Red balance"
+msgstr "Red balance"
+
+#: backend/microtek2.h:695
+#, no-c-format
+msgid "Balance factor for red. A value of 100% means no correction."
+msgstr "Balance factor for red. A value of 100% means no correction."
+
+#: backend/microtek2.h:699
+#, no-c-format
+msgid "Green balance"
+msgstr "Green balance"
+
+#: backend/microtek2.h:700
+#, no-c-format
+msgid "Balance factor for green. A value of 100% means no correction."
+msgstr "Balance factor for green. A value of 100% means no correction."
+
+#: backend/microtek2.h:704
+#, no-c-format
+msgid "Blue balance"
+msgstr "Blue balance"
+
+#: backend/microtek2.h:705
+#, no-c-format
+msgid "Balance factor for blue. A value of 100% means no correction."
+msgstr "Balance factor for blue. A value of 100% means no correction."
+
+#: backend/microtek2.h:709
+#, no-c-format
+msgid "Firmware balance"
+msgstr "Firmware balance"
+
+#: backend/microtek2.h:710
+#, no-c-format
+msgid "Sets the color balance values to the firmware provided values."
+msgstr "Sets the color balance values to the firmware provided values."
+
+#: backend/mustek.c:149
+#, no-c-format
+msgid "Slowest"
+msgstr "Slowest"
+
+#: backend/mustek.c:149
+#, no-c-format
+msgid "Slower"
+msgstr "Slower"
+
+#: backend/mustek.c:150
+#, no-c-format
+msgid "Faster"
+msgstr "Faster"
+
+#: backend/mustek.c:150
+#, no-c-format
+msgid "Fastest"
+msgstr "Fastest"
+
+#: backend/mustek.c:177
+#, no-c-format
+msgid "8x8 coarse"
+msgstr "8x8 coarse"
+
+#: backend/mustek.c:177
+#, no-c-format
+msgid "8x8 normal"
+msgstr "8x8 normal"
+
+#: backend/mustek.c:177
+#, no-c-format
+msgid "8x8 fine"
+msgstr "8x8 fine"
+
+#: backend/mustek.c:178
+#, no-c-format
+msgid "8x8 very fine"
+msgstr "8x8 very fine"
+
+#: backend/mustek.c:178
+#, no-c-format
+msgid "6x6 normal"
+msgstr "6x6 normal"
+
+#: backend/mustek.c:179
+#, no-c-format
+msgid "5x5 coarse"
+msgstr "5x5 coarse"
+
+#: backend/mustek.c:179
+#, no-c-format
+msgid "5x5 fine"
+msgstr "5x5 fine"
+
+#: backend/mustek.c:179
+#, no-c-format
+msgid "4x4 coarse"
+msgstr "4x4 coarse"
+
+#: backend/mustek.c:180
+#, no-c-format
+msgid "4x4 normal"
+msgstr "4x4 normal"
+
+#: backend/mustek.c:180
+#, no-c-format
+msgid "4x4 fine"
+msgstr "4x4 fine"
+
+#: backend/mustek.c:180
+#, no-c-format
+msgid "3x3 normal"
+msgstr "3x3 normal"
+
+#: backend/mustek.c:181
+#, no-c-format
+msgid "2x2 normal"
+msgstr "2x2 normal"
+
+#: backend/mustek.c:181
+#, no-c-format
+msgid "8x8 custom"
+msgstr "8x8 custom"
+
+#: backend/mustek.c:182
+#, no-c-format
+msgid "6x6 custom"
+msgstr "6x6 custom"
+
+#: backend/mustek.c:183
+#, no-c-format
+msgid "5x5 custom"
+msgstr "5x5 custom"
+
+#: backend/mustek.c:183
+#, no-c-format
+msgid "4x4 custom"
+msgstr "4x4 custom"
+
+#: backend/mustek.c:184
+#, no-c-format
+msgid "3x3 custom"
+msgstr "3x3 custom"
+
+#: backend/mustek.c:185
+#, no-c-format
+msgid "2x2 custom"
+msgstr "2x2 custom"
+
+#: backend/mustek.c:4235
+#, no-c-format
+msgid "Fast gray mode"
+msgstr "Fast gray mode"
+
+#: backend/mustek.c:4236
+#, no-c-format
+msgid "Scan in fast gray mode (lower quality)."
+msgstr "Scan in fast gray mode (lower quality)."
+
+#: backend/mustek.c:4333
+#, no-c-format
+msgid ""
+"Request that all previews are done in the fastest (low-quality) mode. "
+"This may be a non-color mode or a low resolution mode."
+msgstr ""
+"Request that all previews are done in the fastest (low-quality) mode. "
+"This may be a non-color mode or a low resolution mode."
+
+#: backend/mustek.c:4341
+#, no-c-format
+msgid "Lamp off time (minutes)"
+msgstr "Lamp off time (minutes)"
+
+#: backend/mustek.c:4342
+#, no-c-format
+msgid "Set the time (in minutes) after which the lamp is shut off."
+msgstr "Set the time (in minutes) after which the lamp is shut off."
+
+#: backend/mustek.c:4353
+#, no-c-format
+msgid "Turn lamp off"
+msgstr "Turn lamp off"
+
+#: backend/mustek.c:4354
+#, no-c-format
+msgid "Turns the lamp off immediately."
+msgstr "Turns the lamp off immediately."
+
+#: backend/mustek.c:4431
+#, no-c-format
+msgid "Red brightness"
+msgstr "Red brightness"
+
+#: backend/mustek.c:4432
+#, no-c-format
+msgid "Controls the brightness of the red channel of the acquired image."
+msgstr "Controls the brightness of the red channel of the acquired image."
+
+#: backend/mustek.c:4444
+#, no-c-format
+msgid "Green brightness"
+msgstr "Green brightness"
+
+#: backend/mustek.c:4445
+#, no-c-format
+msgid "Controls the brightness of the green channel of the acquired image."
+msgstr ""
+"Controls the brightness of the green channel of the acquired image."
+
+#: backend/mustek.c:4457
+#, no-c-format
+msgid "Blue brightness"
+msgstr "Blue brightness"
+
+#: backend/mustek.c:4458
+#, no-c-format
+msgid "Controls the brightness of the blue channel of the acquired image."
+msgstr "Controls the brightness of the blue channel of the acquired image."
+
+#: backend/mustek.c:4483
+#, no-c-format
+msgid "Contrast red channel"
+msgstr "Contrast red channel"
+
+#: backend/mustek.c:4484
+#, no-c-format
+msgid "Controls the contrast of the red channel of the acquired image."
+msgstr "Controls the contrast of the red channel of the acquired image."
+
+#: backend/mustek.c:4496
+#, no-c-format
+msgid "Contrast green channel"
+msgstr "Contrast green channel"
+
+#: backend/mustek.c:4497
+#, no-c-format
+msgid "Controls the contrast of the green channel of the acquired image."
+msgstr "Controls the contrast of the green channel of the acquired image."
+
+#: backend/mustek.c:4509
+#, no-c-format
+msgid "Contrast blue channel"
+msgstr "Contrast blue channel"
+
+#: backend/mustek.c:4510
+#, no-c-format
+msgid "Controls the contrast of the blue channel of the acquired image."
+msgstr "Controls the contrast of the blue channel of the acquired image."
+
+#: backend/mustek_usb2.c:105
+#, no-c-format
+msgid "Color48"
+msgstr "Color48"
+
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
+#, no-c-format
+msgid "Color24"
+msgstr "Color24"
+
+#: backend/mustek_usb2.c:107
+#, no-c-format
+msgid "Gray16"
+msgstr "Gray16"
+
+#: backend/mustek_usb2.c:108
+#, no-c-format
+msgid "Gray8"
+msgstr "Gray8"
+
+#: backend/mustek_usb2.c:119
+#, no-c-format
+msgid "Reflective"
+msgstr "Reflective"
+
+#: backend/mustek_usb2.c:120
+#, no-c-format
+msgid "Positive"
+msgstr "Positive"
+
+#: backend/mustek_usb2.c:421
+#, no-c-format
+msgid ""
+"Warm-up until the lamp's brightness is constant instead of insisting on "
+"40 seconds warm-up time."
+msgstr ""
+"Warm-up until the lamp's brightness is constant instead of insisting on "
+"40 seconds warm-up time."
+
+#: backend/pixma.c:378
+#, no-c-format
+msgid "Negative color"
+msgstr "Negative color"
+
+#: backend/pixma.c:383
+#, no-c-format
+msgid "Negative gray"
+msgstr "Negative gray"
+
+#: backend/pixma.c:396
+#, no-c-format
+msgid "48 bits color"
+msgstr "48 bits color"
+
+#: backend/pixma.c:401
+#, no-c-format
+msgid "16 bits gray"
+msgstr "16 bits gray"
+
+#: backend/pixma_sane_options.c:84
+#, no-c-format
+msgid ""
+"Selects the scan source (such as a document-feeder). Set source before "
+"mode and resolution. Resets mode and resolution to auto values."
+msgstr ""
+"Selects the scan source (such as a document-feeder). Set source before "
+"mode and resolution. Resets mode and resolution to auto values."
+
+#: backend/pixma_sane_options.c:98
+#, no-c-format
+msgid "Button-controlled scan"
+msgstr "Button-controlled scan"
+
+#: backend/pixma_sane_options.c:99
+#, no-c-format
+msgid ""
+"When enabled, scan process will not start immediately. To proceed, press "
+"\"SCAN\" button (for MP150) or \"COLOR\" button (for other models). To "
+"cancel, press \"GRAY\" button."
+msgstr ""
+"When enabled, scan process will not start immediately. To proceed, press "
+"“SCAN� button (for MP150) or “COLOR� button (for other "
+"models). To cancel, press “GRAY� button."
+
+#: backend/pixma_sane_options.c:232
+#, no-c-format
+msgid "Update button state"
+msgstr "Update button state"
+
+#: backend/pixma_sane_options.c:244
+#, no-c-format
+msgid "Button 1"
+msgstr "Button 1"
+
+#: backend/pixma_sane_options.c:258
+#, no-c-format
+msgid "Button 2"
+msgstr "Button 2"
+
+#: backend/pixma_sane_options.c:272
+#, no-c-format
+msgid "Type of original to scan"
+msgstr "Type of original to scan"
+
+#: backend/pixma_sane_options.c:286
+#, no-c-format
+msgid "Target operation type"
+msgstr "Target operation type"
+
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr "ADF Waiting Time"
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
+#, no-c-format
+msgid "Transparency"
+msgstr "Transparency"
+
+#: backend/plustek.c:913
+#, no-c-format
+msgid "Device-Settings"
+msgstr "Device-Settings"
+
+#: backend/plustek.c:920
+#, no-c-format
+msgid "Lampswitch"
+msgstr "Lampswitch"
+
+#: backend/plustek.c:921
+#, no-c-format
+msgid "Manually switching the lamp(s)."
+msgstr "Manually switching the lamp(s)."
+
+#: backend/plustek.c:926
+#, no-c-format
+msgid "Lamp off during dark calibration"
+msgstr "Lamp off during dark calibration"
+
+#: backend/plustek.c:927
+#, no-c-format
+msgid "Always switches lamp off when doing dark calibration."
+msgstr "Always switches lamp off when doing dark calibration."
+
+#: backend/plustek.c:935
+#, no-c-format
+msgid "Calibration data cache"
+msgstr "Calibration data cache"
+
+#: backend/plustek.c:936
+#, no-c-format
+msgid "Enables or disables calibration data cache."
+msgstr "Enables or disables calibration data cache."
+
+#: backend/plustek.c:942
+#, no-c-format
+msgid "Performs calibration"
+msgstr "Performs calibration"
+
+#: backend/plustek.c:959
+#, no-c-format
+msgid "Speedup sensor"
+msgstr "Speedup sensor"
+
+#: backend/plustek.c:960
+#, no-c-format
+msgid "Enables or disables speeding up sensor movement."
+msgstr "Enables or disables speeding up sensor movement."
+
+#: backend/plustek.c:974
+#, no-c-format
+msgid "Warmup-time"
+msgstr "Warmup-time"
+
+#: backend/plustek.c:975
+#, no-c-format
+msgid "Warmup-time in seconds."
+msgstr "Warmup-time in seconds."
+
+#: backend/plustek.c:987
+#, no-c-format
+msgid "Lampoff-time"
+msgstr "Lampoff-time"
+
+#: backend/plustek.c:988
+#, no-c-format
+msgid "Lampoff-time in seconds."
+msgstr "Lampoff-time in seconds."
+
+#: backend/plustek.c:995
+#, no-c-format
+msgid "Analog frontend"
+msgstr "Analog frontend"
+
+#: backend/plustek.c:1002
+#, no-c-format
+msgid "Red gain value of the AFE"
+msgstr "Red gain value of the AFE"
+
+#: backend/plustek.c:1009 backend/umax_pp.c:792
+#, no-c-format
+msgid "Red offset"
+msgstr "Red offset"
+
+#: backend/plustek.c:1010
+#, no-c-format
+msgid "Red offset value of the AFE"
+msgstr "Red offset value of the AFE"
+
+#: backend/plustek.c:1018
+#, no-c-format
+msgid "Green gain value of the AFE"
+msgstr "Green gain value of the AFE"
+
+#: backend/plustek.c:1026
+#, no-c-format
+msgid "Green offset value of the AFE"
+msgstr "Green offset value of the AFE"
+
+#: backend/plustek.c:1034
+#, no-c-format
+msgid "Blue gain value of the AFE"
+msgstr "Blue gain value of the AFE"
+
+#: backend/plustek.c:1042
+#, no-c-format
+msgid "Blue offset value of the AFE"
+msgstr "Blue offset value of the AFE"
+
+#: backend/plustek.c:1049
+#, no-c-format
+msgid "Red lamp off"
+msgstr "Red lamp off"
+
+#: backend/plustek.c:1050
+#, no-c-format
+msgid "Defines red lamp off parameter"
+msgstr "Defines red lamp off parameter"
+
+#: backend/plustek.c:1057
+#, no-c-format
+msgid "Green lamp off"
+msgstr "Green lamp off"
+
+#: backend/plustek.c:1058
+#, no-c-format
+msgid "Defines green lamp off parameter"
+msgstr "Defines green lamp off parameter"
+
+#: backend/plustek.c:1065
+#, no-c-format
+msgid "Blue lamp off"
+msgstr "Blue lamp off"
+
+#: backend/plustek.c:1066
+#, no-c-format
+msgid "Defines blue lamp off parameter"
+msgstr "Defines blue lamp off parameter"
+
+#: backend/plustek.c:1096
+#, no-c-format
+msgid "This option reflects the status of the scanner buttons."
+msgstr "This option reflects the status of the scanner buttons."
+
+#: backend/plustek_pp.c:197
+#, no-c-format
+msgid "Color36"
+msgstr "Color36"
+
+#: backend/plustek_pp.c:211
+#, no-c-format
+msgid "Dithermap 1"
+msgstr "Dithermap 1"
+
+#: backend/plustek_pp.c:212
+#, no-c-format
+msgid "Dithermap 2"
+msgstr "Dithermap 2"
+
+#: backend/plustek_pp.c:213
+#, no-c-format
+msgid "Randomize"
+msgstr "Randomize"
+
+#: backend/pnm.c:168
+#, no-c-format
+msgid "Source Selection"
+msgstr "Source Selection"
+
+#: backend/pnm.c:205
+#, no-c-format
+msgid "Image Enhancement"
+msgstr "Image Enhancement"
+
+#: backend/pnm.c:241
+#, no-c-format
+msgid "Grayify"
+msgstr "Grayify"
+
+#: backend/pnm.c:242
+#, no-c-format
+msgid "Load the image as grayscale."
+msgstr "Load the image as grayscale."
+
+#: backend/pnm.c:253
+#, no-c-format
+msgid "Three-Pass Simulation"
+msgstr "Three-Pass Simulation"
+
+#: backend/pnm.c:255
+#, no-c-format
+msgid ""
+"Simulate a three-pass scanner by returning 3 separate frames.  For "
+"kicks, it returns green, then blue, then red."
+msgstr ""
+"Simulate a three-pass scanner by returning 3 separate frames.  For "
+"kicks, it returns green, then blue, then red."
+
+#: backend/pnm.c:267
+#, no-c-format
+msgid "Hand-Scanner Simulation"
+msgstr "Hand-Scanner Simulation"
+
+#: backend/pnm.c:268
+#, no-c-format
+msgid ""
+"Simulate a hand-scanner.  Hand-scanners often do not know the image "
+"height a priori.  Instead, they return a height of -1.  Setting this "
+"option allows one to test whether a frontend can handle this correctly."
+msgstr ""
+"Simulate a hand-scanner.  Hand-scanners often do not know the image "
+"height a priori.  Instead, they return a height of -1.  Setting this "
+"option allows one to test whether a frontend can handle this correctly."
+
+#: backend/pnm.c:283
+#, no-c-format
+msgid ""
+"Set default values for enhancement controls (brightness & contrast)."
+msgstr ""
+"Set default values for enhancement controls (brightness & contrast)."
+
+#: backend/pnm.c:295
+#, no-c-format
+msgid "Read only test-option"
+msgstr "Read only test-option"
+
+#: backend/pnm.c:296
+#, no-c-format
+msgid "Let's see whether frontends can treat this right"
+msgstr "Let's see whether frontends can treat this right"
+
+#: backend/pnm.c:307
+#, no-c-format
+msgid "Gamma Tables"
+msgstr "Gamma Tables"
+
+#: backend/pnm.c:379
+#, no-c-format
+msgid "Status Code Simulation"
+msgstr "Status Code Simulation"
+
+#: backend/pnm.c:391
+#, no-c-format
+msgid "Do not force status code"
+msgstr "Do not force status code"
+
+#: backend/pnm.c:392
+#, no-c-format
+msgid "Do not force the backend to return a status code."
+msgstr "Do not force the backend to return a status code."
+
+#: backend/pnm.c:403
+#, no-c-format
+msgid "Return SANE_STATUS_EOF"
+msgstr "Return SANE_STATUS_EOF"
+
+#: backend/pnm.c:404
+#, no-c-format
+msgid ""
+"Force the backend to return the status code SANE_STATUS_EOF after "
+"sane_read() has been called."
+msgstr ""
+"Force the backend to return the status code SANE_STATUS_EOF after "
+"sane_read() has been called."
+
+#: backend/pnm.c:416
+#, no-c-format
+msgid "Return SANE_STATUS_JAMMED"
+msgstr "Return SANE_STATUS_JAMMED"
+
+#: backend/pnm.c:418
+#, no-c-format
+msgid ""
+"Force the backend to return the status code SANE_STATUS_JAMMED after "
+"sane_read() has been called."
+msgstr ""
+"Force the backend to return the status code SANE_STATUS_JAMMED after "
+"sane_read() has been called."
+
+#: backend/pnm.c:430
+#, no-c-format
+msgid "Return SANE_STATUS_NO_DOCS"
+msgstr "Return SANE_STATUS_NO_DOCS"
+
+#: backend/pnm.c:431
+#, no-c-format
+msgid ""
+"Force the backend to return the status code SANE_STATUS_NO_DOCS after "
+"sane_read() has been called."
+msgstr ""
+"Force the backend to return the status code SANE_STATUS_NO_DOCS after "
+"sane_read() has been called."
+
+#: backend/pnm.c:443
+#, no-c-format
+msgid "Return SANE_STATUS_COVER_OPEN"
+msgstr "Return SANE_STATUS_COVER_OPEN"
+
+#: backend/pnm.c:444
+#, no-c-format
+msgid ""
+"Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
+"sane_read() has been called."
+msgstr ""
+"Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
+"sane_read() has been called."
+
+#: backend/pnm.c:456
+#, no-c-format
+msgid "Return SANE_STATUS_IO_ERROR"
+msgstr "Return SANE_STATUS_IO_ERROR"
+
+#: backend/pnm.c:457
+#, no-c-format
+msgid ""
+"Force the backend to return the status code SANE_STATUS_IO_ERROR after "
+"sane_read() has been called."
+msgstr ""
+"Force the backend to return the status code SANE_STATUS_IO_ERROR after "
+"sane_read() has been called."
+
+#: backend/pnm.c:469
+#, no-c-format
+msgid "Return SANE_STATUS_NO_MEM"
+msgstr "Return SANE_STATUS_NO_MEM"
+
+#: backend/pnm.c:471
+#, no-c-format
+msgid ""
+"Force the backend to return the status code SANE_STATUS_NO_MEM after "
+"sane_read() has been called."
+msgstr ""
+"Force the backend to return the status code SANE_STATUS_NO_MEM after "
+"sane_read() has been called."
+
+#: backend/pnm.c:483
+#, no-c-format
+msgid "Return SANE_STATUS_ACCESS_DENIED"
+msgstr "Return SANE_STATUS_ACCESS_DENIED"
+
+#: backend/pnm.c:484
+#, no-c-format
+msgid ""
+"Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
+"after sane_read() has been called."
+msgstr ""
+"Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
+"after sane_read() has been called."
+
+#: backend/rts8891.c:2809
+#, no-c-format
+msgid "This option reflects the status of a scanner button."
+msgstr "This option reflects the status of a scanner button."
+
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
+#, no-c-format
+msgid "Lamp on"
+msgstr "Lamp on"
+
+#: backend/rts8891.c:2841 backend/umax.c:5796
+#, no-c-format
+msgid "Turn on scanner lamp"
+msgstr "Turn on scanner lamp"
+
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
+#, no-c-format
+msgid "Lamp off"
+msgstr "Lamp off"
+
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
+#, no-c-format
+msgid "Turn off scanner lamp"
+msgstr "Turn off scanner lamp"
+
+#: backend/sm3840.c:760
+#, no-c-format
+msgid "Lamp timeout"
+msgstr "Lamp timeout"
+
+#: backend/sm3840.c:762
+#, no-c-format
+msgid "Minutes until lamp is turned off after scan"
+msgstr "Minutes until lamp is turned off after scan"
+
+#: backend/sm3840.c:772
+#, no-c-format
+msgid "Threshold value for lineart mode"
+msgstr "Threshold value for lineart mode"
+
+#: backend/snapscan-options.c:88
+#, no-c-format
+msgid "Document Feeder"
+msgstr "Document Feeder"
+
+#: backend/snapscan-options.c:92
+#, no-c-format
+msgid "6x4 (inch)"
+msgstr "6x4 (inch)"
+
+#: backend/snapscan-options.c:93
+#, no-c-format
+msgid "8x10 (inch)"
+msgstr "8x10 (inch)"
+
+#: backend/snapscan-options.c:94
+#, no-c-format
+msgid "8.5x11 (inch)"
+msgstr "8.5x11 (inch)"
+
+#: backend/snapscan-options.c:97
+#, no-c-format
+msgid "Halftoning Unsupported"
+msgstr "Halftoning Unsupported"
+
+#: backend/snapscan-options.c:98
+#, no-c-format
+msgid "DispersedDot8x8"
+msgstr "DispersedDot8x8"
+
+#: backend/snapscan-options.c:99
+#, no-c-format
+msgid "DispersedDot16x16"
+msgstr "DispersedDot16x16"
+
+#: backend/snapscan-options.c:103
+#, no-c-format
+msgid ""
+"Number of scan lines to request in a SCSI read. Changing this parameter "
+"allows you to tune the speed at which data is read from the scanner "
+"during scans. If this is set too low, the scanner will have to stop "
+"periodically in the middle of a scan; if it's set too high, X-based "
+"frontends may stop responding to X events and your system could bog down."
+msgstr ""
+"Number of scan lines to request in a SCSI read. Changing this parameter "
+"allows you to tune the speed at which data is read from the scanner "
+"during scans. If this is set too low, the scanner will have to stop "
+"periodically in the middle of a scan; if it's set too high, X-based "
+"frontends may stop responding to X events and your system could bog down."
+
+#: backend/snapscan-options.c:111
+#, no-c-format
+msgid "Frame number of media holder that should be scanned."
+msgstr "Frame number of media holder that should be scanned."
+
+#: backend/snapscan-options.c:114
+#, no-c-format
+msgid "Use manual or automatic selection of focus point."
+msgstr "Use manual or automatic selection of focus point."
+
+#: backend/snapscan-options.c:117
+#, no-c-format
+msgid "Focus point for scanning."
+msgstr "Focus point for scanning."
+
+#: backend/snapscan-options.c:482
+#, no-c-format
+msgid "Preview mode"
+msgstr "Preview mode"
+
+#: backend/snapscan-options.c:484
+#, no-c-format
+msgid ""
+"Select the mode for previews. Greyscale previews usually give the best "
+"combination of speed and detail."
+msgstr ""
+"Select the mode for previews. Greyscale previews usually give the best "
+"combination of speed and detail."
+
+#: backend/snapscan-options.c:601
+#, no-c-format
+msgid "Predefined settings"
+msgstr "Predefined settings"
+
+#: backend/snapscan-options.c:603
+#, no-c-format
+msgid ""
+"Provides standard scanning areas for photographs, printed pages and the "
+"like."
+msgstr ""
+"Provides standard scanning areas for photographs, printed pages and the "
+"like."
+
+#: backend/snapscan-options.c:884
+#, no-c-format
+msgid "Frame"
+msgstr "Frame"
+
+#: backend/snapscan-options.c:885
+#, no-c-format
+msgid "Frame to be scanned"
+msgstr "Frame to be scanned"
+
+#: backend/snapscan-options.c:897
+#, no-c-format
+msgid "Focus-mode"
+msgstr "Focus-mode"
+
+#: backend/snapscan-options.c:898
+#, no-c-format
+msgid "Auto or manual focus"
+msgstr "Auto or manual focus"
+
+#: backend/snapscan-options.c:911
+#, no-c-format
+msgid "Focus-point"
+msgstr "Focus-point"
+
+#: backend/snapscan-options.c:912
+#, no-c-format
+msgid "Focus point"
+msgstr "Focus point"
+
+#: backend/snapscan-options.c:930
+#, no-c-format
+msgid "Colour lines per read"
+msgstr "Colour lines per read"
+
+#: backend/snapscan-options.c:942
+#, no-c-format
+msgid "Greyscale lines per read"
+msgstr "Greyscale lines per read"
+
+#: backend/stv680.c:974
+#, no-c-format
+msgid "webcam"
+msgstr "webcam"
+
+#: backend/stv680.h:115
+#, no-c-format
+msgid "Color RAW"
+msgstr "Color RAW"
+
+#: backend/stv680.h:116
+#, no-c-format
+msgid "Color RGB"
+msgstr "Color RGB"
+
+#: backend/stv680.h:117
+#, no-c-format
+msgid "Color RGB TEXT"
+msgstr "Color RGB TEXT"
+
+#: backend/test.c:137
+#, no-c-format
+msgid "Solid black"
+msgstr "Solid black"
+
+#: backend/test.c:137
+#, no-c-format
+msgid "Solid white"
+msgstr "Solid white"
+
+#: backend/test.c:138
+#, no-c-format
+msgid "Color pattern"
+msgstr "Color pattern"
+
+#: backend/test.c:138
+#, no-c-format
+msgid "Grid"
+msgstr "Grid"
+
+#: backend/test.c:163 backend/test.c:171
+#, no-c-format
+msgid "First entry"
+msgstr "First entry"
+
+#: backend/test.c:163 backend/test.c:171
+#, no-c-format
+msgid "Second entry"
+msgstr "Second entry"
+
+#: backend/test.c:165
+#, no-c-format
+msgid ""
+"This is the very long third entry. Maybe the frontend has an idea how to "
+"display it"
+msgstr ""
+"This is the very long third entry. Maybe the frontend has an idea how to "
+"display it"
+
+#: backend/test.c:348
+#, no-c-format
+msgid "Hand-scanner simulation"
+msgstr "Hand-scanner simulation"
+
+#: backend/test.c:349
+#, no-c-format
+msgid ""
+"Simulate a hand-scanner.  Hand-scanners do not know the image height a "
+"priori.  Instead, they return a height of -1.  Setting this option "
+"allows one to test whether a frontend can handle this correctly.  This "
+"option also enables a fixed width of 11 cm."
+msgstr ""
+"Simulate a hand-scanner.  Hand-scanners do not know the image height a "
+"priori.  Instead, they return a height of -1.  Setting this option "
+"allows one to test whether a frontend can handle this correctly.  This "
+"option also enables a fixed width of 11 cm."
+
+#: backend/test.c:366
+#, no-c-format
+msgid "Three-pass simulation"
+msgstr "Three-pass simulation"
+
+#: backend/test.c:367
+#, no-c-format
+msgid ""
+"Simulate a three-pass scanner. In color mode, three frames are "
+"transmitted."
+msgstr ""
+"Simulate a three-pass scanner. In color mode, three frames are "
+"transmitted."
+
+#: backend/test.c:382
+#, no-c-format
+msgid "Set the order of frames"
+msgstr "Set the order of frames"
+
+#: backend/test.c:383
+#, no-c-format
+msgid "Set the order of frames in three-pass color mode."
+msgstr "Set the order of frames in three-pass color mode."
+
+#: backend/test.c:416
+#, no-c-format
+msgid ""
+"If Automatic Document Feeder is selected, the feeder will be 'empty' "
+"after 10 scans."
+msgstr ""
+"If Automatic Document Feeder is selected, the feeder will be "
+"‘empty’ after 10 scans."
+
+#: backend/test.c:431
+#, no-c-format
+msgid "Special Options"
+msgstr "Special Options"
+
+#: backend/test.c:444
+#, no-c-format
+msgid "Select the test picture"
+msgstr "Select the test picture"
+
+#: backend/test.c:446
+#, no-c-format
+msgid ""
+"Select the kind of test picture. Available options:\n"
+"Solid black: fills the whole scan with black.\n"
+"Solid white: fills the whole scan with white.\n"
+"Color pattern: draws various color test patterns depending on the mode.\n"
+"Grid: draws a black/white grid with a width and height of 10 mm per "
+"square."
+msgstr ""
+"Select the kind of test picture. Available options:\n"
+"Solid black: fills the whole scan with black.\n"
+"Solid white: fills the whole scan with white.\n"
+"Color pattern: draws various color test patterns depending on the mode.\n"
+"Grid: draws a black/white grid with a width and height of 10 mm per "
+"square."
+
+#: backend/test.c:467
+#, no-c-format
+msgid "Invert endianness"
+msgstr "Invert endianness"
+
+#: backend/test.c:468
+#, no-c-format
+msgid ""
+"Exchange upper and lower byte of image data in 16 bit modes. This option "
+"can be used to test the 16 bit modes of frontends, e.g. if the frontend "
+"uses the correct endianness."
+msgstr ""
+"Exchange upper and lower byte of image data in 16 bit modes. This option "
+"can be used to test the 16 bit modes of frontends, e.g. if the frontend "
+"uses the correct endianness."
+
+#: backend/test.c:484
+#, no-c-format
+msgid "Read limit"
+msgstr "Read limit"
+
+#: backend/test.c:485
+#, no-c-format
+msgid "Limit the amount of data transferred with each call to sane_read()."
+msgstr ""
+"Limit the amount of data transferred with each call to sane_read()."
+
+#: backend/test.c:498
+#, no-c-format
+msgid "Size of read-limit"
+msgstr "Size of read-limit"
+
+#: backend/test.c:499
+#, no-c-format
+msgid ""
+"The (maximum) amount of data transferred with each call to sane_read()."
+msgstr ""
+"The (maximum) amount of data transferred with each call to sane_read()."
+
+#: backend/test.c:514
+#, no-c-format
+msgid "Read delay"
+msgstr "Read delay"
+
+#: backend/test.c:515
+#, no-c-format
+msgid "Delay the transfer of data to the pipe."
+msgstr "Delay the transfer of data to the pipe."
+
+#: backend/test.c:527
+#, no-c-format
+msgid "Duration of read-delay"
+msgstr "Duration of read-delay"
+
+#: backend/test.c:528
+#, no-c-format
+msgid ""
+"How long to wait after transferring each buffer of data through the pipe."
+msgstr ""
+"How long to wait after transferring each buffer of data through the pipe."
+
+#: backend/test.c:543
+#, no-c-format
+msgid "Return-value of sane_read"
+msgstr "Return-value of sane_read"
+
+#: backend/test.c:545
+#, no-c-format
+msgid ""
+"Select the return-value of sane_read(). \"Default\" is the normal "
+"handling for scanning. All other status codes are for testing how the "
+"frontend handles them."
+msgstr ""
+"Select the return-value of sane_read(). “Default� is the normal "
+"handling for scanning. All other status codes are for testing how the "
+"frontend handles them."
+
+#: backend/test.c:562
+#, no-c-format
+msgid "Loss of pixels per line"
+msgstr "Loss of pixels per line"
+
+#: backend/test.c:564
+#, no-c-format
+msgid "The number of pixels that are wasted at the end of each line."
+msgstr "The number of pixels that are wasted at the end of each line."
+
+#: backend/test.c:577
+#, no-c-format
+msgid "Fuzzy parameters"
+msgstr "Fuzzy parameters"
+
+#: backend/test.c:578
+#, no-c-format
+msgid ""
+"Return fuzzy lines and bytes per line when sane_parameters() is called "
+"before sane_start()."
+msgstr ""
+"Return fuzzy lines and bytes per line when sane_parameters() is called "
+"before sane_start()."
+
+#: backend/test.c:591
+#, no-c-format
+msgid "Use non-blocking IO"
+msgstr "Use non-blocking IO"
+
+#: backend/test.c:592
+#, no-c-format
+msgid "Use non-blocking IO for sane_read() if supported by the frontend."
+msgstr "Use non-blocking IO for sane_read() if supported by the frontend."
+
+#: backend/test.c:605
+#, no-c-format
+msgid "Offer select file descriptor"
+msgstr "Offer select file descriptor"
+
+#: backend/test.c:606
+#, no-c-format
+msgid ""
+"Offer a select filedescriptor for detecting if sane_read() will return "
+"data."
+msgstr ""
+"Offer a select filedescriptor for detecting if sane_read() will return "
+"data."
+
+#: backend/test.c:619
+#, no-c-format
+msgid "Enable test options"
+msgstr "Enable test options"
+
+#: backend/test.c:620
+#, no-c-format
+msgid ""
+"Enable various test options. This is for testing the ability of "
+"frontends to view and modify all the different SANE option types."
+msgstr ""
+"Enable various test options. This is for testing the ability of "
+"frontends to view and modify all the different SANE option types."
+
+#: backend/test.c:634
+#, no-c-format
+msgid "Print options"
+msgstr "Print options"
+
+#: backend/test.c:635
+#, no-c-format
+msgid "Print a list of all options."
+msgstr "Print a list of all options."
+
+#: backend/test.c:712
+#, no-c-format
+msgid "Bool test options"
+msgstr "Bool test options"
+
+#: backend/test.c:725
+#, no-c-format
+msgid "(1/6) Bool soft select soft detect"
+msgstr "(1/6) Bool soft select soft detect"
+
+#: backend/test.c:727
+#, no-c-format
+msgid ""
+"(1/6) Bool test option that has soft select and soft detect (and "
+"advanced) capabilities. That's just a normal bool option."
+msgstr ""
+"(1/6) Bool test option that has soft select and soft detect (and "
+"advanced) capabilities. That's just a normal bool option."
+
+#: backend/test.c:743
+#, no-c-format
+msgid "(2/6) Bool hard select soft detect"
+msgstr "(2/6) Bool hard select soft detect"
+
+#: backend/test.c:745
+#, no-c-format
+msgid ""
+"(2/6) Bool test option that has hard select and soft detect (and "
+"advanced) capabilities. That means the option can't be set by the "
+"frontend but by the user (e.g. by pressing a button at the device)."
+msgstr ""
+"(2/6) Bool test option that has hard select and soft detect (and "
+"advanced) capabilities. That means the option can't be set by the "
+"frontend but by the user (e.g. by pressing a button at the device)."
+
+#: backend/test.c:762
+#, no-c-format
+msgid "(3/6) Bool hard select"
+msgstr "(3/6) Bool hard select"
+
+#: backend/test.c:763
+#, no-c-format
+msgid ""
+"(3/6) Bool test option that has hard select (and advanced) capabilities. "
+"That means the option can't be set by the frontend but by the user (e.g. "
+"by pressing a button at the device) and can't be read by the frontend."
+msgstr ""
+"(3/6) Bool test option that has hard select (and advanced) capabilities. "
+"That means the option can't be set by the frontend but by the user (e.g. "
+"by pressing a button at the device) and can't be read by the frontend."
+
+#: backend/test.c:781
+#, no-c-format
+msgid "(4/6) Bool soft detect"
+msgstr "(4/6) Bool soft detect"
+
+#: backend/test.c:782
+#, no-c-format
+msgid ""
+"(4/6) Bool test option that has soft detect (and advanced) capabilities. "
+"That means the option is read-only."
+msgstr ""
+"(4/6) Bool test option that has soft detect (and advanced) capabilities. "
+"That means the option is read-only."
+
+#: backend/test.c:798
+#, no-c-format
+msgid "(5/6) Bool soft select soft detect emulated"
+msgstr "(5/6) Bool soft select soft detect emulated"
+
+#: backend/test.c:799
+#, no-c-format
+msgid ""
+"(5/6) Bool test option that has soft select, soft detect, and emulated "
+"(and advanced) capabilities."
+msgstr ""
+"(5/6) Bool test option that has soft select, soft detect, and emulated "
+"(and advanced) capabilities."
+
+#: backend/test.c:815
+#, no-c-format
+msgid "(6/6) Bool soft select soft detect auto"
+msgstr "(6/6) Bool soft select soft detect auto"
+
+#: backend/test.c:816
+#, no-c-format
+msgid ""
+"(6/6) Bool test option that has soft select, soft detect, and automatic "
+"(and advanced) capabilities. This option can be automatically set by the "
+"backend."
+msgstr ""
+"(6/6) Bool test option that has soft select, soft detect, and automatic "
+"(and advanced) capabilities. This option can be automatically set by the "
+"backend."
+
+#: backend/test.c:833
+#, no-c-format
+msgid "Int test options"
+msgstr "Int test options"
+
+#: backend/test.c:846
+#, no-c-format
+msgid "(1/6) Int"
+msgstr "(1/6) Int"
+
+#: backend/test.c:847
+#, no-c-format
+msgid "(1/6) Int test option with no unit and no constraint set."
+msgstr "(1/6) Int test option with no unit and no constraint set."
+
+#: backend/test.c:862
+#, no-c-format
+msgid "(2/6) Int constraint range"
+msgstr "(2/6) Int constraint range"
+
+#: backend/test.c:863
+#, no-c-format
+msgid ""
+"(2/6) Int test option with unit pixel and constraint range set. Minimum "
+"is 4, maximum 192, and quant is 2."
+msgstr ""
+"(2/6) Int test option with unit pixel and constraint range set. Minimum "
+"is 4, maximum 192, and quant is 2."
+
+#: backend/test.c:879
+#, no-c-format
+msgid "(3/6) Int constraint word list"
+msgstr "(3/6) Int constraint word list"
+
+#: backend/test.c:880
+#, no-c-format
+msgid "(3/6) Int test option with unit bits and constraint word list set."
+msgstr "(3/6) Int test option with unit bits and constraint word list set."
+
+#: backend/test.c:895
+#, no-c-format
+msgid "(4/6) Int array"
+msgstr "(4/6) Int array"
+
+#: backend/test.c:896
+#, no-c-format
+msgid ""
+"(4/6) Int test option with unit mm and using an array without "
+"constraints."
+msgstr ""
+"(4/6) Int test option with unit mm and using an array without "
+"constraints."
+
+#: backend/test.c:911
+#, no-c-format
+msgid "(5/6) Int array constraint range"
+msgstr "(5/6) Int array constraint range"
+
+#: backend/test.c:912
+#, no-c-format
+msgid ""
+"(5/6) Int test option with unit dpi and using an array with a range "
+"constraint. Minimum is 4, maximum 192, and quant is 2."
+msgstr ""
+"(5/6) Int test option with unit dpi and using an array with a range "
+"constraint. Minimum is 4, maximum 192, and quant is 2."
+
+#: backend/test.c:929
+#, no-c-format
+msgid "(6/6) Int array constraint word list"
+msgstr "(6/6) Int array constraint word list"
+
+#: backend/test.c:930
+#, no-c-format
+msgid ""
+"(6/6) Int test option with unit percent and using an array with a word "
+"list constraint."
+msgstr ""
+"(6/6) Int test option with unit percent and using an array with a word "
+"list constraint."
+
+#: backend/test.c:946
+#, no-c-format
+msgid "Fixed test options"
+msgstr "Fixed test options"
+
+#: backend/test.c:959
+#, no-c-format
+msgid "(1/3) Fixed"
+msgstr "(1/3) Fixed"
+
+#: backend/test.c:960
+#, no-c-format
+msgid "(1/3) Fixed test option with no unit and no constraint set."
+msgstr "(1/3) Fixed test option with no unit and no constraint set."
+
+#: backend/test.c:975
+#, no-c-format
+msgid "(2/3) Fixed constraint range"
+msgstr "(2/3) Fixed constraint range"
+
+#: backend/test.c:976
+#, no-c-format
+msgid ""
+"(2/3) Fixed test option with unit microsecond and constraint range set. "
+"Minimum is -42.17, maximum 32767.9999, and quant is 2.0."
+msgstr ""
+"(2/3) Fixed test option with unit microsecond and constraint range set. "
+"Minimum is -42.17, maximum 32767.9999, and quant is 2.0."
+
+#: backend/test.c:992
+#, no-c-format
+msgid "(3/3) Fixed constraint word list"
+msgstr "(3/3) Fixed constraint word list"
+
+#: backend/test.c:993
+#, no-c-format
+msgid "(3/3) Fixed test option with no unit and constraint word list set."
+msgstr "(3/3) Fixed test option with no unit and constraint word list set."
+
+#: backend/test.c:1008
+#, no-c-format
+msgid "String test options"
+msgstr "String test options"
+
+#: backend/test.c:1021
+#, no-c-format
+msgid "(1/3) String"
+msgstr "(1/3) String"
+
+#: backend/test.c:1022
+#, no-c-format
+msgid "(1/3) String test option without constraint."
+msgstr "(1/3) String test option without constraint."
+
+#: backend/test.c:1039
+#, no-c-format
+msgid "(2/3) String constraint string list"
+msgstr "(2/3) String constraint string list"
+
+#: backend/test.c:1040
+#, no-c-format
+msgid "(2/3) String test option with string list constraint."
+msgstr "(2/3) String test option with string list constraint."
+
+#: backend/test.c:1059
+#, no-c-format
+msgid "(3/3) String constraint long string list"
+msgstr "(3/3) String constraint long string list"
+
+#: backend/test.c:1060
+#, no-c-format
+msgid ""
+"(3/3) String test option with string list constraint. Contains some more "
+"entries..."
+msgstr ""
+"(3/3) String test option with string list constraint. Contains some more "
+"entries..."
+
+#: backend/test.c:1080
+#, no-c-format
+msgid "Button test options"
+msgstr "Button test options"
+
+#: backend/test.c:1093
+#, no-c-format
+msgid "(1/1) Button"
+msgstr "(1/1) Button"
+
+#: backend/test.c:1094
+#, no-c-format
+msgid "(1/1) Button test option. Prints some text..."
+msgstr "(1/1) Button test option. Prints some text..."
+
+#: backend/u12.c:149
+#, no-c-format
+msgid "Color 36"
+msgstr "Color 36"
+
+#: backend/umax.c:235
+#, no-c-format
+msgid "Use Image Composition"
+msgstr "Use Image Composition"
+
+#: backend/umax.c:236
+#, no-c-format
+msgid "Bi-level black and white (lineart mode)"
+msgstr "Bi-level black and white (lineart mode)"
+
+#: backend/umax.c:237
+#, no-c-format
+msgid "Dithered/halftone black & white (halftone mode)"
+msgstr "Dithered/halftone black & white (halftone mode)"
+
+#: backend/umax.c:238
+#, no-c-format
+msgid "Multi-level black & white (grayscale mode)"
+msgstr "Multi-level black & white (grayscale mode)"
+
+#: backend/umax.c:239
+#, no-c-format
+msgid "Multi-level RGB color (one pass color)"
+msgstr "Multi-level RGB color (one pass color)"
+
+#: backend/umax.c:240
+#, no-c-format
+msgid "Ignore calibration"
+msgstr "Ignore calibration"
+
+#: backend/umax.c:5733
+#, no-c-format
+msgid "Disable pre focus"
+msgstr "Disable pre focus"
+
+#: backend/umax.c:5734
+#, no-c-format
+msgid "Do not calibrate focus"
+msgstr "Do not calibrate focus"
+
+#: backend/umax.c:5745
+#, no-c-format
+msgid "Manual pre focus"
+msgstr "Manual pre focus"
+
+#: backend/umax.c:5757
+#, no-c-format
+msgid "Fix focus position"
+msgstr "Fix focus position"
+
+#: backend/umax.c:5769
+#, no-c-format
+msgid "Lens calibration in doc position"
+msgstr "Lens calibration in doc position"
+
+#: backend/umax.c:5770
+#, no-c-format
+msgid "Calibrate lens focus in document position"
+msgstr "Calibrate lens focus in document position"
+
+#: backend/umax.c:5781
+#, no-c-format
+msgid "Holder focus position 0mm"
+msgstr "Holder focus position 0mm"
+
+#: backend/umax.c:5782
+#, no-c-format
+msgid "Use 0mm holder focus position instead of 0.6mm"
+msgstr "Use 0mm holder focus position instead of 0.6mm"
+
+#: backend/umax.c:5885
+#, no-c-format
+msgid "Calibration mode"
+msgstr "Calibration mode"
+
+#: backend/umax.c:5886
+#, no-c-format
+msgid "Define calibration mode"
+msgstr "Define calibration mode"
+
+#: backend/umax_pp.c:640
+#, no-c-format
+msgid "Sets lamp on/off"
+msgstr "Sets lamp on/off"
+
+#: backend/umax_pp.c:649
+#, no-c-format
+msgid "UTA on"
+msgstr "UTA on"
+
+#: backend/umax_pp.c:650
+#, no-c-format
+msgid "Sets UTA on/off"
+msgstr "Sets UTA on/off"
+
+#: backend/umax_pp.c:771
+#, no-c-format
+msgid "Offset"
+msgstr "Offset"
+
+#: backend/umax_pp.c:773
+#, no-c-format
+msgid "Color channels offset settings"
+msgstr "Color channels offset settings"
+
+#: backend/umax_pp.c:780
+#, no-c-format
+msgid "Gray offset"
+msgstr "Gray offset"
+
+#: backend/umax_pp.c:781
+#, no-c-format
+msgid "Sets gray channel offset"
+msgstr "Sets gray channel offset"
+
+#: backend/umax_pp.c:793
+#, no-c-format
+msgid "Sets red channel offset"
+msgstr "Sets red channel offset"
+
+#: backend/umax_pp.c:805
+#, no-c-format
+msgid "Sets green channel offset"
+msgstr "Sets green channel offset"
+
+#: backend/umax_pp.c:817
+#, no-c-format
+msgid "Sets blue channel offset"
+msgstr "Sets blue channel offset"
diff --git a/po/en@quot.gmo b/po/en@quot.gmo
new file mode 100644
index 0000000..b9bccd3
--- /dev/null
+++ b/po/en@quot.gmo
diff --git a/po/en@quot.header b/po/en@quot.header
new file mode 100644
index 0000000..a9647fc
--- /dev/null
+++ b/po/en@quot.header
@@ -0,0 +1,22 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
diff --git a/po/en@quot.po b/po/en@quot.po
new file mode 100644
index 0000000..4fd95b5
--- /dev/null
+++ b/po/en@quot.po
@@ -0,0 +1,6488 @@
+# English translations for sane-backends package.
+# Copyright (C) 2017 The SANE developers
+# This file is distributed under the same license as the sane-backends package.
+# Automatically generated, 2017.
+#
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sane-backends 1.0.27\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
+"PO-Revision-Date: 2017-05-22 11:18-0400\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: en@quot\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: include/sane/saneopts.h:154
+#, no-c-format
+msgid "Number of options"
+msgstr "Number of options"
+
+#: include/sane/saneopts.h:156
+#, no-c-format
+msgid "Standard"
+msgstr "Standard"
+
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
+#, no-c-format
+msgid "Geometry"
+msgstr "Geometry"
+
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
+#, no-c-format
+msgid "Enhancement"
+msgstr "Enhancement"
+
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
+#, no-c-format
+msgid "Advanced"
+msgstr "Advanced"
+
+#: include/sane/saneopts.h:160
+#, no-c-format
+msgid "Sensors"
+msgstr "Sensors"
+
+#: include/sane/saneopts.h:162
+#, no-c-format
+msgid "Preview"
+msgstr "Preview"
+
+#: include/sane/saneopts.h:163
+#, no-c-format
+msgid "Force monochrome preview"
+msgstr "Force monochrome preview"
+
+#: include/sane/saneopts.h:164
+#, no-c-format
+msgid "Bit depth"
+msgstr "Bit depth"
+
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
+#, no-c-format
+msgid "Scan mode"
+msgstr "Scan mode"
+
+#: include/sane/saneopts.h:166
+#, no-c-format
+msgid "Scan speed"
+msgstr "Scan speed"
+
+#: include/sane/saneopts.h:167
+#, no-c-format
+msgid "Scan source"
+msgstr "Scan source"
+
+#: include/sane/saneopts.h:168
+#, no-c-format
+msgid "Force backtracking"
+msgstr "Force backtracking"
+
+#: include/sane/saneopts.h:169
+#, no-c-format
+msgid "Top-left x"
+msgstr "Top-left x"
+
+#: include/sane/saneopts.h:170
+#, no-c-format
+msgid "Top-left y"
+msgstr "Top-left y"
+
+#: include/sane/saneopts.h:171
+#, no-c-format
+msgid "Bottom-right x"
+msgstr "Bottom-right x"
+
+#: include/sane/saneopts.h:172
+#, no-c-format
+msgid "Bottom-right y"
+msgstr "Bottom-right y"
+
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
+#, no-c-format
+msgid "Scan resolution"
+msgstr "Scan resolution"
+
+#: include/sane/saneopts.h:174
+#, no-c-format
+msgid "X-resolution"
+msgstr "X-resolution"
+
+#: include/sane/saneopts.h:175
+#, no-c-format
+msgid "Y-resolution"
+msgstr "Y-resolution"
+
+#: include/sane/saneopts.h:176
+#, no-c-format
+msgid "Page width"
+msgstr "Page width"
+
+#: include/sane/saneopts.h:177
+#, no-c-format
+msgid "Page height"
+msgstr "Page height"
+
+#: include/sane/saneopts.h:178
+#, no-c-format
+msgid "Use custom gamma table"
+msgstr "Use custom gamma table"
+
+#: include/sane/saneopts.h:179
+#, no-c-format
+msgid "Image intensity"
+msgstr "Image intensity"
+
+#: include/sane/saneopts.h:180
+#, no-c-format
+msgid "Red intensity"
+msgstr "Red intensity"
+
+#: include/sane/saneopts.h:181
+#, no-c-format
+msgid "Green intensity"
+msgstr "Green intensity"
+
+#: include/sane/saneopts.h:182
+#, no-c-format
+msgid "Blue intensity"
+msgstr "Blue intensity"
+
+#: include/sane/saneopts.h:183
+#, no-c-format
+msgid "Brightness"
+msgstr "Brightness"
+
+#: include/sane/saneopts.h:184
+#, no-c-format
+msgid "Contrast"
+msgstr "Contrast"
+
+#: include/sane/saneopts.h:185
+#, no-c-format
+msgid "Grain size"
+msgstr "Grain size"
+
+#: include/sane/saneopts.h:186
+#, no-c-format
+msgid "Halftoning"
+msgstr "Halftoning"
+
+#: include/sane/saneopts.h:187
+#, no-c-format
+msgid "Black level"
+msgstr "Black level"
+
+#: include/sane/saneopts.h:188
+#, no-c-format
+msgid "White level"
+msgstr "White level"
+
+#: include/sane/saneopts.h:189
+#, no-c-format
+msgid "White level for red"
+msgstr "White level for red"
+
+#: include/sane/saneopts.h:190
+#, no-c-format
+msgid "White level for green"
+msgstr "White level for green"
+
+#: include/sane/saneopts.h:191
+#, no-c-format
+msgid "White level for blue"
+msgstr "White level for blue"
+
+#: include/sane/saneopts.h:192
+#, no-c-format
+msgid "Shadow"
+msgstr "Shadow"
+
+#: include/sane/saneopts.h:193
+#, no-c-format
+msgid "Shadow for red"
+msgstr "Shadow for red"
+
+#: include/sane/saneopts.h:194
+#, no-c-format
+msgid "Shadow for green"
+msgstr "Shadow for green"
+
+#: include/sane/saneopts.h:195
+#, no-c-format
+msgid "Shadow for blue"
+msgstr "Shadow for blue"
+
+#: include/sane/saneopts.h:196
+#, no-c-format
+msgid "Highlight"
+msgstr "Highlight"
+
+#: include/sane/saneopts.h:197
+#, no-c-format
+msgid "Highlight for red"
+msgstr "Highlight for red"
+
+#: include/sane/saneopts.h:198
+#, no-c-format
+msgid "Highlight for green"
+msgstr "Highlight for green"
+
+#: include/sane/saneopts.h:199
+#, no-c-format
+msgid "Highlight for blue"
+msgstr "Highlight for blue"
+
+#: include/sane/saneopts.h:200
+#, no-c-format
+msgid "Hue"
+msgstr "Hue"
+
+#: include/sane/saneopts.h:201
+#, no-c-format
+msgid "Saturation"
+msgstr "Saturation"
+
+#: include/sane/saneopts.h:202
+#, no-c-format
+msgid "Filename"
+msgstr "Filename"
+
+#: include/sane/saneopts.h:203
+#, no-c-format
+msgid "Halftone pattern size"
+msgstr "Halftone pattern size"
+
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
+#, no-c-format
+msgid "Halftone pattern"
+msgstr "Halftone pattern"
+
+#: include/sane/saneopts.h:205
+#, no-c-format
+msgid "Bind X and Y resolution"
+msgstr "Bind X and Y resolution"
+
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
+#, no-c-format
+msgid "Negative"
+msgstr "Negative"
+
+#: include/sane/saneopts.h:207
+#, no-c-format
+msgid "Quality calibration"
+msgstr "Quality calibration"
+
+#: include/sane/saneopts.h:208
+#, no-c-format
+msgid "Double Optical Resolution"
+msgstr "Double Optical Resolution"
+
+#: include/sane/saneopts.h:209
+#, no-c-format
+msgid "Bind RGB"
+msgstr "Bind RGB"
+
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
+#, no-c-format
+msgid "Threshold"
+msgstr "Threshold"
+
+#: include/sane/saneopts.h:211
+#, no-c-format
+msgid "Analog gamma correction"
+msgstr "Analog gamma correction"
+
+#: include/sane/saneopts.h:212
+#, no-c-format
+msgid "Analog gamma red"
+msgstr "Analog gamma red"
+
+#: include/sane/saneopts.h:213
+#, no-c-format
+msgid "Analog gamma green"
+msgstr "Analog gamma green"
+
+#: include/sane/saneopts.h:214
+#, no-c-format
+msgid "Analog gamma blue"
+msgstr "Analog gamma blue"
+
+#: include/sane/saneopts.h:215
+#, no-c-format
+msgid "Bind analog gamma"
+msgstr "Bind analog gamma"
+
+#: include/sane/saneopts.h:216
+#, no-c-format
+msgid "Warmup lamp"
+msgstr "Warmup lamp"
+
+#: include/sane/saneopts.h:217
+#, no-c-format
+msgid "Cal. exposure-time"
+msgstr "Cal. exposure-time"
+
+#: include/sane/saneopts.h:218
+#, no-c-format
+msgid "Cal. exposure-time for red"
+msgstr "Cal. exposure-time for red"
+
+#: include/sane/saneopts.h:219
+#, no-c-format
+msgid "Cal. exposure-time for green"
+msgstr "Cal. exposure-time for green"
+
+#: include/sane/saneopts.h:221
+#, no-c-format
+msgid "Cal. exposure-time for blue"
+msgstr "Cal. exposure-time for blue"
+
+#: include/sane/saneopts.h:222
+#, no-c-format
+msgid "Scan exposure-time"
+msgstr "Scan exposure-time"
+
+#: include/sane/saneopts.h:223
+#, no-c-format
+msgid "Scan exposure-time for red"
+msgstr "Scan exposure-time for red"
+
+#: include/sane/saneopts.h:224
+#, no-c-format
+msgid "Scan exposure-time for green"
+msgstr "Scan exposure-time for green"
+
+#: include/sane/saneopts.h:226
+#, no-c-format
+msgid "Scan exposure-time for blue"
+msgstr "Scan exposure-time for blue"
+
+#: include/sane/saneopts.h:227
+#, no-c-format
+msgid "Set exposure-time"
+msgstr "Set exposure-time"
+
+#: include/sane/saneopts.h:228
+#, no-c-format
+msgid "Cal. lamp density"
+msgstr "Cal. lamp density"
+
+#: include/sane/saneopts.h:229
+#, no-c-format
+msgid "Scan lamp density"
+msgstr "Scan lamp density"
+
+#: include/sane/saneopts.h:230
+#, no-c-format
+msgid "Set lamp density"
+msgstr "Set lamp density"
+
+#: include/sane/saneopts.h:231 backend/umax.c:5829
+#, no-c-format
+msgid "Lamp off at exit"
+msgstr "Lamp off at exit"
+
+#: include/sane/saneopts.h:245
+#, no-c-format
+msgid ""
+"Read-only option that specifies how many options a specific devices "
+"supports."
+msgstr ""
+"Read-only option that specifies how many options a specific devices "
+"supports."
+
+#: include/sane/saneopts.h:248
+#, no-c-format
+msgid "Source, mode and resolution options"
+msgstr "Source, mode and resolution options"
+
+#: include/sane/saneopts.h:249
+#, no-c-format
+msgid "Scan area and media size options"
+msgstr "Scan area and media size options"
+
+#: include/sane/saneopts.h:250
+#, no-c-format
+msgid "Image modification options"
+msgstr "Image modification options"
+
+#: include/sane/saneopts.h:251
+#, no-c-format
+msgid "Hardware specific options"
+msgstr "Hardware specific options"
+
+#: include/sane/saneopts.h:252
+#, no-c-format
+msgid "Scanner sensors and buttons"
+msgstr "Scanner sensors and buttons"
+
+#: include/sane/saneopts.h:255
+#, no-c-format
+msgid "Request a preview-quality scan."
+msgstr "Request a preview-quality scan."
+
+#: include/sane/saneopts.h:258
+#, no-c-format
+msgid ""
+"Request that all previews are done in monochrome mode.  On a three-pass "
+"scanner this cuts down the number of passes to one and on a one-pass "
+"scanner, it reduces the memory requirements and scan-time of the preview."
+msgstr ""
+"Request that all previews are done in monochrome mode.  On a three-pass "
+"scanner this cuts down the number of passes to one and on a one-pass "
+"scanner, it reduces the memory requirements and scan-time of the preview."
+
+#: include/sane/saneopts.h:264
+#, no-c-format
+msgid ""
+"Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
+"for multibit scans."
+msgstr ""
+"Number of bits per sample, typical values are 1 for “line-art� and 8 for "
+"multibit scans."
+
+#: include/sane/saneopts.h:268
+#, no-c-format
+msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
+msgstr "Selects the scan mode (e.g., lineart, monochrome, or color)."
+
+#: include/sane/saneopts.h:271
+#, no-c-format
+msgid "Determines the speed at which the scan proceeds."
+msgstr "Determines the speed at which the scan proceeds."
+
+#: include/sane/saneopts.h:274
+#, no-c-format
+msgid "Selects the scan source (such as a document-feeder)."
+msgstr "Selects the scan source (such as a document-feeder)."
+
+#: include/sane/saneopts.h:277
+#, no-c-format
+msgid "Controls whether backtracking is forced."
+msgstr "Controls whether backtracking is forced."
+
+#: include/sane/saneopts.h:280
+#, no-c-format
+msgid "Top-left x position of scan area."
+msgstr "Top-left x position of scan area."
+
+#: include/sane/saneopts.h:283
+#, no-c-format
+msgid "Top-left y position of scan area."
+msgstr "Top-left y position of scan area."
+
+#: include/sane/saneopts.h:286
+#, no-c-format
+msgid "Bottom-right x position of scan area."
+msgstr "Bottom-right x position of scan area."
+
+#: include/sane/saneopts.h:289
+#, no-c-format
+msgid "Bottom-right y position of scan area."
+msgstr "Bottom-right y position of scan area."
+
+#: include/sane/saneopts.h:292
+#, no-c-format
+msgid "Sets the resolution of the scanned image."
+msgstr "Sets the resolution of the scanned image."
+
+#: include/sane/saneopts.h:295
+#, no-c-format
+msgid "Sets the horizontal resolution of the scanned image."
+msgstr "Sets the horizontal resolution of the scanned image."
+
+#: include/sane/saneopts.h:298
+#, no-c-format
+msgid "Sets the vertical resolution of the scanned image."
+msgstr "Sets the vertical resolution of the scanned image."
+
+#: include/sane/saneopts.h:301
+#, no-c-format
+msgid ""
+"Specifies the width of the media.  Required for automatic centering of "
+"sheet-fed scans."
+msgstr ""
+"Specifies the width of the media.  Required for automatic centering of "
+"sheet-fed scans."
+
+#: include/sane/saneopts.h:305
+#, no-c-format
+msgid "Specifies the height of the media."
+msgstr "Specifies the height of the media."
+
+#: include/sane/saneopts.h:308
+#, no-c-format
+msgid ""
+"Determines whether a builtin or a custom gamma-table should be used."
+msgstr ""
+"Determines whether a builtin or a custom gamma-table should be used."
+
+#: include/sane/saneopts.h:312
+#, no-c-format
+msgid ""
+"Gamma-correction table.  In color mode this option equally affects the "
+"red, green, and blue channels simultaneously (i.e., it is an intensity "
+"gamma table)."
+msgstr ""
+"Gamma-correction table.  In color mode this option equally affects the "
+"red, green, and blue channels simultaneously (i.e., it is an intensity "
+"gamma table)."
+
+#: include/sane/saneopts.h:317
+#, no-c-format
+msgid "Gamma-correction table for the red band."
+msgstr "Gamma-correction table for the red band."
+
+#: include/sane/saneopts.h:320
+#, no-c-format
+msgid "Gamma-correction table for the green band."
+msgstr "Gamma-correction table for the green band."
+
+#: include/sane/saneopts.h:323
+#, no-c-format
+msgid "Gamma-correction table for the blue band."
+msgstr "Gamma-correction table for the blue band."
+
+#: include/sane/saneopts.h:326
+#, no-c-format
+msgid "Controls the brightness of the acquired image."
+msgstr "Controls the brightness of the acquired image."
+
+#: include/sane/saneopts.h:329
+#, no-c-format
+msgid "Controls the contrast of the acquired image."
+msgstr "Controls the contrast of the acquired image."
+
+#: include/sane/saneopts.h:332
+#, no-c-format
+msgid ""
+"Selects the \"graininess\" of the acquired image.  Smaller values result "
+"in sharper images."
+msgstr ""
+"Selects the “graininess� of the acquired image.  Smaller values result "
+"in sharper images."
+
+#: include/sane/saneopts.h:336
+#, no-c-format
+msgid "Selects whether the acquired image should be halftoned (dithered)."
+msgstr "Selects whether the acquired image should be halftoned (dithered)."
+
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
+#, no-c-format
+msgid "Selects what radiance level should be considered \"black\"."
+msgstr "Selects what radiance level should be considered “black�."
+
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
+#, no-c-format
+msgid "Selects what radiance level should be considered \"white\"."
+msgstr "Selects what radiance level should be considered “white�."
+
+#: include/sane/saneopts.h:345
+#, no-c-format
+msgid "Selects what red radiance level should be considered \"white\"."
+msgstr "Selects what red radiance level should be considered “white�."
+
+#: include/sane/saneopts.h:348
+#, no-c-format
+msgid "Selects what green radiance level should be considered \"white\"."
+msgstr "Selects what green radiance level should be considered “white�."
+
+#: include/sane/saneopts.h:351
+#, no-c-format
+msgid "Selects what blue radiance level should be considered \"white\"."
+msgstr "Selects what blue radiance level should be considered “white�."
+
+#: include/sane/saneopts.h:356
+#, no-c-format
+msgid "Selects what red radiance level should be considered \"black\"."
+msgstr "Selects what red radiance level should be considered “black�."
+
+#: include/sane/saneopts.h:358
+#, no-c-format
+msgid "Selects what green radiance level should be considered \"black\"."
+msgstr "Selects what green radiance level should be considered “black�."
+
+#: include/sane/saneopts.h:360
+#, no-c-format
+msgid "Selects what blue radiance level should be considered \"black\"."
+msgstr "Selects what blue radiance level should be considered “black�."
+
+#: include/sane/saneopts.h:365
+#, no-c-format
+msgid "Selects what red radiance level should be considered \"full red\"."
+msgstr "Selects what red radiance level should be considered “full red�."
+
+#: include/sane/saneopts.h:367
+#, no-c-format
+msgid ""
+"Selects what green radiance level should be considered \"full green\"."
+msgstr ""
+"Selects what green radiance level should be considered “full green�."
+
+#: include/sane/saneopts.h:370
+#, no-c-format
+msgid ""
+"Selects what blue radiance level should be considered \"full blue\"."
+msgstr "Selects what blue radiance level should be considered “full blue�."
+
+#: include/sane/saneopts.h:374
+#, no-c-format
+msgid "Controls the \"hue\" (blue-level) of the acquired image."
+msgstr "Controls the “hue� (blue-level) of the acquired image."
+
+#: include/sane/saneopts.h:377
+#, no-c-format
+msgid ""
+"The saturation level controls the amount of \"blooming\" that occurs "
+"when acquiring an image with a camera. Larger values cause more blooming."
+msgstr ""
+"The saturation level controls the amount of “blooming� that occurs when "
+"acquiring an image with a camera. Larger values cause more blooming."
+
+#: include/sane/saneopts.h:382
+#, no-c-format
+msgid "The filename of the image to be loaded."
+msgstr "The filename of the image to be loaded."
+
+#: include/sane/saneopts.h:385
+#, no-c-format
+msgid ""
+"Sets the size of the halftoning (dithering) pattern used when scanning "
+"halftoned images."
+msgstr ""
+"Sets the size of the halftoning (dithering) pattern used when scanning "
+"halftoned images."
+
+#: include/sane/saneopts.h:389
+#, no-c-format
+msgid ""
+"Defines the halftoning (dithering) pattern for scanning halftoned images."
+msgstr ""
+"Defines the halftoning (dithering) pattern for scanning halftoned images."
+
+#: include/sane/saneopts.h:393
+#, no-c-format
+msgid "Use same values for X and Y resolution"
+msgstr "Use same values for X and Y resolution"
+
+#: include/sane/saneopts.h:395
+#, no-c-format
+msgid "Swap black and white"
+msgstr "Swap black and white"
+
+#: include/sane/saneopts.h:397
+#, no-c-format
+msgid "Do a quality white-calibration"
+msgstr "Do a quality white-calibration"
+
+#: include/sane/saneopts.h:399
+#, no-c-format
+msgid "Use lens that doubles optical resolution"
+msgstr "Use lens that doubles optical resolution"
+
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
+#, no-c-format
+msgid "In RGB-mode use same values for each color"
+msgstr "In RGB-mode use same values for each color"
+
+#: include/sane/saneopts.h:403
+#, no-c-format
+msgid "Select minimum-brightness to get a white point"
+msgstr "Select minimum-brightness to get a white point"
+
+#: include/sane/saneopts.h:405
+#, no-c-format
+msgid "Analog gamma-correction"
+msgstr "Analog gamma-correction"
+
+#: include/sane/saneopts.h:407
+#, no-c-format
+msgid "Analog gamma-correction for red"
+msgstr "Analog gamma-correction for red"
+
+#: include/sane/saneopts.h:409
+#, no-c-format
+msgid "Analog gamma-correction for green"
+msgstr "Analog gamma-correction for green"
+
+#: include/sane/saneopts.h:411
+#, no-c-format
+msgid "Analog gamma-correction for blue"
+msgstr "Analog gamma-correction for blue"
+
+#: include/sane/saneopts.h:415
+#, no-c-format
+msgid "Warmup lamp before scanning"
+msgstr "Warmup lamp before scanning"
+
+#: include/sane/saneopts.h:417
+#, no-c-format
+msgid "Define exposure-time for calibration"
+msgstr "Define exposure-time for calibration"
+
+#: include/sane/saneopts.h:419
+#, no-c-format
+msgid "Define exposure-time for red calibration"
+msgstr "Define exposure-time for red calibration"
+
+#: include/sane/saneopts.h:421
+#, no-c-format
+msgid "Define exposure-time for green calibration"
+msgstr "Define exposure-time for green calibration"
+
+#: include/sane/saneopts.h:423
+#, no-c-format
+msgid "Define exposure-time for blue calibration"
+msgstr "Define exposure-time for blue calibration"
+
+#: include/sane/saneopts.h:425
+#, no-c-format
+msgid "Define exposure-time for scan"
+msgstr "Define exposure-time for scan"
+
+#: include/sane/saneopts.h:427
+#, no-c-format
+msgid "Define exposure-time for red scan"
+msgstr "Define exposure-time for red scan"
+
+#: include/sane/saneopts.h:429
+#, no-c-format
+msgid "Define exposure-time for green scan"
+msgstr "Define exposure-time for green scan"
+
+#: include/sane/saneopts.h:431
+#, no-c-format
+msgid "Define exposure-time for blue scan"
+msgstr "Define exposure-time for blue scan"
+
+#: include/sane/saneopts.h:433
+#, no-c-format
+msgid "Enable selection of exposure-time"
+msgstr "Enable selection of exposure-time"
+
+#: include/sane/saneopts.h:435
+#, no-c-format
+msgid "Define lamp density for calibration"
+msgstr "Define lamp density for calibration"
+
+#: include/sane/saneopts.h:437
+#, no-c-format
+msgid "Define lamp density for scan"
+msgstr "Define lamp density for scan"
+
+#: include/sane/saneopts.h:439
+#, no-c-format
+msgid "Enable selection of lamp density"
+msgstr "Enable selection of lamp density"
+
+#: include/sane/saneopts.h:441 backend/umax.c:5830
+#, no-c-format
+msgid "Turn off lamp when program exits"
+msgstr "Turn off lamp when program exits"
+
+#: include/sane/saneopts.h:444
+#, no-c-format
+msgid "Scan button"
+msgstr "Scan button"
+
+#: include/sane/saneopts.h:445
+#, no-c-format
+msgid "Email button"
+msgstr "Email button"
+
+#: include/sane/saneopts.h:446
+#, no-c-format
+msgid "Fax button"
+msgstr "Fax button"
+
+#: include/sane/saneopts.h:447
+#, no-c-format
+msgid "Copy button"
+msgstr "Copy button"
+
+#: include/sane/saneopts.h:448
+#, no-c-format
+msgid "PDF button"
+msgstr "PDF button"
+
+#: include/sane/saneopts.h:449
+#, no-c-format
+msgid "Cancel button"
+msgstr "Cancel button"
+
+#: include/sane/saneopts.h:450
+#, no-c-format
+msgid "Page loaded"
+msgstr "Page loaded"
+
+#: include/sane/saneopts.h:451
+#, no-c-format
+msgid "Cover open"
+msgstr "Cover open"
+
+#: include/sane/saneopts.h:454
+#, no-c-format
+msgid "Color"
+msgstr "Color"
+
+#: include/sane/saneopts.h:455
+#, no-c-format
+msgid "Color Lineart"
+msgstr "Color Lineart"
+
+#: include/sane/saneopts.h:456
+#, no-c-format
+msgid "Color Halftone"
+msgstr "Color Halftone"
+
+#: include/sane/saneopts.h:457
+#, no-c-format
+msgid "Gray"
+msgstr "Gray"
+
+#: include/sane/saneopts.h:458
+#, no-c-format
+msgid "Halftone"
+msgstr "Halftone"
+
+#: include/sane/saneopts.h:459
+#, no-c-format
+msgid "Lineart"
+msgstr "Lineart"
+
+#: backend/sane_strstatus.c:59
+#, no-c-format
+msgid "Success"
+msgstr "Success"
+
+#: backend/sane_strstatus.c:62
+#, no-c-format
+msgid "Operation not supported"
+msgstr "Operation not supported"
+
+#: backend/sane_strstatus.c:65
+#, no-c-format
+msgid "Operation was cancelled"
+msgstr "Operation was cancelled"
+
+#: backend/sane_strstatus.c:68
+#, no-c-format
+msgid "Device busy"
+msgstr "Device busy"
+
+#: backend/sane_strstatus.c:71
+#, no-c-format
+msgid "Invalid argument"
+msgstr "Invalid argument"
+
+#: backend/sane_strstatus.c:74
+#, no-c-format
+msgid "End of file reached"
+msgstr "End of file reached"
+
+#: backend/sane_strstatus.c:77
+#, no-c-format
+msgid "Document feeder jammed"
+msgstr "Document feeder jammed"
+
+#: backend/sane_strstatus.c:80
+#, no-c-format
+msgid "Document feeder out of documents"
+msgstr "Document feeder out of documents"
+
+#: backend/sane_strstatus.c:83
+#, no-c-format
+msgid "Scanner cover is open"
+msgstr "Scanner cover is open"
+
+#: backend/sane_strstatus.c:86
+#, no-c-format
+msgid "Error during device I/O"
+msgstr "Error during device I/O"
+
+#: backend/sane_strstatus.c:89
+#, no-c-format
+msgid "Out of memory"
+msgstr "Out of memory"
+
+#: backend/sane_strstatus.c:92
+#, no-c-format
+msgid "Access to resource has been denied"
+msgstr "Access to resource has been denied"
+
+#: backend/sane_strstatus.c:96
+#, no-c-format
+msgid "Lamp not ready, please retry"
+msgstr "Lamp not ready, please retry"
+
+#: backend/sane_strstatus.c:101
+#, no-c-format
+msgid "Scanner mechanism locked for transport"
+msgstr "Scanner mechanism locked for transport"
+
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
+#, no-c-format
+msgid "Defaults"
+msgstr "Defaults"
+
+#: backend/artec_eplus48u.c:2876
+#, no-c-format
+msgid "Set default values for enhancement controls."
+msgstr "Set default values for enhancement controls."
+
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
+#, no-c-format
+msgid "Calibration"
+msgstr "Calibration"
+
+#: backend/artec_eplus48u.c:2941
+#, no-c-format
+msgid "Calibrate before next scan"
+msgstr "Calibrate before next scan"
+
+#: backend/artec_eplus48u.c:2943
+#, no-c-format
+msgid ""
+"If enabled, the device will be calibrated before the next scan. "
+"Otherwise, calibration is performed only before the first start."
+msgstr ""
+"If enabled, the device will be calibrated before the next scan. "
+"Otherwise, calibration is performed only before the first start."
+
+#: backend/artec_eplus48u.c:2954
+#, no-c-format
+msgid "Only perform shading-correction"
+msgstr "Only perform shading-correction"
+
+#: backend/artec_eplus48u.c:2956
+#, no-c-format
+msgid ""
+"If enabled, only the shading correction is performed during calibration. "
+"The default values for gain, offset and exposure time, either build-in "
+"or from the configuration file, are used."
+msgstr ""
+"If enabled, only the shading correction is performed during calibration. "
+"The default values for gain, offset and exposure time, either build-in "
+"or from the configuration file, are used."
+
+#: backend/artec_eplus48u.c:2967
+#, no-c-format
+msgid "Button state"
+msgstr "Button state"
+
+#: backend/avision.h:778
+#, no-c-format
+msgid "Number of the frame to scan"
+msgstr "Number of the frame to scan"
+
+#: backend/avision.h:779
+#, no-c-format
+msgid "Selects the number of the frame to scan"
+msgstr "Selects the number of the frame to scan"
+
+#: backend/avision.h:782
+#, no-c-format
+msgid "Duplex scan"
+msgstr "Duplex scan"
+
+#: backend/avision.h:783
+#, no-c-format
+msgid ""
+"Duplex scan provide a scan of the front and back side of the document"
+msgstr ""
+"Duplex scan provide a scan of the front and back side of the document"
+
+#: backend/canon630u.c:159
+#, no-c-format
+msgid "Calibrate Scanner"
+msgstr "Calibrate Scanner"
+
+#: backend/canon630u.c:160
+#, no-c-format
+msgid "Force scanner calibration before scan"
+msgstr "Force scanner calibration before scan"
+
+#: backend/canon630u.c:259 backend/umax1220u.c:208
+#, no-c-format
+msgid "Grayscale scan"
+msgstr "Grayscale scan"
+
+#: backend/canon630u.c:260 backend/umax1220u.c:209
+#, no-c-format
+msgid "Do a grayscale rather than color scan"
+msgstr "Do a grayscale rather than color scan"
+
+#: backend/canon630u.c:306
+#, no-c-format
+msgid "Analog Gain"
+msgstr "Analog Gain"
+
+#: backend/canon630u.c:307
+#, no-c-format
+msgid "Increase or decrease the analog gain of the CCD array"
+msgstr "Increase or decrease the analog gain of the CCD array"
+
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
+#, no-c-format
+msgid "Gamma Correction"
+msgstr "Gamma Correction"
+
+#: backend/canon630u.c:348
+#, no-c-format
+msgid "Selects the gamma corrected transfer curve"
+msgstr "Selects the gamma corrected transfer curve"
+
+#: backend/canon.c:149 backend/canon-sane.c:1318
+#, no-c-format
+msgid "Raw"
+msgstr "Raw"
+
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
+#, no-c-format
+msgid "Fine color"
+msgstr "Fine color"
+
+#: backend/canon.c:169
+#, no-c-format
+msgid "No transparency correction"
+msgstr "No transparency correction"
+
+#: backend/canon.c:170 backend/canon-sane.c:680
+#, no-c-format
+msgid "Correction according to film type"
+msgstr "Correction according to film type"
+
+#: backend/canon.c:171 backend/canon-sane.c:674
+#, no-c-format
+msgid "Correction according to transparency ratio"
+msgstr "Correction according to transparency ratio"
+
+#: backend/canon.c:176 backend/canon-sane.c:776
+#, no-c-format
+msgid "Negatives"
+msgstr "Negatives"
+
+#: backend/canon.c:176
+#, no-c-format
+msgid "Slides"
+msgstr "Slides"
+
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
+#, no-c-format
+msgid "Automatic"
+msgstr "Automatic"
+
+#: backend/canon.c:186
+#, no-c-format
+msgid "Normal speed"
+msgstr "Normal speed"
+
+#: backend/canon.c:187
+#, no-c-format
+msgid "1/2 normal speed"
+msgstr "1/2 normal speed"
+
+#: backend/canon.c:187
+#, no-c-format
+msgid "1/3 normal speed"
+msgstr "1/3 normal speed"
+
+#: backend/canon.c:365
+#, no-c-format
+msgid "rounded parameter"
+msgstr "rounded parameter"
+
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
+#, no-c-format
+msgid "unknown"
+msgstr "unknown"
+
+#: backend/canon.c:378
+#, no-c-format
+msgid "ADF jam"
+msgstr "ADF jam"
+
+#: backend/canon.c:381
+#, no-c-format
+msgid "ADF cover open"
+msgstr "ADF cover open"
+
+#: backend/canon.c:394
+#, no-c-format
+msgid "lamp failure"
+msgstr "lamp failure"
+
+#: backend/canon.c:397
+#, no-c-format
+msgid "scan head positioning error"
+msgstr "scan head positioning error"
+
+#: backend/canon.c:400
+#, no-c-format
+msgid "CPU check error"
+msgstr "CPU check error"
+
+#: backend/canon.c:403
+#, no-c-format
+msgid "RAM check error"
+msgstr "RAM check error"
+
+#: backend/canon.c:406
+#, no-c-format
+msgid "ROM check error"
+msgstr "ROM check error"
+
+#: backend/canon.c:409
+#, no-c-format
+msgid "hardware check error"
+msgstr "hardware check error"
+
+#: backend/canon.c:412
+#, no-c-format
+msgid "transparency unit lamp failure"
+msgstr "transparency unit lamp failure"
+
+#: backend/canon.c:415
+#, no-c-format
+msgid "transparency unit scan head positioning failure"
+msgstr "transparency unit scan head positioning failure"
+
+#: backend/canon.c:429
+#, no-c-format
+msgid "parameter list length error"
+msgstr "parameter list length error"
+
+#: backend/canon.c:433
+#, no-c-format
+msgid "invalid command operation code"
+msgstr "invalid command operation code"
+
+#: backend/canon.c:437
+#, no-c-format
+msgid "invalid field in CDB"
+msgstr "invalid field in CDB"
+
+#: backend/canon.c:441
+#, no-c-format
+msgid "unsupported LUN"
+msgstr "unsupported LUN"
+
+#: backend/canon.c:445
+#, no-c-format
+msgid "invalid field in parameter list"
+msgstr "invalid field in parameter list"
+
+#: backend/canon.c:449
+#, no-c-format
+msgid "command sequence error"
+msgstr "command sequence error"
+
+#: backend/canon.c:453
+#, no-c-format
+msgid "too many windows specified"
+msgstr "too many windows specified"
+
+#: backend/canon.c:457
+#, no-c-format
+msgid "medium not present"
+msgstr "medium not present"
+
+#: backend/canon.c:461
+#, no-c-format
+msgid "invalid bit IDENTIFY message"
+msgstr "invalid bit IDENTIFY message"
+
+#: backend/canon.c:465
+#, no-c-format
+msgid "option not connect"
+msgstr "option not connect"
+
+#: backend/canon.c:479
+#, no-c-format
+msgid "power on reset / bus device reset"
+msgstr "power on reset / bus device reset"
+
+#: backend/canon.c:483
+#, no-c-format
+msgid "parameter changed by another initiator"
+msgstr "parameter changed by another initiator"
+
+#: backend/canon.c:497
+#, no-c-format
+msgid "no additional sense information"
+msgstr "no additional sense information"
+
+#: backend/canon.c:501
+#, no-c-format
+msgid "reselect failure"
+msgstr "reselect failure"
+
+#: backend/canon.c:505
+#, no-c-format
+msgid "SCSI parity error"
+msgstr "SCSI parity error"
+
+#: backend/canon.c:509
+#, no-c-format
+msgid "initiator detected error message received"
+msgstr "initiator detected error message received"
+
+#: backend/canon.c:514
+#, no-c-format
+msgid "invalid message error"
+msgstr "invalid message error"
+
+#: backend/canon.c:518
+#, no-c-format
+msgid "timeout error"
+msgstr "timeout error"
+
+#: backend/canon.c:522
+#, no-c-format
+msgid "transparency unit shading error"
+msgstr "transparency unit shading error"
+
+#: backend/canon.c:526
+#, no-c-format
+msgid "lamp not stabilized"
+msgstr "lamp not stabilized"
+
+#: backend/canon.c:852 backend/canon.c:867
+#, no-c-format
+msgid "film scanner"
+msgstr "film scanner"
+
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
+#, no-c-format
+msgid "flatbed scanner"
+msgstr "flatbed scanner"
+
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
+#, no-c-format
+msgid "Film type"
+msgstr "Film type"
+
+#: backend/canon.c:1184
+#, no-c-format
+msgid "Selects the film type, i.e. negatives or slides"
+msgstr "Selects the film type, i.e. negatives or slides"
+
+#: backend/canon.c:1196
+#, no-c-format
+msgid "Negative film type"
+msgstr "Negative film type"
+
+#: backend/canon.c:1197
+#, no-c-format
+msgid "Selects the negative film type"
+msgstr "Selects the negative film type"
+
+#: backend/canon.c:1236
+#, no-c-format
+msgid "Hardware resolution"
+msgstr "Hardware resolution"
+
+#: backend/canon.c:1237
+#, no-c-format
+msgid "Use only hardware resolutions"
+msgstr "Use only hardware resolutions"
+
+#: backend/canon.c:1318
+#, no-c-format
+msgid "Focus"
+msgstr "Focus"
+
+#: backend/canon.c:1328
+#, no-c-format
+msgid "Auto focus"
+msgstr "Auto focus"
+
+#: backend/canon.c:1329
+#, no-c-format
+msgid "Enable/disable auto focus"
+msgstr "Enable/disable auto focus"
+
+#: backend/canon.c:1336
+#, no-c-format
+msgid "Auto focus only once"
+msgstr "Auto focus only once"
+
+#: backend/canon.c:1337
+#, no-c-format
+msgid "Do auto focus only once between ejects"
+msgstr "Do auto focus only once between ejects"
+
+#: backend/canon.c:1345
+#, no-c-format
+msgid "Manual focus position"
+msgstr "Manual focus position"
+
+#: backend/canon.c:1346
+#, no-c-format
+msgid "Set the optical system's focus position by hand (default: 128)."
+msgstr "Set the optical system's focus position by hand (default: 128)."
+
+#: backend/canon.c:1356
+#, no-c-format
+msgid "Scan margins"
+msgstr "Scan margins"
+
+#: backend/canon.c:1403
+#, no-c-format
+msgid "Extra color adjustments"
+msgstr "Extra color adjustments"
+
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
+#, no-c-format
+msgid "Mirror image"
+msgstr "Mirror image"
+
+#: backend/canon.c:1539
+#, no-c-format
+msgid "Mirror the image horizontally"
+msgstr "Mirror the image horizontally"
+
+#: backend/canon.c:1608
+#, no-c-format
+msgid "Auto exposure"
+msgstr "Auto exposure"
+
+#: backend/canon.c:1609
+#, no-c-format
+msgid "Enable/disable the auto exposure feature"
+msgstr "Enable/disable the auto exposure feature"
+
+#: backend/canon.c:1625
+#, no-c-format
+msgid "Calibration now"
+msgstr "Calibration now"
+
+#: backend/canon.c:1626
+#, no-c-format
+msgid "Execute calibration *now*"
+msgstr "Execute calibration *now*"
+
+#: backend/canon.c:1636
+#, no-c-format
+msgid "Self diagnosis"
+msgstr "Self diagnosis"
+
+#: backend/canon.c:1637
+#, no-c-format
+msgid "Perform scanner self diagnosis"
+msgstr "Perform scanner self diagnosis"
+
+#: backend/canon.c:1648
+#, no-c-format
+msgid "Reset scanner"
+msgstr "Reset scanner"
+
+#: backend/canon.c:1649
+#, no-c-format
+msgid "Reset the scanner"
+msgstr "Reset the scanner"
+
+#: backend/canon.c:1659
+#, no-c-format
+msgid "Medium handling"
+msgstr "Medium handling"
+
+#: backend/canon.c:1668
+#, no-c-format
+msgid "Eject film after each scan"
+msgstr "Eject film after each scan"
+
+#: backend/canon.c:1669
+#, no-c-format
+msgid "Automatically eject the film from the device after each scan"
+msgstr "Automatically eject the film from the device after each scan"
+
+#: backend/canon.c:1680
+#, no-c-format
+msgid "Eject film before exit"
+msgstr "Eject film before exit"
+
+#: backend/canon.c:1681
+#, no-c-format
+msgid ""
+"Automatically eject the film from the device before exiting the program"
+msgstr ""
+"Automatically eject the film from the device before exiting the program"
+
+#: backend/canon.c:1690
+#, no-c-format
+msgid "Eject film now"
+msgstr "Eject film now"
+
+#: backend/canon.c:1691
+#, no-c-format
+msgid "Eject the film *now*"
+msgstr "Eject the film *now*"
+
+#: backend/canon.c:1700
+#, no-c-format
+msgid "Document feeder extras"
+msgstr "Document feeder extras"
+
+#: backend/canon.c:1707
+#, no-c-format
+msgid "Flatbed only"
+msgstr "Flatbed only"
+
+#: backend/canon.c:1708
+#, no-c-format
+msgid "Disable auto document feeder and use flatbed only"
+msgstr "Disable auto document feeder and use flatbed only"
+
+#: backend/canon.c:1718 backend/canon.c:1728
+#, no-c-format
+msgid "Transparency unit"
+msgstr "Transparency unit"
+
+#: backend/canon.c:1729
+#, no-c-format
+msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
+msgstr "Switch on/off the transparency unit (FAU, film adapter unit)"
+
+#: backend/canon.c:1739
+#, no-c-format
+msgid "Negative film"
+msgstr "Negative film"
+
+#: backend/canon.c:1740
+#, no-c-format
+msgid "Positive or negative film"
+msgstr "Positive or negative film"
+
+#: backend/canon.c:1749
+#, no-c-format
+msgid "Density control"
+msgstr "Density control"
+
+#: backend/canon.c:1750
+#, no-c-format
+msgid "Set density control mode"
+msgstr "Set density control mode"
+
+#: backend/canon.c:1761
+#, no-c-format
+msgid "Transparency ratio"
+msgstr "Transparency ratio"
+
+#: backend/canon.c:1775
+#, no-c-format
+msgid "Select film type"
+msgstr "Select film type"
+
+#: backend/canon.c:1776
+#, no-c-format
+msgid "Select the film type"
+msgstr "Select the film type"
+
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
+#, no-c-format
+msgid "Flatbed"
+msgstr "Flatbed"
+
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
+#, no-c-format
+msgid "ADF Front"
+msgstr "ADF Front"
+
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
+#, no-c-format
+msgid "ADF Back"
+msgstr "ADF Back"
+
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
+#, no-c-format
+msgid "ADF Duplex"
+msgstr "ADF Duplex"
+
+#: backend/canon_dr.c:412
+#, no-c-format
+msgid "Card Front"
+msgstr "Card Front"
+
+#: backend/canon_dr.c:413
+#, no-c-format
+msgid "Card Back"
+msgstr "Card Back"
+
+#: backend/canon_dr.c:414
+#, no-c-format
+msgid "Card Duplex"
+msgstr "Card Duplex"
+
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
+#, no-c-format
+msgid "Red"
+msgstr "Red"
+
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
+#, no-c-format
+msgid "Green"
+msgstr "Green"
+
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
+#, no-c-format
+msgid "Blue"
+msgstr "Blue"
+
+#: backend/canon_dr.c:424
+#, no-c-format
+msgid "Enhance Red"
+msgstr "Enhance Red"
+
+#: backend/canon_dr.c:425
+#, no-c-format
+msgid "Enhance Green"
+msgstr "Enhance Green"
+
+#: backend/canon_dr.c:426
+#, no-c-format
+msgid "Enhance Blue"
+msgstr "Enhance Blue"
+
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
+#, no-c-format
+msgid "None"
+msgstr "None"
+
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
+#, no-c-format
+msgid "JPEG"
+msgstr "JPEG"
+
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr "Software blank skip percentage"
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr "Request driver to discard pages with low percentage of dark pixels"
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
+#, no-c-format
+msgid "Simplex"
+msgstr "Simplex"
+
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
+#, no-c-format
+msgid "Duplex"
+msgstr "Duplex"
+
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
+#, no-c-format
+msgid "Transparency Unit"
+msgstr "Transparency Unit"
+
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
+#, no-c-format
+msgid "Automatic Document Feeder"
+msgstr "Automatic Document Feeder"
+
+#: backend/epson.c:523 backend/epson2.c:134
+#, no-c-format
+msgid "Positive Film"
+msgstr "Positive Film"
+
+#: backend/epson.c:524 backend/epson2.c:135
+#, no-c-format
+msgid "Negative Film"
+msgstr "Negative Film"
+
+#: backend/epson.c:529 backend/epson2.c:142
+#, no-c-format
+msgid "Focus on glass"
+msgstr "Focus on glass"
+
+#: backend/epson.c:530 backend/epson2.c:143
+#, no-c-format
+msgid "Focus 2.5mm above glass"
+msgstr "Focus 2.5mm above glass"
+
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
+#, no-c-format
+msgid "Halftone A (Hard Tone)"
+msgstr "Halftone A (Hard Tone)"
+
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
+#, no-c-format
+msgid "Halftone B (Soft Tone)"
+msgstr "Halftone B (Soft Tone)"
+
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
+#, no-c-format
+msgid "Halftone C (Net Screen)"
+msgstr "Halftone C (Net Screen)"
+
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
+#, no-c-format
+msgid "Dither A (4x4 Bayer)"
+msgstr "Dither A (4x4 Bayer)"
+
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
+#, no-c-format
+msgid "Dither B (4x4 Spiral)"
+msgstr "Dither B (4x4 Spiral)"
+
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
+#, no-c-format
+msgid "Dither C (4x4 Net Screen)"
+msgstr "Dither C (4x4 Net Screen)"
+
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
+#, no-c-format
+msgid "Dither D (8x4 Net Screen)"
+msgstr "Dither D (8x4 Net Screen)"
+
+#: backend/epson.c:584 backend/epson2.c:193
+#, no-c-format
+msgid "Text Enhanced Technology"
+msgstr "Text Enhanced Technology"
+
+#: backend/epson.c:585 backend/epson2.c:194
+#, no-c-format
+msgid "Download pattern A"
+msgstr "Download pattern A"
+
+#: backend/epson.c:586 backend/epson2.c:195
+#, no-c-format
+msgid "Download pattern B"
+msgstr "Download pattern B"
+
+#: backend/epson.c:631
+#, no-c-format
+msgid "No Correction"
+msgstr "No Correction"
+
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
+#, no-c-format
+msgid "User defined"
+msgstr "User defined"
+
+#: backend/epson.c:633
+#, no-c-format
+msgid "Impact-dot printers"
+msgstr "Impact-dot printers"
+
+#: backend/epson.c:634
+#, no-c-format
+msgid "Thermal printers"
+msgstr "Thermal printers"
+
+#: backend/epson.c:635
+#, no-c-format
+msgid "Ink-jet printers"
+msgstr "Ink-jet printers"
+
+#: backend/epson.c:636
+#, no-c-format
+msgid "CRT monitors"
+msgstr "CRT monitors"
+
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
+#, no-c-format
+msgid "Default"
+msgstr "Default"
+
+#: backend/epson.c:658 backend/epson2.c:256
+#, no-c-format
+msgid "High density printing"
+msgstr "High density printing"
+
+#: backend/epson.c:659 backend/epson2.c:257
+#, no-c-format
+msgid "Low density printing"
+msgstr "Low density printing"
+
+#: backend/epson.c:660 backend/epson2.c:258
+#, no-c-format
+msgid "High contrast printing"
+msgstr "High contrast printing"
+
+#: backend/epson.c:678 backend/epson2.c:276
+#, no-c-format
+msgid "User defined (Gamma=1.0)"
+msgstr "User defined (Gamma=1.0)"
+
+#: backend/epson.c:679 backend/epson2.c:277
+#, no-c-format
+msgid "User defined (Gamma=1.8)"
+msgstr "User defined (Gamma=1.8)"
+
+#: backend/epson.c:757
+#, no-c-format
+msgid "CD"
+msgstr "CD"
+
+#: backend/epson.c:758
+#, no-c-format
+msgid "A5 portrait"
+msgstr "A5 portrait"
+
+#: backend/epson.c:759
+#, no-c-format
+msgid "A5 landscape"
+msgstr "A5 landscape"
+
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
+#, no-c-format
+msgid "Letter"
+msgstr "Letter"
+
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
+#, no-c-format
+msgid "A4"
+msgstr "A4"
+
+#: backend/epson.c:762
+#, no-c-format
+msgid "Max"
+msgstr "Max"
+
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
+#, no-c-format
+msgid "Scan Mode"
+msgstr "Scan Mode"
+
+#: backend/epson.c:2845 backend/epson2.c:1012
+#, no-c-format
+msgid "Selects the halftone."
+msgstr "Selects the halftone."
+
+#: backend/epson.c:2867 backend/epson2.c:1033
+#, no-c-format
+msgid "Dropout"
+msgstr "Dropout"
+
+#: backend/epson.c:2868 backend/epson2.c:1034
+#, no-c-format
+msgid "Selects the dropout."
+msgstr "Selects the dropout."
+
+#: backend/epson.c:2880 backend/epson2.c:1046
+#, no-c-format
+msgid "Selects the brightness."
+msgstr "Selects the brightness."
+
+#: backend/epson.c:2895 backend/epson2.c:1059
+#, no-c-format
+msgid "Sharpness"
+msgstr "Sharpness"
+
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
+#, no-c-format
+msgid "Color correction"
+msgstr "Color correction"
+
+#: backend/epson.c:3034 backend/epson2.c:1177
+#, no-c-format
+msgid "Sets the color correction table for the selected output device."
+msgstr "Sets the color correction table for the selected output device."
+
+#: backend/epson.c:3075
+#, no-c-format
+msgid "Color correction coefficients"
+msgstr "Color correction coefficients"
+
+#: backend/epson.c:3076
+#, no-c-format
+msgid "Matrix multiplication of RGB"
+msgstr "Matrix multiplication of RGB"
+
+#: backend/epson.c:3093
+#, no-c-format
+msgid "Shift green to red"
+msgstr "Shift green to red"
+
+#: backend/epson.c:3094
+#, no-c-format
+msgid "Shift green to blue"
+msgstr "Shift green to blue"
+
+#: backend/epson.c:3095
+#, no-c-format
+msgid "Shift red to green"
+msgstr "Shift red to green"
+
+#: backend/epson.c:3097
+#, no-c-format
+msgid "Shift red to blue"
+msgstr "Shift red to blue"
+
+#: backend/epson.c:3098
+#, no-c-format
+msgid "Shift blue to green"
+msgstr "Shift blue to green"
+
+#: backend/epson.c:3099
+#, no-c-format
+msgid "Shift blue to red"
+msgstr "Shift blue to red"
+
+#: backend/epson.c:3102
+#, no-c-format
+msgid "Controls green level"
+msgstr "Controls green level"
+
+#: backend/epson.c:3103
+#, no-c-format
+msgid "Adds to red based on green level"
+msgstr "Adds to red based on green level"
+
+#: backend/epson.c:3104
+#, no-c-format
+msgid "Adds to blue based on green level"
+msgstr "Adds to blue based on green level"
+
+#: backend/epson.c:3105
+#, no-c-format
+msgid "Adds to green based on red level"
+msgstr "Adds to green based on red level"
+
+#: backend/epson.c:3106
+#, no-c-format
+msgid "Controls red level"
+msgstr "Controls red level"
+
+#: backend/epson.c:3107
+#, no-c-format
+msgid "Adds to blue based on red level"
+msgstr "Adds to blue based on red level"
+
+#: backend/epson.c:3108
+#, no-c-format
+msgid "Adds to green based on blue level"
+msgstr "Adds to green based on blue level"
+
+#: backend/epson.c:3109
+#, no-c-format
+msgid "Adds to red based on blue level"
+msgstr "Adds to red based on blue level"
+
+#: backend/epson.c:3110
+#, no-c-format
+msgid "Controls blue level"
+msgstr "Controls blue level"
+
+#: backend/epson.c:3206 backend/epson2.c:1256
+#, no-c-format
+msgid "Mirror the image."
+msgstr "Mirror the image."
+
+#: backend/epson.c:3232 backend/mustek.c:4332
+#, no-c-format
+msgid "Fast preview"
+msgstr "Fast preview"
+
+#: backend/epson.c:3245 backend/epson2.c:1266
+#, no-c-format
+msgid "Auto area segmentation"
+msgstr "Auto area segmentation"
+
+#: backend/epson.c:3258
+#, no-c-format
+msgid "Short resolution list"
+msgstr "Short resolution list"
+
+#: backend/epson.c:3260
+#, no-c-format
+msgid "Display short resolution list"
+msgstr "Display short resolution list"
+
+#: backend/epson.c:3267
+#, no-c-format
+msgid "Zoom"
+msgstr "Zoom"
+
+#: backend/epson.c:3269
+#, no-c-format
+msgid "Defines the zoom factor the scanner will use"
+msgstr "Defines the zoom factor the scanner will use"
+
+#: backend/epson.c:3349
+#, no-c-format
+msgid "Quick format"
+msgstr "Quick format"
+
+#: backend/epson.c:3360 backend/epson2.c:1341
+#, no-c-format
+msgid "Optional equipment"
+msgstr "Optional equipment"
+
+#: backend/epson.c:3431 backend/epson2.c:1394
+#, no-c-format
+msgid "Eject"
+msgstr "Eject"
+
+#: backend/epson.c:3432 backend/epson2.c:1395
+#, no-c-format
+msgid "Eject the sheet in the ADF"
+msgstr "Eject the sheet in the ADF"
+
+#: backend/epson.c:3444 backend/epson2.c:1405
+#, no-c-format
+msgid "Auto eject"
+msgstr "Auto eject"
+
+#: backend/epson.c:3445 backend/epson2.c:1407
+#, no-c-format
+msgid "Eject document after scanning"
+msgstr "Eject document after scanning"
+
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
+#, no-c-format
+msgid "ADF Mode"
+msgstr "ADF Mode"
+
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
+#, no-c-format
+msgid "Selects the ADF mode (simplex/duplex)"
+msgstr "Selects the ADF mode (simplex/duplex)"
+
+#: backend/epson.c:3473 backend/epson2.c:1431
+#, no-c-format
+msgid "Bay"
+msgstr "Bay"
+
+#: backend/epson.c:3474 backend/epson2.c:1432
+#, no-c-format
+msgid "Select bay to scan"
+msgstr "Select bay to scan"
+
+#: backend/epson.h:69 backend/epson2.h:68
+#, no-c-format
+msgid ""
+"Selects the gamma correction value from a list of pre-defined devices or "
+"the user defined table, which can be downloaded to the scanner"
+msgstr ""
+"Selects the gamma correction value from a list of pre-defined devices or "
+"the user defined table, which can be downloaded to the scanner"
+
+#: backend/epson.h:72 backend/epson2.h:71
+#, no-c-format
+msgid "Focus Position"
+msgstr "Focus Position"
+
+#: backend/epson.h:73 backend/epson2.h:72
+#, no-c-format
+msgid ""
+"Sets the focus position to either the glass or 2.5mm above the glass"
+msgstr ""
+"Sets the focus position to either the glass or 2.5mm above the glass"
+
+#: backend/epson.h:75 backend/epson2.h:74
+#, no-c-format
+msgid "Wait for Button"
+msgstr "Wait for Button"
+
+#: backend/epson.h:76 backend/epson2.h:75
+#, no-c-format
+msgid ""
+"After sending the scan command, wait until the button on the scanner is "
+"pressed to actually start the scan process."
+msgstr ""
+"After sending the scan command, wait until the button on the scanner is "
+"pressed to actually start the scan process."
+
+#: backend/epson2.c:102 backend/pixma.c:390
+#, no-c-format
+msgid "Infrared"
+msgstr "Infrared"
+
+#: backend/epson2.c:117
+#, no-c-format
+msgid "TPU8x10"
+msgstr "TPU8x10"
+
+#: backend/epson2.c:136
+#, no-c-format
+msgid "Positive Slide"
+msgstr "Positive Slide"
+
+#: backend/epson2.c:137
+#, no-c-format
+msgid "Negative Slide"
+msgstr "Negative Slide"
+
+#: backend/epson2.c:215
+#, no-c-format
+msgid "Built in CCT profile"
+msgstr "Built in CCT profile"
+
+#: backend/epson2.c:216
+#, no-c-format
+msgid "User defined CCT profile"
+msgstr "User defined CCT profile"
+
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
+#, no-c-format
+msgid "On"
+msgstr "On"
+
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
+#, no-c-format
+msgid "Off"
+msgstr "Off"
+
+#: backend/fujitsu.c:686
+#, no-c-format
+msgid "DTC"
+msgstr "DTC"
+
+#: backend/fujitsu.c:687
+#, no-c-format
+msgid "SDTC"
+msgstr "SDTC"
+
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
+#, no-c-format
+msgid "Dither"
+msgstr "Dither"
+
+#: backend/fujitsu.c:690
+#, no-c-format
+msgid "Diffusion"
+msgstr "Diffusion"
+
+#: backend/fujitsu.c:695
+#, no-c-format
+msgid "White"
+msgstr "White"
+
+#: backend/fujitsu.c:696
+#, no-c-format
+msgid "Black"
+msgstr "Black"
+
+#: backend/fujitsu.c:701
+#, no-c-format
+msgid "Continue"
+msgstr "Continue"
+
+#: backend/fujitsu.c:702
+#, no-c-format
+msgid "Stop"
+msgstr "Stop"
+
+#: backend/fujitsu.c:704
+#, no-c-format
+msgid "10mm"
+msgstr "10mm"
+
+#: backend/fujitsu.c:705
+#, no-c-format
+msgid "15mm"
+msgstr "15mm"
+
+#: backend/fujitsu.c:706
+#, no-c-format
+msgid "20mm"
+msgstr "20mm"
+
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
+#, no-c-format
+msgid "Horizontal"
+msgstr "Horizontal"
+
+#: backend/fujitsu.c:709
+#, no-c-format
+msgid "Horizontal bold"
+msgstr "Horizontal bold"
+
+#: backend/fujitsu.c:710
+#, no-c-format
+msgid "Horizontal narrow"
+msgstr "Horizontal narrow"
+
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
+#, no-c-format
+msgid "Vertical"
+msgstr "Vertical"
+
+#: backend/fujitsu.c:712
+#, no-c-format
+msgid "Vertical bold"
+msgstr "Vertical bold"
+
+#: backend/fujitsu.c:714
+#, no-c-format
+msgid "Top to bottom"
+msgstr "Top to bottom"
+
+#: backend/fujitsu.c:715
+#, no-c-format
+msgid "Bottom to top"
+msgstr "Bottom to top"
+
+#: backend/fujitsu.c:717
+#, no-c-format
+msgid "Front"
+msgstr "Front"
+
+#: backend/fujitsu.c:718
+#, no-c-format
+msgid "Back"
+msgstr "Back"
+
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
+#, no-c-format
+msgid "Gamma function exponent"
+msgstr "Gamma function exponent"
+
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
+#, no-c-format
+msgid "Changes intensity of midtones"
+msgstr "Changes intensity of midtones"
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr "RIF"
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr "Reverse image format"
+
+#: backend/fujitsu.c:3165
+#, no-c-format
+msgid "Halftone type"
+msgstr "Halftone type"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr "Control type of halftone filter"
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr "Control pattern of halftone filter"
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr "Outline"
+
+#: backend/fujitsu.c:3210
+#, no-c-format
+msgid "Perform outline extraction"
+msgstr "Perform outline extraction"
+
+#: backend/fujitsu.c:3221
+#, no-c-format
+msgid "Emphasis"
+msgstr "Emphasis"
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr "Negative to smooth or positive to sharpen image"
+
+#: backend/fujitsu.c:3240
+#, no-c-format
+msgid "Separation"
+msgstr "Separation"
+
+#: backend/fujitsu.c:3241
+#, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr "Enable automatic separation of image and text"
+
+#: backend/fujitsu.c:3252
+#, no-c-format
+msgid "Mirroring"
+msgstr "Mirroring"
+
+#: backend/fujitsu.c:3253
+#, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "Reflect output image horizontally"
+
+#: backend/fujitsu.c:3270
+#, no-c-format
+msgid "White level follower"
+msgstr "White level follower"
+
+#: backend/fujitsu.c:3271
+#, no-c-format
+msgid "Control white level follower"
+msgstr "Control white level follower"
+
+#: backend/fujitsu.c:3289
+#, no-c-format
+msgid "BP filter"
+msgstr "BP filter"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr "Improves quality of high resolution ball-point pen text"
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr "Smoothing"
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr "Enable smoothing for improved OCR"
+
+#: backend/fujitsu.c:3323
+#, no-c-format
+msgid "Gamma curve"
+msgstr "Gamma curve"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr "Gamma curve, from light to dark, but upper two may not work"
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, no-c-format
+msgid "Threshold curve"
+msgstr "Threshold curve"
+
+#: backend/fujitsu.c:3347
+#, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+
+#: backend/fujitsu.c:3369
+#, no-c-format
+msgid "Threshold white"
+msgstr "Threshold white"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr "Set pixels equal to threshold to white instead of black"
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, no-c-format
+msgid "Noise removal"
+msgstr "Noise removal"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr "Matrix 5x5"
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr "Remove 5 pixel square noise"
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr "Matrix 4x4"
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr "Remove 4 pixel square noise"
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr "Matrix 3x3"
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr "Remove 3 pixel square noise"
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr "Matrix 2x2"
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr "Remove 2 pixel square noise"
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr "Variance"
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr "Set SDTC variance rate (sensitivity), 0 equals 127"
+
+#: backend/fujitsu.c:3508
+#, no-c-format
+msgid "Auto width detection"
+msgstr "Auto width detection"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr "Scanner detects paper sides. May reduce scanning speed."
+
+#: backend/fujitsu.c:3526
+#, no-c-format
+msgid "Auto length detection"
+msgstr "Auto length detection"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr "Scanner detects paper lower edge. May confuse some frontends."
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr "Compression"
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr "Enable compressed data. May crash your front-end program"
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr "Compression argument"
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr "DF action"
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr "Action following double feed error"
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr "DF skew"
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr "Enable double feed error due to skew"
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr "DF thickness"
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr "Enable double feed error due to paper thickness"
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr "DF length"
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr "Enable double feed error due to paper length"
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
+msgstr "DF length difference"
+
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr "Difference in page length to trigger double feed error"
+
+#: backend/fujitsu.c:3708
+#, no-c-format
+msgid "DF recovery mode"
+msgstr "DF recovery mode"
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr "Request scanner to reverse feed on paper jam"
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr "Paper protection"
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr "Request scanner to predict jams in the ADF"
+
+#: backend/fujitsu.c:3748
+#, no-c-format
+msgid "Advanced paper protection"
+msgstr "Advanced paper protection"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr "Request scanner to predict jams in the ADF using improved sensors"
+
+#: backend/fujitsu.c:3768
+#, no-c-format
+msgid "Staple detection"
+msgstr "Staple detection"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr "Request scanner to detect jams in the ADF caused by staples"
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr "Background color"
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+"Set color of background for scans. May conflict with overscan option"
+
+#: backend/fujitsu.c:3809
+#, no-c-format
+msgid "Dropout color"
+msgstr "Dropout color"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+
+#: backend/fujitsu.c:3833
+#, no-c-format
+msgid "Buffer mode"
+msgstr "Buffer mode"
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+"Request scanner to read pages quickly from ADF into internal memory"
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr "Prepick"
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr "Request scanner to grab next page from ADF"
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr "Overscan"
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr "Sleep timer"
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+"Time in minutes until the internal power supply switches to sleep mode"
+
+#: backend/fujitsu.c:3911
+#, no-c-format
+msgid "Off timer"
+msgstr "Off timer"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+
+#: backend/fujitsu.c:3930
+#, no-c-format
+msgid "Duplex offset"
+msgstr "Duplex offset"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr "Adjust front/back offset"
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "Green offset"
+
+#: backend/fujitsu.c:3949
+#, no-c-format
+msgid "Adjust green/red offset"
+msgstr "Adjust green/red offset"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr "Blue offset"
+
+#: backend/fujitsu.c:3967
+#, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "Adjust blue/red offset"
+
+#: backend/fujitsu.c:3980
+#, no-c-format
+msgid "Low Memory"
+msgstr "Low Memory"
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option ‘side’ can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+
+#: backend/fujitsu.c:3996
+#, no-c-format
+msgid "Duplex side"
+msgstr "Duplex side"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr "Hardware deskew and crop"
+
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr "Request scanner to rotate and crop pages digitally."
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr "Software deskew"
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr "Request driver to rotate skewed pages digitally."
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr "Software despeckle diameter"
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
+msgstr "Maximum diameter of lone dots to remove from scan."
+
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
+#, no-c-format
+msgid "Software crop"
+msgstr "Software crop"
+
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr "Request driver to remove border from pages digitally."
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr "Halt on Cancel"
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+
+#: backend/fujitsu.c:4095
+#, no-c-format
+msgid "Endorser Options"
+msgstr "Endorser Options"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr "Controls for endorser unit"
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr "Endorser"
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr "Enable endorser unit"
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr "Endorser bits"
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr "Determines maximum endorser counter value."
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr "Endorser value"
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr "Initial endorser counter value."
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr "Endorser step"
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr "Change endorser counter value by this much for each page."
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr "Endorser Y"
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr "Endorser print offset from top of paper."
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr "Endorser font"
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr "Endorser printing font."
+
+#: backend/fujitsu.c:4253
+#, no-c-format
+msgid "Endorser direction"
+msgstr "Endorser direction"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr "Endorser printing direction."
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr "Endorser side"
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr "Endorser printing side, requires hardware support to change"
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr "Endorser string"
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr "Top edge"
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr "Paper is pulled partly into adf"
+
+#: backend/fujitsu.c:4344
+#, no-c-format
+msgid "A3 paper"
+msgstr "A3 paper"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr "A3 paper detected"
+
+#: backend/fujitsu.c:4356
+#, no-c-format
+msgid "B4 paper"
+msgstr "B4 paper"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr "B4 paper detected"
+
+#: backend/fujitsu.c:4368
+#, no-c-format
+msgid "A4 paper"
+msgstr "A4 paper"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr "A4 paper detected"
+
+#: backend/fujitsu.c:4380
+#, no-c-format
+msgid "B5 paper"
+msgstr "B5 paper"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr "B5 paper detected"
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr "OMR or DF"
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr "OMR or double feed detected"
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr "Power saving"
+
+#: backend/fujitsu.c:4429
+#, no-c-format
+msgid "Scanner in power saving mode"
+msgstr "Scanner in power saving mode"
+
+#: backend/fujitsu.c:4452
+#, no-c-format
+msgid "Manual feed"
+msgstr "Manual feed"
+
+#: backend/fujitsu.c:4453
+#, no-c-format
+msgid "Manual feed selected"
+msgstr "Manual feed selected"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr "Function"
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr "Function character on screen"
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr "Ink low"
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr "Imprinter ink running low"
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr "Double feed"
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr "Double feed detected"
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr "Error code"
+
+#: backend/fujitsu.c:4513
+#, no-c-format
+msgid "Hardware error code"
+msgstr "Hardware error code"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr "Skew angle"
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr "Requires black background for scanning"
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr "Ink remaining"
+
+#: backend/fujitsu.c:4537
+#, no-c-format
+msgid "Imprinter ink level"
+msgstr "Imprinter ink level"
+
+#: backend/fujitsu.c:4548
+#, no-c-format
+msgid "Density"
+msgstr "Density"
+
+#: backend/fujitsu.c:4549
+#, no-c-format
+msgid "Density dial"
+msgstr "Density dial"
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, no-c-format
+msgid "Duplex switch"
+msgstr "Duplex switch"
+
+#: backend/genesys.c:5761
+#, no-c-format
+msgid "Request backend to remove border from pages digitally"
+msgstr "Request backend to remove border from pages digitally"
+
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
+#, no-c-format
+msgid "Request driver to discard pages with low numbers of dark pixels"
+msgstr "Request driver to discard pages with low numbers of dark pixels"
+
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
+#, no-c-format
+msgid "Software derotate"
+msgstr "Software derotate"
+
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
+#, no-c-format
+msgid "Request driver to detect and correct 90 degree image rotation"
+msgstr "Request driver to detect and correct 90 degree image rotation"
+
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
+#, no-c-format
+msgid "Extras"
+msgstr "Extras"
+
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
+#, no-c-format
+msgid "Dynamic threshold curve, from light to dark, normally 50-65"
+msgstr "Dynamic threshold curve, from light to dark, normally 50-65"
+
+#: backend/genesys.c:5842
+#, no-c-format
+msgid "Disable dynamic lineart"
+msgstr "Disable dynamic lineart"
+
+#: backend/genesys.c:5844
+#, no-c-format
+msgid ""
+"Disable use of a software adaptive algorithm to generate lineart relying "
+"instead on hardware lineart."
+msgstr ""
+"Disable use of a software adaptive algorithm to generate lineart relying "
+"instead on hardware lineart."
+
+#: backend/genesys.c:5860
+#, no-c-format
+msgid "Disable interpolation"
+msgstr "Disable interpolation"
+
+#: backend/genesys.c:5863
+#, no-c-format
+msgid ""
+"When using high resolutions where the horizontal resolution is smaller "
+"than the vertical resolution this disables horizontal interpolation."
+msgstr ""
+"When using high resolutions where the horizontal resolution is smaller "
+"than the vertical resolution this disables horizontal interpolation."
+
+#: backend/genesys.c:5872
+#, no-c-format
+msgid "Color filter"
+msgstr "Color filter"
+
+#: backend/genesys.c:5875
+#, no-c-format
+msgid "When using gray or lineart this option selects the used color."
+msgstr "When using gray or lineart this option selects the used color."
+
+#: backend/genesys.c:5901
+#, no-c-format
+msgid "Calibration file"
+msgstr "Calibration file"
+
+#: backend/genesys.c:5902
+#, no-c-format
+msgid "Specify the calibration file to use"
+msgstr "Specify the calibration file to use"
+
+#: backend/genesys.c:5919
+#, no-c-format
+msgid "Calibration cache expiration time"
+msgstr "Calibration cache expiration time"
+
+#: backend/genesys.c:5920
+#, no-c-format
+msgid ""
+"Time (in minutes) before a cached calibration expires. A value of 0 "
+"means cache is not used. A negative value means cache never expires."
+msgstr ""
+"Time (in minutes) before a cached calibration expires. A value of 0 "
+"means cache is not used. A negative value means cache never expires."
+
+#: backend/genesys.c:5930
+#, no-c-format
+msgid "Lamp off time"
+msgstr "Lamp off time"
+
+#: backend/genesys.c:5933
+#, no-c-format
+msgid ""
+"The lamp will be turned off after the given time (in minutes). A value "
+"of 0 means, that the lamp won't be turned off."
+msgstr ""
+"The lamp will be turned off after the given time (in minutes). A value "
+"of 0 means, that the lamp won't be turned off."
+
+#: backend/genesys.c:5943
+#, no-c-format
+msgid "Lamp off during scan"
+msgstr "Lamp off during scan"
+
+#: backend/genesys.c:5944
+#, no-c-format
+msgid "The lamp will be turned off during scan. "
+msgstr "The lamp will be turned off during scan. "
+
+#: backend/genesys.c:5972 backend/genesys.c:5973
+#, no-c-format
+msgid "File button"
+msgstr "File button"
+
+#: backend/genesys.c:6025 backend/genesys.c:6026
+#, no-c-format
+msgid "OCR button"
+msgstr "OCR button"
+
+#: backend/genesys.c:6039 backend/genesys.c:6040
+#, no-c-format
+msgid "Power button"
+msgstr "Power button"
+
+#: backend/genesys.c:6053 backend/genesys.c:6054
+#, no-c-format
+msgid "Extra button"
+msgstr "Extra button"
+
+#: backend/genesys.c:6067 backend/gt68xx.c:762
+#, no-c-format
+msgid "Need calibration"
+msgstr "Need calibration"
+
+#: backend/genesys.c:6068 backend/gt68xx.c:763
+#, no-c-format
+msgid "The scanner needs calibration for the current settings"
+msgstr "The scanner needs calibration for the current settings"
+
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
+#, no-c-format
+msgid "Buttons"
+msgstr "Buttons"
+
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
+#, no-c-format
+msgid "Calibrate"
+msgstr "Calibrate"
+
+#: backend/genesys.c:6091 backend/gt68xx.c:796
+#, no-c-format
+msgid "Start calibration using special sheet"
+msgstr "Start calibration using special sheet"
+
+#: backend/genesys.c:6105 backend/gt68xx.c:809
+#, no-c-format
+msgid "Clear calibration"
+msgstr "Clear calibration"
+
+#: backend/genesys.c:6106 backend/gt68xx.c:810
+#, no-c-format
+msgid "Clear calibration cache"
+msgstr "Clear calibration cache"
+
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
+#, no-c-format
+msgid "Transparency Adapter"
+msgstr "Transparency Adapter"
+
+#: backend/gt68xx.c:477
+#, no-c-format
+msgid "Gray mode color"
+msgstr "Gray mode color"
+
+#: backend/gt68xx.c:479
+#, no-c-format
+msgid "Selects which scan color is used gray mode (default: green)."
+msgstr "Selects which scan color is used gray mode (default: green)."
+
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
+#, no-c-format
+msgid "Debugging Options"
+msgstr "Debugging Options"
+
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
+#, no-c-format
+msgid "Automatic warmup"
+msgstr "Automatic warmup"
+
+#: backend/gt68xx.c:573
+#, no-c-format
+msgid ""
+"Warm-up until the lamp's brightness is constant instead of insisting on "
+"60 seconds warm-up time."
+msgstr ""
+"Warm-up until the lamp's brightness is constant instead of insisting on "
+"60 seconds warm-up time."
+
+#: backend/gt68xx.c:585
+#, no-c-format
+msgid "Full scan"
+msgstr "Full scan"
+
+#: backend/gt68xx.c:587
+#, no-c-format
+msgid ""
+"Scan the complete scanning area including calibration strip. Be careful. "
+"Don't select the full height. For testing only."
+msgstr ""
+"Scan the complete scanning area including calibration strip. Be careful. "
+"Don't select the full height. For testing only."
+
+#: backend/gt68xx.c:598
+#, no-c-format
+msgid "Coarse calibration"
+msgstr "Coarse calibration"
+
+#: backend/gt68xx.c:600
+#, no-c-format
+msgid ""
+"Setup gain and offset for scanning automatically. If this option is "
+"disabled, options for setting the analog frontend parameters manually "
+"are provided. This option is enabled by default. For testing only."
+msgstr ""
+"Setup gain and offset for scanning automatically. If this option is "
+"disabled, options for setting the analog frontend parameters manually "
+"are provided. This option is enabled by default. For testing only."
+
+#: backend/gt68xx.c:619
+#, no-c-format
+msgid "Coarse calibration for first scan only"
+msgstr "Coarse calibration for first scan only"
+
+#: backend/gt68xx.c:621
+#, no-c-format
+msgid ""
+"Coarse calibration is only done for the first scan. Works with most "
+"scanners and can save scanning time. If the image brightness is "
+"different with each scan, disable this option. For testing only."
+msgstr ""
+"Coarse calibration is only done for the first scan. Works with most "
+"scanners and can save scanning time. If the image brightness is "
+"different with each scan, disable this option. For testing only."
+
+#: backend/gt68xx.c:654
+#, no-c-format
+msgid "Backtrack lines"
+msgstr "Backtrack lines"
+
+#: backend/gt68xx.c:656
+#, no-c-format
+msgid ""
+"Number of lines the scan slider moves back when backtracking occurs. "
+"That happens when the scanner scans faster than the computer can receive "
+"the data. Low values cause faster scans but increase the risk of "
+"omitting lines."
+msgstr ""
+"Number of lines the scan slider moves back when backtracking occurs. "
+"That happens when the scanner scans faster than the computer can receive "
+"the data. Low values cause faster scans but increase the risk of "
+"omitting lines."
+
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
+#, no-c-format
+msgid "Gamma value"
+msgstr "Gamma value"
+
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
+#, no-c-format
+msgid "Sets the gamma value of all channels."
+msgstr "Sets the gamma value of all channels."
+
+#: backend/hp3500.c:1020
+#, no-c-format
+msgid "Geometry Group"
+msgstr "Geometry Group"
+
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
+#, no-c-format
+msgid "Scan Mode Group"
+msgstr "Scan Mode Group"
+
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
+#, no-c-format
+msgid "Slide"
+msgstr "Slide"
+
+#: backend/hp3900_sane.c:1405
+#, no-c-format
+msgid "Scanner model"
+msgstr "Scanner model"
+
+#: backend/hp3900_sane.c:1408
+#, no-c-format
+msgid "Allows one to test device behaviour with other supported models"
+msgstr "Allows one to test device behaviour with other supported models"
+
+#: backend/hp3900_sane.c:1422
+#, no-c-format
+msgid "Image colours will be inverted"
+msgstr "Image colours will be inverted"
+
+#: backend/hp3900_sane.c:1436
+#, no-c-format
+msgid "Disable gamma correction"
+msgstr "Disable gamma correction"
+
+#: backend/hp3900_sane.c:1437
+#, no-c-format
+msgid "Gamma correction will be disabled"
+msgstr "Gamma correction will be disabled"
+
+#: backend/hp3900_sane.c:1451
+#, no-c-format
+msgid "Disable white shading correction"
+msgstr "Disable white shading correction"
+
+#: backend/hp3900_sane.c:1453
+#, no-c-format
+msgid "White shading correction will be disabled"
+msgstr "White shading correction will be disabled"
+
+#: backend/hp3900_sane.c:1467
+#, no-c-format
+msgid "Skip warmup process"
+msgstr "Skip warmup process"
+
+#: backend/hp3900_sane.c:1468
+#, no-c-format
+msgid "Warmup process will be disabled"
+msgstr "Warmup process will be disabled"
+
+#: backend/hp3900_sane.c:1482
+#, no-c-format
+msgid "Force real depth"
+msgstr "Force real depth"
+
+#: backend/hp3900_sane.c:1485
+#, no-c-format
+msgid ""
+"If gamma is enabled, scans are always made in 16 bits depth to improve "
+"image quality and then converted to the selected depth. This option "
+"avoids depth emulation."
+msgstr ""
+"If gamma is enabled, scans are always made in 16 bits depth to improve "
+"image quality and then converted to the selected depth. This option "
+"avoids depth emulation."
+
+#: backend/hp3900_sane.c:1499
+#, no-c-format
+msgid "Emulate Grayscale"
+msgstr "Emulate Grayscale"
+
+#: backend/hp3900_sane.c:1502
+#, no-c-format
+msgid ""
+"If enabled, image will be scanned in color mode and then converted to "
+"grayscale by software. This may improve image quality in some "
+"circumstances."
+msgstr ""
+"If enabled, image will be scanned in color mode and then converted to "
+"grayscale by software. This may improve image quality in some "
+"circumstances."
+
+#: backend/hp3900_sane.c:1516
+#, no-c-format
+msgid "Save debugging images"
+msgstr "Save debugging images"
+
+#: backend/hp3900_sane.c:1519
+#, no-c-format
+msgid ""
+"If enabled, some images involved in scanner processing are saved to "
+"analyze them."
+msgstr ""
+"If enabled, some images involved in scanner processing are saved to "
+"analyze them."
+
+#: backend/hp3900_sane.c:1533
+#, no-c-format
+msgid "Reset chipset"
+msgstr "Reset chipset"
+
+#: backend/hp3900_sane.c:1534
+#, no-c-format
+msgid "Resets chipset data"
+msgstr "Resets chipset data"
+
+#: backend/hp3900_sane.c:1547
+#, no-c-format
+msgid "Information"
+msgstr "Information"
+
+#: backend/hp3900_sane.c:1560
+#, no-c-format
+msgid "Chipset name"
+msgstr "Chipset name"
+
+#: backend/hp3900_sane.c:1561
+#, no-c-format
+msgid "Shows chipset name used in device."
+msgstr "Shows chipset name used in device."
+
+#: backend/hp3900_sane.c:1565
+#, no-c-format
+msgid "Unknown"
+msgstr "Unknown"
+
+#: backend/hp3900_sane.c:1571
+#, no-c-format
+msgid "Chipset ID"
+msgstr "Chipset ID"
+
+#: backend/hp3900_sane.c:1572
+#, no-c-format
+msgid "Shows the chipset ID"
+msgstr "Shows the chipset ID"
+
+#: backend/hp3900_sane.c:1582
+#, no-c-format
+msgid "Scan counter"
+msgstr "Scan counter"
+
+#: backend/hp3900_sane.c:1584
+#, no-c-format
+msgid "Shows the number of scans made by scanner"
+msgstr "Shows the number of scans made by scanner"
+
+#: backend/hp3900_sane.c:1594
+#, no-c-format
+msgid "Update information"
+msgstr "Update information"
+
+#: backend/hp3900_sane.c:1595
+#, no-c-format
+msgid "Updates information about device"
+msgstr "Updates information about device"
+
+#: backend/hp3900_sane.c:1635
+#, no-c-format
+msgid "This option reflects a front panel scanner button"
+msgstr "This option reflects a front panel scanner button"
+
+#: backend/hp5400_sane.c:313 backend/niash.c:678
+#, no-c-format
+msgid "Image"
+msgstr "Image"
+
+#: backend/hp5400_sane.c:352 backend/niash.c:709
+#, no-c-format
+msgid "Miscellaneous"
+msgstr "Miscellaneous"
+
+#: backend/hp5400_sane.c:358
+#, no-c-format
+msgid "offset X"
+msgstr "offset X"
+
+#: backend/hp5400_sane.c:359
+#, no-c-format
+msgid "Hardware internal X position of the scanning area."
+msgstr "Hardware internal X position of the scanning area."
+
+#: backend/hp5400_sane.c:368
+#, no-c-format
+msgid "offset Y"
+msgstr "offset Y"
+
+#: backend/hp5400_sane.c:369
+#, no-c-format
+msgid "Hardware internal Y position of the scanning area."
+msgstr "Hardware internal Y position of the scanning area."
+
+#: backend/hp5400_sane.c:381 backend/niash.c:716
+#, no-c-format
+msgid "Lamp status"
+msgstr "Lamp status"
+
+#: backend/hp5400_sane.c:382 backend/niash.c:717
+#, no-c-format
+msgid "Switches the lamp on or off."
+msgstr "Switches the lamp on or off."
+
+#: backend/hp5400_sane.c:393 backend/niash.c:727
+#, no-c-format
+msgid "Calibrates for black and white level."
+msgstr "Calibrates for black and white level."
+
+#: backend/hp5590.c:86 backend/hp-option.c:3253
+#, no-c-format
+msgid "ADF"
+msgstr "ADF"
+
+#: backend/hp5590.c:88
+#, no-c-format
+msgid "TMA Slides"
+msgstr "TMA Slides"
+
+#: backend/hp5590.c:89
+#, no-c-format
+msgid "TMA Negatives"
+msgstr "TMA Negatives"
+
+#: backend/hp5590.c:92
+#, no-c-format
+msgid "Color (48 bits)"
+msgstr "Color (48 bits)"
+
+#: backend/hp5590.c:95
+#, no-c-format
+msgid "Extend lamp timeout"
+msgstr "Extend lamp timeout"
+
+#: backend/hp5590.c:96
+#, no-c-format
+msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
+msgstr "Extends lamp timeout (from 15 minutes to 1 hour)"
+
+#: backend/hp5590.c:98
+#, no-c-format
+msgid "Wait for button"
+msgstr "Wait for button"
+
+#: backend/hp5590.c:99
+#, no-c-format
+msgid "Waits for button before scanning"
+msgstr "Waits for button before scanning"
+
+#: backend/hp-option.c:2984
+#, no-c-format
+msgid "Advanced Options"
+msgstr "Advanced Options"
+
+#: backend/hp-option.c:3041
+#, no-c-format
+msgid "Coarse"
+msgstr "Coarse"
+
+#: backend/hp-option.c:3042
+#, no-c-format
+msgid "Fine"
+msgstr "Fine"
+
+#: backend/hp-option.c:3043
+#, no-c-format
+msgid "Bayer"
+msgstr "Bayer"
+
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
+#, no-c-format
+msgid "Custom"
+msgstr "Custom"
+
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
+#, no-c-format
+msgid "Auto"
+msgstr "Auto"
+
+#: backend/hp-option.c:3088
+#, no-c-format
+msgid "NTSC RGB"
+msgstr "NTSC RGB"
+
+#: backend/hp-option.c:3089
+#, no-c-format
+msgid "XPA RGB"
+msgstr "XPA RGB"
+
+#: backend/hp-option.c:3090
+#, no-c-format
+msgid "Pass-through"
+msgstr "Pass-through"
+
+#: backend/hp-option.c:3091
+#, no-c-format
+msgid "NTSC Gray"
+msgstr "NTSC Gray"
+
+#: backend/hp-option.c:3092
+#, no-c-format
+msgid "XPA Gray"
+msgstr "XPA Gray"
+
+#: backend/hp-option.c:3144
+#, no-c-format
+msgid "Slow"
+msgstr "Slow"
+
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
+#, no-c-format
+msgid "Normal"
+msgstr "Normal"
+
+#: backend/hp-option.c:3146
+#, no-c-format
+msgid "Fast"
+msgstr "Fast"
+
+#: backend/hp-option.c:3147
+#, no-c-format
+msgid "Extra Fast"
+msgstr "Extra Fast"
+
+#: backend/hp-option.c:3160
+#, no-c-format
+msgid "2-pixel"
+msgstr "2-pixel"
+
+#: backend/hp-option.c:3161
+#, no-c-format
+msgid "4-pixel"
+msgstr "4-pixel"
+
+#: backend/hp-option.c:3162
+#, no-c-format
+msgid "8-pixel"
+msgstr "8-pixel"
+
+#: backend/hp-option.c:3173
+#, no-c-format
+msgid "Print"
+msgstr "Print"
+
+#: backend/hp-option.c:3175
+#, no-c-format
+msgid "Film-strip"
+msgstr "Film-strip"
+
+#: backend/hp-option.c:3254
+#, no-c-format
+msgid "XPA"
+msgstr "XPA"
+
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
+#, no-c-format
+msgid "Conditional"
+msgstr "Conditional"
+
+#: backend/hp-option.c:3414
+#, no-c-format
+msgid "Experiment"
+msgstr "Experiment"
+
+#: backend/hp-option.h:60
+#, no-c-format
+msgid "Sharpening"
+msgstr "Sharpening"
+
+#: backend/hp-option.h:61
+#, no-c-format
+msgid "Set sharpening value."
+msgstr "Set sharpening value."
+
+#: backend/hp-option.h:66
+#, no-c-format
+msgid "Auto Threshold"
+msgstr "Auto Threshold"
+
+#: backend/hp-option.h:68
+#, no-c-format
+msgid "Enable automatic determination of threshold for line-art scans."
+msgstr "Enable automatic determination of threshold for line-art scans."
+
+#: backend/hp-option.h:74
+#, no-c-format
+msgid "Select smoothing filter."
+msgstr "Select smoothing filter."
+
+#: backend/hp-option.h:79
+#, no-c-format
+msgid "Unload media after scan"
+msgstr "Unload media after scan"
+
+#: backend/hp-option.h:80
+#, no-c-format
+msgid "Unloads the media after a scan."
+msgstr "Unloads the media after a scan."
+
+#: backend/hp-option.h:85
+#, no-c-format
+msgid "Change document"
+msgstr "Change document"
+
+#: backend/hp-option.h:86
+#, no-c-format
+msgid "Change Document."
+msgstr "Change Document."
+
+#: backend/hp-option.h:91
+#, no-c-format
+msgid "Unload"
+msgstr "Unload"
+
+#: backend/hp-option.h:92
+#, no-c-format
+msgid "Unload Document."
+msgstr "Unload Document."
+
+#: backend/hp-option.h:98
+#, no-c-format
+msgid "Start calibration process."
+msgstr "Start calibration process."
+
+#: backend/hp-option.h:103
+#, no-c-format
+msgid "Media"
+msgstr "Media"
+
+#: backend/hp-option.h:104
+#, no-c-format
+msgid "Set type of media."
+msgstr "Set type of media."
+
+#: backend/hp-option.h:109
+#, no-c-format
+msgid "Exposure time"
+msgstr "Exposure time"
+
+#: backend/hp-option.h:111
+#, no-c-format
+msgid ""
+"A longer exposure time lets the scanner collect more light. Suggested "
+"use is 175% for prints, 150% for normal slides and \"Negative\" for "
+"negative film. For dark (underexposed) images you can increase this "
+"value."
+msgstr ""
+"A longer exposure time lets the scanner collect more light. Suggested "
+"use is 175% for prints, 150% for normal slides and “Negative� for "
+"negative film. For dark (underexposed) images you can increase this "
+"value."
+
+#: backend/hp-option.h:119 backend/hp-option.h:126
+#, no-c-format
+msgid "Color Matrix"
+msgstr "Color Matrix"
+
+#: backend/hp-option.h:121
+#, no-c-format
+msgid "Set the scanners color matrix."
+msgstr "Set the scanners color matrix."
+
+#: backend/hp-option.h:127
+#, no-c-format
+msgid "Custom color matrix."
+msgstr "Custom color matrix."
+
+#: backend/hp-option.h:132
+#, no-c-format
+msgid "Mono Color Matrix"
+msgstr "Mono Color Matrix"
+
+#: backend/hp-option.h:133
+#, no-c-format
+msgid "Custom color matrix for grayscale scans."
+msgstr "Custom color matrix for grayscale scans."
+
+#: backend/hp-option.h:138
+#, no-c-format
+msgid "Mirror horizontal"
+msgstr "Mirror horizontal"
+
+#: backend/hp-option.h:139
+#, no-c-format
+msgid "Mirror image horizontally."
+msgstr "Mirror image horizontally."
+
+#: backend/hp-option.h:144
+#, no-c-format
+msgid "Mirror vertical"
+msgstr "Mirror vertical"
+
+#: backend/hp-option.h:145
+#, no-c-format
+msgid "Mirror image vertically."
+msgstr "Mirror image vertically."
+
+#: backend/hp-option.h:150
+#, no-c-format
+msgid "Update options"
+msgstr "Update options"
+
+#: backend/hp-option.h:151
+#, no-c-format
+msgid "Update options."
+msgstr "Update options."
+
+#: backend/hp-option.h:156
+#, no-c-format
+msgid "8 bit output"
+msgstr "8 bit output"
+
+#: backend/hp-option.h:158
+#, no-c-format
+msgid "Use bit depth greater eight internally, but output only eight bits."
+msgstr ""
+"Use bit depth greater eight internally, but output only eight bits."
+
+#: backend/hp-option.h:164
+#, no-c-format
+msgid "Front button wait"
+msgstr "Front button wait"
+
+#: backend/hp-option.h:165
+#, no-c-format
+msgid "Wait to scan for front-panel button push."
+msgstr "Wait to scan for front-panel button push."
+
+#: backend/hp-option.h:172
+#, no-c-format
+msgid "Shut off lamp"
+msgstr "Shut off lamp"
+
+#: backend/hp-option.h:173
+#, no-c-format
+msgid "Shut off scanner lamp."
+msgstr "Shut off scanner lamp."
+
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
+#, no-c-format
+msgid "Paper size"
+msgstr "Paper size"
+
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
+#, no-c-format
+msgid "Automatic separation"
+msgstr "Automatic separation"
+
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
+#, no-c-format
+msgid "Landscape"
+msgstr "Landscape"
+
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
+#, no-c-format
+msgid "Inverse Image"
+msgstr "Inverse Image"
+
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
+#, no-c-format
+msgid "Long paper mode"
+msgstr "Long paper mode"
+
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
+#, no-c-format
+msgid "Length control mode"
+msgstr "Length control mode"
+
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
+#, no-c-format
+msgid "Manual feed mode"
+msgstr "Manual feed mode"
+
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
+#, no-c-format
+msgid "Manual feed timeout"
+msgstr "Manual feed timeout"
+
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
+#, no-c-format
+msgid "Double feed detection"
+msgstr "Double feed detection"
+
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
+#, no-c-format
+msgid "Enable Duplex (Dual-Sided) Scanning"
+msgstr "Enable Duplex (Dual-Sided) Scanning"
+
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
+#, no-c-format
+msgid "Physical size of the paper in the ADF"
+msgstr "Physical size of the paper in the ADF"
+
+#: backend/kvs1025_opt.c:39
+#, no-c-format
+msgid "bw"
+msgstr "bw"
+
+#: backend/kvs1025_opt.c:40
+#, no-c-format
+msgid "halftone"
+msgstr "halftone"
+
+#: backend/kvs1025_opt.c:41
+#, no-c-format
+msgid "gray"
+msgstr "gray"
+
+#: backend/kvs1025_opt.c:42
+#, no-c-format
+msgid "color"
+msgstr "color"
+
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
+#, no-c-format
+msgid "adf"
+msgstr "adf"
+
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
+#, no-c-format
+msgid "fb"
+msgstr "fb"
+
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
+#, no-c-format
+msgid "single"
+msgstr "single"
+
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
+#, no-c-format
+msgid "continuous"
+msgstr "continuous"
+
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
+#, no-c-format
+msgid "off"
+msgstr "off"
+
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
+#, no-c-format
+msgid "wait_doc"
+msgstr "wait_doc"
+
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
+#, no-c-format
+msgid "wait_key"
+msgstr "wait_key"
+
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
+#, no-c-format
+msgid "user_def"
+msgstr "user_def"
+
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
+#, no-c-format
+msgid "business_card"
+msgstr "business_card"
+
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
+#, no-c-format
+msgid "Check"
+msgstr "Check"
+
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
+#, no-c-format
+msgid "A5"
+msgstr "A5"
+
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
+#, no-c-format
+msgid "A6"
+msgstr "A6"
+
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
+#, no-c-format
+msgid "B5"
+msgstr "B5"
+
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
+#, no-c-format
+msgid "B6"
+msgstr "B6"
+
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
+#, no-c-format
+msgid "Legal"
+msgstr "Legal"
+
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
+#, no-c-format
+msgid "bayer_64"
+msgstr "bayer_64"
+
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
+#, no-c-format
+msgid "bayer_16"
+msgstr "bayer_16"
+
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
+#, no-c-format
+msgid "halftone_32"
+msgstr "halftone_32"
+
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
+#, no-c-format
+msgid "halftone_64"
+msgstr "halftone_64"
+
+#: backend/kvs1025_opt.c:153
+#, no-c-format
+msgid "diffusion"
+msgstr "diffusion"
+
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
+#, no-c-format
+msgid "normal"
+msgstr "normal"
+
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
+#, no-c-format
+msgid "light"
+msgstr "light"
+
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
+#, no-c-format
+msgid "dark"
+msgstr "dark"
+
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
+#, no-c-format
+msgid "From scanner"
+msgstr "From scanner"
+
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
+#, no-c-format
+msgid "From paper"
+msgstr "From paper"
+
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
+#, no-c-format
+msgid "default"
+msgstr "default"
+
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
+#, no-c-format
+msgid "smooth"
+msgstr "smooth"
+
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
+#, no-c-format
+msgid "none"
+msgstr "none"
+
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
+#, no-c-format
+msgid "low"
+msgstr "low"
+
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
+#, no-c-format
+msgid "medium"
+msgstr "medium"
+
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
+#, no-c-format
+msgid "high"
+msgstr "high"
+
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
+#, no-c-format
+msgid "crt"
+msgstr "crt"
+
+#: backend/kvs1025_opt.c:230
+#, no-c-format
+msgid "linier"
+msgstr "linier"
+
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
+#, no-c-format
+msgid "red"
+msgstr "red"
+
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
+#, no-c-format
+msgid "green"
+msgstr "green"
+
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
+#, no-c-format
+msgid "blue"
+msgstr "blue"
+
+#: backend/kvs1025_opt.c:562
+#, no-c-format
+msgid "Sets the scan source"
+msgstr "Sets the scan source"
+
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
+#, no-c-format
+msgid "Feeder mode"
+msgstr "Feeder mode"
+
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
+#, no-c-format
+msgid "Sets the feeding mode"
+msgstr "Sets the feeding mode"
+
+#: backend/kvs1025_opt.c:584
+#, no-c-format
+msgid "Enable/Disable long paper mode"
+msgstr "Enable/Disable long paper mode"
+
+#: backend/kvs1025_opt.c:593
+#, no-c-format
+msgid "Enable/Disable length control mode"
+msgstr "Enable/Disable length control mode"
+
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
+#, no-c-format
+msgid "Sets the manual feed mode"
+msgstr "Sets the manual feed mode"
+
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
+#, no-c-format
+msgid "Sets the manual feed timeout in seconds"
+msgstr "Sets the manual feed timeout in seconds"
+
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
+#, no-c-format
+msgid "Enable/Disable double feed detection"
+msgstr "Enable/Disable double feed detection"
+
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
+#, no-c-format
+msgid "fit-to-page"
+msgstr "fit-to-page"
+
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
+#, no-c-format
+msgid "Fit to page"
+msgstr "Fit to page"
+
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
+#, no-c-format
+msgid "Scanner shrinks image to fit scanned page"
+msgstr "Scanner shrinks image to fit scanned page"
+
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
+#, no-c-format
+msgid "Set paper position : true for landscape, false for portrait"
+msgstr "Set paper position : true for landscape, false for portrait"
+
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
+#, no-c-format
+msgid "Automatic threshold"
+msgstr "Automatic threshold"
+
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
+#, no-c-format
+msgid ""
+"Automatically sets brightness, contrast, white level, gamma, noise "
+"reduction and image emphasis"
+msgstr ""
+"Automatically sets brightness, contrast, white level, gamma, noise "
+"reduction and image emphasis"
+
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
+#, no-c-format
+msgid "Noise reduction"
+msgstr "Noise reduction"
+
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
+#, no-c-format
+msgid "Reduce the isolated dot noise"
+msgstr "Reduce the isolated dot noise"
+
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
+#, no-c-format
+msgid "Image emphasis"
+msgstr "Image emphasis"
+
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
+#, no-c-format
+msgid "Sets the image emphasis"
+msgstr "Sets the image emphasis"
+
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
+#, no-c-format
+msgid "Gamma"
+msgstr "Gamma"
+
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
+#, no-c-format
+msgid "Lamp color"
+msgstr "Lamp color"
+
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
+#, no-c-format
+msgid "Sets the lamp color (color dropout)"
+msgstr "Sets the lamp color (color dropout)"
+
+#: backend/kvs1025_opt.c:832
+#, no-c-format
+msgid "Inverse image in B/W or halftone mode"
+msgstr "Inverse image in B/W or halftone mode"
+
+#: backend/kvs1025_opt.c:840
+#, no-c-format
+msgid "Mirror image (left/right flip)"
+msgstr "Mirror image (left/right flip)"
+
+#: backend/kvs1025_opt.c:847
+#, no-c-format
+msgid "jpeg compression"
+msgstr "jpeg compression"
+
+#: backend/kvs1025_opt.c:850
+#, no-c-format
+msgid "JPEG Image Compression with Q parameter, '0' - no compression"
+msgstr "JPEG Image Compression with Q parameter, ‘0’ - no compression"
+
+#: backend/kvs1025_opt.c:860
+#, no-c-format
+msgid "Rotate image clockwise"
+msgstr "Rotate image clockwise"
+
+#: backend/kvs1025_opt.c:862
+#, no-c-format
+msgid "Request driver to rotate pages by a fixed amount"
+msgstr "Request driver to rotate pages by a fixed amount"
+
+#: backend/kvs1025_opt.c:874
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally"
+msgstr "Request driver to rotate skewed pages digitally"
+
+#: backend/kvs1025_opt.c:883
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan"
+msgstr "Maximum diameter of lone dots to remove from scan"
+
+#: backend/kvs1025_opt.c:902
+#, no-c-format
+msgid "Software automatic cropping"
+msgstr "Software automatic cropping"
+
+#: backend/kvs1025_opt.c:904
+#, no-c-format
+msgid "Request driver to remove border from pages digitally"
+msgstr "Request driver to remove border from pages digitally"
+
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
+#, no-c-format
+msgid ""
+"Length Control Mode is a mode that the scanner reads up to the shorter "
+"length of actual paper or logical document length."
+msgstr ""
+"Length Control Mode is a mode that the scanner reads up to the shorter "
+"length of actual paper or logical document length."
+
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
+#, no-c-format
+msgid "Gamma correction"
+msgstr "Gamma correction"
+
+#: backend/kvs40xx_opt.c:117
+#, no-c-format
+msgid "wait_doc_hopper_up"
+msgstr "wait_doc_hopper_up"
+
+#: backend/kvs40xx_opt.c:127
+#, no-c-format
+msgid "A3"
+msgstr "A3"
+
+#: backend/kvs40xx_opt.c:132
+#, no-c-format
+msgid "Double letter 11x17 in"
+msgstr "Double letter 11x17 in"
+
+#: backend/kvs40xx_opt.c:133
+#, no-c-format
+msgid "B4"
+msgstr "B4"
+
+#: backend/kvs40xx_opt.c:231
+#, no-c-format
+msgid "High sensivity"
+msgstr "High sensivity"
+
+#: backend/kvs40xx_opt.c:232
+#, no-c-format
+msgid "Low sensivity"
+msgstr "Low sensivity"
+
+#: backend/kvs40xx_opt.c:243
+#, no-c-format
+msgid "err_diffusion"
+msgstr "err_diffusion"
+
+#: backend/kvs40xx_opt.c:249
+#, no-c-format
+msgid "No detection"
+msgstr "No detection"
+
+#: backend/kvs40xx_opt.c:250
+#, no-c-format
+msgid "Normal mode"
+msgstr "Normal mode"
+
+#: backend/kvs40xx_opt.c:251
+#, no-c-format
+msgid "Enhanced mode"
+msgstr "Enhanced mode"
+
+#: backend/kvs40xx_opt.c:405
+#, no-c-format
+msgid ""
+"Long Paper Mode is a mode that the scanner reads the image after it "
+"divides long paper by the length which is set in Document Size option."
+msgstr ""
+"Long Paper Mode is a mode that the scanner reads the image after it "
+"divides long paper by the length which is set in Document Size option."
+
+#: backend/kvs40xx_opt.c:449
+#, no-c-format
+msgid "Double feed detector sensitivity"
+msgstr "Double feed detector sensitivity"
+
+#: backend/kvs40xx_opt.c:450
+#, no-c-format
+msgid "Set the double feed detector sensitivity"
+msgstr "Set the double feed detector sensitivity"
+
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
+#, no-c-format
+msgid "Do not stop after double feed detection"
+msgstr "Do not stop after double feed detection"
+
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
+#, no-c-format
+msgid "Ignore left double feed sensor"
+msgstr "Ignore left double feed sensor"
+
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
+#, no-c-format
+msgid "Ignore center double feed sensor"
+msgstr "Ignore center double feed sensor"
+
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
+#, no-c-format
+msgid "Ignore right double feed sensor"
+msgstr "Ignore right double feed sensor"
+
+#: backend/kvs40xx_opt.c:642
+#, no-c-format
+msgid "Automatic threshold mode"
+msgstr "Automatic threshold mode"
+
+#: backend/kvs40xx_opt.c:643
+#, no-c-format
+msgid "Sets the automatic threshold mode"
+msgstr "Sets the automatic threshold mode"
+
+#: backend/kvs40xx_opt.c:694
+#, no-c-format
+msgid "Inverse image in B/W mode"
+msgstr "Inverse image in B/W mode"
+
+#: backend/kvs40xx_opt.c:715
+#, no-c-format
+msgid "JPEG compression"
+msgstr "JPEG compression"
+
+#: backend/kvs40xx_opt.c:718
+#, no-c-format
+msgid "JPEG compression (yours application must be able to uncompress)"
+msgstr "JPEG compression (yours application must be able to uncompress)"
+
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
+#, no-c-format
+msgid "Detect stapled document"
+msgstr "Detect stapled document"
+
+#: backend/kvs40xx_opt.c:776
+#, no-c-format
+msgid "chroma of red"
+msgstr "chroma of red"
+
+#: backend/kvs40xx_opt.c:777
+#, no-c-format
+msgid "Set chroma of red"
+msgstr "Set chroma of red"
+
+#: backend/kvs40xx_opt.c:787
+#, no-c-format
+msgid "chroma of blue"
+msgstr "chroma of blue"
+
+#: backend/kvs40xx_opt.c:788
+#, no-c-format
+msgid "Set chroma of blue"
+msgstr "Set chroma of blue"
+
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
+#, no-c-format
+msgid "Skew adjustment"
+msgstr "Skew adjustment"
+
+#: backend/kvs40xx_opt.c:808
+#, no-c-format
+msgid "Stop scanner when a paper have been skewed"
+msgstr "Stop scanner when a paper have been skewed"
+
+#: backend/kvs40xx_opt.c:809
+#, no-c-format
+msgid "Scanner will be stop  when a paper have been skewed"
+msgstr "Scanner will be stop  when a paper have been skewed"
+
+#: backend/kvs40xx_opt.c:816
+#, no-c-format
+msgid "Crop actual image area"
+msgstr "Crop actual image area"
+
+#: backend/kvs40xx_opt.c:817
+#, no-c-format
+msgid "Scanner automatically detect image area and crop it"
+msgstr "Scanner automatically detect image area and crop it"
+
+#: backend/kvs40xx_opt.c:827
+#, no-c-format
+msgid "It is right and left reversing"
+msgstr "It is right and left reversing"
+
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
+#, no-c-format
+msgid "Addition of space in top position"
+msgstr "Addition of space in top position"
+
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
+#, no-c-format
+msgid "Addition of space in bottom position"
+msgstr "Addition of space in bottom position"
+
+#: backend/leo.c:110
+#, no-c-format
+msgid "Diamond"
+msgstr "Diamond"
+
+#: backend/leo.c:111
+#, no-c-format
+msgid "8x8 Coarse Fatting"
+msgstr "8x8 Coarse Fatting"
+
+#: backend/leo.c:112
+#, no-c-format
+msgid "8x8 Fine Fatting"
+msgstr "8x8 Fine Fatting"
+
+#: backend/leo.c:113
+#, no-c-format
+msgid "8x8 Bayer"
+msgstr "8x8 Bayer"
+
+#: backend/leo.c:114
+#, no-c-format
+msgid "8x8 Vertical Line"
+msgstr "8x8 Vertical Line"
+
+#: backend/lexmark.c:273 backend/umax_pp.c:715
+#, no-c-format
+msgid "Gain"
+msgstr "Gain"
+
+#: backend/lexmark.c:274 backend/umax_pp.c:716
+#, no-c-format
+msgid "Color channels gain settings"
+msgstr "Color channels gain settings"
+
+#: backend/lexmark.c:283 backend/umax_pp.c:723
+#, no-c-format
+msgid "Gray gain"
+msgstr "Gray gain"
+
+#: backend/lexmark.c:284 backend/umax_pp.c:724
+#, no-c-format
+msgid "Sets gray channel gain"
+msgstr "Sets gray channel gain"
+
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
+#, no-c-format
+msgid "Red gain"
+msgstr "Red gain"
+
+#: backend/lexmark.c:298 backend/umax_pp.c:736
+#, no-c-format
+msgid "Sets red channel gain"
+msgstr "Sets red channel gain"
+
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
+#, no-c-format
+msgid "Green gain"
+msgstr "Green gain"
+
+#: backend/lexmark.c:312 backend/umax_pp.c:748
+#, no-c-format
+msgid "Sets green channel gain"
+msgstr "Sets green channel gain"
+
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
+#, no-c-format
+msgid "Blue gain"
+msgstr "Blue gain"
+
+#: backend/lexmark.c:326 backend/umax_pp.c:760
+#, no-c-format
+msgid "Sets blue channel gain"
+msgstr "Sets blue channel gain"
+
+#: backend/matsushita.c:139
+#, no-c-format
+msgid "Bayer Dither 16"
+msgstr "Bayer Dither 16"
+
+#: backend/matsushita.c:140
+#, no-c-format
+msgid "Bayer Dither 64"
+msgstr "Bayer Dither 64"
+
+#: backend/matsushita.c:141
+#, no-c-format
+msgid "Halftone Dot 32"
+msgstr "Halftone Dot 32"
+
+#: backend/matsushita.c:142
+#, no-c-format
+msgid "Halftone Dot 64"
+msgstr "Halftone Dot 64"
+
+#: backend/matsushita.c:143
+#, no-c-format
+msgid "Error Diffusion"
+msgstr "Error Diffusion"
+
+#: backend/matsushita.c:160
+#, no-c-format
+msgid "Mode 1"
+msgstr "Mode 1"
+
+#: backend/matsushita.c:161
+#, no-c-format
+msgid "Mode 2"
+msgstr "Mode 2"
+
+#: backend/matsushita.c:162
+#, no-c-format
+msgid "Mode 3"
+msgstr "Mode 3"
+
+#: backend/matsushita.c:176
+#, no-c-format
+msgid "From white stick"
+msgstr "From white stick"
+
+#: backend/matsushita.c:212
+#, no-c-format
+msgid "Smooth"
+msgstr "Smooth"
+
+#: backend/matsushita.c:214 backend/matsushita.c:229
+#, no-c-format
+msgid "Low"
+msgstr "Low"
+
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
+#, no-c-format
+msgid "Medium"
+msgstr "Medium"
+
+#: backend/matsushita.c:216 backend/matsushita.c:231
+#, no-c-format
+msgid "High"
+msgstr "High"
+
+#: backend/matsushita.c:245
+#, no-c-format
+msgid "CRT"
+msgstr "CRT"
+
+#: backend/matsushita.c:257
+#, no-c-format
+msgid "One page"
+msgstr "One page"
+
+#: backend/matsushita.c:258
+#, no-c-format
+msgid "All pages"
+msgstr "All pages"
+
+#: backend/matsushita.c:1034 backend/plustek.c:1333
+#, no-c-format
+msgid "sheetfed scanner"
+msgstr "sheetfed scanner"
+
+#: backend/matsushita.h:209
+#, no-c-format
+msgid "Grayscale 4 bits"
+msgstr "Grayscale 4 bits"
+
+#: backend/matsushita.h:210
+#, no-c-format
+msgid "Grayscale 8 bits"
+msgstr "Grayscale 8 bits"
+
+#: backend/microtek2.h:601
+#, no-c-format
+msgid "Shadow, midtone, highlight, exposure time"
+msgstr "Shadow, midtone, highlight, exposure time"
+
+#: backend/microtek2.h:603
+#, no-c-format
+msgid "Special options"
+msgstr "Special options"
+
+#: backend/microtek2.h:604
+#, no-c-format
+msgid "Color balance"
+msgstr "Color balance"
+
+#: backend/microtek2.h:607
+#, no-c-format
+msgid "Disable backtracking"
+msgstr "Disable backtracking"
+
+#: backend/microtek2.h:608
+#, no-c-format
+msgid "If checked the scanner does not perform backtracking"
+msgstr "If checked the scanner does not perform backtracking"
+
+#: backend/microtek2.h:612
+#, no-c-format
+msgid "Toggle lamp of flatbed"
+msgstr "Toggle lamp of flatbed"
+
+#: backend/microtek2.h:613
+#, no-c-format
+msgid "Toggles the lamp of the flatbed"
+msgstr "Toggles the lamp of the flatbed"
+
+#: backend/microtek2.h:616
+#, no-c-format
+msgid "Calibration by backend"
+msgstr "Calibration by backend"
+
+#: backend/microtek2.h:617
+#, no-c-format
+msgid ""
+"If checked the color calibration before a scan is done by the backend"
+msgstr ""
+"If checked the color calibration before a scan is done by the backend"
+
+#: backend/microtek2.h:621
+#, no-c-format
+msgid "Use the lightlid-35mm adapter"
+msgstr "Use the lightlid-35mm adapter"
+
+#: backend/microtek2.h:622
+#, no-c-format
+msgid "This option turns off the lamp of the flatbed during a scan"
+msgstr "This option turns off the lamp of the flatbed during a scan"
+
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
+#, no-c-format
+msgid "Quality scan"
+msgstr "Quality scan"
+
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
+#, no-c-format
+msgid "Highest quality but lower speed"
+msgstr "Highest quality but lower speed"
+
+#: backend/microtek2.h:630
+#, no-c-format
+msgid "Fast scan"
+msgstr "Fast scan"
+
+#: backend/microtek2.h:631
+#, no-c-format
+msgid "Highest speed but lower quality"
+msgstr "Highest speed but lower quality"
+
+#: backend/microtek2.h:634
+#, no-c-format
+msgid "Automatic adjustment of threshold"
+msgstr "Automatic adjustment of threshold"
+
+#: backend/microtek2.h:635
+#, no-c-format
+msgid ""
+"If checked the backend automatically tries to determine an optimal value "
+"for the threshold."
+msgstr ""
+"If checked the backend automatically tries to determine an optimal value "
+"for the threshold."
+
+#: backend/microtek2.h:641
+#, no-c-format
+msgid "Selects the gamma correction mode."
+msgstr "Selects the gamma correction mode."
+
+#: backend/microtek2.h:644
+#, no-c-format
+msgid "Bind gamma"
+msgstr "Bind gamma"
+
+#: backend/microtek2.h:645
+#, no-c-format
+msgid "Use same gamma values for all colour channels."
+msgstr "Use same gamma values for all colour channels."
+
+#: backend/microtek2.h:649
+#, no-c-format
+msgid "Scalar gamma"
+msgstr "Scalar gamma"
+
+#: backend/microtek2.h:650
+#, no-c-format
+msgid "Selects a value for scalar gamma correction."
+msgstr "Selects a value for scalar gamma correction."
+
+#: backend/microtek2.h:654
+#, no-c-format
+msgid "Scalar gamma red"
+msgstr "Scalar gamma red"
+
+#: backend/microtek2.h:655
+#, no-c-format
+msgid "Selects a value for scalar gamma correction (red channel)"
+msgstr "Selects a value for scalar gamma correction (red channel)"
+
+#: backend/microtek2.h:659
+#, no-c-format
+msgid "Scalar gamma green"
+msgstr "Scalar gamma green"
+
+#: backend/microtek2.h:660
+#, no-c-format
+msgid "Selects a value for scalar gamma correction (green channel)"
+msgstr "Selects a value for scalar gamma correction (green channel)"
+
+#: backend/microtek2.h:664
+#, no-c-format
+msgid "Scalar gamma blue"
+msgstr "Scalar gamma blue"
+
+#: backend/microtek2.h:665
+#, no-c-format
+msgid "Selects a value for scalar gamma correction (blue channel)"
+msgstr "Selects a value for scalar gamma correction (blue channel)"
+
+#: backend/microtek2.h:669
+#, no-c-format
+msgid "Channel"
+msgstr "Channel"
+
+#: backend/microtek2.h:670
+#, no-c-format
+msgid ""
+"Selects the colour band, \"Master\" means that all colours are affected."
+msgstr ""
+"Selects the colour band, “Master� means that all colours are affected."
+
+#: backend/microtek2.h:674
+#, no-c-format
+msgid "Midtone"
+msgstr "Midtone"
+
+#: backend/microtek2.h:675
+#, no-c-format
+msgid "Selects which radiance level should be considered \"50 % gray\"."
+msgstr "Selects which radiance level should be considered “50 % gray�."
+
+#: backend/microtek2.h:679
+#, no-c-format
+msgid "Midtone for red"
+msgstr "Midtone for red"
+
+#: backend/microtek2.h:680
+#, no-c-format
+msgid "Selects which radiance level should be considered \"50 % red\"."
+msgstr "Selects which radiance level should be considered “50 % red�."
+
+#: backend/microtek2.h:684
+#, no-c-format
+msgid "Midtone for green"
+msgstr "Midtone for green"
+
+#: backend/microtek2.h:685
+#, no-c-format
+msgid "Selects which radiance level should be considered \"50 % green\"."
+msgstr "Selects which radiance level should be considered “50 % green�."
+
+#: backend/microtek2.h:689
+#, no-c-format
+msgid "Midtone for blue"
+msgstr "Midtone for blue"
+
+#: backend/microtek2.h:690
+#, no-c-format
+msgid "Selects which radiance level should be considered \"50 % blue\"."
+msgstr "Selects which radiance level should be considered “50 % blue�."
+
+#: backend/microtek2.h:694
+#, no-c-format
+msgid "Red balance"
+msgstr "Red balance"
+
+#: backend/microtek2.h:695
+#, no-c-format
+msgid "Balance factor for red. A value of 100% means no correction."
+msgstr "Balance factor for red. A value of 100% means no correction."
+
+#: backend/microtek2.h:699
+#, no-c-format
+msgid "Green balance"
+msgstr "Green balance"
+
+#: backend/microtek2.h:700
+#, no-c-format
+msgid "Balance factor for green. A value of 100% means no correction."
+msgstr "Balance factor for green. A value of 100% means no correction."
+
+#: backend/microtek2.h:704
+#, no-c-format
+msgid "Blue balance"
+msgstr "Blue balance"
+
+#: backend/microtek2.h:705
+#, no-c-format
+msgid "Balance factor for blue. A value of 100% means no correction."
+msgstr "Balance factor for blue. A value of 100% means no correction."
+
+#: backend/microtek2.h:709
+#, no-c-format
+msgid "Firmware balance"
+msgstr "Firmware balance"
+
+#: backend/microtek2.h:710
+#, no-c-format
+msgid "Sets the color balance values to the firmware provided values."
+msgstr "Sets the color balance values to the firmware provided values."
+
+#: backend/mustek.c:149
+#, no-c-format
+msgid "Slowest"
+msgstr "Slowest"
+
+#: backend/mustek.c:149
+#, no-c-format
+msgid "Slower"
+msgstr "Slower"
+
+#: backend/mustek.c:150
+#, no-c-format
+msgid "Faster"
+msgstr "Faster"
+
+#: backend/mustek.c:150
+#, no-c-format
+msgid "Fastest"
+msgstr "Fastest"
+
+#: backend/mustek.c:177
+#, no-c-format
+msgid "8x8 coarse"
+msgstr "8x8 coarse"
+
+#: backend/mustek.c:177
+#, no-c-format
+msgid "8x8 normal"
+msgstr "8x8 normal"
+
+#: backend/mustek.c:177
+#, no-c-format
+msgid "8x8 fine"
+msgstr "8x8 fine"
+
+#: backend/mustek.c:178
+#, no-c-format
+msgid "8x8 very fine"
+msgstr "8x8 very fine"
+
+#: backend/mustek.c:178
+#, no-c-format
+msgid "6x6 normal"
+msgstr "6x6 normal"
+
+#: backend/mustek.c:179
+#, no-c-format
+msgid "5x5 coarse"
+msgstr "5x5 coarse"
+
+#: backend/mustek.c:179
+#, no-c-format
+msgid "5x5 fine"
+msgstr "5x5 fine"
+
+#: backend/mustek.c:179
+#, no-c-format
+msgid "4x4 coarse"
+msgstr "4x4 coarse"
+
+#: backend/mustek.c:180
+#, no-c-format
+msgid "4x4 normal"
+msgstr "4x4 normal"
+
+#: backend/mustek.c:180
+#, no-c-format
+msgid "4x4 fine"
+msgstr "4x4 fine"
+
+#: backend/mustek.c:180
+#, no-c-format
+msgid "3x3 normal"
+msgstr "3x3 normal"
+
+#: backend/mustek.c:181
+#, no-c-format
+msgid "2x2 normal"
+msgstr "2x2 normal"
+
+#: backend/mustek.c:181
+#, no-c-format
+msgid "8x8 custom"
+msgstr "8x8 custom"
+
+#: backend/mustek.c:182
+#, no-c-format
+msgid "6x6 custom"
+msgstr "6x6 custom"
+
+#: backend/mustek.c:183
+#, no-c-format
+msgid "5x5 custom"
+msgstr "5x5 custom"
+
+#: backend/mustek.c:183
+#, no-c-format
+msgid "4x4 custom"
+msgstr "4x4 custom"
+
+#: backend/mustek.c:184
+#, no-c-format
+msgid "3x3 custom"
+msgstr "3x3 custom"
+
+#: backend/mustek.c:185
+#, no-c-format
+msgid "2x2 custom"
+msgstr "2x2 custom"
+
+#: backend/mustek.c:4235
+#, no-c-format
+msgid "Fast gray mode"
+msgstr "Fast gray mode"
+
+#: backend/mustek.c:4236
+#, no-c-format
+msgid "Scan in fast gray mode (lower quality)."
+msgstr "Scan in fast gray mode (lower quality)."
+
+#: backend/mustek.c:4333
+#, no-c-format
+msgid ""
+"Request that all previews are done in the fastest (low-quality) mode. "
+"This may be a non-color mode or a low resolution mode."
+msgstr ""
+"Request that all previews are done in the fastest (low-quality) mode. "
+"This may be a non-color mode or a low resolution mode."
+
+#: backend/mustek.c:4341
+#, no-c-format
+msgid "Lamp off time (minutes)"
+msgstr "Lamp off time (minutes)"
+
+#: backend/mustek.c:4342
+#, no-c-format
+msgid "Set the time (in minutes) after which the lamp is shut off."
+msgstr "Set the time (in minutes) after which the lamp is shut off."
+
+#: backend/mustek.c:4353
+#, no-c-format
+msgid "Turn lamp off"
+msgstr "Turn lamp off"
+
+#: backend/mustek.c:4354
+#, no-c-format
+msgid "Turns the lamp off immediately."
+msgstr "Turns the lamp off immediately."
+
+#: backend/mustek.c:4431
+#, no-c-format
+msgid "Red brightness"
+msgstr "Red brightness"
+
+#: backend/mustek.c:4432
+#, no-c-format
+msgid "Controls the brightness of the red channel of the acquired image."
+msgstr "Controls the brightness of the red channel of the acquired image."
+
+#: backend/mustek.c:4444
+#, no-c-format
+msgid "Green brightness"
+msgstr "Green brightness"
+
+#: backend/mustek.c:4445
+#, no-c-format
+msgid "Controls the brightness of the green channel of the acquired image."
+msgstr ""
+"Controls the brightness of the green channel of the acquired image."
+
+#: backend/mustek.c:4457
+#, no-c-format
+msgid "Blue brightness"
+msgstr "Blue brightness"
+
+#: backend/mustek.c:4458
+#, no-c-format
+msgid "Controls the brightness of the blue channel of the acquired image."
+msgstr "Controls the brightness of the blue channel of the acquired image."
+
+#: backend/mustek.c:4483
+#, no-c-format
+msgid "Contrast red channel"
+msgstr "Contrast red channel"
+
+#: backend/mustek.c:4484
+#, no-c-format
+msgid "Controls the contrast of the red channel of the acquired image."
+msgstr "Controls the contrast of the red channel of the acquired image."
+
+#: backend/mustek.c:4496
+#, no-c-format
+msgid "Contrast green channel"
+msgstr "Contrast green channel"
+
+#: backend/mustek.c:4497
+#, no-c-format
+msgid "Controls the contrast of the green channel of the acquired image."
+msgstr "Controls the contrast of the green channel of the acquired image."
+
+#: backend/mustek.c:4509
+#, no-c-format
+msgid "Contrast blue channel"
+msgstr "Contrast blue channel"
+
+#: backend/mustek.c:4510
+#, no-c-format
+msgid "Controls the contrast of the blue channel of the acquired image."
+msgstr "Controls the contrast of the blue channel of the acquired image."
+
+#: backend/mustek_usb2.c:105
+#, no-c-format
+msgid "Color48"
+msgstr "Color48"
+
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
+#, no-c-format
+msgid "Color24"
+msgstr "Color24"
+
+#: backend/mustek_usb2.c:107
+#, no-c-format
+msgid "Gray16"
+msgstr "Gray16"
+
+#: backend/mustek_usb2.c:108
+#, no-c-format
+msgid "Gray8"
+msgstr "Gray8"
+
+#: backend/mustek_usb2.c:119
+#, no-c-format
+msgid "Reflective"
+msgstr "Reflective"
+
+#: backend/mustek_usb2.c:120
+#, no-c-format
+msgid "Positive"
+msgstr "Positive"
+
+#: backend/mustek_usb2.c:421
+#, no-c-format
+msgid ""
+"Warm-up until the lamp's brightness is constant instead of insisting on "
+"40 seconds warm-up time."
+msgstr ""
+"Warm-up until the lamp's brightness is constant instead of insisting on "
+"40 seconds warm-up time."
+
+#: backend/pixma.c:378
+#, no-c-format
+msgid "Negative color"
+msgstr "Negative color"
+
+#: backend/pixma.c:383
+#, no-c-format
+msgid "Negative gray"
+msgstr "Negative gray"
+
+#: backend/pixma.c:396
+#, no-c-format
+msgid "48 bits color"
+msgstr "48 bits color"
+
+#: backend/pixma.c:401
+#, no-c-format
+msgid "16 bits gray"
+msgstr "16 bits gray"
+
+#: backend/pixma_sane_options.c:84
+#, no-c-format
+msgid ""
+"Selects the scan source (such as a document-feeder). Set source before "
+"mode and resolution. Resets mode and resolution to auto values."
+msgstr ""
+"Selects the scan source (such as a document-feeder). Set source before "
+"mode and resolution. Resets mode and resolution to auto values."
+
+#: backend/pixma_sane_options.c:98
+#, no-c-format
+msgid "Button-controlled scan"
+msgstr "Button-controlled scan"
+
+#: backend/pixma_sane_options.c:99
+#, no-c-format
+msgid ""
+"When enabled, scan process will not start immediately. To proceed, press "
+"\"SCAN\" button (for MP150) or \"COLOR\" button (for other models). To "
+"cancel, press \"GRAY\" button."
+msgstr ""
+"When enabled, scan process will not start immediately. To proceed, press "
+"“SCAN� button (for MP150) or “COLOR� button (for other models). To "
+"cancel, press “GRAY� button."
+
+#: backend/pixma_sane_options.c:232
+#, no-c-format
+msgid "Update button state"
+msgstr "Update button state"
+
+#: backend/pixma_sane_options.c:244
+#, no-c-format
+msgid "Button 1"
+msgstr "Button 1"
+
+#: backend/pixma_sane_options.c:258
+#, no-c-format
+msgid "Button 2"
+msgstr "Button 2"
+
+#: backend/pixma_sane_options.c:272
+#, no-c-format
+msgid "Type of original to scan"
+msgstr "Type of original to scan"
+
+#: backend/pixma_sane_options.c:286
+#, no-c-format
+msgid "Target operation type"
+msgstr "Target operation type"
+
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr "ADF Waiting Time"
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
+#, no-c-format
+msgid "Transparency"
+msgstr "Transparency"
+
+#: backend/plustek.c:913
+#, no-c-format
+msgid "Device-Settings"
+msgstr "Device-Settings"
+
+#: backend/plustek.c:920
+#, no-c-format
+msgid "Lampswitch"
+msgstr "Lampswitch"
+
+#: backend/plustek.c:921
+#, no-c-format
+msgid "Manually switching the lamp(s)."
+msgstr "Manually switching the lamp(s)."
+
+#: backend/plustek.c:926
+#, no-c-format
+msgid "Lamp off during dark calibration"
+msgstr "Lamp off during dark calibration"
+
+#: backend/plustek.c:927
+#, no-c-format
+msgid "Always switches lamp off when doing dark calibration."
+msgstr "Always switches lamp off when doing dark calibration."
+
+#: backend/plustek.c:935
+#, no-c-format
+msgid "Calibration data cache"
+msgstr "Calibration data cache"
+
+#: backend/plustek.c:936
+#, no-c-format
+msgid "Enables or disables calibration data cache."
+msgstr "Enables or disables calibration data cache."
+
+#: backend/plustek.c:942
+#, no-c-format
+msgid "Performs calibration"
+msgstr "Performs calibration"
+
+#: backend/plustek.c:959
+#, no-c-format
+msgid "Speedup sensor"
+msgstr "Speedup sensor"
+
+#: backend/plustek.c:960
+#, no-c-format
+msgid "Enables or disables speeding up sensor movement."
+msgstr "Enables or disables speeding up sensor movement."
+
+#: backend/plustek.c:974
+#, no-c-format
+msgid "Warmup-time"
+msgstr "Warmup-time"
+
+#: backend/plustek.c:975
+#, no-c-format
+msgid "Warmup-time in seconds."
+msgstr "Warmup-time in seconds."
+
+#: backend/plustek.c:987
+#, no-c-format
+msgid "Lampoff-time"
+msgstr "Lampoff-time"
+
+#: backend/plustek.c:988
+#, no-c-format
+msgid "Lampoff-time in seconds."
+msgstr "Lampoff-time in seconds."
+
+#: backend/plustek.c:995
+#, no-c-format
+msgid "Analog frontend"
+msgstr "Analog frontend"
+
+#: backend/plustek.c:1002
+#, no-c-format
+msgid "Red gain value of the AFE"
+msgstr "Red gain value of the AFE"
+
+#: backend/plustek.c:1009 backend/umax_pp.c:792
+#, no-c-format
+msgid "Red offset"
+msgstr "Red offset"
+
+#: backend/plustek.c:1010
+#, no-c-format
+msgid "Red offset value of the AFE"
+msgstr "Red offset value of the AFE"
+
+#: backend/plustek.c:1018
+#, no-c-format
+msgid "Green gain value of the AFE"
+msgstr "Green gain value of the AFE"
+
+#: backend/plustek.c:1026
+#, no-c-format
+msgid "Green offset value of the AFE"
+msgstr "Green offset value of the AFE"
+
+#: backend/plustek.c:1034
+#, no-c-format
+msgid "Blue gain value of the AFE"
+msgstr "Blue gain value of the AFE"
+
+#: backend/plustek.c:1042
+#, no-c-format
+msgid "Blue offset value of the AFE"
+msgstr "Blue offset value of the AFE"
+
+#: backend/plustek.c:1049
+#, no-c-format
+msgid "Red lamp off"
+msgstr "Red lamp off"
+
+#: backend/plustek.c:1050
+#, no-c-format
+msgid "Defines red lamp off parameter"
+msgstr "Defines red lamp off parameter"
+
+#: backend/plustek.c:1057
+#, no-c-format
+msgid "Green lamp off"
+msgstr "Green lamp off"
+
+#: backend/plustek.c:1058
+#, no-c-format
+msgid "Defines green lamp off parameter"
+msgstr "Defines green lamp off parameter"
+
+#: backend/plustek.c:1065
+#, no-c-format
+msgid "Blue lamp off"
+msgstr "Blue lamp off"
+
+#: backend/plustek.c:1066
+#, no-c-format
+msgid "Defines blue lamp off parameter"
+msgstr "Defines blue lamp off parameter"
+
+#: backend/plustek.c:1096
+#, no-c-format
+msgid "This option reflects the status of the scanner buttons."
+msgstr "This option reflects the status of the scanner buttons."
+
+#: backend/plustek_pp.c:197
+#, no-c-format
+msgid "Color36"
+msgstr "Color36"
+
+#: backend/plustek_pp.c:211
+#, no-c-format
+msgid "Dithermap 1"
+msgstr "Dithermap 1"
+
+#: backend/plustek_pp.c:212
+#, no-c-format
+msgid "Dithermap 2"
+msgstr "Dithermap 2"
+
+#: backend/plustek_pp.c:213
+#, no-c-format
+msgid "Randomize"
+msgstr "Randomize"
+
+#: backend/pnm.c:168
+#, no-c-format
+msgid "Source Selection"
+msgstr "Source Selection"
+
+#: backend/pnm.c:205
+#, no-c-format
+msgid "Image Enhancement"
+msgstr "Image Enhancement"
+
+#: backend/pnm.c:241
+#, no-c-format
+msgid "Grayify"
+msgstr "Grayify"
+
+#: backend/pnm.c:242
+#, no-c-format
+msgid "Load the image as grayscale."
+msgstr "Load the image as grayscale."
+
+#: backend/pnm.c:253
+#, no-c-format
+msgid "Three-Pass Simulation"
+msgstr "Three-Pass Simulation"
+
+#: backend/pnm.c:255
+#, no-c-format
+msgid ""
+"Simulate a three-pass scanner by returning 3 separate frames.  For "
+"kicks, it returns green, then blue, then red."
+msgstr ""
+"Simulate a three-pass scanner by returning 3 separate frames.  For "
+"kicks, it returns green, then blue, then red."
+
+#: backend/pnm.c:267
+#, no-c-format
+msgid "Hand-Scanner Simulation"
+msgstr "Hand-Scanner Simulation"
+
+#: backend/pnm.c:268
+#, no-c-format
+msgid ""
+"Simulate a hand-scanner.  Hand-scanners often do not know the image "
+"height a priori.  Instead, they return a height of -1.  Setting this "
+"option allows one to test whether a frontend can handle this correctly."
+msgstr ""
+"Simulate a hand-scanner.  Hand-scanners often do not know the image "
+"height a priori.  Instead, they return a height of -1.  Setting this "
+"option allows one to test whether a frontend can handle this correctly."
+
+#: backend/pnm.c:283
+#, no-c-format
+msgid ""
+"Set default values for enhancement controls (brightness & contrast)."
+msgstr ""
+"Set default values for enhancement controls (brightness & contrast)."
+
+#: backend/pnm.c:295
+#, no-c-format
+msgid "Read only test-option"
+msgstr "Read only test-option"
+
+#: backend/pnm.c:296
+#, no-c-format
+msgid "Let's see whether frontends can treat this right"
+msgstr "Let's see whether frontends can treat this right"
+
+#: backend/pnm.c:307
+#, no-c-format
+msgid "Gamma Tables"
+msgstr "Gamma Tables"
+
+#: backend/pnm.c:379
+#, no-c-format
+msgid "Status Code Simulation"
+msgstr "Status Code Simulation"
+
+#: backend/pnm.c:391
+#, no-c-format
+msgid "Do not force status code"
+msgstr "Do not force status code"
+
+#: backend/pnm.c:392
+#, no-c-format
+msgid "Do not force the backend to return a status code."
+msgstr "Do not force the backend to return a status code."
+
+#: backend/pnm.c:403
+#, no-c-format
+msgid "Return SANE_STATUS_EOF"
+msgstr "Return SANE_STATUS_EOF"
+
+#: backend/pnm.c:404
+#, no-c-format
+msgid ""
+"Force the backend to return the status code SANE_STATUS_EOF after "
+"sane_read() has been called."
+msgstr ""
+"Force the backend to return the status code SANE_STATUS_EOF after "
+"sane_read() has been called."
+
+#: backend/pnm.c:416
+#, no-c-format
+msgid "Return SANE_STATUS_JAMMED"
+msgstr "Return SANE_STATUS_JAMMED"
+
+#: backend/pnm.c:418
+#, no-c-format
+msgid ""
+"Force the backend to return the status code SANE_STATUS_JAMMED after "
+"sane_read() has been called."
+msgstr ""
+"Force the backend to return the status code SANE_STATUS_JAMMED after "
+"sane_read() has been called."
+
+#: backend/pnm.c:430
+#, no-c-format
+msgid "Return SANE_STATUS_NO_DOCS"
+msgstr "Return SANE_STATUS_NO_DOCS"
+
+#: backend/pnm.c:431
+#, no-c-format
+msgid ""
+"Force the backend to return the status code SANE_STATUS_NO_DOCS after "
+"sane_read() has been called."
+msgstr ""
+"Force the backend to return the status code SANE_STATUS_NO_DOCS after "
+"sane_read() has been called."
+
+#: backend/pnm.c:443
+#, no-c-format
+msgid "Return SANE_STATUS_COVER_OPEN"
+msgstr "Return SANE_STATUS_COVER_OPEN"
+
+#: backend/pnm.c:444
+#, no-c-format
+msgid ""
+"Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
+"sane_read() has been called."
+msgstr ""
+"Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
+"sane_read() has been called."
+
+#: backend/pnm.c:456
+#, no-c-format
+msgid "Return SANE_STATUS_IO_ERROR"
+msgstr "Return SANE_STATUS_IO_ERROR"
+
+#: backend/pnm.c:457
+#, no-c-format
+msgid ""
+"Force the backend to return the status code SANE_STATUS_IO_ERROR after "
+"sane_read() has been called."
+msgstr ""
+"Force the backend to return the status code SANE_STATUS_IO_ERROR after "
+"sane_read() has been called."
+
+#: backend/pnm.c:469
+#, no-c-format
+msgid "Return SANE_STATUS_NO_MEM"
+msgstr "Return SANE_STATUS_NO_MEM"
+
+#: backend/pnm.c:471
+#, no-c-format
+msgid ""
+"Force the backend to return the status code SANE_STATUS_NO_MEM after "
+"sane_read() has been called."
+msgstr ""
+"Force the backend to return the status code SANE_STATUS_NO_MEM after "
+"sane_read() has been called."
+
+#: backend/pnm.c:483
+#, no-c-format
+msgid "Return SANE_STATUS_ACCESS_DENIED"
+msgstr "Return SANE_STATUS_ACCESS_DENIED"
+
+#: backend/pnm.c:484
+#, no-c-format
+msgid ""
+"Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
+"after sane_read() has been called."
+msgstr ""
+"Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
+"after sane_read() has been called."
+
+#: backend/rts8891.c:2809
+#, no-c-format
+msgid "This option reflects the status of a scanner button."
+msgstr "This option reflects the status of a scanner button."
+
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
+#, no-c-format
+msgid "Lamp on"
+msgstr "Lamp on"
+
+#: backend/rts8891.c:2841 backend/umax.c:5796
+#, no-c-format
+msgid "Turn on scanner lamp"
+msgstr "Turn on scanner lamp"
+
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
+#, no-c-format
+msgid "Lamp off"
+msgstr "Lamp off"
+
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
+#, no-c-format
+msgid "Turn off scanner lamp"
+msgstr "Turn off scanner lamp"
+
+#: backend/sm3840.c:760
+#, no-c-format
+msgid "Lamp timeout"
+msgstr "Lamp timeout"
+
+#: backend/sm3840.c:762
+#, no-c-format
+msgid "Minutes until lamp is turned off after scan"
+msgstr "Minutes until lamp is turned off after scan"
+
+#: backend/sm3840.c:772
+#, no-c-format
+msgid "Threshold value for lineart mode"
+msgstr "Threshold value for lineart mode"
+
+#: backend/snapscan-options.c:88
+#, no-c-format
+msgid "Document Feeder"
+msgstr "Document Feeder"
+
+#: backend/snapscan-options.c:92
+#, no-c-format
+msgid "6x4 (inch)"
+msgstr "6x4 (inch)"
+
+#: backend/snapscan-options.c:93
+#, no-c-format
+msgid "8x10 (inch)"
+msgstr "8x10 (inch)"
+
+#: backend/snapscan-options.c:94
+#, no-c-format
+msgid "8.5x11 (inch)"
+msgstr "8.5x11 (inch)"
+
+#: backend/snapscan-options.c:97
+#, no-c-format
+msgid "Halftoning Unsupported"
+msgstr "Halftoning Unsupported"
+
+#: backend/snapscan-options.c:98
+#, no-c-format
+msgid "DispersedDot8x8"
+msgstr "DispersedDot8x8"
+
+#: backend/snapscan-options.c:99
+#, no-c-format
+msgid "DispersedDot16x16"
+msgstr "DispersedDot16x16"
+
+#: backend/snapscan-options.c:103
+#, no-c-format
+msgid ""
+"Number of scan lines to request in a SCSI read. Changing this parameter "
+"allows you to tune the speed at which data is read from the scanner "
+"during scans. If this is set too low, the scanner will have to stop "
+"periodically in the middle of a scan; if it's set too high, X-based "
+"frontends may stop responding to X events and your system could bog down."
+msgstr ""
+"Number of scan lines to request in a SCSI read. Changing this parameter "
+"allows you to tune the speed at which data is read from the scanner "
+"during scans. If this is set too low, the scanner will have to stop "
+"periodically in the middle of a scan; if it's set too high, X-based "
+"frontends may stop responding to X events and your system could bog down."
+
+#: backend/snapscan-options.c:111
+#, no-c-format
+msgid "Frame number of media holder that should be scanned."
+msgstr "Frame number of media holder that should be scanned."
+
+#: backend/snapscan-options.c:114
+#, no-c-format
+msgid "Use manual or automatic selection of focus point."
+msgstr "Use manual or automatic selection of focus point."
+
+#: backend/snapscan-options.c:117
+#, no-c-format
+msgid "Focus point for scanning."
+msgstr "Focus point for scanning."
+
+#: backend/snapscan-options.c:482
+#, no-c-format
+msgid "Preview mode"
+msgstr "Preview mode"
+
+#: backend/snapscan-options.c:484
+#, no-c-format
+msgid ""
+"Select the mode for previews. Greyscale previews usually give the best "
+"combination of speed and detail."
+msgstr ""
+"Select the mode for previews. Greyscale previews usually give the best "
+"combination of speed and detail."
+
+#: backend/snapscan-options.c:601
+#, no-c-format
+msgid "Predefined settings"
+msgstr "Predefined settings"
+
+#: backend/snapscan-options.c:603
+#, no-c-format
+msgid ""
+"Provides standard scanning areas for photographs, printed pages and the "
+"like."
+msgstr ""
+"Provides standard scanning areas for photographs, printed pages and the "
+"like."
+
+#: backend/snapscan-options.c:884
+#, no-c-format
+msgid "Frame"
+msgstr "Frame"
+
+#: backend/snapscan-options.c:885
+#, no-c-format
+msgid "Frame to be scanned"
+msgstr "Frame to be scanned"
+
+#: backend/snapscan-options.c:897
+#, no-c-format
+msgid "Focus-mode"
+msgstr "Focus-mode"
+
+#: backend/snapscan-options.c:898
+#, no-c-format
+msgid "Auto or manual focus"
+msgstr "Auto or manual focus"
+
+#: backend/snapscan-options.c:911
+#, no-c-format
+msgid "Focus-point"
+msgstr "Focus-point"
+
+#: backend/snapscan-options.c:912
+#, no-c-format
+msgid "Focus point"
+msgstr "Focus point"
+
+#: backend/snapscan-options.c:930
+#, no-c-format
+msgid "Colour lines per read"
+msgstr "Colour lines per read"
+
+#: backend/snapscan-options.c:942
+#, no-c-format
+msgid "Greyscale lines per read"
+msgstr "Greyscale lines per read"
+
+#: backend/stv680.c:974
+#, no-c-format
+msgid "webcam"
+msgstr "webcam"
+
+#: backend/stv680.h:115
+#, no-c-format
+msgid "Color RAW"
+msgstr "Color RAW"
+
+#: backend/stv680.h:116
+#, no-c-format
+msgid "Color RGB"
+msgstr "Color RGB"
+
+#: backend/stv680.h:117
+#, no-c-format
+msgid "Color RGB TEXT"
+msgstr "Color RGB TEXT"
+
+#: backend/test.c:137
+#, no-c-format
+msgid "Solid black"
+msgstr "Solid black"
+
+#: backend/test.c:137
+#, no-c-format
+msgid "Solid white"
+msgstr "Solid white"
+
+#: backend/test.c:138
+#, no-c-format
+msgid "Color pattern"
+msgstr "Color pattern"
+
+#: backend/test.c:138
+#, no-c-format
+msgid "Grid"
+msgstr "Grid"
+
+#: backend/test.c:163 backend/test.c:171
+#, no-c-format
+msgid "First entry"
+msgstr "First entry"
+
+#: backend/test.c:163 backend/test.c:171
+#, no-c-format
+msgid "Second entry"
+msgstr "Second entry"
+
+#: backend/test.c:165
+#, no-c-format
+msgid ""
+"This is the very long third entry. Maybe the frontend has an idea how to "
+"display it"
+msgstr ""
+"This is the very long third entry. Maybe the frontend has an idea how to "
+"display it"
+
+#: backend/test.c:348
+#, no-c-format
+msgid "Hand-scanner simulation"
+msgstr "Hand-scanner simulation"
+
+#: backend/test.c:349
+#, no-c-format
+msgid ""
+"Simulate a hand-scanner.  Hand-scanners do not know the image height a "
+"priori.  Instead, they return a height of -1.  Setting this option "
+"allows one to test whether a frontend can handle this correctly.  This "
+"option also enables a fixed width of 11 cm."
+msgstr ""
+"Simulate a hand-scanner.  Hand-scanners do not know the image height a "
+"priori.  Instead, they return a height of -1.  Setting this option "
+"allows one to test whether a frontend can handle this correctly.  This "
+"option also enables a fixed width of 11 cm."
+
+#: backend/test.c:366
+#, no-c-format
+msgid "Three-pass simulation"
+msgstr "Three-pass simulation"
+
+#: backend/test.c:367
+#, no-c-format
+msgid ""
+"Simulate a three-pass scanner. In color mode, three frames are "
+"transmitted."
+msgstr ""
+"Simulate a three-pass scanner. In color mode, three frames are "
+"transmitted."
+
+#: backend/test.c:382
+#, no-c-format
+msgid "Set the order of frames"
+msgstr "Set the order of frames"
+
+#: backend/test.c:383
+#, no-c-format
+msgid "Set the order of frames in three-pass color mode."
+msgstr "Set the order of frames in three-pass color mode."
+
+#: backend/test.c:416
+#, no-c-format
+msgid ""
+"If Automatic Document Feeder is selected, the feeder will be 'empty' "
+"after 10 scans."
+msgstr ""
+"If Automatic Document Feeder is selected, the feeder will be ‘empty’ "
+"after 10 scans."
+
+#: backend/test.c:431
+#, no-c-format
+msgid "Special Options"
+msgstr "Special Options"
+
+#: backend/test.c:444
+#, no-c-format
+msgid "Select the test picture"
+msgstr "Select the test picture"
+
+#: backend/test.c:446
+#, no-c-format
+msgid ""
+"Select the kind of test picture. Available options:\n"
+"Solid black: fills the whole scan with black.\n"
+"Solid white: fills the whole scan with white.\n"
+"Color pattern: draws various color test patterns depending on the mode.\n"
+"Grid: draws a black/white grid with a width and height of 10 mm per "
+"square."
+msgstr ""
+"Select the kind of test picture. Available options:\n"
+"Solid black: fills the whole scan with black.\n"
+"Solid white: fills the whole scan with white.\n"
+"Color pattern: draws various color test patterns depending on the mode.\n"
+"Grid: draws a black/white grid with a width and height of 10 mm per "
+"square."
+
+#: backend/test.c:467
+#, no-c-format
+msgid "Invert endianness"
+msgstr "Invert endianness"
+
+#: backend/test.c:468
+#, no-c-format
+msgid ""
+"Exchange upper and lower byte of image data in 16 bit modes. This option "
+"can be used to test the 16 bit modes of frontends, e.g. if the frontend "
+"uses the correct endianness."
+msgstr ""
+"Exchange upper and lower byte of image data in 16 bit modes. This option "
+"can be used to test the 16 bit modes of frontends, e.g. if the frontend "
+"uses the correct endianness."
+
+#: backend/test.c:484
+#, no-c-format
+msgid "Read limit"
+msgstr "Read limit"
+
+#: backend/test.c:485
+#, no-c-format
+msgid "Limit the amount of data transferred with each call to sane_read()."
+msgstr ""
+"Limit the amount of data transferred with each call to sane_read()."
+
+#: backend/test.c:498
+#, no-c-format
+msgid "Size of read-limit"
+msgstr "Size of read-limit"
+
+#: backend/test.c:499
+#, no-c-format
+msgid ""
+"The (maximum) amount of data transferred with each call to sane_read()."
+msgstr ""
+"The (maximum) amount of data transferred with each call to sane_read()."
+
+#: backend/test.c:514
+#, no-c-format
+msgid "Read delay"
+msgstr "Read delay"
+
+#: backend/test.c:515
+#, no-c-format
+msgid "Delay the transfer of data to the pipe."
+msgstr "Delay the transfer of data to the pipe."
+
+#: backend/test.c:527
+#, no-c-format
+msgid "Duration of read-delay"
+msgstr "Duration of read-delay"
+
+#: backend/test.c:528
+#, no-c-format
+msgid ""
+"How long to wait after transferring each buffer of data through the pipe."
+msgstr ""
+"How long to wait after transferring each buffer of data through the pipe."
+
+#: backend/test.c:543
+#, no-c-format
+msgid "Return-value of sane_read"
+msgstr "Return-value of sane_read"
+
+#: backend/test.c:545
+#, no-c-format
+msgid ""
+"Select the return-value of sane_read(). \"Default\" is the normal "
+"handling for scanning. All other status codes are for testing how the "
+"frontend handles them."
+msgstr ""
+"Select the return-value of sane_read(). “Default� is the normal handling "
+"for scanning. All other status codes are for testing how the frontend "
+"handles them."
+
+#: backend/test.c:562
+#, no-c-format
+msgid "Loss of pixels per line"
+msgstr "Loss of pixels per line"
+
+#: backend/test.c:564
+#, no-c-format
+msgid "The number of pixels that are wasted at the end of each line."
+msgstr "The number of pixels that are wasted at the end of each line."
+
+#: backend/test.c:577
+#, no-c-format
+msgid "Fuzzy parameters"
+msgstr "Fuzzy parameters"
+
+#: backend/test.c:578
+#, no-c-format
+msgid ""
+"Return fuzzy lines and bytes per line when sane_parameters() is called "
+"before sane_start()."
+msgstr ""
+"Return fuzzy lines and bytes per line when sane_parameters() is called "
+"before sane_start()."
+
+#: backend/test.c:591
+#, no-c-format
+msgid "Use non-blocking IO"
+msgstr "Use non-blocking IO"
+
+#: backend/test.c:592
+#, no-c-format
+msgid "Use non-blocking IO for sane_read() if supported by the frontend."
+msgstr "Use non-blocking IO for sane_read() if supported by the frontend."
+
+#: backend/test.c:605
+#, no-c-format
+msgid "Offer select file descriptor"
+msgstr "Offer select file descriptor"
+
+#: backend/test.c:606
+#, no-c-format
+msgid ""
+"Offer a select filedescriptor for detecting if sane_read() will return "
+"data."
+msgstr ""
+"Offer a select filedescriptor for detecting if sane_read() will return "
+"data."
+
+#: backend/test.c:619
+#, no-c-format
+msgid "Enable test options"
+msgstr "Enable test options"
+
+#: backend/test.c:620
+#, no-c-format
+msgid ""
+"Enable various test options. This is for testing the ability of "
+"frontends to view and modify all the different SANE option types."
+msgstr ""
+"Enable various test options. This is for testing the ability of "
+"frontends to view and modify all the different SANE option types."
+
+#: backend/test.c:634
+#, no-c-format
+msgid "Print options"
+msgstr "Print options"
+
+#: backend/test.c:635
+#, no-c-format
+msgid "Print a list of all options."
+msgstr "Print a list of all options."
+
+#: backend/test.c:712
+#, no-c-format
+msgid "Bool test options"
+msgstr "Bool test options"
+
+#: backend/test.c:725
+#, no-c-format
+msgid "(1/6) Bool soft select soft detect"
+msgstr "(1/6) Bool soft select soft detect"
+
+#: backend/test.c:727
+#, no-c-format
+msgid ""
+"(1/6) Bool test option that has soft select and soft detect (and "
+"advanced) capabilities. That's just a normal bool option."
+msgstr ""
+"(1/6) Bool test option that has soft select and soft detect (and "
+"advanced) capabilities. That's just a normal bool option."
+
+#: backend/test.c:743
+#, no-c-format
+msgid "(2/6) Bool hard select soft detect"
+msgstr "(2/6) Bool hard select soft detect"
+
+#: backend/test.c:745
+#, no-c-format
+msgid ""
+"(2/6) Bool test option that has hard select and soft detect (and "
+"advanced) capabilities. That means the option can't be set by the "
+"frontend but by the user (e.g. by pressing a button at the device)."
+msgstr ""
+"(2/6) Bool test option that has hard select and soft detect (and "
+"advanced) capabilities. That means the option can't be set by the "
+"frontend but by the user (e.g. by pressing a button at the device)."
+
+#: backend/test.c:762
+#, no-c-format
+msgid "(3/6) Bool hard select"
+msgstr "(3/6) Bool hard select"
+
+#: backend/test.c:763
+#, no-c-format
+msgid ""
+"(3/6) Bool test option that has hard select (and advanced) capabilities. "
+"That means the option can't be set by the frontend but by the user (e.g. "
+"by pressing a button at the device) and can't be read by the frontend."
+msgstr ""
+"(3/6) Bool test option that has hard select (and advanced) capabilities. "
+"That means the option can't be set by the frontend but by the user (e.g. "
+"by pressing a button at the device) and can't be read by the frontend."
+
+#: backend/test.c:781
+#, no-c-format
+msgid "(4/6) Bool soft detect"
+msgstr "(4/6) Bool soft detect"
+
+#: backend/test.c:782
+#, no-c-format
+msgid ""
+"(4/6) Bool test option that has soft detect (and advanced) capabilities. "
+"That means the option is read-only."
+msgstr ""
+"(4/6) Bool test option that has soft detect (and advanced) capabilities. "
+"That means the option is read-only."
+
+#: backend/test.c:798
+#, no-c-format
+msgid "(5/6) Bool soft select soft detect emulated"
+msgstr "(5/6) Bool soft select soft detect emulated"
+
+#: backend/test.c:799
+#, no-c-format
+msgid ""
+"(5/6) Bool test option that has soft select, soft detect, and emulated "
+"(and advanced) capabilities."
+msgstr ""
+"(5/6) Bool test option that has soft select, soft detect, and emulated "
+"(and advanced) capabilities."
+
+#: backend/test.c:815
+#, no-c-format
+msgid "(6/6) Bool soft select soft detect auto"
+msgstr "(6/6) Bool soft select soft detect auto"
+
+#: backend/test.c:816
+#, no-c-format
+msgid ""
+"(6/6) Bool test option that has soft select, soft detect, and automatic "
+"(and advanced) capabilities. This option can be automatically set by the "
+"backend."
+msgstr ""
+"(6/6) Bool test option that has soft select, soft detect, and automatic "
+"(and advanced) capabilities. This option can be automatically set by the "
+"backend."
+
+#: backend/test.c:833
+#, no-c-format
+msgid "Int test options"
+msgstr "Int test options"
+
+#: backend/test.c:846
+#, no-c-format
+msgid "(1/6) Int"
+msgstr "(1/6) Int"
+
+#: backend/test.c:847
+#, no-c-format
+msgid "(1/6) Int test option with no unit and no constraint set."
+msgstr "(1/6) Int test option with no unit and no constraint set."
+
+#: backend/test.c:862
+#, no-c-format
+msgid "(2/6) Int constraint range"
+msgstr "(2/6) Int constraint range"
+
+#: backend/test.c:863
+#, no-c-format
+msgid ""
+"(2/6) Int test option with unit pixel and constraint range set. Minimum "
+"is 4, maximum 192, and quant is 2."
+msgstr ""
+"(2/6) Int test option with unit pixel and constraint range set. Minimum "
+"is 4, maximum 192, and quant is 2."
+
+#: backend/test.c:879
+#, no-c-format
+msgid "(3/6) Int constraint word list"
+msgstr "(3/6) Int constraint word list"
+
+#: backend/test.c:880
+#, no-c-format
+msgid "(3/6) Int test option with unit bits and constraint word list set."
+msgstr "(3/6) Int test option with unit bits and constraint word list set."
+
+#: backend/test.c:895
+#, no-c-format
+msgid "(4/6) Int array"
+msgstr "(4/6) Int array"
+
+#: backend/test.c:896
+#, no-c-format
+msgid ""
+"(4/6) Int test option with unit mm and using an array without "
+"constraints."
+msgstr ""
+"(4/6) Int test option with unit mm and using an array without "
+"constraints."
+
+#: backend/test.c:911
+#, no-c-format
+msgid "(5/6) Int array constraint range"
+msgstr "(5/6) Int array constraint range"
+
+#: backend/test.c:912
+#, no-c-format
+msgid ""
+"(5/6) Int test option with unit dpi and using an array with a range "
+"constraint. Minimum is 4, maximum 192, and quant is 2."
+msgstr ""
+"(5/6) Int test option with unit dpi and using an array with a range "
+"constraint. Minimum is 4, maximum 192, and quant is 2."
+
+#: backend/test.c:929
+#, no-c-format
+msgid "(6/6) Int array constraint word list"
+msgstr "(6/6) Int array constraint word list"
+
+#: backend/test.c:930
+#, no-c-format
+msgid ""
+"(6/6) Int test option with unit percent and using an array with a word "
+"list constraint."
+msgstr ""
+"(6/6) Int test option with unit percent and using an array with a word "
+"list constraint."
+
+#: backend/test.c:946
+#, no-c-format
+msgid "Fixed test options"
+msgstr "Fixed test options"
+
+#: backend/test.c:959
+#, no-c-format
+msgid "(1/3) Fixed"
+msgstr "(1/3) Fixed"
+
+#: backend/test.c:960
+#, no-c-format
+msgid "(1/3) Fixed test option with no unit and no constraint set."
+msgstr "(1/3) Fixed test option with no unit and no constraint set."
+
+#: backend/test.c:975
+#, no-c-format
+msgid "(2/3) Fixed constraint range"
+msgstr "(2/3) Fixed constraint range"
+
+#: backend/test.c:976
+#, no-c-format
+msgid ""
+"(2/3) Fixed test option with unit microsecond and constraint range set. "
+"Minimum is -42.17, maximum 32767.9999, and quant is 2.0."
+msgstr ""
+"(2/3) Fixed test option with unit microsecond and constraint range set. "
+"Minimum is -42.17, maximum 32767.9999, and quant is 2.0."
+
+#: backend/test.c:992
+#, no-c-format
+msgid "(3/3) Fixed constraint word list"
+msgstr "(3/3) Fixed constraint word list"
+
+#: backend/test.c:993
+#, no-c-format
+msgid "(3/3) Fixed test option with no unit and constraint word list set."
+msgstr "(3/3) Fixed test option with no unit and constraint word list set."
+
+#: backend/test.c:1008
+#, no-c-format
+msgid "String test options"
+msgstr "String test options"
+
+#: backend/test.c:1021
+#, no-c-format
+msgid "(1/3) String"
+msgstr "(1/3) String"
+
+#: backend/test.c:1022
+#, no-c-format
+msgid "(1/3) String test option without constraint."
+msgstr "(1/3) String test option without constraint."
+
+#: backend/test.c:1039
+#, no-c-format
+msgid "(2/3) String constraint string list"
+msgstr "(2/3) String constraint string list"
+
+#: backend/test.c:1040
+#, no-c-format
+msgid "(2/3) String test option with string list constraint."
+msgstr "(2/3) String test option with string list constraint."
+
+#: backend/test.c:1059
+#, no-c-format
+msgid "(3/3) String constraint long string list"
+msgstr "(3/3) String constraint long string list"
+
+#: backend/test.c:1060
+#, no-c-format
+msgid ""
+"(3/3) String test option with string list constraint. Contains some more "
+"entries..."
+msgstr ""
+"(3/3) String test option with string list constraint. Contains some more "
+"entries..."
+
+#: backend/test.c:1080
+#, no-c-format
+msgid "Button test options"
+msgstr "Button test options"
+
+#: backend/test.c:1093
+#, no-c-format
+msgid "(1/1) Button"
+msgstr "(1/1) Button"
+
+#: backend/test.c:1094
+#, no-c-format
+msgid "(1/1) Button test option. Prints some text..."
+msgstr "(1/1) Button test option. Prints some text..."
+
+#: backend/u12.c:149
+#, no-c-format
+msgid "Color 36"
+msgstr "Color 36"
+
+#: backend/umax.c:235
+#, no-c-format
+msgid "Use Image Composition"
+msgstr "Use Image Composition"
+
+#: backend/umax.c:236
+#, no-c-format
+msgid "Bi-level black and white (lineart mode)"
+msgstr "Bi-level black and white (lineart mode)"
+
+#: backend/umax.c:237
+#, no-c-format
+msgid "Dithered/halftone black & white (halftone mode)"
+msgstr "Dithered/halftone black & white (halftone mode)"
+
+#: backend/umax.c:238
+#, no-c-format
+msgid "Multi-level black & white (grayscale mode)"
+msgstr "Multi-level black & white (grayscale mode)"
+
+#: backend/umax.c:239
+#, no-c-format
+msgid "Multi-level RGB color (one pass color)"
+msgstr "Multi-level RGB color (one pass color)"
+
+#: backend/umax.c:240
+#, no-c-format
+msgid "Ignore calibration"
+msgstr "Ignore calibration"
+
+#: backend/umax.c:5733
+#, no-c-format
+msgid "Disable pre focus"
+msgstr "Disable pre focus"
+
+#: backend/umax.c:5734
+#, no-c-format
+msgid "Do not calibrate focus"
+msgstr "Do not calibrate focus"
+
+#: backend/umax.c:5745
+#, no-c-format
+msgid "Manual pre focus"
+msgstr "Manual pre focus"
+
+#: backend/umax.c:5757
+#, no-c-format
+msgid "Fix focus position"
+msgstr "Fix focus position"
+
+#: backend/umax.c:5769
+#, no-c-format
+msgid "Lens calibration in doc position"
+msgstr "Lens calibration in doc position"
+
+#: backend/umax.c:5770
+#, no-c-format
+msgid "Calibrate lens focus in document position"
+msgstr "Calibrate lens focus in document position"
+
+#: backend/umax.c:5781
+#, no-c-format
+msgid "Holder focus position 0mm"
+msgstr "Holder focus position 0mm"
+
+#: backend/umax.c:5782
+#, no-c-format
+msgid "Use 0mm holder focus position instead of 0.6mm"
+msgstr "Use 0mm holder focus position instead of 0.6mm"
+
+#: backend/umax.c:5885
+#, no-c-format
+msgid "Calibration mode"
+msgstr "Calibration mode"
+
+#: backend/umax.c:5886
+#, no-c-format
+msgid "Define calibration mode"
+msgstr "Define calibration mode"
+
+#: backend/umax_pp.c:640
+#, no-c-format
+msgid "Sets lamp on/off"
+msgstr "Sets lamp on/off"
+
+#: backend/umax_pp.c:649
+#, no-c-format
+msgid "UTA on"
+msgstr "UTA on"
+
+#: backend/umax_pp.c:650
+#, no-c-format
+msgid "Sets UTA on/off"
+msgstr "Sets UTA on/off"
+
+#: backend/umax_pp.c:771
+#, no-c-format
+msgid "Offset"
+msgstr "Offset"
+
+#: backend/umax_pp.c:773
+#, no-c-format
+msgid "Color channels offset settings"
+msgstr "Color channels offset settings"
+
+#: backend/umax_pp.c:780
+#, no-c-format
+msgid "Gray offset"
+msgstr "Gray offset"
+
+#: backend/umax_pp.c:781
+#, no-c-format
+msgid "Sets gray channel offset"
+msgstr "Sets gray channel offset"
+
+#: backend/umax_pp.c:793
+#, no-c-format
+msgid "Sets red channel offset"
+msgstr "Sets red channel offset"
+
+#: backend/umax_pp.c:805
+#, no-c-format
+msgid "Sets green channel offset"
+msgstr "Sets green channel offset"
+
+#: backend/umax_pp.c:817
+#, no-c-format
+msgid "Sets blue channel offset"
+msgstr "Sets blue channel offset"
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
new file mode 100644
index 0000000..e6b77c1
--- /dev/null
+++ b/po/en_GB.gmo
diff --git a/po/en_GB.po b/po/en_GB.po
index 1bb0a52..f683493 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,423 +5,417 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
 "PO-Revision-Date: 2009-04-25 00:19+0100\n"
 "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
 "Language-Team: British English <kde-i18n-doc@kde.org>\n"
-"Language: \n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr "Number of options"
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr ""
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "Geometry"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "Enhancement"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "Advanced"
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr ""
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "Preview"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr "Force monochrome preview"
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr "Bit depth"
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Scan mode"
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "Scan speed"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr "Scan source"
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr "Force backtracking"
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "Top-left x"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "Top-left y"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "Bottom-right x"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "Bottom-right y"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Scan resolution"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "X-resolution"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Y-resolution"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr ""
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, fuzzy, no-c-format
 msgid "Page height"
 msgstr "Highlight"
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr "Use custom gamma table"
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr "Image intensity"
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr "Red intensity"
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr "Green intensity"
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr "Blue intensity"
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr "Brightness"
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "Contrast"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr "Grain size"
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr "Halftoning"
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "Black level"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "White level"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr "White level for red"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
 msgstr "White level for green"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr "White level for blue"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "Shadow"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr "Shadow for red"
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr "Shadow for green"
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr "Shadow for blue"
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr "Highlight"
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr "Highlight for red"
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr "Highlight for green"
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr "Highlight for blue"
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr "Hue"
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr "Saturation"
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "Filename"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr "Halftone pattern size"
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "Halftone pattern"
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr "Bind X and Y resolution"
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "Negative"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "Quality calibration"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr "Double Optical Resolution"
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr "Bind RGB"
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr "Threshold"
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr "Analogue gamma correction"
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr "Analogue gamma red"
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr "Analogue gamma green"
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr "Analogue gamma blue"
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr "Bind analogue gamma"
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr "Warmup lamp"
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr "Cal. exposure-time"
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr "Cal. exposure-time for red"
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr "Cal. exposure-time for green"
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr "Cal. exposure-time for blue"
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr "Scan exposure-time"
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr "Scan exposure-time for red"
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr "Scan exposure-time for green"
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr "Scan exposure-time for blue"
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr "Set exposure-time"
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr "Cal. lamp density"
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr "Scan lamp density"
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr "Set lamp density"
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr "Lamp off at exit"
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
@@ -430,37 +424,37 @@ msgstr ""
 "Read-only option that specifies how many options a specific devices "
 "supports."
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, fuzzy, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "Short resolution list"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr ""
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, fuzzy, no-c-format
 msgid "Image modification options"
 msgstr "Number of options"
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, fuzzy, no-c-format
 msgid "Hardware specific options"
 msgstr "Hardware resolution"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr ""
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr "Request a preview-quality scan."
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -471,7 +465,7 @@ msgstr ""
 "scanner this cuts down the number of passes to one and on a one-pass "
 "scanner, it reduces the memory requirements and scan-time of the preview."
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
@@ -480,81 +474,81 @@ msgstr ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
 "for multibit scans."
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr "Selects the scan mode (e.g., lineart, monochrome, or colour)."
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr "Determines the speed at which the scan proceeds."
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr "Selects the scan source (such as a document-feeder)."
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr "Controls whether backtracking is forced."
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "Top-left x position of scan area."
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "Top-left y position of scan area."
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "Bottom-right x position of scan area."
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "Bottom-right y position of scan area."
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr "Sets the resolution of the scanned image."
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr "Sets the horizontal resolution of the scanned image."
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr "Sets the vertical resolution of the scanned image."
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
 "sheet-fed scans."
 msgstr ""
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, fuzzy, no-c-format
 msgid "Specifies the height of the media."
 msgstr "Sets the resolution of the scanned image."
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid ""
 "Determines whether a builtin or a custom gamma-table should be used."
 msgstr ""
 "Determines whether a builtin or a custom gamma-table should be used."
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -565,32 +559,32 @@ msgstr ""
 "red, green, and blue channels simultaneously (i.e., it is an intensity "
 "gamma table)."
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr "Gamma-correction table for the red band."
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr "Gamma-correction table for the green band."
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr "Gamma-correction table for the blue band."
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr "Controls the brightness of the acquired image."
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr "Controls the contrast of the acquired image."
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
@@ -599,76 +593,76 @@ msgstr ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
 "in sharper images."
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr "Selects whether the acquired image should be halftoned (dithered)."
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr "Selects what radiance level should be considered \"black\"."
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr "Selects what radiance level should be considered \"white\"."
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr "Selects what red radiance level should be considered \"white\"."
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr "Selects what green radiance level should be considered \"white\"."
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr " "
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr "Selects what red radiance level should be considered \"black\"."
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr "Selects what green radiance level should be considered \"black\"."
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr "Selects what blue radiance level should be considered \"black\"."
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr "Selects what red radiance level should be considered \"full red\"."
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid ""
 "Selects what green radiance level should be considered \"full green\"."
 msgstr ""
 "Selects what green radiance level should be considered \"full green\"."
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid ""
 "Selects what blue radiance level should be considered \"full blue\"."
 msgstr ""
 "Selects what blue radiance level should be considered \"full blue\"."
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr "Controls the \"hue\" (blue-level) of the acquired image."
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
@@ -677,12 +671,12 @@ msgstr ""
 "The saturation level controls the amount of \"blooming\" that occurs "
 "when acquiring an image with a camera. Larger values cause more blooming."
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr "The filename of the image to be loaded."
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
@@ -691,294 +685,294 @@ msgstr ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
 "halftoned images."
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
 msgstr ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr "Use same values for X and Y resolution"
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr "Swap black and white"
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr "Do a quality white-calibration"
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr "Use lens that doubles optical resolution"
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr "In RGB-mode use same values for each colour"
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr "Select minimum-brightness to get a white point"
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr "Analog gamma-correction"
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr "Analog gamma-correction for red"
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr "Analog gamma-correction for green"
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr "Analog gamma-correction for blue"
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr "Warmup lamp before scanning"
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr "Define exposure-time for calibration"
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr "Define exposure-time for red calibration"
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr "Define exposure-time for green calibration"
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr "Define exposure-time for blue calibration"
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr "Define exposure-time for scan"
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr "Define exposure-time for red scan"
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr "Define exposure-time for green scan"
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr "Define exposure-time for blue scan"
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr "Enable selection of exposure-time"
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr "Define lamp density for calibration"
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr "Define lamp density for scan"
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr "Enable selection of lamp density"
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr "Turn off lamp when program exits"
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, fuzzy, no-c-format
 msgid "Scan button"
 msgstr "Scan resolution"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, fuzzy, no-c-format
 msgid "Email button"
 msgstr "Wait for button"
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, fuzzy, no-c-format
 msgid "Fax button"
 msgstr "Wait for button"
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, fuzzy, no-c-format
 msgid "Copy button"
 msgstr "Wait for button"
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr ""
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, fuzzy, no-c-format
 msgid "Cover open"
 msgstr "ADF cover open"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "Colour"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr "Colour Lineart"
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr "Colour Halftone"
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "Grey"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr "Halftone"
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "Lineart"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, fuzzy, no-c-format
 msgid "Operation not supported"
 msgstr "Halftoning Unsupported"
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, fuzzy, no-c-format
 msgid "Document feeder jammed"
 msgstr "Document feeder extras"
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, fuzzy, no-c-format
 msgid "Document feeder out of documents"
 msgstr "Document feeder extras"
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, fuzzy, no-c-format
 msgid "Scanner cover is open"
 msgstr "ADF cover open"
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "Defaults"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr "Set default values for enhancement controls."
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "Calibration"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr "Calibrate before next scan"
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
@@ -987,12 +981,12 @@ msgstr ""
 "If enabled, the device will be calibrated before the next scan. "
 "Otherwise, calibration is performed only before the first start."
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr "Only perform shading-correction"
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -1003,1060 +997,1051 @@ msgstr ""
 "The default values for gain, offset and exposure time, either build-in "
 "or from the configuration file, are used."
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr "Button state"
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr "Number of the frame to scan"
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr "Selects the number of the frame to scan"
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, no-c-format
 msgid "Duplex scan"
 msgstr "Duplex scan"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid ""
 "Duplex scan provide a scan of the front and back side of the document"
 msgstr ""
 "Duplex scan provide a scan of the front and back side of the document"
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr "Calibrate Scanner"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr "Force scanner calibration before scan"
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr "Greyscale scan"
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr "Do a greyscale rather than colour scan"
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr "Analogue Gain"
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr "Increase or decrease the analogue gain of the CCD array"
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "Gamma Correction"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr "Selects the gamma corrected transfer curve"
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr "Raw"
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr "Fine colour"
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, no-c-format
 msgid "No transparency correction"
 msgstr "No transparency correction"
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr "Correction according to film type"
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr "Correction according to transparency ratio"
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, no-c-format
 msgid "Negatives"
 msgstr "Negatives"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, no-c-format
 msgid "Slides"
 msgstr "Slides"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, no-c-format
 msgid "Normal speed"
 msgstr "Normal speed"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/2 normal speed"
 msgstr "1/2 normal speed"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/3 normal speed"
 msgstr "1/3 normal speed"
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, no-c-format
 msgid "rounded parameter"
 msgstr "rounded parameter"
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr "unknown"
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, no-c-format
 msgid "ADF jam"
 msgstr "ADF jam"
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr "ADF cover open"
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, no-c-format
 msgid "lamp failure"
 msgstr "lamp failure"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr "scan head positioning error"
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr "CPU check error"
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr "RAM check error"
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr "ROM check error"
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr "hardware check error"
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, no-c-format
 msgid "transparency unit lamp failure"
 msgstr "transparency unit lamp failure"
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr "transparency unit scan head positioning failure"
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr "parameter list length error"
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr "invalid command operation code"
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr "invalid field in CDB"
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr "unsupported LUN"
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr "invalid field in parameter list"
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr "command sequence error"
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr "too many windows specified"
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr "medium not present"
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr "invalid bit IDENTIFY message"
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr "option not connect"
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr "power on reset / bus device reset"
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr "parameter changed by another initiator"
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr "no additional sense information"
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr "reselect failure"
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr "SCSI parity error"
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr "initiator detected error message received"
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr "invalid message error"
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr "timeout error"
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, no-c-format
 msgid "transparency unit shading error"
 msgstr "transparency unit shading error"
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr "lamp not stabilised"
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, no-c-format
 msgid "film scanner"
 msgstr "film scanner"
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr "flatbed scanner"
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr "Film type"
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr "Selects the film type, i.e. negatives or slides"
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, no-c-format
 msgid "Negative film type"
 msgstr "Negative film type"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, no-c-format
 msgid "Selects the negative film type"
 msgstr "Selects the negative film type"
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, no-c-format
 msgid "Hardware resolution"
 msgstr "Hardware resolution"
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "Use only hardware resolutions"
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr "Focus"
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, no-c-format
 msgid "Auto focus"
 msgstr "Auto focus"
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, no-c-format
 msgid "Enable/disable auto focus"
 msgstr "Enable/disable auto focus"
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr "Auto focus only once"
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr "Do auto focus only once between ejects"
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, no-c-format
 msgid "Manual focus position"
 msgstr "Manual focus position"
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr "Set the optical system's focus position by hand (default: 128)."
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr "Scan margins"
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr "Extra colour adjustments"
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "Mirror image"
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "Mirror the image horizontally"
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, no-c-format
 msgid "Auto exposure"
 msgstr "Auto exposure"
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr "Enable/disable the auto exposure feature"
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, no-c-format
 msgid "Calibration now"
 msgstr "Calibration now"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Execute calibration *now*"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr "Self diagnosis"
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr "Perform scanner self diagnosis"
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, no-c-format
 msgid "Reset scanner"
 msgstr "Reset scanner"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, no-c-format
 msgid "Reset the scanner"
 msgstr "Reset the scanner"
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr "Medium handling"
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, no-c-format
 msgid "Eject film after each scan"
 msgstr "Eject film after each scan"
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr "Automatically eject the film from the device after each scan"
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr "Eject film before exit"
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr ""
 "Automatically eject the film from the device before exiting the program"
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr "Eject film now"
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr "Eject the film *now*"
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, no-c-format
 msgid "Document feeder extras"
 msgstr "Document feeder extras"
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, no-c-format
 msgid "Flatbed only"
 msgstr "Flatbed only"
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr "Disable auto document feeder and use flatbed only"
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, no-c-format
 msgid "Transparency unit"
 msgstr "Transparency unit"
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr "Switch on/off the transparency unit (FAU, film adapter unit)"
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, no-c-format
 msgid "Negative film"
 msgstr "Negative film"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, no-c-format
 msgid "Positive or negative film"
 msgstr "Positive or negative film"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr "Density control"
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr "Set density control mode"
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, no-c-format
 msgid "Transparency ratio"
 msgstr "Transparency ratio"
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, no-c-format
 msgid "Select film type"
 msgstr "Select film type"
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, no-c-format
 msgid "Select the film type"
 msgstr "Select the film type"
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "Flatbed"
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, fuzzy, no-c-format
 msgid "ADF Front"
 msgstr "ADF cover open"
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, fuzzy, no-c-format
 msgid "ADF Back"
 msgstr "ADF jam"
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, no-c-format
 msgid "ADF Duplex"
 msgstr "ADF Duplex"
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, fuzzy, no-c-format
 msgid "Card Front"
 msgstr "Print"
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, no-c-format
 msgid "Card Back"
 msgstr ""
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, fuzzy, no-c-format
 msgid "Card Duplex"
 msgstr "Duplex"
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "Red"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "Green"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "Blue"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, fuzzy, no-c-format
 msgid "Enhance Red"
 msgstr "Enhancement"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, fuzzy, no-c-format
 msgid "Enhance Green"
 msgstr "Enhancement"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, fuzzy, no-c-format
 msgid "Enhance Blue"
 msgstr "Enhancement"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr "None"
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr ""
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr ""
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr "Simplex"
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr "Duplex"
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr "Transparency Unit"
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr "Automatic Document Feeder"
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "Positive Film"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "Negative Film"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr "Focus on glass"
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr "Focus 2.5mm above glass"
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr "Halftone A (Hard Tone)"
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr "Halftone B (Soft Tone)"
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr "Halftone C (Net Screen)"
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr "Dither A (4x4 Bayer)"
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr "Dither B (4x4 Spiral)"
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr "Dither C (4x4 Net Screen)"
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr "Dither D (8x4 Net Screen)"
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr "Text Enhanced Technology"
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr "Download pattern A"
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr "Download pattern B"
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "No Correction"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr "User defined"
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr "Impact-dot printers"
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr "Thermal printers"
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "Ink-jet printers"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr "CRT monitors"
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "Default"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr "High density printing"
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr "Low density printing"
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr "High contrast printing"
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr "User defined (Gamma=1.0)"
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr "User defined (Gamma=1.8)"
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr "CD"
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr "A5 portrait"
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr "A5 landscape"
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr "Letter"
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr "A4"
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "Max"
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr "Scan Mode"
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr "Selects the halftone."
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr "Dropout"
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr "Selects the dropout."
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr "Selects the brightness."
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr "Sharpness"
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr "Colour correction"
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr "Sets the colour correction table for the selected output device."
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr "Colour correction coefficients"
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr "Matrix multiplication of RGB"
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr "Shift green to red"
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr "Shift green to blue"
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr "Shift red to green"
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr "Shift red to blue"
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr "Shift blue to green"
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr "Shift blue to red"
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr "Controls green level"
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr "Adds to red based on green level"
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr "Adds to blue based on green level"
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr "Adds to green based on red level"
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr "Controls red level"
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr "Adds to blue based on red level"
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr "Adds to green based on blue level"
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr "Adds to red based on blue level"
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, no-c-format
 msgid "Controls blue level"
 msgstr "Controls blue level"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr "Mirror the image."
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr "Fast preview"
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr "Auto area segmentation"
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr "Short resolution list"
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr "Display short resolution list"
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr "Defines the zoom factor the scanner will use"
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr "Quick format"
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr "Optional equipment"
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr "Eject"
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr "Eject the sheet in the ADF"
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr "Auto eject"
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr "Eject document after scanning"
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr "ADF Mode"
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr "Selects the ADF mode (simplex/duplex)"
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr "Bay"
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr "Select bay to scan"
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
@@ -2065,24 +2050,24 @@ msgstr ""
 "Selects the gamma correction value from a list of pre-defined devices or "
 "the user defined table, which can be downloaded to the scanner"
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr "Focus Position"
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
 msgstr ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr "Wait for Button"
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
@@ -2091,219 +2076,964 @@ msgstr ""
 "After sending the scan command, wait until the button on the scanner is "
 "pressed to actually start the scan process."
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr ""
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, no-c-format
 msgid "Positive Slide"
 msgstr "Positive Slide"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, no-c-format
 msgid "Negative Slide"
 msgstr "Negative Slide"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr ""
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, fuzzy, no-c-format
 msgid "User defined CCT profile"
 msgstr "User defined"
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr "On"
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr "Off"
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr "Dither"
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, fuzzy, no-c-format
 msgid "Diffusion"
 msgstr "Error Diffusion"
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, fuzzy, no-c-format
 msgid "White"
 msgstr "White level"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, fuzzy, no-c-format
 msgid "Black"
 msgstr "Black level"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, fuzzy, no-c-format
 msgid "Continue"
 msgstr "Conditional"
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr ""
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, fuzzy, no-c-format
 msgid "Horizontal bold"
 msgstr "Horizontal"
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, fuzzy, no-c-format
 msgid "Horizontal narrow"
 msgstr "Horizontal"
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr "Vertical"
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, fuzzy, no-c-format
 msgid "Vertical bold"
 msgstr "Vertical"
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr ""
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr ""
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, fuzzy, no-c-format
 msgid "Front"
 msgstr "Print"
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr ""
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
+msgid "Gamma function exponent"
 msgstr ""
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
 #, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
+msgid "Changes intensity of midtones"
+msgstr ""
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr ""
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr ""
+
+#: backend/fujitsu.c:3165
+#, fuzzy, no-c-format
+msgid "Halftone type"
+msgstr "Halftone"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr ""
+
+#: backend/fujitsu.c:3210
+#, fuzzy, no-c-format
+msgid "Perform outline extraction"
+msgstr "Performs calibration"
+
+#: backend/fujitsu.c:3221
+#, fuzzy, no-c-format
+msgid "Emphasis"
+msgstr "Image emphasis"
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr ""
+
+#: backend/fujitsu.c:3240
+#, fuzzy, no-c-format
+msgid "Separation"
+msgstr "Saturation"
+
+#: backend/fujitsu.c:3241
+#, fuzzy, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr "Enable automatic determination of threshold for line-art scans."
+
+#: backend/fujitsu.c:3252
+#, fuzzy, no-c-format
+msgid "Mirroring"
+msgstr "Mirror image"
+
+#: backend/fujitsu.c:3253
+#, fuzzy, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "Mirror image horizontally."
+
+#: backend/fujitsu.c:3270
+#, fuzzy, no-c-format
+msgid "White level follower"
+msgstr "White level for blue"
+
+#: backend/fujitsu.c:3271
+#, fuzzy, no-c-format
+msgid "Control white level follower"
+msgstr "Controls red level"
+
+#: backend/fujitsu.c:3289
+#, fuzzy, no-c-format
+msgid "BP filter"
+msgstr "Colour Filter"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr ""
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr "Smoothing"
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr ""
+
+#: backend/fujitsu.c:3323
+#, fuzzy, no-c-format
+msgid "Gamma curve"
+msgstr "Gamma value"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, fuzzy, no-c-format
+msgid "Threshold curve"
+msgstr "Threshold"
+
+#: backend/fujitsu.c:3347
+#, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+
+#: backend/fujitsu.c:3369
+#, fuzzy, no-c-format
+msgid "Threshold white"
+msgstr "Threshold"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr ""
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, fuzzy, no-c-format
+msgid "Noise removal"
+msgstr "Noise reduction"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr ""
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr ""
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr ""
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr ""
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr ""
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr ""
+
+#: backend/fujitsu.c:3508
+#, fuzzy, no-c-format
+msgid "Auto width detection"
+msgstr "No Correction"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr ""
+
+#: backend/fujitsu.c:3526
+#, fuzzy, no-c-format
+msgid "Auto length detection"
+msgstr "No Correction"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr ""
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr ""
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr ""
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr ""
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr ""
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr ""
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr ""
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
 msgstr ""
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3708
+#, fuzzy, no-c-format
+msgid "DF recovery mode"
+msgstr "ADF cover open"
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr ""
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3748
+#, fuzzy, no-c-format
+msgid "Advanced paper protection"
+msgstr "Advanced Options"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+
+#: backend/fujitsu.c:3768
+#, fuzzy, no-c-format
+msgid "Staple detection"
+msgstr "No Correction"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr ""
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+
+#: backend/fujitsu.c:3809
+#, fuzzy, no-c-format
+msgid "Dropout color"
+msgstr "Dropout"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+
+#: backend/fujitsu.c:3833
+#, fuzzy, no-c-format
+msgid "Buffer mode"
+msgstr "Feeder mode"
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr ""
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr ""
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr ""
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+
+#: backend/fujitsu.c:3911
+#, fuzzy, no-c-format
+msgid "Off timer"
+msgstr "Lamp off time"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+
+#: backend/fujitsu.c:3930
+#, fuzzy, no-c-format
+msgid "Duplex offset"
+msgstr "Blue offset"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr ""
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "Green offset"
+
+#: backend/fujitsu.c:3949
+#, fuzzy, no-c-format
+msgid "Adjust green/red offset"
+msgstr "Green offset"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr "Blue offset"
+
+#: backend/fujitsu.c:3967
+#, fuzzy, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "Sets blue channel offset"
+
+#: backend/fujitsu.c:3980
+#, no-c-format
+msgid "Low Memory"
+msgstr ""
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+
+#: backend/fujitsu.c:3996
+#, fuzzy, no-c-format
+msgid "Duplex side"
+msgstr "Duplex scan"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr ""
+
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr ""
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr ""
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
+msgstr ""
+
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr ""
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+
+#: backend/fujitsu.c:4095
+#, fuzzy, no-c-format
+msgid "Endorser Options"
+msgstr "Advanced Options"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr ""
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr ""
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr ""
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr ""
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr ""
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr ""
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr ""
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr ""
+
+#: backend/fujitsu.c:4253
+#, fuzzy, no-c-format
+msgid "Endorser direction"
+msgstr "Noise reduction"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr ""
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr ""
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr ""
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr ""
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr ""
+
+#: backend/fujitsu.c:4344
+#, fuzzy, no-c-format
+msgid "A3 paper"
+msgstr "From paper"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4356
+#, fuzzy, no-c-format
+msgid "B4 paper"
+msgstr "From paper"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4368
+#, fuzzy, no-c-format
+msgid "A4 paper"
+msgstr "From paper"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4380
+#, fuzzy, no-c-format
+msgid "B5 paper"
+msgstr "From paper"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr ""
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr ""
+
+#: backend/fujitsu.c:4429
+#, fuzzy, no-c-format
+msgid "Scanner in power saving mode"
+msgstr "ADF cover open"
+
+#: backend/fujitsu.c:4452
+#, fuzzy, no-c-format
+msgid "Manual feed"
+msgstr " "
+
+#: backend/fujitsu.c:4453
+#, fuzzy, no-c-format
+msgid "Manual feed selected"
+msgstr " "
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr ""
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr ""
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr ""
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr ""
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr ""
+
+#: backend/fujitsu.c:4513
+#, fuzzy, no-c-format
+msgid "Hardware error code"
+msgstr "hardware check error"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr ""
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr ""
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr ""
+
+#: backend/fujitsu.c:4537
+#, fuzzy, no-c-format
+msgid "Imprinter ink level"
+msgstr "White level"
+
+#: backend/fujitsu.c:4548
+#, fuzzy, no-c-format
+msgid "Density"
+msgstr "Density control"
+
+#: backend/fujitsu.c:4549
+#, fuzzy, no-c-format
+msgid "Density dial"
+msgstr "Density control"
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, fuzzy, no-c-format
+msgid "Duplex switch"
+msgstr "Duplex scan"
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, no-c-format
 msgid "Extras"
 msgstr "Extras"
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, fuzzy, no-c-format
-msgid "Threshold curve"
-msgstr "Threshold"
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr ""
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
 "instead on hardware lineart."
 msgstr ""
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, no-c-format
 msgid "Disable interpolation"
 msgstr "Disable interpolation"
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
@@ -2312,44 +3042,44 @@ msgstr ""
 "When using high resolutions where the horizontal resolution is smaller "
 "than the vertical resolution this disables horizontal interpolation."
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "Colour Filter"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr "When using grey or lineart this option selects the used colour."
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "Calibration"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Define calibration mode"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Calibration data cache"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, no-c-format
 msgid "Lamp off time"
 msgstr "Lamp off time"
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
@@ -2358,103 +3088,101 @@ msgstr ""
 "The lamp will be turned off after the given time (in minutes). A value "
 "of 0 means, that the lamp won't be turned off."
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, fuzzy, no-c-format
 msgid "Lamp off during scan"
 msgstr "Lamp off during dark calibration"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, fuzzy, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr "Minutes until lamp is turned off after scan"
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, fuzzy, no-c-format
 msgid "File button"
 msgstr "Wait for button"
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr ""
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, fuzzy, no-c-format
 msgid "Power button"
 msgstr "Wait for button"
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "Wait for button"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, fuzzy, no-c-format
 msgid "Need calibration"
 msgstr "Coarse calibration"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, fuzzy, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr "Force scanner calibration before scan"
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, no-c-format
 msgid "Buttons"
 msgstr "Buttons"
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr "Calibrate"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, fuzzy, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "Start calibration process."
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, fuzzy, no-c-format
 msgid "Clear calibration"
 msgstr "Coarse calibration"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, fuzzy, no-c-format
 msgid "Clear calibration cache"
 msgstr "Calibration data cache"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr "Transparency Adapter"
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr "Grey mode colour"
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr "Selects which scan colour is used grey mode (default: green)."
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr "Debugging Options"
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "Automatic warmup"
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -2463,12 +3191,12 @@ msgstr ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
 "60 seconds warm-up time."
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "Full scan"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
@@ -2477,12 +3205,12 @@ msgstr ""
 "Scan the complete scanning area including calibration strip. Be careful. "
 "Don't select the full height. For testing only."
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Coarse calibration"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2493,12 +3221,12 @@ msgstr ""
 "disabled, options for setting the analog frontend parameters manually "
 "are provided. This option is enabled by default. For testing only."
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "Coarse calibration for first scan only"
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2509,12 +3237,12 @@ msgstr ""
 "scanners and can save scanning time. If the image brightness is "
 "different with each scan, disable this option. For testing only."
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, no-c-format
 msgid "Backtrack lines"
 msgstr "Backtrack lines"
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2527,83 +3255,83 @@ msgstr ""
 "the data. Low values cause faster scans but increase the risk of "
 "omitting lines."
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Gamma value"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr "Sets the gamma value of all channels."
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, no-c-format
 msgid "Geometry Group"
 msgstr "Geometry Group"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, no-c-format
 msgid "Scan Mode Group"
 msgstr "Scan Mode Group"
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr "Slide"
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, no-c-format
 msgid "Scanner model"
 msgstr "Scanner model"
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, fuzzy, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr "Allows to test device behaviour with other supported models"
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr "Image colours will be inverted"
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, no-c-format
 msgid "Disable gamma correction"
 msgstr "Disable gamma correction"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "Gamma correction will be disabled"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, no-c-format
 msgid "Disable white shading correction"
 msgstr "Disable white shading correction"
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr "White shading correction will be disabled"
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr "Skip warmup process"
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr "Warmup process will be disabled"
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr "Force real depth"
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2614,12 +3342,12 @@ msgstr ""
 "image quality and then converted to the selected depth. This option "
 "avoids depth emulation."
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, no-c-format
 msgid "Emulate Grayscale"
 msgstr "Emulate Greyscale"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2630,12 +3358,12 @@ msgstr ""
 "grayscele by software. This may improve image quality in some "
 "circumstances."
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr "Save debugging images"
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
@@ -2644,356 +3372,350 @@ msgstr ""
 "If enabled, some images involved in scanner processing are saved to "
 "analyse them."
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, no-c-format
 msgid "Reset chipset"
 msgstr "Reset chipset"
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr "Resets chipset data"
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, no-c-format
 msgid "Information"
 msgstr "Information"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, no-c-format
 msgid "Chipset name"
 msgstr "Chipset name"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr "Shows chipset name used in device."
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr "Chipset ID"
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, no-c-format
 msgid "Shows the chipset ID"
 msgstr "Shows the chipset ID"
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, no-c-format
 msgid "Scan counter"
 msgstr "Scan counter"
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr "Shows the number of scans made by scanner"
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, no-c-format
 msgid "Update information"
 msgstr "Update information"
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr "Updates information about device"
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr "This option reflects a front panel scanner button"
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr "Image"
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr "Miscellaneous"
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, no-c-format
 msgid "offset X"
 msgstr "offset X"
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr "Hardware internal X position of the scanning area."
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, no-c-format
 msgid "offset Y"
 msgstr "offset Y"
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr "Hardware internal Y position of the scanning area."
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr "Lamp status"
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr "Switches the lamp on or off."
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr " "
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr "ADF"
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, no-c-format
 msgid "TMA Slides"
 msgstr "TMA Slides"
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, no-c-format
 msgid "TMA Negatives"
 msgstr "TMA Negatives"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, no-c-format
 msgid "Color (48 bits)"
 msgstr "Colour (48 bits)"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, no-c-format
 msgid "Extend lamp timeout"
 msgstr "Extend lamp timeout"
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr "Extends lamp timeout (from 15 minutes to 1 hour)"
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr "Wait for button"
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, no-c-format
 msgid "Waits for button before scanning"
 msgstr "Waits for button before scanning"
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, no-c-format
 msgid "Advanced Options"
 msgstr "Advanced Options"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr "Coarse"
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr "Fine"
 
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr "Bayer"
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr "Custom"
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr "NTSC RGB"
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr "XPA RGB"
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr "Pass-through"
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "NTSC Grey"
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr "XPA Grey"
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "Slow"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "Fast"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr "Extra Fast"
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr "2-pixel"
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr "4-pixel"
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr "8-pixel"
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr "Print"
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, no-c-format
 msgid "Film-strip"
 msgstr "Film-strip"
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr "XPA"
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr "Conditional"
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, no-c-format
 msgid "Experiment"
 msgstr "Experiment"
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, no-c-format
 msgid "Sharpening"
 msgstr "Sharpening"
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr "Set sharpening value."
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr "Auto Threshold"
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr "Enable automatic determination of threshold for line-art scans."
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr "Smoothing"
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr " "
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr " "
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, no-c-format
 msgid "Unloads the media after a scan."
 msgstr "Unloads the media after a scan."
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, no-c-format
 msgid "Change document"
 msgstr " "
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr "Change Document."
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr "Unload"
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr "Unload Document."
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, no-c-format
 msgid "Start calibration process."
 msgstr "Start calibration process."
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, no-c-format
 msgid "Media"
 msgstr "Media"
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr "Set type of media."
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr "Exposure time"
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -3006,461 +3728,460 @@ msgstr ""
 "negative film. For dark (underexposed) images you can increase this "
 "value."
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, no-c-format
 msgid "Color Matrix"
 msgstr "Colour Matrix"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, no-c-format
 msgid "Set the scanners color matrix."
 msgstr "Set the scanners colour matrix."
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr "Custom colour matrix."
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, no-c-format
 msgid "Mono Color Matrix"
 msgstr "Mono Colour Matrix"
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr "Custom colour matrix for greyscale scans."
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, no-c-format
 msgid "Mirror horizontal"
 msgstr "Mirror horizontal"
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, no-c-format
 msgid "Mirror image horizontally."
 msgstr "Mirror image horizontally."
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, no-c-format
 msgid "Mirror vertical"
 msgstr "Mirror vertical"
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, no-c-format
 msgid "Mirror image vertically."
 msgstr "Mirror image vertically."
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, no-c-format
 msgid "Update options"
 msgstr "Update options"
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, no-c-format
 msgid "Update options."
 msgstr "Update options."
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr "8 bit output"
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr ""
 "Use bit depth greater eight internally, but output only eight bits."
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr "Front button wait"
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr "Wait to scan for front-panel button push."
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr "Shut off lamp"
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr "Shut off scanner lamp."
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "Paper size"
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr "Automatic separation"
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, fuzzy, no-c-format
 msgid "Landscape"
 msgstr "A5 landscape"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr ""
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, fuzzy, no-c-format
 msgid "Length control mode"
 msgstr "Set density control mode"
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, fuzzy, no-c-format
 msgid "Manual feed mode"
 msgstr " "
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, fuzzy, no-c-format
 msgid "Manual feed timeout"
 msgstr " "
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr "Enable Duplex (Dual-Sided) Scanning"
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr "Physical size of the paper in the ADF"
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, fuzzy, no-c-format
 msgid "halftone"
 msgstr "Halftone"
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, fuzzy, no-c-format
 msgid "color"
 msgstr "Colour"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, fuzzy, no-c-format
 msgid "continuous"
 msgstr "Conditional"
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, fuzzy, no-c-format
 msgid "off"
 msgstr "Off"
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, fuzzy, no-c-format
 msgid "bayer_64"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, fuzzy, no-c-format
 msgid "bayer_16"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, fuzzy, no-c-format
 msgid "halftone_32"
 msgstr "Halftone"
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, fuzzy, no-c-format
 msgid "halftone_64"
 msgstr "Halftone"
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, fuzzy, no-c-format
 msgid "diffusion"
 msgstr "Error Diffusion"
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, fuzzy, no-c-format
 msgid "normal"
 msgstr "Normal"
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, fuzzy, no-c-format
 msgid "light"
 msgstr "Highlight"
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, fuzzy, no-c-format
 msgid "From scanner"
 msgstr "film scanner"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr "From paper"
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, fuzzy, no-c-format
 msgid "default"
 msgstr "Default"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, fuzzy, no-c-format
 msgid "smooth"
 msgstr "Smooth"
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, fuzzy, no-c-format
 msgid "low"
 msgstr "Slow"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, fuzzy, no-c-format
 msgid "medium"
 msgstr "Medium"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, fuzzy, no-c-format
 msgid "red"
 msgstr "Red"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, fuzzy, no-c-format
 msgid "green"
 msgstr "Green"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, fuzzy, no-c-format
 msgid "Sets the scan source"
 msgstr "Scan source"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr "Feeder mode"
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr "Sets the feeding mode"
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, fuzzy, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr "Enable/disable auto focus"
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, fuzzy, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr "Set density control mode"
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, fuzzy, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "Sets the feeding mode"
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, fuzzy, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr "Sets the feeding mode"
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr "Automatic threshold"
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
@@ -3469,557 +4190,544 @@ msgstr ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
 "reduction and image emphasis"
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "Noise reduction"
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr "Reduce the isolated dot noise"
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr "Image emphasis"
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr "Sets the image emphasis"
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, fuzzy, no-c-format
 msgid "Lamp color"
 msgstr "Lamp on"
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, fuzzy, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr "Switches the lamp on or off."
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, fuzzy, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "Mirror image vertically."
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
 "length of actual paper or logical document length."
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "Gamma correction"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, fuzzy, no-c-format
 msgid "High sensivity"
 msgstr "High density printing"
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, fuzzy, no-c-format
 msgid "Low sensivity"
 msgstr "Low density printing"
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, fuzzy, no-c-format
 msgid "err_diffusion"
 msgstr "Error Diffusion"
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, fuzzy, no-c-format
 msgid "No detection"
 msgstr "No Correction"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, fuzzy, no-c-format
 msgid "Normal mode"
 msgstr "Normal"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, fuzzy, no-c-format
 msgid "Enhanced mode"
 msgstr "Enhancement"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
 "divides long paper by the length which is set in Document Size option."
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, fuzzy, no-c-format
 msgid "Automatic threshold mode"
 msgstr "Automatic threshold"
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, fuzzy, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr "Automatic threshold"
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, fuzzy, no-c-format
 msgid "Set chroma of red"
 msgstr "Set the order of frames"
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, fuzzy, no-c-format
 msgid "chroma of blue"
 msgstr "Shadow for blue"
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, fuzzy, no-c-format
 msgid "Set chroma of blue"
 msgstr "Shift red to blue"
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr "Diamond"
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr "8x8 Coarse Fatting"
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr "8x8 Fine Fatting"
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr "8x8 Bayer"
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr "8x8 Vertical Line"
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr " "
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr "Colour channels gain settings"
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, no-c-format
 msgid "Gray gain"
 msgstr "Grey gain"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr "Sets grey channel gain"
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, no-c-format
 msgid "Red gain"
 msgstr "Red gain"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr "Sets red channel gain"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, no-c-format
 msgid "Green gain"
 msgstr "Green gain"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr "Sets green channel gain"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, no-c-format
 msgid "Blue gain"
 msgstr "Blue gain"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr "Sets blue channel gain"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr "Bayer Dither 16"
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr "Bayer Dither 64"
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr "Halftone Dot 32"
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr "Halftone Dot 64"
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr "Error Diffusion"
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr "Mode 1"
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr "Mode 2"
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr "Mode 3"
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr "From white stick"
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr "Smooth"
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr "Low"
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr "Medium"
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr "High"
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr "CRT"
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "One page"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "All pages"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr "sheetfed scanner"
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr "Greyscale 4 bits"
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr "Greyscale 8 bits"
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr "Shadow, midtone, highlight, exposure time"
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr "Special options"
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr "Colour balance"
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr "Disable backtracking"
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr "If ticked the scanner does not perform backtracking"
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr "Toggle lamp of flatbed"
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr "Toggles the lamp of the flatbed"
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr "Calibration by backend"
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid ""
 "If checked the color calibration before a scan is done by the backend"
 msgstr ""
 "If ticked the colour calibration before a scan is done by the backend"
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr "Use the lightlid-35mm adapter"
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr "This option turns off the lamp of the flatbed during a scan"
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "Quality scan"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr "Highest quality but lower speed"
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "Fast scan"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr "Highest speed but lower quality"
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr "Automatic adjustment of threshold"
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
@@ -4028,274 +4736,274 @@ msgstr ""
 "If ticked the backend automatically tries to determine an optimal value "
 "for the threshold."
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr "Selects the gamma correction mode."
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr "Bind gamma"
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr "Use same gamma values for all colour channels."
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr "Scalar gamma"
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr "Selects a value for scalar gamma correction."
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr "Scalar gamma red"
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr "Selects a value for scalar gamma correction (red channel)"
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr "Scalar gamma green"
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr "Selects a value for scalar gamma correction (green channel)"
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr "Scalar gamma blue"
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr "Selects a value for scalar gamma correction (blue channel)"
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr "Channel"
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
 msgstr ""
 "Selects the colour band, \"Master\" means that all colours are affected."
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr "Midtone"
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr "Selects which radiance level should be considered \"50 % grey\"."
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr "Midtone for red"
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr "Selects which radiance level should be considered \"50 % red\"."
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr "Midtone for green"
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr "Selects which radiance level should be considered \"50 % green\"."
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr "Midtone for blue"
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr "Selects which radiance level should be considered \"50 % blue\"."
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr "Red balance"
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr "Balance factor for red. A value of 100% means no correction."
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr "Green balance"
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr "Balance factor for green. A value of 100% means no correction."
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr "Blue balance"
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr " "
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr " "
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr "Sets the colour balance values to the firmware provided values."
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "Slowest"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "Slower"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "Faster"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "Fastest"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr "8x8 coarse"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr "8x8 normal"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr " "
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr "8x8 very fine"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr "6x6 normal"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr "5x5 coarse"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr "5x5 fine"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr "4x4 coarse"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr " "
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr "4x4 fine"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr "3x3 normal"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr "2x2 normal"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr " "
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr "6x6 custom"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr "5x5 custom"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr "4x4 custom"
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr " "
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr "2x2 custom"
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr "Fast grey mode"
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr "Scan in fast grey mode (lower quality)."
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
@@ -4304,118 +5012,118 @@ msgstr ""
 "Request that all previews are done in the fastest (low-quality) mode. "
 "This may be a non-colour mode or a low resolution mode."
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr "Lamp off time (minutes)"
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr "Set the time (in minutes) after which the lamp is shut off."
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, no-c-format
 msgid "Turn lamp off"
 msgstr "Turn lamp off"
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr "Turns the lamp off immediately."
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr "Red brightness"
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr "Controls the brightness of the red channel of the acquired image."
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr "Green brightness"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr ""
 "Controls the brightness of the green channel of the acquired image."
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr "Blue brightness"
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr "Controls the brightness of the blue channel of the acquired image."
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "Contrast red channel"
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr "Controls the contrast of the red channel of the acquired image."
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "Contrast green channel"
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr "Controls the contrast of the green channel of the acquired image."
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "Contrast blue channel"
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr "Controls the contrast of the blue channel of the acquired image."
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr "Colour48"
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr "Colour24"
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr "Grey16"
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr "Grey8"
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr "Reflective"
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, no-c-format
 msgid "Positive"
 msgstr "Positive"
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -4424,39 +5132,39 @@ msgstr ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
 "40 seconds warm-up time."
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, fuzzy, no-c-format
 msgid "Negative color"
 msgstr "Negative film"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, fuzzy, no-c-format
 msgid "Negative gray"
 msgstr "Negative"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, fuzzy, no-c-format
 msgid "48 bits color"
 msgstr "Fine colour"
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
 "mode and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, fuzzy, no-c-format
 msgid "Button-controlled scan"
 msgstr "Button-controlled scan (experimental)"
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4467,248 +5175,239 @@ msgstr ""
 "\"SCAN\" button (for MP150) or \"COLOUR\" button (for other models). To "
 "cancel, press \"GREY\" button."
 
-#: ../backend/pixma_sane_options.c:143
-#, no-c-format
-msgid "Gamma function exponent"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:144
-#, no-c-format
-msgid "Changes intensity of midtones"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:232
 #, no-c-format
 msgid "Update button state"
 msgstr "Update button state"
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:244
 #, no-c-format
 msgid "Button 1"
 msgstr "Button 1"
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:258
 #, no-c-format
 msgid "Button 2"
 msgstr "Button 2"
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr ""
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr ""
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr "Transparency"
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr "Device-Settings"
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr "Lampswitch"
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr "Manually switching the lamp(s)."
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "Lamp off during dark calibration"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr "Always switches lamp off when doing dark calibration."
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, no-c-format
 msgid "Calibration data cache"
 msgstr "Calibration data cache"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr "Enables or disables calibration data cache."
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, no-c-format
 msgid "Performs calibration"
 msgstr "Performs calibration"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr "Speedup sensor"
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr "Enables or disables speeding up sensor movement."
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, no-c-format
 msgid "Warmup-time"
 msgstr "Warmup-time"
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, no-c-format
 msgid "Warmup-time in seconds."
 msgstr "Warmup-time in seconds."
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, no-c-format
 msgid "Lampoff-time"
 msgstr "Lampoff-time"
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr "Lampoff-time in seconds."
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, no-c-format
 msgid "Analog frontend"
 msgstr "Analogue frontend"
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr "Red gain value of the AFE"
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr "Red offset"
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr "Red offset value of the AFE"
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr "Green gain value of the AFE"
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr "Green offset"
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr "Green offset value of the AFE"
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr "Blue gain value of the AFE"
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr "Blue offset"
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr "Blue offset value of the AFE"
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, no-c-format
 msgid "Red lamp off"
 msgstr "Red lamp off"
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr "Defines red lamp off parameter"
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, no-c-format
 msgid "Green lamp off"
 msgstr "Green lamp off"
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr "Defines green lamp off parameter"
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, no-c-format
 msgid "Blue lamp off"
 msgstr "Blue lamp off"
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr "Defines blue lamp off parameter"
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr "This option reflects the status of the scanner buttons."
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr "Colour36"
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr "Dithermap 1"
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr "Dithermap 2"
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr "Randomise"
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr "Source Selection"
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr "Image Enhancement"
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr "Greyify"
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr "Load the image as greyscale."
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr "Three-Pass Simulation"
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
@@ -4717,12 +5416,12 @@ msgstr ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
 "kicks, it returns green, then blue, then red."
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr "Hand-Scanner Simulation"
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4733,49 +5432,49 @@ msgstr ""
 "height a priori.  Instead, they return a height of -1.  Setting this "
 "option allows one to test whether a frontend can handle this correctly."
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid ""
 "Set default values for enhancement controls (brightness & contrast)."
 msgstr ""
 "Set default values for enhancement controls (brightness & contrast)."
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr "Read only test-option"
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr "Let's see whether frontends can treat this right"
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr "Gamma Tables"
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr "Status Code Simulation"
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr "Do not force status code"
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr "Do not force the backend to return a status code."
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr "Return SANE_STATUS_EOF"
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
@@ -4784,12 +5483,12 @@ msgstr ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
 "sane_read() has been called."
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr "Return SANE_STATUS_JAMMED"
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
@@ -4798,12 +5497,12 @@ msgstr ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
 "sane_read() has been called."
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr "Return SANE_STATUS_NO_DOCS"
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
@@ -4812,12 +5511,12 @@ msgstr ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
 "sane_read() has been called."
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr "Return SANE_STATUS_COVER_OPEN"
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
@@ -4826,12 +5525,12 @@ msgstr ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
 "sane_read() has been called."
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr "Return SANE_STATUS_IO_ERROR"
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
@@ -4840,12 +5539,12 @@ msgstr ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
 "sane_read() has been called."
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr "Return SANE_STATUS_NO_MEM"
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
@@ -4854,12 +5553,12 @@ msgstr ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
 "sane_read() has been called."
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr "Return SANE_STATUS_ACCESS_DENIED"
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
@@ -4868,85 +5567,82 @@ msgstr ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
 "after sane_read() has been called."
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, fuzzy, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr "This option reflects the status of the scanner buttons."
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr "Lamp on"
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr "Turn on scanner lamp"
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr "Lamp off"
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr "Turn off scanner lamp"
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, no-c-format
 msgid "Lamp timeout"
 msgstr "Lamp timeout"
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr "Minutes until lamp is turned off after scan"
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr "Threshold value for lineart mode"
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr "Document Feeder"
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr "6x4 (inch)"
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr "8x10 (inch)"
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr "8.5x11 (inch)"
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr "Halftoning Unsupported"
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr "DispersedDot8x8"
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr "DispersedDot16x16"
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -4961,27 +5657,27 @@ msgstr ""
 "periodically in the middle of a scan; if it's set too high, X-based "
 "frontends may stop responding to X events and your system could bog down."
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr ""
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr ""
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, fuzzy, no-c-format
 msgid "Focus point for scanning."
 msgstr "Eject document after scanning"
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr "Preview mode"
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
@@ -4990,12 +5686,12 @@ msgstr ""
 "Select the mode for previews. Greyscale previews usually give the best "
 "combination of speed and detail."
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr "Predefined settings"
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
@@ -5004,97 +5700,97 @@ msgstr ""
 "Provides standard scanning areas for photographs, printed pages and the "
 "like."
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr ""
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, fuzzy, no-c-format
 msgid "Frame to be scanned"
 msgstr "flatbed scanner"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, fuzzy, no-c-format
 msgid "Focus-mode"
 msgstr "Focus"
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, fuzzy, no-c-format
 msgid "Auto or manual focus"
 msgstr "Auto focus"
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, fuzzy, no-c-format
 msgid "Focus-point"
 msgstr "Focus Position"
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, fuzzy, no-c-format
 msgid "Focus point"
 msgstr "Focus Position"
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr "Colour lines per read"
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr "Greyscale lines per read"
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr "webcam"
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr "Colour RAW"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr "Colour RGB"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr "Colour RGB TEXT"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr "Solid black"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr "Solid white"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr "Colour pattern"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr "Grid"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr "First entry"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr "Second entry"
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
@@ -5103,12 +5799,12 @@ msgstr ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
 "display it"
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr "Hand-scanner simulation"
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5121,12 +5817,12 @@ msgstr ""
 "allows one to test whether a frontend can handle this correctly.  This "
 "option also enables a fixed width of 11 cm."
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr "Three-pass simulation"
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
@@ -5135,17 +5831,17 @@ msgstr ""
 "Simulate a three-pass scanner. In colour mode, three frames are "
 "transmitted."
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr "Set the order of frames"
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr "Set the order of frames in three-pass colour mode."
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
@@ -5154,17 +5850,17 @@ msgstr ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
 "after 10 scans."
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr "Special Options"
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr "Select the test picture"
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5182,12 +5878,12 @@ msgstr ""
 "Grid: draws a black/white grid with a width and height of 10 mm per "
 "square."
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr "Invert endianness"
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5198,57 +5894,57 @@ msgstr ""
 "can be used to test the 16 bit modes of frontends, e.g. if the frontend "
 "uses the correct endianness."
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr "Read limit"
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 "Limit the amount of data transferred with each call to sane_read()."
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr "Size of read-limit"
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
 msgstr ""
 "The (maximum) amount of data transferred with each call to sane_read()."
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr "Read delay"
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr "Delay the transfer of data to the pipe."
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr "Duration of read-delay"
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
 msgstr ""
 "How long to wait after transferring each buffer of data through the pipe."
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr "Return-value of sane_read"
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
@@ -5259,22 +5955,22 @@ msgstr ""
 "handling for scanning. All other status codes are for testing how the "
 "frontend handles them."
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr "Loss of pixels per line"
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr "The number of pixels that are wasted at the end of each line."
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr "Fuzzy parameters"
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
@@ -5283,22 +5979,22 @@ msgstr ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
 "before sane_start()."
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr "Use non-blocking IO"
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr "Use non-blocking IO for sane_read() if supported by the frontend."
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr "Offer select file descriptor"
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
@@ -5307,12 +6003,12 @@ msgstr ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
 "data."
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr "Enable test options"
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
@@ -5321,27 +6017,27 @@ msgstr ""
 "Enable various test options. This is for testing the ability of "
 "frontends to view and modify all the different SANE option types."
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr "Print options"
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr "Print a list of all options."
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr "Bool test options"
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr "(1/6) Bool soft select soft detect"
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
@@ -5350,12 +6046,12 @@ msgstr ""
 "(1/6) Bool test option that has soft select and soft detect (and "
 "advanced) capabilities. That's just a normal bool option."
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr "(2/6) Bool hard select soft detect"
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
@@ -5366,12 +6062,12 @@ msgstr ""
 "advanced) capabilities. That means the option can't be set by the "
 "frontend but by the user (e.g. by pressing a button at the device)."
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr "(3/6) Bool hard select"
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5382,12 +6078,12 @@ msgstr ""
 "That means the option can't be set by the frontend but by the user (e.g. "
 "by pressing a button at the device) and can't be read by the frontend."
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr "(4/6) Bool soft detect"
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
@@ -5396,12 +6092,12 @@ msgstr ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
 "That means the option is read-only."
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr "(5/6) Bool soft select soft detect emulated"
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
@@ -5410,12 +6106,12 @@ msgstr ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
 "(and advanced) capabilities."
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr "(6/6) Bool soft select soft detect auto"
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5426,27 +6122,27 @@ msgstr ""
 "(and advanced) capabilities. This option can be automatically set by the "
 "backend."
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr "Int test options"
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr "(1/6) Int"
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr "(1/6) Int test option with no unit and no constraint set."
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr "(2/6) Int constraint range"
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
@@ -5455,22 +6151,22 @@ msgstr ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
 "is 4, maximum 192, and quant is 2."
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr "(3/6) Int constraint word list"
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr "(3/6) Int test option with unit bits and constraint word list set."
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr "(4/6) Int array"
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
@@ -5479,12 +6175,12 @@ msgstr ""
 "(4/6) Int test option with unit mm and using an array without "
 "constraints."
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr "(5/6) Int array constraint range"
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
@@ -5493,12 +6189,12 @@ msgstr ""
 "(5/6) Int test option with unit dpi and using an array with a range "
 "constraint. Minimum is 4, maximum 192, and quant is 2."
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr "(6/6) Int array constraint word list"
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
@@ -5507,27 +6203,27 @@ msgstr ""
 "(6/6) Int test option with unit percent and using an array with a word "
 "list constraint."
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr "Fixed test options"
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr "(1/3) Fixed"
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr "(1/3) Fixed test option with no unit and no constraint set."
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr "(2/3) Fixed constraint range"
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
@@ -5536,47 +6232,47 @@ msgstr ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
 "Minimum is -42.17, maximum 32767.9999, and quant is 2.0."
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr "(3/3) Fixed constraint word list"
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr "(3/3) Fixed test option with no unit and constraint word list set."
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr "String test options"
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr "(1/3) String"
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr "(1/3) String test option without constraint."
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr "(2/3) String constraint string list"
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr "(2/3) String test option with string list constraint."
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr "(3/3) String constraint long string list"
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
@@ -5585,156 +6281,160 @@ msgstr ""
 "(3/3) String test option with string list constraint. Contains some more "
 "entries..."
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr "Button test options"
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr "(1/1) Button"
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr "(1/1) Button test option. Prints some text..."
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, no-c-format
 msgid "Color 36"
 msgstr "Colour 36"
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr "Use Image Composition"
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr "Bi-level black and white (lineart mode)"
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr "Dithered/halftone black & white (halftone mode)"
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr "Multi-level black & white (greyscale mode)"
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr "Multi-level RGB colour (one pass colour)"
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr "Ignore calibration"
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr "Disable pre focus"
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr "Do not calibrate focus"
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr " "
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr "Fix focus position"
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr "Lens calibration in doc position"
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr "Calibrate lens focus in document position"
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr "Holder focus position 0mm"
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr "Use 0mm holder focus position instead of 0.6mm"
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr "Calibration mode"
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr "Define calibration mode"
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr "Sets lamp on/off"
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr "UTA on"
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr "Sets UTA on/off"
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr "Offset"
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr "Colour channels offset settings"
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, no-c-format
 msgid "Gray offset"
 msgstr "Grey offset"
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr "Sets grey channel offset"
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr "Sets red channel offset"
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr "Sets green channel offset"
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr "Sets blue channel offset"
 
+#, fuzzy
+#~ msgid "IPC mode"
+#~ msgstr "Preview mode"
+
 #~ msgid "problem not analyzed (unknown SCSI class)"
 #~ msgstr "problem not analysed (unknown SCSI class)"
 
diff --git a/po/eo.gmo b/po/eo.gmo
new file mode 100644
index 0000000..bf15262
--- /dev/null
+++ b/po/eo.gmo
diff --git a/po/eo.po b/po/eo.po
index aa0bcef..d4ea7a1 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,422 +9,416 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends.eo\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
 "PO-Revision-Date: 2007-12-08 13:28+0100\n"
 "Last-Translator: A.C.Codazzi\n"
 "Language-Team:  <it@li.org>\n"
-"Language: \n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr "Nombro da opcioj"
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr ""
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "Geometrio"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "Plibonigo"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "Avana"
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr ""
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "AntaÅ­montro"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr "Perfortu monokromatan antaÅ­montron"
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr "Profundeco en bitoj"
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Moduso de skanado"
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "Rapideco de skanilo"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr "Fonto de skanilo"
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr "Perfortu malavancon"
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "Supre-maldekstre X"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "Supre-maldekstre Y"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "Sube-dekstre X"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "Sube-dekstre Y"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Difino de skanado"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "Distingo de X"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Distingo de Y"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr ""
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, fuzzy, no-c-format
 msgid "Page height"
 msgstr "Lumbrilo"
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr "Uzu personigitan tabelon de gama"
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr "Intenso de bildo"
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr "Intenso de ru�o"
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr "Intenso de verdo"
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr "Intenso de bluo"
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr "Heleco"
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "Kontrasto"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr "Grajno"
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr "Meznuancoj"
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "Nivelo de nigro"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "Nivelo de blanko"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr "Nivelo de blanko laŭ ru�o"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
 msgstr "Nivelo de blanko laÅ­ verdo"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr "Nivelo de blanko laÅ­ bluo"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "Ombrumo"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr "Ombrumo laŭ ru�o"
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr "Ombrumo laÅ­ verdo"
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr "Ombrumo laÅ­ bluo"
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr "Lumbrilo"
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr "Lumbrilo laŭ ru�o"
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr "Lumbrilo laÅ­ verdo"
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr "Lumbrilo laÅ­ bluo"
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr "Nuanco"
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr "Saturado"
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "Dosiernomo"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr "Grado de modelo por meznuancoj"
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "Modelo por meznuanco"
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr "Bindu distindon de X kaj Y"
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "Negativo"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "Kvalito de kalibrigo"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr "Duobligu Optikan Distingon"
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr "Bindu RGB-kanalojn"
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr "Sojlo"
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr "Korektado de analoga gama"
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr "Ru�o de analoga gama"
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr "Verdo de analoga gama"
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr "Bluo de analoga gama"
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr "Bindu analogan gaman"
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr "Varmigo de lampo"
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr "Kal. ekspontempon"
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr "Kal. ekspontempon por ru�o"
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr "Kal. ekspontempon por verdo"
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr "Kal. ekspontempon por bluo"
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr "Ekspontempo de skanado"
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr "Ekspontempo de skanado por ru�o"
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr "Ekspontempo de skanado por verdo"
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr "Ekspontempo de skanado por verdo"
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr "Agordu ekspontempon"
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr "Kal. potencon de lampo"
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr "Potenco de lampo en skanado"
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr "Agordu potencon de lampo"
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr "El�altu lampon kaj eliru"
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
@@ -433,37 +427,37 @@ msgstr ""
 "Äœi estas nurlega opcio kiu priskribas kiom da opcioj subtenas specifa "
 "aparato."
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, fuzzy, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "Listeto pri distingoj"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr ""
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, fuzzy, no-c-format
 msgid "Image modification options"
 msgstr "Nombro da opcioj"
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, fuzzy, no-c-format
 msgid "Hardware specific options"
 msgstr "Hardvara difino"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr ""
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr "Äœi mendas antaÅ­montra-kvalitan skanadon."
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -475,7 +469,7 @@ msgstr ""
 "kun 1-paso-skanilo�i malpliigas la memoron kiu necesas kaj la tempo de "
 "skanado por la antaÅ­montro."
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
@@ -484,82 +478,82 @@ msgstr ""
 "Nombro da bitoj por specimeno, kutima valoro estas 1 por \"duuma\" kaj 8 "
 "por multbitaj skanadoj."
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr ""
 "Äœi elektas la moduson de skanado (ekz. duuma, monokromata aÅ­ koloro)."
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr "Äœi determinas la rapidecon de skanado."
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr "Äœi elektas la fonton por la skanado (ekz. provizilo)"
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr "Kontrolu ke la malavanco estas perfortita."
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "Supra-maldekstra posicio de X en areo de skanado."
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "Supra-maldekstra posicio de Y en areo de skanado."
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "Suba-dekstra posicio de X en areo de skanado.."
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "Suba-dekstra posicio de Y en areo de skanado."
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr "Äœi agordas la difinon de la skanita bildo."
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr "Äœi agordas la horizontalan difinon de la skanita bildo."
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr "Äœi agordas la vertikalan difinon de la skanita bildo."
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
 "sheet-fed scans."
 msgstr ""
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, fuzzy, no-c-format
 msgid "Specifies the height of the media."
 msgstr "Äœi agordas la difinon de la skanita bildo."
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid ""
 "Determines whether a builtin or a custom gamma-table should be used."
 msgstr ""
 "Äœi determinas uzi antaÅ­difinitan tabelon de gama aÅ­ personigitan tabelon."
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -570,32 +564,32 @@ msgstr ""
 "samtempe sur 3 kanaloj (ru�o, verdo, bluo) kaj do �i estas gama-tabelo "
 "de intenseco. "
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr "Tabelo de gama-korektado laŭ ru�o."
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr "Tabelo de gama-korektado laÅ­ verdo."
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr "Tabelo de gama-korektado laÅ­ bluo"
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr "Äœi kontrolas la helecon de la akirita bildo."
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr "Äœi kontrolas la kontraston de la akirita bildo."
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
@@ -604,66 +598,66 @@ msgstr ""
 "Äœi elektas la \"grajneco\" de la akirita bildo. Malpli grandaj valoroj "
 "donas pli netajn bildojn."
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr ""
 "Äœi elektas se la akirita bildon devas esti neznuancigita (stompita)."
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr "Äœi elektas la nivelon de heleco kiu estas konsiderenda \"nigro\"."
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr "Äœi elektas la nivelon de heleco kiu estas konsiderenda \"blanko\"."
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr ""
 "Ĝi elektas la nivelon de ru�a heleco kiu estas konsiderenda \"blanko\"."
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr ""
 "Äœi elektas la nivelon de verda heleco kiu estas konsiderenda \"blanko\"."
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr ""
 "Äœi elektas la nivelon de blua heleco kiu estas konsiderenda \"blanko\"."
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr ""
 "Ĝi elektas la nivelon de ru�a heleco kiu estas konsiderenda \"nigro\"."
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr ""
 "Äœi elektas la nivelon de verda heleco kiu estas konsiderenda \"nigro\"."
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr ""
 "Äœi elektas la nivelon de blua heleco kiu estas konsiderenda \"nigro\"."
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr ""
 "Ĝi elektas la nivelon de ru�a heleco kiu estas konsiderenda \"tuta ru�o"
 "\"."
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid ""
 "Selects what green radiance level should be considered \"full green\"."
@@ -671,7 +665,7 @@ msgstr ""
 "Äœi elektas la nivelon de verda heleco kiu estas konsiderenda \"tuta verdo"
 "\"."
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid ""
 "Selects what blue radiance level should be considered \"full blue\"."
@@ -679,12 +673,12 @@ msgstr ""
 "Äœi elektas la nivelon de blua heleco kiu estas konsiderenda \"tuta bluo"
 "\"."
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr "Äœi kontrolas la nuancon (nivelon de bluo) de la akirita bildo."
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
@@ -694,12 +688,12 @@ msgstr ""
 "kiam oni akiras bildon per kamerao. Pli lar�aj valoroj kaŭzas pli "
 "floradon."
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr "La dosiernomo de la �argenda bildo."
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
@@ -708,7 +702,7 @@ msgstr ""
 "Äœi agordas la grandon de modelo por meznuanco (stompado/punktismo) uzata "
 "kun neznuancaj bildoj."
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
@@ -716,287 +710,287 @@ msgstr ""
 "Äœi agordas la modelon por meznuanco (stompado/punktismo) uzata kun "
 "neznuancaj bildoj."
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr "Uzu la saman valoron por distingo de X kaj Y"
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr "Inter�an�u blankon kaj nigron"
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr "Plenumu kvalitan kalibrigon laÅ­ blanko"
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr "Uzu la lensojn kiuj duobligas optikan distingon"
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr "Uzu la samajn valorojn por ĉiu koloro en RGB-moduso"
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr "Agordu minimuman helecon por havi blankan punkton"
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr "Analoga korektado de gama"
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr "Analoga korektado de gama por ru�o"
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr "Analoga korektado de gama por verdo"
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr "Analoga korektado de gama por bluo"
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr "Varmigu lampon antaÅ­ la skanado"
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr "Difinu la ekspontempon por la kalibrigo"
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr "Difinu la ekspontempon por la kalibrigo de ru�o"
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr "Difinu la ekspontempon por la kalibrigo de verdo"
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr "Difinu la ekspontempon por la kalibrigo de bluo"
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr "Difinu la ekspontempon por la skanado"
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr "Difinu la ekspontempon por la skanado de ru�o"
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr "Difinu la ekspontempon por la skanado de verdo"
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr "Difinu la ekspontempon por la skanado de bluo"
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr "Ebligu la elektadon de ekspontempo"
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr "Definu la intenson de la lampo por la kalibrigo"
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr "Definu la intenson de la lampo por la skanado"
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr "Ebligu la elektadon de la intenson de la lampo"
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr "El�altu la lampon elirante de la programo"
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, fuzzy, no-c-format
 msgid "Scan button"
 msgstr "Difino de skanado"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, fuzzy, no-c-format
 msgid "Email button"
 msgstr "Atendu butonon"
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, fuzzy, no-c-format
 msgid "Fax button"
 msgstr "Atendu butonon"
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, fuzzy, no-c-format
 msgid "Copy button"
 msgstr "Atendu butonon"
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr ""
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, fuzzy, no-c-format
 msgid "Cover open"
 msgstr "Kovrilo de ADF estas malfermita"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "Koloro"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr "Duuma Koloro"
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr "Meznuanca Koloro"
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "Grizo"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr "Meznuancoj"
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "Duuma"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, fuzzy, no-c-format
 msgid "Operation not supported"
 msgstr "Mez-nuancoj Nesubtenitaj"
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, fuzzy, no-c-format
 msgid "Document feeder jammed"
 msgstr "Aliaj agordoj pri provizilo de dokumentoj"
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, fuzzy, no-c-format
 msgid "Document feeder out of documents"
 msgstr "Aliaj agordoj pri provizilo de dokumentoj"
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, fuzzy, no-c-format
 msgid "Scanner cover is open"
 msgstr "Kovrilo de ADF estas malfermita"
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "DefaÅ­ltaj valoroj"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr "Uzu la defaÅ­ltajn valorojn por la regilojn de plibonigo."
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "Kalibrigo"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr "Kalibrigu la skanilon antaÅ­ la venonta skanado"
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
@@ -1005,12 +999,12 @@ msgstr ""
 "Se �i estas ebligita, la skanilo estos kalibrigita antaŭ la venonta "
 "skanado. Alie la kalibrigo plenumi�os nur antaŭ la unua starto."
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr "Plenumu nur korektadon de ombroj"
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -1021,1061 +1015,1052 @@ msgstr ""
 "kalibrigo. La defaÅ­ltaj valoroj (aÅ­ tiuj en la agorddosiero) estos "
 "uzataj por gajno, de�ovo kaj ekspontempo."
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr "Stato de butono"
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr "Nombro da skanendaj filmeroj"
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr "Elektu nombron da skanendaj filmeroj"
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, no-c-format
 msgid "Duplex scan"
 msgstr "Fronta-dorsa skanado"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid ""
 "Duplex scan provide a scan of the front and back side of the document"
 msgstr "Äœi plenumas frontan-dorsan skanadon de la dokumento"
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr "Kalibrigu Skanilon"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr "Äœi devigas kalibrigon de skanilon antaÅ­ la skanado"
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr "Grizgama skanado"
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr "Äœi plenumas grizgaman anstataÅ­ kolora skanadon"
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr "Analoga Gajno"
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr "Äœi pliigas aÅ­ malpliigas la analogan gajnon de la CCD-sentilo"
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "Korektado de Gama"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr "Äœi elektas la kurbon de korektado de gama"
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr "Kruda"
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr "Fajna koloro"
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, no-c-format
 msgid "No transparency correction"
 msgstr "Neniu korektado de diafaneco"
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr "Korektado rilata al la filmospeco"
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr "Korektado rilata al la rej�o de diafaneco"
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, no-c-format
 msgid "Negatives"
 msgstr "Negativoj"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, no-c-format
 msgid "Slides"
 msgstr "Lumbildoj"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "AÅ­tomata"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, no-c-format
 msgid "Normal speed"
 msgstr "Normala rapideco"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/2 normal speed"
 msgstr "Duono de la normala radipeco"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/3 normal speed"
 msgstr "Triono de la normala radipeco"
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, no-c-format
 msgid "rounded parameter"
 msgstr "rondigitaj parametroj"
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr "nekonata"
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, no-c-format
 msgid "ADF jam"
 msgstr "ADF estas blokita"
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr "Kovrilo de ADF estas malfermita"
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, no-c-format
 msgid "lamp failure"
 msgstr "lampo malfunkcias"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr "eraro de loki�o de skan-kapeto"
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr "Eraro de kontrolo de CPU"
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr "Eraro de kontrolo de RAM"
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr "Eraro de kontrolo de ROM"
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr "Eraro de kontrolo de la aparataro"
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, no-c-format
 msgid "transparency unit lamp failure"
 msgstr "la lampo de diafanecoj malfunkcias"
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr "eraro de loki�o de la skan-kapeto por diafanecoj"
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr "eraro de longo de listo pri parametroj"
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr "nevalida kodo de komando"
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr "nevalida kampo en CDB"
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr "nesubtenita LUN"
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr "nevalida kampo en la listo pri parametroj"
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr "eraro en la vico de komandoj"
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr "la difinitaj fenestroj estas troaj"
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr "la aparato estas neĉeestanta"
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr "mesa�o kun nevalida IDENTIFY-bito"
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr "opcio de ne-konektado"
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr "re-agordo de nutro / re-agordo de buso de aparatoj"
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr "parametro estis �an�ita de alia pravaloranto"
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr "neniu alia aldona informo pri «senso»"
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr "re-elektado malsukcesis"
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr "eraro de pareco de SCSI"
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr "oni ricevis mesa�on pri eraro rekonita de pravaloranto"
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr "eraro de nevalida mesa�o"
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr "eraro de tempofino"
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, no-c-format
 msgid "transparency unit shading error"
 msgstr "eraro de vualo de diafaneco"
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr "nestabiligita lampo"
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, no-c-format
 msgid "film scanner"
 msgstr "skanilo por negativoj"
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr "plata skanilo"
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr "Filmo"
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr "Äœi elektas specon de filmo: negativoj aÅ­ lumbildoj"
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, no-c-format
 msgid "Negative film type"
 msgstr "Speco de negativa filmo"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, no-c-format
 msgid "Selects the negative film type"
 msgstr "Äœi elektas la specon de negativa filmo"
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, no-c-format
 msgid "Hardware resolution"
 msgstr "Hardvara difino"
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "Uzu nur hardvarajn difinojn"
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr "Fokuso"
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, no-c-format
 msgid "Auto focus"
 msgstr "Mem-fokusigo"
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, no-c-format
 msgid "Enable/disable auto focus"
 msgstr "Äœi ebligas/malebligas aÅ­tomatan fokusigon"
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr "Memfokusigo nur unu-foje"
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr "Ĝi plenumas memfokusigon nur unu-foje por ĉiu enigo de filmo"
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, no-c-format
 msgid "Manual focus position"
 msgstr "Lokado de mana fokusigo"
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr "Äœi mane agordas lokadon de optika fokusigo (defaÅ­to: 128)."
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr "Mar�enoj por skanado"
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr "Aliaj aran�oj de koloro"
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "Spegula bildo"
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "Äœi reflektas bildon horizontale"
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, no-c-format
 msgid "Auto exposure"
 msgstr "Mem-ekspono"
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr "Äœi ebligas/malebligas aÅ­tomatan eksponon"
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, no-c-format
 msgid "Calibration now"
 msgstr "Tuja kalibrigo"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Äœi plenumas kalibrigon tuj"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr "Mem-diagnozo"
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr "Äœi plenumas aÅ­tomatajn kontrolojn"
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, no-c-format
 msgid "Reset scanner"
 msgstr "Re-agordu skanilon"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, no-c-format
 msgid "Reset the scanner"
 msgstr "Äœi ree agordas la skanilon"
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr "Mastrumado de aparato"
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, no-c-format
 msgid "Eject film after each scan"
 msgstr "Elpelu filmon post ĉiu skanado"
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr "Ĝi aŭtomate elpelas filmon post ĉiu skanado"
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr "Elpelu filmon antaÅ­ eliri"
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr "Äœi aÅ­tomate elpelas filmon antaÅ­ la eliro de la programo"
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr "Elpelu filmon nun"
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr "Äœi elpelas filmon *nun*"
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, no-c-format
 msgid "Document feeder extras"
 msgstr "Aliaj agordoj pri provizilo de dokumentoj"
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, no-c-format
 msgid "Flatbed only"
 msgstr "Nur fiksa ebeno"
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr "Äœi malebligas provizilon de dokumentoj kaj uzas nur fiksan ebeno"
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, no-c-format
 msgid "Transparency unit"
 msgstr "Reguligilo de diafaneco"
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr ""
 "Ĝi evligas/malebligas la reguligilon de diafaneco (FAU, «film adapter "
 "unit»)"
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, no-c-format
 msgid "Negative film"
 msgstr "Negativa filmo"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, no-c-format
 msgid "Positive or negative film"
 msgstr "Pozitiva aÅ­ negativa filmo"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr "Regilo de denseco"
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr "Äœi ebligas moduson de la regado de denseco"
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, no-c-format
 msgid "Transparency ratio"
 msgstr "Rej�o de diafaneco"
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, no-c-format
 msgid "Select film type"
 msgstr "Elektu specon de filmo"
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, no-c-format
 msgid "Select the film type"
 msgstr "Äœi elektas specon de filmo"
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "Fiksa ebeno"
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, fuzzy, no-c-format
 msgid "ADF Front"
 msgstr "Kovrilo de ADF estas malfermita"
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, fuzzy, no-c-format
 msgid "ADF Back"
 msgstr "ADF estas blokita"
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, no-c-format
 msgid "ADF Duplex"
 msgstr "Fronta-dorsa ADF"
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, fuzzy, no-c-format
 msgid "Card Front"
 msgstr "Presu"
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, no-c-format
 msgid "Card Back"
 msgstr ""
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, fuzzy, no-c-format
 msgid "Card Duplex"
 msgstr "Fronta-dorsa"
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "Ru�o"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "Verdo"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "Bluo"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, fuzzy, no-c-format
 msgid "Enhance Red"
 msgstr "Plibonigo"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, fuzzy, no-c-format
 msgid "Enhance Green"
 msgstr "Plibonigo"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, fuzzy, no-c-format
 msgid "Enhance Blue"
 msgstr "Plibonigo"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr "Nenio"
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr ""
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr ""
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr "Unuopa"
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr "Fronta-dorsa"
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr "Reguligilo de Diafaneco"
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr "AÅ­tomata Provizilo de Dokumentoj"
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "Pozitiva filmo"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "Negativa filmo"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr "Fokusigo sur la vitro"
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr "Fokusigo je 2.5mm super la vitro"
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr "Meznuanco A (Duraj tonoj)"
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr "Meznuanco B (Delikataj tonoj)"
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr "Meznuanco C (Reta ekrano)"
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr "Punktismo A (4x4 Bayer)"
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr "Punktismo B (4x4 Spiralo)"
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr "Punktismo C (4x4 Reta ekrano)"
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr "Punktismo D (8x4 Reta ekrano)"
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr "Teknologio por Plibonigo de Teksto"
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr "El�utu modelon A"
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr "El�utu modelon B"
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "Neniu korektado"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr "Agordita de la uzanto"
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr "Kontaktaj printiloj"
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr "Termikaj printiloj"
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "Inko�prucaj printiloj"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr "CRT ekranoj"
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "DefaÅ­lto"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr "Altdensa printado"
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr "Malaltdensa printado"
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr "Altkontrasta printado"
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr "Agordita de la uzanto (Gama=1.0)"
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr "Agordita de la uzanto (Gama=1.8)"
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr "KD"
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr "A5 verticala"
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr "A5 horizontala"
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr "Letero"
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr "A4"
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "Maks"
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr "Moduso de Skanado"
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr "Elektu meznuancojn."
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr "Eskludado"
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr "Äœi elektas la eskludadon."
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr "Äœi elektas la helecon."
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr "Neteco"
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr "Korektado de koloro"
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr ""
 "Äœi ebligas la tabelon de la korektado de koloro por la elektita aparato."
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr "Koeficientoj de korektado de koloro"
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr "Matrica multipliko de RGB"
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr "Ŝovu verdon al ru�o"
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr "Åœovu verdon al bluo"
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr "Ŝovu ru�on al verdo"
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr "Ŝovu ru�on al bluo"
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr "Åœovu bluon al verdo"
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr "Ŝovu bluon al ru�o"
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr "Mastrumu nivelon de verdo"
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr "Aldonu ru�on surbaze de nivelo de verdo"
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr "Aldonu bluon surbaze de nivelo de verdo"
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr "Aldonu verdon surbaze de nivelo de ru�o"
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr "Mastrumu nivelon de ru�o"
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr "Aldonu bluon surbaze de nivelo de ru�o"
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr "Aldonu verdon surbaze de nivelo de bluo"
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr "Aldonu ru�on surbaze de nivelo de bluo"
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, no-c-format
 msgid "Controls blue level"
 msgstr "Mastrumu nivelon de bluo"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr "Spegulu bildon"
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr "Tuja antaÅ­montro"
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr "AÅ­tomata segmentado de areo"
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr "Listeto pri distingoj"
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr "Vidigu etan liston pri disponeblaj distingoj"
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr "Zomo"
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr "Äœi agordas la faktoron de zomo kiun la skanilo uzos"
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr "Formato rapido"
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr "Akcesora ekipaĵo"
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr "Elpelo"
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr "Äœi elpelas la folion el aÅ­tomata provizilo"
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr "Mem-elpelo"
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr "Äœi elpelas la dokumento post la skanado"
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr "Moduso por ADF"
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr "Äœi elektas la ADF-moduso (unuopa/fronta-dorsa)"
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr "Kesto"
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr "Äœi elektas la keston por skani"
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
@@ -2084,24 +2069,24 @@ msgstr ""
 "Äœi elektas korektadon de gama el listo de antaÅ­difinitaj aparatoj aÅ­ el "
 "la personigita tabelo, kiu esti al�utebla en skanilon scanner"
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr "Loki�o de Fokusigo"
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
 msgstr ""
 "Ĝi agordas la loki�on de la fokusigo aŭ sur la vitro aŭ je 2,5mm super �i"
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr "Atendu Butonon"
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
@@ -2110,219 +2095,964 @@ msgstr ""
 "Post la sendo de la skan-komando, �i atendas la premon de la butono de "
 "la skanilo por startigi la skanadon."
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr ""
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, no-c-format
 msgid "Positive Slide"
 msgstr "Pozitiva lumbildo"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, no-c-format
 msgid "Negative Slide"
 msgstr "Negativa lumbildo"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr ""
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, fuzzy, no-c-format
 msgid "User defined CCT profile"
 msgstr "Agordita de la uzanto"
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr "Kondukta"
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr "Elkluda"
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr "Punktismo"
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, fuzzy, no-c-format
 msgid "Diffusion"
 msgstr "Difuzo de Eraro"
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, fuzzy, no-c-format
 msgid "White"
 msgstr "Nivelo de blanko"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, fuzzy, no-c-format
 msgid "Black"
 msgstr "Nivelo de nigro"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, fuzzy, no-c-format
 msgid "Continue"
 msgstr "Kondiĉa"
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr ""
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr "Horizontala"
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, fuzzy, no-c-format
 msgid "Horizontal bold"
 msgstr "Horizontala"
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, fuzzy, no-c-format
 msgid "Horizontal narrow"
 msgstr "Horizontala"
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr "Vertikala"
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, fuzzy, no-c-format
 msgid "Vertical bold"
 msgstr "Vertikala"
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr ""
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr ""
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, fuzzy, no-c-format
 msgid "Front"
 msgstr "Presu"
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr ""
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
+msgid "Gamma function exponent"
 msgstr ""
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
 #, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
+msgid "Changes intensity of midtones"
+msgstr ""
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr ""
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr ""
+
+#: backend/fujitsu.c:3165
+#, fuzzy, no-c-format
+msgid "Halftone type"
+msgstr "Meznuancoj"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr ""
+
+#: backend/fujitsu.c:3210
+#, fuzzy, no-c-format
+msgid "Perform outline extraction"
+msgstr "Plenumu kalibrigon"
+
+#: backend/fujitsu.c:3221
+#, fuzzy, no-c-format
+msgid "Emphasis"
+msgstr "Emfazo de bildo"
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr ""
+
+#: backend/fujitsu.c:3240
+#, fuzzy, no-c-format
+msgid "Separation"
+msgstr "Saturado"
+
+#: backend/fujitsu.c:3241
+#, fuzzy, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr "Äœi elbligas aÅ­tomatan elekton de sojlo por duuma skanado."
+
+#: backend/fujitsu.c:3252
+#, fuzzy, no-c-format
+msgid "Mirroring"
+msgstr "Spegula bildo"
+
+#: backend/fujitsu.c:3253
+#, fuzzy, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "Äœi reflektas bildon horizontale."
+
+#: backend/fujitsu.c:3270
+#, fuzzy, no-c-format
+msgid "White level follower"
+msgstr "Nivelo de blanko laÅ­ bluo"
+
+#: backend/fujitsu.c:3271
+#, fuzzy, no-c-format
+msgid "Control white level follower"
+msgstr "Mastrumu nivelon de ru�o"
+
+#: backend/fujitsu.c:3289
+#, fuzzy, no-c-format
+msgid "BP filter"
+msgstr "Filtrilo de Koloro"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr ""
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr "Glatigo"
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr ""
+
+#: backend/fujitsu.c:3323
+#, fuzzy, no-c-format
+msgid "Gamma curve"
+msgstr "Valoro de Gama"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, fuzzy, no-c-format
+msgid "Threshold curve"
+msgstr "Sojlo"
+
+#: backend/fujitsu.c:3347
+#, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+
+#: backend/fujitsu.c:3369
+#, fuzzy, no-c-format
+msgid "Threshold white"
+msgstr "Sojlo"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr ""
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, fuzzy, no-c-format
+msgid "Noise removal"
+msgstr "Redukto de bruo"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr ""
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr ""
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr ""
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr ""
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr ""
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr ""
+
+#: backend/fujitsu.c:3508
+#, fuzzy, no-c-format
+msgid "Auto width detection"
+msgstr "Neniu korektado"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr ""
+
+#: backend/fujitsu.c:3526
+#, fuzzy, no-c-format
+msgid "Auto length detection"
+msgstr "Neniu korektado"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr ""
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr ""
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr ""
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr ""
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr ""
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr ""
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr ""
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
 msgstr ""
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3708
+#, fuzzy, no-c-format
+msgid "DF recovery mode"
+msgstr "Kovrilo de ADF estas malfermita"
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr ""
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3748
+#, fuzzy, no-c-format
+msgid "Advanced paper protection"
+msgstr "Avanaj Opcioj"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+
+#: backend/fujitsu.c:3768
+#, fuzzy, no-c-format
+msgid "Staple detection"
+msgstr "Neniu korektado"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr ""
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+
+#: backend/fujitsu.c:3809
+#, fuzzy, no-c-format
+msgid "Dropout color"
+msgstr "Eskludado"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+
+#: backend/fujitsu.c:3833
+#, fuzzy, no-c-format
+msgid "Buffer mode"
+msgstr "Moduso de provizilo"
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr ""
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr ""
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr ""
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+
+#: backend/fujitsu.c:3911
+#, fuzzy, no-c-format
+msgid "Off timer"
+msgstr "Ripozo de lampo"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+
+#: backend/fujitsu.c:3930
+#, fuzzy, no-c-format
+msgid "Duplex offset"
+msgstr "De�ovo laŭ bluo"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr ""
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "De�ovo laŭ verdo"
+
+#: backend/fujitsu.c:3949
+#, fuzzy, no-c-format
+msgid "Adjust green/red offset"
+msgstr "De�ovo laŭ verdo"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr "De�ovo laŭ bluo"
+
+#: backend/fujitsu.c:3967
+#, fuzzy, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "Ĝi agordas la de�ovon de la blua kanalo"
+
+#: backend/fujitsu.c:3980
+#, no-c-format
+msgid "Low Memory"
+msgstr ""
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+
+#: backend/fujitsu.c:3996
+#, fuzzy, no-c-format
+msgid "Duplex side"
+msgstr "Fronta-dorsa skanado"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr ""
+
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr ""
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr ""
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
+msgstr ""
+
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr ""
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+
+#: backend/fujitsu.c:4095
+#, fuzzy, no-c-format
+msgid "Endorser Options"
+msgstr "Avanaj Opcioj"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr ""
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr ""
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr ""
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr ""
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr ""
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr ""
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr ""
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr ""
+
+#: backend/fujitsu.c:4253
+#, fuzzy, no-c-format
+msgid "Endorser direction"
+msgstr "Redukto de bruo"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr ""
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr ""
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr ""
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr ""
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr ""
+
+#: backend/fujitsu.c:4344
+#, fuzzy, no-c-format
+msgid "A3 paper"
+msgstr "El papero"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4356
+#, fuzzy, no-c-format
+msgid "B4 paper"
+msgstr "El papero"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4368
+#, fuzzy, no-c-format
+msgid "A4 paper"
+msgstr "El papero"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4380
+#, fuzzy, no-c-format
+msgid "B5 paper"
+msgstr "El papero"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr ""
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr ""
+
+#: backend/fujitsu.c:4429
+#, fuzzy, no-c-format
+msgid "Scanner in power saving mode"
+msgstr "Kovrilo de ADF estas malfermita"
+
+#: backend/fujitsu.c:4452
+#, fuzzy, no-c-format
+msgid "Manual feed"
+msgstr "Mana prepara fokusigo"
+
+#: backend/fujitsu.c:4453
+#, fuzzy, no-c-format
+msgid "Manual feed selected"
+msgstr "Mana prepara fokusigo"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr ""
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr ""
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr ""
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr ""
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr ""
+
+#: backend/fujitsu.c:4513
+#, fuzzy, no-c-format
+msgid "Hardware error code"
+msgstr "Eraro de kontrolo de la aparataro"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr ""
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr ""
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr ""
+
+#: backend/fujitsu.c:4537
+#, fuzzy, no-c-format
+msgid "Imprinter ink level"
+msgstr "Nivelo de blanko"
+
+#: backend/fujitsu.c:4548
+#, fuzzy, no-c-format
+msgid "Density"
+msgstr "Regilo de denseco"
+
+#: backend/fujitsu.c:4549
+#, fuzzy, no-c-format
+msgid "Density dial"
+msgstr "Regilo de denseco"
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, fuzzy, no-c-format
+msgid "Duplex switch"
+msgstr "Fronta-dorsa skanado"
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, no-c-format
 msgid "Extras"
 msgstr "Ekstraĵoj"
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, fuzzy, no-c-format
-msgid "Threshold curve"
-msgstr "Sojlo"
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr ""
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
 "instead on hardware lineart."
 msgstr ""
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, no-c-format
 msgid "Disable interpolation"
 msgstr "Malebligu interpoladon"
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
@@ -2331,45 +3061,45 @@ msgstr ""
 "Kiam oni uzas altajn distingojn kun la horizontala malpli alta ol la "
 "verticala, la horizontala interpolado estas malebligata."
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "Filtrilo de Koloro"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 "Kiam oni uzas grizan aÅ­ duuman kolorojn, tiu elektas uzatan koloron."
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "Kalibrigo"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Difinu moduson de kalibrigo"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Ka�memoro por kalibrigo"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, no-c-format
 msgid "Lamp off time"
 msgstr "Ripozo de lampo"
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
@@ -2378,105 +3108,103 @@ msgstr ""
 "La lampo estos el�altata post la fiksita tempo (en minutoj). La valoro "
 "signifas ke la lampo neniam ripozos."
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, fuzzy, no-c-format
 msgid "Lamp off during scan"
 msgstr "El�altita lampo dum kalibrigo de nigro"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, fuzzy, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr ""
 "Nombro da minutoj pasantaj inter la skanado kaj la el�alto de la lampo"
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, fuzzy, no-c-format
 msgid "File button"
 msgstr "Atendu butonon"
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr ""
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, fuzzy, no-c-format
 msgid "Power button"
 msgstr "Atendu butonon"
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "Atendu butonon"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, fuzzy, no-c-format
 msgid "Need calibration"
 msgstr "Grajneca kalibrigo"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, fuzzy, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr "Äœi devigas kalibrigon de skanilon antaÅ­ la skanado"
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, no-c-format
 msgid "Buttons"
 msgstr "Butonoj"
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr "Kalibrigu"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, fuzzy, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "Startigu kalibrigadon."
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, fuzzy, no-c-format
 msgid "Clear calibration"
 msgstr "Grajneca kalibrigo"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, fuzzy, no-c-format
 msgid "Clear calibration cache"
 msgstr "Ka�memoro por kalibrigo"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr "reguligilo de Diafaneco"
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr "Koloro por grizgamo"
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 "Äœi elektas la skan-koloron uzendan por la grizgamo (defaÅ­lto: verdo)."
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr "Opcioj de Sencimigo"
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "AÅ­tomata varmigo"
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -2485,12 +3213,12 @@ msgstr ""
 "Ĝi varmigas la lampon tiel ke �ia heleco estas sensan�a anstataŭ ĉiufoja "
 "varmigo je 60 sekundoj."
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "Plena skanado"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
@@ -2499,12 +3227,12 @@ msgstr ""
 "Ĝi skanas la tutan areon, do �i skanas ankaŭ la strion de kalibrigo. "
 "Atentu. Ne elektu plenan alton. Äœi estas uzenda nur por testi."
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Grajneca kalibrigo"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2515,12 +3243,12 @@ msgstr ""
 "malebligita, mane agordado de la parametroj estas ebligita. Tiu ĉi opcio "
 "estas defaÅ­lta. Äœi estas uzenda nur por testi."
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "Grajneca kalibrigo nur por unua skanado"
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2532,12 +3260,12 @@ msgstr ""
 "opcio se la heleco estas malsama en ĉiu skanita bildo. Ĝi estas uzenda "
 "nur por testi."
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, no-c-format
 msgid "Backtrack lines"
 msgstr "Linioj de malavanco"
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2550,83 +3278,83 @@ msgstr ""
 "Malaltaj valoroj ebligas pli rapidan skanadon sed pliigas la riskon pri "
 "mankantaj linioj."
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Valoro de Gama"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr "Ĝi agordas valoron de gama por ĉiuj kanaloj."
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, no-c-format
 msgid "Geometry Group"
 msgstr "Geometria Grupo"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, no-c-format
 msgid "Scan Mode Group"
 msgstr "Grupo de Moduso de Skanado"
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr "Lumbildo"
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, fuzzy, no-c-format
 msgid "Scanner model"
 msgstr "Moduso de skanado"
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, fuzzy, no-c-format
 msgid "Disable gamma correction"
 msgstr "Korektado de analoga gama"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, fuzzy, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "Korektado de gama"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, fuzzy, no-c-format
 msgid "Disable white shading correction"
 msgstr "Plenumu nur korektadon de ombroj"
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2634,12 +3362,12 @@ msgid ""
 "avoids depth emulation."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, fuzzy, no-c-format
 msgid "Emulate Grayscale"
 msgstr "Grizgamo"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2647,370 +3375,364 @@ msgid ""
 "circumstances."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
 "analyze them."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, fuzzy, no-c-format
 msgid "Reset chipset"
 msgstr "Re-agordu skanilon"
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, fuzzy, no-c-format
 msgid "Information"
 msgstr "Ignoru kalibrigon"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, fuzzy, no-c-format
 msgid "Chipset name"
 msgstr "Dosiernomo"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, fuzzy, no-c-format
 msgid "Unknown"
 msgstr "nekonata"
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, fuzzy, no-c-format
 msgid "Shows the chipset ID"
 msgstr "Re-agordu skanilon"
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, fuzzy, no-c-format
 msgid "Scan counter"
 msgstr "Fonto de skanilo"
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, fuzzy, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr "Elektu nombron da skanendaj filmeroj"
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, fuzzy, no-c-format
 msgid "Update information"
 msgstr "Opcioj de �isdatigo"
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, fuzzy, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr "Tiuj ĉi opcioj agas sur la stato de la butonoj de la skanilo."
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr "Bildo"
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr "Diversaĵoj"
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, no-c-format
 msgid "offset X"
 msgstr "de�ovo X"
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr "Hardvara interna pozicio de X en la skanada areo."
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, no-c-format
 msgid "offset Y"
 msgstr "de�ovo Y"
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr "Hardvara interna pozicio de Y en la skanada areo."
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr "Stato de la lampo"
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr "Ŝaltu aŭ el�altu la lampon."
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr "Kalibrigu la nivelojn de nigro kaj blanko."
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr "ADF"
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, no-c-format
 msgid "TMA Slides"
 msgstr "TMA-Lumbildoj"
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, no-c-format
 msgid "TMA Negatives"
 msgstr "TMA-Negativoj"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, no-c-format
 msgid "Color (48 bits)"
 msgstr "Koloro (48 bitoj)"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, no-c-format
 msgid "Extend lamp timeout"
 msgstr "Prokastu el�alton de lampo"
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr "Ĝi prokastas el�alton de lampo (de 15 minutoj �is 1 horo)"
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr "Atendu butonon"
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, no-c-format
 msgid "Waits for button before scanning"
 msgstr "Äœi atendas butonpremon antaÅ­ skanado"
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, no-c-format
 msgid "Advanced Options"
 msgstr "Avanaj Opcioj"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr "Grajna"
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr "Fajna"
 
 # Bayer è il nome della persona che ha inventato questa matrice per il
 # dithering.
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr "Bayer"
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr "Personigita"
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "AÅ­tomata"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr "NTSC RGB"
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr "XPA RGB"
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr "Trapasanta"
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "NTSC-Grizo"
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr "XPA-Grizo"
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "Malrapida"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr "Normala"
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "Rapida"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr "Tre Rapida"
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr "2-bilderoj"
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr "4-bilderoj"
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr "8-bilderoj"
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr "Presu"
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, no-c-format
 msgid "Film-strip"
 msgstr "Filmo"
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr "XPA"
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr "Kondiĉa"
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, no-c-format
 msgid "Experiment"
 msgstr "Eksperimento"
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, no-c-format
 msgid "Sharpening"
 msgstr "Neteco"
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr "Äœi agordas la valoron de neteco."
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr "AÅ­tomata Sojlo"
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr "Äœi elbligas aÅ­tomatan elekton de sojlo por duuma skanado."
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr "Glatigo"
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr "Elektu filtrilon por glatigi."
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr "Elpelu bazon post skanado"
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, no-c-format
 msgid "Unloads the media after a scan."
 msgstr "Äœi elpelas la bazon post skanado."
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, no-c-format
 msgid "Change document"
 msgstr "Åœangu dokumenton"
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr "Ĝi �angas dokumenton."
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr "Elpelu"
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr "Elpelu Dokumenton."
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, no-c-format
 msgid "Start calibration process."
 msgstr "Startigu kalibrigadon."
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, no-c-format
 msgid "Media"
 msgstr "Bazo"
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr "Agordu specon de bazo."
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr "Ekspontempo"
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -3023,464 +3745,463 @@ msgstr ""
 "kaj \"Negativo\" por filmoj. Por malhelaj bildoj (subeksponitaj) pliigu "
 "tiun ĉi valoro."
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, no-c-format
 msgid "Color Matrix"
 msgstr "Matrico de Koloro"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, no-c-format
 msgid "Set the scanners color matrix."
 msgstr "Äœi agordas matricon de koloro."
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr "Personigita matrico de koloro."
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, no-c-format
 msgid "Mono Color Matrix"
 msgstr "Matrico de Monokromata Koloro"
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr "Personigita matrico de koloro por grizgamaj skanadoj."
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, no-c-format
 msgid "Mirror horizontal"
 msgstr "Spegulu horizontale"
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, no-c-format
 msgid "Mirror image horizontally."
 msgstr "Äœi reflektas bildon horizontale."
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, no-c-format
 msgid "Mirror vertical"
 msgstr "Spegulu vertikale"
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, no-c-format
 msgid "Mirror image vertically."
 msgstr "Äœi reflektas bildon vertikale."
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, no-c-format
 msgid "Update options"
 msgstr "Opcioj de �isdatigo"
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, no-c-format
 msgid "Update options."
 msgstr "Opcioj de �isdatigo."
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr "8-bita eligo"
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr "Uzu ene pli ol 8 bitoj de profundeco, sed eligu nur 8-bitojn."
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr "Atendante frontan butonon"
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr "Äœi atendas premon de la fronta butono de lo skanilo por skani."
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr "El�altu lampon"
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr "Ĝi el�altas la lampon de la skanilo."
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "Grando de folio"
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr "Mem-dividado"
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, fuzzy, no-c-format
 msgid "Landscape"
 msgstr "A5 horizontala"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr ""
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, fuzzy, no-c-format
 msgid "Length control mode"
 msgstr "Äœi ebligas moduson de la regado de denseco"
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, fuzzy, no-c-format
 msgid "Manual feed mode"
 msgstr "Mana prepara fokusigo"
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, fuzzy, no-c-format
 msgid "Manual feed timeout"
 msgstr "Mana prepara fokusigo"
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr "Ebligu frontan-dorsan skanado"
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr "Grando de folio en provizilo"
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, fuzzy, no-c-format
 msgid "halftone"
 msgstr "Meznuancoj"
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, fuzzy, no-c-format
 msgid "color"
 msgstr "Koloro"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, fuzzy, no-c-format
 msgid "continuous"
 msgstr "Kondiĉa"
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, fuzzy, no-c-format
 msgid "off"
 msgstr "Elkluda"
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr ""
 
 # Bayer è il nome della persona che ha inventato questa matrice per il
 # dithering.
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, fuzzy, no-c-format
 msgid "bayer_64"
 msgstr "Bayer"
 
 # Bayer è il nome della persona che ha inventato questa matrice per il
 # dithering.
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, fuzzy, no-c-format
 msgid "bayer_16"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, fuzzy, no-c-format
 msgid "halftone_32"
 msgstr "Meznuancoj"
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, fuzzy, no-c-format
 msgid "halftone_64"
 msgstr "Meznuancoj"
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, fuzzy, no-c-format
 msgid "diffusion"
 msgstr "Difuzo de Eraro"
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, fuzzy, no-c-format
 msgid "normal"
 msgstr "Normala"
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, fuzzy, no-c-format
 msgid "light"
 msgstr "Lumbrilo"
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, fuzzy, no-c-format
 msgid "From scanner"
 msgstr "skanilo por negativoj"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr "El papero"
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, fuzzy, no-c-format
 msgid "default"
 msgstr "DefaÅ­lto"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, fuzzy, no-c-format
 msgid "smooth"
 msgstr "Milda"
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, fuzzy, no-c-format
 msgid "low"
 msgstr "Malrapida"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, fuzzy, no-c-format
 msgid "medium"
 msgstr "Meza"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, fuzzy, no-c-format
 msgid "red"
 msgstr "Ru�o"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, fuzzy, no-c-format
 msgid "green"
 msgstr "Verdo"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, fuzzy, no-c-format
 msgid "Sets the scan source"
 msgstr "Fonto de skanilo"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr "Moduso de provizilo"
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr "Agordu moduson de provizilo"
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, fuzzy, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr "Äœi ebligas/malebligas aÅ­tomatan fokusigon"
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, fuzzy, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr "Äœi ebligas moduson de la regado de denseco"
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, fuzzy, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "Agordu moduson de provizilo"
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, fuzzy, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr "Agordu moduson de provizilo"
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr "AÅ­tomata sojlo"
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
@@ -3489,515 +4210,502 @@ msgstr ""
 "Heleco, kontrasto, nivelo de blanko, gama, redukto de bruo kaj emfazo de "
 "bildo estos aÅ­tomate agorditaj"
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "Redukto de bruo"
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr "Äœi reduktas bruon de izolitaj punktoj"
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr "Emfazo de bildo"
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr "Äœiu ebligas emfazon de bildo"
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr "Gama"
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, fuzzy, no-c-format
 msgid "Lamp color"
 msgstr "Åœaltu lampon"
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, fuzzy, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr "Ŝaltu aŭ el�altu la lampon."
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, fuzzy, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "Äœi reflektas bildon vertikale."
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
 "length of actual paper or logical document length."
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "Korektado de gama"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, fuzzy, no-c-format
 msgid "High sensivity"
 msgstr "Altdensa printado"
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, fuzzy, no-c-format
 msgid "Low sensivity"
 msgstr "Malaltdensa printado"
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, fuzzy, no-c-format
 msgid "err_diffusion"
 msgstr "Difuzo de Eraro"
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, fuzzy, no-c-format
 msgid "No detection"
 msgstr "Neniu korektado"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, fuzzy, no-c-format
 msgid "Normal mode"
 msgstr "Normala"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, fuzzy, no-c-format
 msgid "Enhanced mode"
 msgstr "Plibonigo"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
 "divides long paper by the length which is set in Document Size option."
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, fuzzy, no-c-format
 msgid "Automatic threshold mode"
 msgstr "AÅ­tomata sojlo"
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, fuzzy, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr "AÅ­tomata sojlo"
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, fuzzy, no-c-format
 msgid "Set chroma of red"
 msgstr "Agordu ordon por la bildoj"
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, fuzzy, no-c-format
 msgid "chroma of blue"
 msgstr "Ombrumo laÅ­ bluo"
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, fuzzy, no-c-format
 msgid "Set chroma of blue"
 msgstr "Ŝovu ru�on al bluo"
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr "Diamanto"
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr "8x8 grajna"
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr "8x8 fajna"
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr "8x8 Bayer"
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr "8x8 vertikal-linia"
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr "Gajno"
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr "Agordaĵoj pri la gajno de la kanaloj de koloro"
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, no-c-format
 msgid "Gray gain"
 msgstr "Gajno laÅ­ grizo"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr "Äœi agordas la gajnon de la griza kanalo"
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, no-c-format
 msgid "Red gain"
 msgstr "Gajno laŭ ru�o"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr "Ĝi agordas la gajnon de la ru�a kanalo"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, no-c-format
 msgid "Green gain"
 msgstr "Gajno laÅ­ verdo"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr "Äœi agordas la gajnon de la verda kanalo"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, no-c-format
 msgid "Blue gain"
 msgstr "Gajno laÅ­ bluo"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr "Äœi agordas la gajnon de la blua kanalo"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr "Bayer-punktismo 16"
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr "Bayer-punktismo 64"
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr "Meznuanca punkto 32"
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr "Meznuanca punkto 64"
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr "Difuzo de Eraro"
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr "Moduso 1"
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr "Moduso 2"
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr "Moduso 3"
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr "El blanka batoneto"
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr "Milda"
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr "Malalta"
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr "Meza"
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr "Alta"
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr "CRT"
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "Unu pa�o"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "Ĉiuj pa�oj"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr "skaner kun aÅ­tomata provizilo"
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr "Grizgamo je 4 bitoj"
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr "Grizgamo je 8 bitoj"
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr "Ombroj, meznuancoj, kontrasto, ekspontempo"
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr "Specialaj opcioj"
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr "Ekvilibrigo de koloro"
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr "Malebligu malavancon"
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr "Se �i estas ebligita, la skanilo ne plenumas malavancon"
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr "Ŝan�u staton de lampo de skanilo"
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr "Ĝi �altas aŭ el�altas la lampon de skanilo"
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr "Mem-kalibrigo"
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid ""
 "If checked the color calibration before a scan is done by the backend"
@@ -4005,42 +4713,42 @@ msgstr ""
 "Se �i estas ebligita, la kalibrigo de koloro estas farita de "
 "internainterfaco"
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr "Uzu adaptilon de lumbildoj je 35mm"
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr "Ĝi el�altas la lampon de la skanilo dum la skanado"
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "Kvalito de skanado"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr "Maks. kvalito sed min. rapideco"
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "Rapida skanado"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr "Maks. rapideco sed min. kvalito"
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr "Mem-aran�o de sojlo"
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
@@ -4049,67 +4757,67 @@ msgstr ""
 "Se �i estas markita, la interna interfaco aŭtomate provas determini "
 "optimuman valoron de sojlo."
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr "Äœi elektas la moduson de korektado de gama."
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr "Fiksa gama"
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr "Ĝi uzas la saman valoron de gama por ĉiuj kanaloj."
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr "Skalara gama"
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr "Äœi elektas valoron por korektado de skalara gama."
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr "Skalara gama laŭ ru�o"
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr "Ĝi elektas valoron por korektado de skalara gama laŭ ru�a kanalo"
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr "Skalara gama laÅ­ verdo"
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr "Äœi elektas valoron por korektado de skalara gama laÅ­ verda kanalo"
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr "Skalara gama laÅ­ bluo"
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr "Äœi elektas valoron por korektado de skalara gama laÅ­ blua kanalo"
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr "Kanalo"
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
@@ -4117,211 +4825,211 @@ msgstr ""
 "Elektu bendon de koloro, \"Ĉefa\" signifas ke ĉiuj koloroj eltenas "
 "influon.saranno influenzati."
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr "Meznuanco"
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr ""
 "Elektu nivelon de heleco kiu estus konsiderenda kiel \"50% grizo\"."
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr "Meznuanco laŭ ru�o"
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr "Elektu nivelon de heleco kiu estus konsiderenda kiel \"50% ru�o\"."
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr "Meznuanco laÅ­ verdo"
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr ""
 "Elektu nivelon de heleco kiu estus konsiderenda kiel \"50% verdo\"."
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr "Meznuanco laÅ­ bluo"
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr "Elektu nivelon de heleco kiu estus konsiderenda kiel \"50% bluo\"."
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr "Ekvilibrigo de ru�o"
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr "Faktoro de ekvilibri�o leŭ ru�o. 100% signifas neniun korekton."
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr "Ekvilibrigo de verdo"
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr "Faktoro de ekvilibri�o leŭ verdo. 100% signifas neniun korekton."
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr "Ekvilibrigo de bluo"
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr "Faktoro de ekvilibri�o leŭ bluo. 100% signifas neniun korekton."
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr "HardvardefaÅ­lta ekvilibrigo"
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr ""
 "Äœi re-agordas la valorojn de ekvilibrigo per la defaÅ­taj valoroj "
 "konservitaj en firmvaro"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "Plej malrapida"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "Pli malrapida"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "Pli rapida"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "Plej rapida"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr "8x8 grajna"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr "8x8 normala"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr "8x8 fajna"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr "8x8 tre fajna"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr "6x6 normala"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr "5x5 grajna"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr "5x5 fajna"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr "4x4 grajna"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr "4x4 normala"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr "4x4 fajna"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr "3x3 normala"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr "2x2 normala"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr "8x8 personigita"
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr "6x6 personigita"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr "5x5 personigita"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr "4x4 personigita"
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr "3x3 personigita"
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr "2x2 personigita"
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr "Rapida griza moduso"
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr "Äœi estas rapida skanado per grizgamo (malalta kvalito)."
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
@@ -4330,117 +5038,117 @@ msgstr ""
 "Ĝi mendas ke ĉiuj antaŭmontroj estu skanitaj per la plej rapida moduso "
 "(malalta kvalito). Tiu ĉi povus esti sen koloroj aŭ kun malalta difino."
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr "Ripozo de la lampo (en minutoj)"
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr "Ĝi agordas la tempon (en minutoj) post kiu lampo estas el�altata."
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, no-c-format
 msgid "Turn lamp off"
 msgstr "El�altu lampon"
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr "Ĝi el�altas la lampon tuj."
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr "Heleco de ru�o"
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr "Ĝi mastrumas la helecon de la ru�a kanalo de la akirita bildo."
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr "Heleco de verdo"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr "Äœi mastrumas la helecon de la verda kanalo de la akirita bildo."
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr "Heleco de bluo"
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr "Äœi mastrumas la helecon de la blua kanalo de la akirita bildo."
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "Kontrasto de ru�a kanalo"
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr "Ĝi mastrumas la kontraston de la ru�a kanalo de la akirita bildo."
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "Kontrasto de verda kanalo"
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr "Äœi mastrumas la kontraston de la verda kanalo de la akirita bildo."
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "Kontrasto de blua kanalo"
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr "Äœi mastrumas la kontraston de la blua kanalo de la akirita bildo."
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr "Koloro je 48 bitoj"
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr "Koloro je 24 bitoj"
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr "Grizo je 16 bitoj"
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr "Grizo je 8 bitoj"
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr "Reflektita"
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, no-c-format
 msgid "Positive"
 msgstr "Positiva filmo"
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -4449,39 +5157,39 @@ msgstr ""
 "Ĝi varmigas la lampon tiel ke �ia heleco estas sensan�a anstataŭ ĉiufoja "
 "varmigo je 40 sekundoj."
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, fuzzy, no-c-format
 msgid "Negative color"
 msgstr "Negativa filmo"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, fuzzy, no-c-format
 msgid "Negative gray"
 msgstr "Negativo"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, fuzzy, no-c-format
 msgid "48 bits color"
 msgstr "Fajna koloro"
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
 "mode and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr "Skanado mastrumita de butono"
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4492,248 +5200,239 @@ msgstr ""
 "butonon \"SCAN\" (por ML150) aÅ­ \"COLOR\" (por aliaj modeloj). Por "
 "refuzi, premu la butonon \"GRAY\"."
 
-#: ../backend/pixma_sane_options.c:143
-#, no-c-format
-msgid "Gamma function exponent"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:144
-#, no-c-format
-msgid "Changes intensity of midtones"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:232
 #, no-c-format
 msgid "Update button state"
 msgstr "Äœisdatigu staton de butono"
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:244
 #, no-c-format
 msgid "Button 1"
 msgstr "Butono 1"
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:258
 #, no-c-format
 msgid "Button 2"
 msgstr "Butono 2"
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr ""
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr ""
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr "Diafaneco"
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr "Agordoj de aparato"
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr "Butono de lampo"
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr "Mane �alto de la lampo(j)."
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "El�altita lampo dum kalibrigo de nigro"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr "Ĝi ĉiam el�altas la lampon dum la kalibrigo de nigro."
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, no-c-format
 msgid "Calibration data cache"
 msgstr "Ka�memoro por kalibrigo"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr "Ĝi ebligas aŭ malebligas ka�memoron por kalibrigo."
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, no-c-format
 msgid "Performs calibration"
 msgstr "Plenumu kalibrigon"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr "Sentilo de akcelo"
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr "Äœi ebligas aÅ­ malebligas movadon de la sentilo de akcelo."
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, no-c-format
 msgid "Warmup-time"
 msgstr "Tempo de varmigo"
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, no-c-format
 msgid "Warmup-time in seconds."
 msgstr "Tempo en sekundoj por varmigi la lampon."
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, no-c-format
 msgid "Lampoff-time"
 msgstr "Ripoztempo de lampo"
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr "Tempo en sekundoj dum kiu la lampo restas el�altata."
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, no-c-format
 msgid "Analog frontend"
 msgstr "Analoga fasado"
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr "Valoro de gajno laŭ ru�o de la analoga fasado"
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr "De�ovo laŭ ru�o"
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr "Valoro de de�ovo laŭ ru�o de la analoga fasado"
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr "Valoro de gajno laÅ­ verdo de la analoga fasado"
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr "De�ovo laŭ verdo"
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr "Valoro de de�ovo laŭ verdo de la analoga fasado"
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr "Valoro de gajno laÅ­ bluo de la analoga fasado"
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr "De�ovo laŭ bluo"
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr "Valoro de de�ovo laŭ bluo de la analoga fasado"
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, no-c-format
 msgid "Red lamp off"
 msgstr "Ru�a lampo el�altita"
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr "Ĝi agordas la parametron pri el�altado de la ru�a lampo"
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, no-c-format
 msgid "Green lamp off"
 msgstr "Ru�a lampo el�altita"
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr "Ĝi agordas la parametron pri el�altado de la verda lampo"
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, no-c-format
 msgid "Blue lamp off"
 msgstr "Ru�a lampo el�altita"
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr "Ĝi agordas la parametron pri el�altado de la blua lampo"
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr "Tiuj ĉi opcioj agas sur la stato de la butonoj de la skanilo."
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr "Koloro je 36 bitoj"
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr "Punktismmapo 1"
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr "Punktismmapo 2"
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr "Aleatorigu"
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr "Elekto de Fonto"
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr "Plibonigo de Bildo"
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr "Grizigu"
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr "Ĝi �argas la bildon kiel grizgaman"
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr "Simulado de 3-pasa skanilo"
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
@@ -4742,12 +5441,12 @@ msgstr ""
 "Äœi simulas akiradon en tri pasadoj per reveno de tri bildoj: unue la "
 "verda, poste la blua kaj fine la ru�a."
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr "Simulado de mana skanilo"
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4758,49 +5457,49 @@ msgstr ""
 "la alton de la bildon apriore, do ili revenigas alton kun valoro -1. Per "
 "tiu ĉi opcio, oni povas testi ke la fasado estas �uste mastrumita."
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid ""
 "Set default values for enhancement controls (brightness & contrast)."
 msgstr ""
 "Uzu defaÅ­ltajn valorojn por regiloj de plibonigo (kontrasto kaj heleco)."
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr "Opcio por nurlega testado"
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr "Äœi kontrolas ke la fasado plenumas tion korekte aÅ­ ne."
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr "Tabeloj de Gama"
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr "Simulado de valoro pri stato"
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr "Ne perfortu la valoron pri stato"
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr "Ne perfortu la internan interfacon revenigi valoron pri stato."
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr "Revenigu SANE_STATUS_EOF"
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
@@ -4809,12 +5508,12 @@ msgstr ""
 "Äœi perfortas la internan interfacon revenigi la valoron pri stato "
 "SANE_STATUS_EOF post la alvoko de la funkcio sane_read()."
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr "Revenigu SANE_STATUS_JAMMED"
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
@@ -4823,12 +5522,12 @@ msgstr ""
 "Äœi perfortas la internan interfacon revenigi la valoron pri stato "
 "SANE_STATUS_JAMMED post la alvoko de la funkcio sane_read()."
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr "Revenigu SANE_STATUS_NO_DOCS"
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
@@ -4837,12 +5536,12 @@ msgstr ""
 "Äœi perfortas la internan interfacon revenigi la valoron pri stato "
 "SANE_STATUS_NO_DOCS post la alvoko de la funkcio sane_read()."
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr "Revenigu SANE_STATUS_COVER_OPEN"
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
@@ -4851,12 +5550,12 @@ msgstr ""
 "Äœi perfortas la internan interfacon revenigi la valoron pri stato "
 "SANE_STATUS_COVER_OPEN post la alvoko de la funkcio sane_read()."
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr "Revenigu SANE_STATUS_IO_ERROR"
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
@@ -4865,12 +5564,12 @@ msgstr ""
 "Äœi perfortas la internan interfacon revenigi la valoron pri stato "
 "SANE_STATUS_IO_ERROR post la alvoko de la funkcio sane_read()."
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr "Revenigu SANE_STATUS_NO_MEM"
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
@@ -4879,12 +5578,12 @@ msgstr ""
 "Äœi perfortas la internan interfacon revenigi la valoron pri stato "
 "SANE_STATUS_NO_MEM post la alvoko de la funkcio sane_read()."
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr "Revenigu SANE_STATUS_ACCESS_DENIED"
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
@@ -4893,86 +5592,83 @@ msgstr ""
 "Äœi perfortas la internan interfacon revenigi la valoron pri stato "
 "SANE_STATUS_ACCESS_DENIED post la alvoko de la funkcio sane_read()."
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, fuzzy, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr "Tiuj ĉi opcioj agas sur la stato de la butonoj de la skanilo."
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr "Åœaltu lampon"
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr "Ĝi �altas la lampon de la skanilo"
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr "El�altu lampon"
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr "Ĝi el�altas la lampon de la skanilo"
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, no-c-format
 msgid "Lamp timeout"
 msgstr "Tempo antaÅ­ la ripozo de la lampo"
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr ""
 "Nombro da minutoj pasantaj inter la skanado kaj la el�alto de la lampo"
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr "Valoro de sojlo por duuma moduso"
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr "Provizilo por dokumentoj"
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr "6x4 coloj (~15x10 cm)"
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr "8x10 coloj (~20x25 cm)"
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr "8.5x11 coloj (~21x28 cm)"
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr "Mez-nuancoj Nesubtenitaj"
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr "DispersedDot8x8"
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr "DispersedDot16x16"
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -4988,27 +5684,27 @@ msgstr ""
 "estas tro alta, X-bazitaj fasadoj povus halti respondante al X-eventoj, "
 "kaj do tiu povus kra�i aŭ bloki la sistemon."
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr ""
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr ""
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, fuzzy, no-c-format
 msgid "Focus point for scanning."
 msgstr "Äœi elpelas la dokumento post la skanado"
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr "Moduso de antaÅ­montro"
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
@@ -5017,12 +5713,12 @@ msgstr ""
 "Äœi elektas la moduson de la antaÅ­montro: grizgama antaÅ­montro kutime "
 "donas la plej bonan kompromison inter rapideco kaj detaleco."
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr "AntaÅ­determinitaj valoroj"
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
@@ -5030,97 +5726,97 @@ msgid ""
 msgstr ""
 "Ĝi havigas standartajn areojn de skanado por fotoj, presitaj pa�oj k.t.p."
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr ""
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, fuzzy, no-c-format
 msgid "Frame to be scanned"
 msgstr "plata skanilo"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, fuzzy, no-c-format
 msgid "Focus-mode"
 msgstr "Fokuso"
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, fuzzy, no-c-format
 msgid "Auto or manual focus"
 msgstr "Mem-fokusigo"
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, fuzzy, no-c-format
 msgid "Focus-point"
 msgstr "Loki�o de Fokusigo"
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, fuzzy, no-c-format
 msgid "Focus point"
 msgstr "Loki�o de Fokusigo"
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr "Koloraj linioj por ĉiu legado"
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr "Ĝrizgamaj linioj por ĉiu legado"
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr "retkamerao"
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr "RAW-koloro"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr "RGB-koloro"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr "Koloro RGB-TEKSTO"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr "Solida negro"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr "Solida blanko"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr "Åœablono de koloro"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr "Krado"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr "Unua enigo"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr "Dua enigo"
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
@@ -5129,12 +5825,12 @@ msgstr ""
 "Tiu ĉi estas tre longa tria enigo. Eble la fasado havas ideon por "
 "kiamaniere montri �in."
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr "Simulado de mana skanilo"
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5147,12 +5843,12 @@ msgstr ""
 "valoro -1. Per tiu ĉi opcio, oni povas testi ke la fasado estas �uste "
 "mastrumita. Tiu ĉi opcio ebligas ankaŭ fiksan alton je 11 cm."
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr "Simulado de 3-pasa skanilo"
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
@@ -5161,19 +5857,19 @@ msgstr ""
 "Äœi simulas akiradon (de 3-pasa skanilo) en tri pasadoj. En moduso de "
 "koloro, �i redonas tri bildojn."
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr "Agordu ordon por la bildoj"
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr ""
 "Äœi agordas la sinsekvon de la bildojn en moduso de koloro de 3-pasa "
 "skanado."
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
@@ -5182,17 +5878,17 @@ msgstr ""
 "Se la aÅ­tomata provizilo por dokumentoj estas elektita, la provizilo "
 "estos malplena post 10 skanadoj."
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr "Specialaj Agordoj"
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr "Elektu la bildon de testo"
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5209,12 +5905,12 @@ msgstr ""
 "dependantaj de la moduso\n"
 "Krado: �i desegnas kradon per blankaj-nigraj fakoj je 10mm."
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr "Inverigu la \"endianness\""
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5225,24 +5921,24 @@ msgstr ""
 "de 16 bitoj. Tiu ĉi opcio estas uzebla por testi la 16-bita moduson de "
 "la fasadoj, t.e. se la fasado korekte uzas la \"endianness\"."
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr "Limo de legado"
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 "Ĝi limigas la kvanton da datumoj transigitan kun ĉiu alvoko al "
 "sane_read()."
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr "Grando de la legadlimo"
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
@@ -5250,22 +5946,22 @@ msgstr ""
 "La (maksimuma) kvanto da datumoj transigita kun ĉiu alvoko al "
 "sane_read()."
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr "Malfruo de legado"
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr "Äœi malfruigas la transigon de datumoj al la dukto."
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr "DaÅ­ro de legad-malfruo"
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
@@ -5273,12 +5969,12 @@ msgstr ""
 "Kiom da tempo �i atendas poste ke oni transigis ĉiun bufron de datumoj "
 "tra la dukto."
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr "Reven-valoro de sane_read"
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
@@ -5289,22 +5985,22 @@ msgstr ""
 "korekta mastrumo de la skanado. Ĉiuj aliaj stat-kodoj utilas por testi "
 "kiamaniere la fasado mastrumas ilin."
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr "Bilderperdo por ĉiu linio"
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr "Nombro da bilderoj fu�uzitaj en la fino de ĉiu linio."
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr "Svagaj parametroj"
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
@@ -5313,23 +6009,23 @@ msgstr ""
 "Ĝi revenigas svagajn liniojn kaj bitojn por ĉiu linio kiam "
 "sane_parameters()  estas alvokata antaÅ­ sane_start()."
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr "Uszi ne-blokantan eneligon"
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 "Ĝi uzas ne-blokantan eneligon por sane_read() se la fasado subtenas �in."
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr "Proponu la priskribilon de elektita dosiero"
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
@@ -5338,12 +6034,12 @@ msgstr ""
 "Äœi proponas la priskribilon de dosiero por kontroli se sane_read() "
 "revenigos datumojn."
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr "Ebligu opciojn por testi"
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
@@ -5353,27 +6049,27 @@ msgstr ""
 "kapablon de la fasado vidi kaj modifi ĉiujn diversajn specojn de opcio "
 "de SANE."
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr "Presu la opciojn"
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr "Ĝi presas la liston de ĉiuj opcioj."
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr "Buleaj opcioj por testi"
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr "(1/6) Bulea, simbola elektado simbola rekonado"
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
@@ -5382,12 +6078,12 @@ msgstr ""
 "(1/6) Bulea test-opcio kiu havas simbola-elektantan kaj simbola-"
 "rekonantan (kaj avanajn) kapablojn. Äœi estas ordinara bulea opcio."
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr "(2/6) Bulea, rekta elektado simbola rekonado"
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
@@ -5399,12 +6095,12 @@ msgstr ""
 "agordebla de la fasado, sed nur de la uzanto mem (t.e. per premo de "
 "butono sur la aparato).dispositivo)."
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr "(3/6) Bulea, rekta elektado"
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5416,12 +6112,12 @@ msgstr ""
 "nur de la uzanto mem (t.e. per premo de butono sur la aparato) kaj �i ne "
 "estas legebla de la fasado."
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr "(4/6) Bulea, simbola rekonado"
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
@@ -5430,12 +6126,12 @@ msgstr ""
 "(4/6) Bulea test-opcio kiu havas simbola-rekonantan (kaj avanajn) "
 "kapablojn. Tio signifas ke la opcio estas nur-legebla."
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr "(5/6) Bulea, simbola elektado simbola rekonado emulado"
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
@@ -5444,12 +6140,12 @@ msgstr ""
 "Bulea test-opcio kiu havas simbola-rekonantan, simbola-elektantan kaj "
 "emulan (kaj avanajn) kapablojn."
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr "(6/6) Bulea, simbola elektado simbola rekonado aÅ­tomata"
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5460,27 +6156,27 @@ msgstr ""
 "kaj aŭtomatan kaj avanajn) kapablojn. Tiu ĉi opcio estas aŭtomate "
 "agordebla de la interna intefaco."
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr "Entjeraj test-opcioj"
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr "(1/6) Entjero"
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr "(1/6) Entjera test-opcio sen mezurunito kaj trudoj."
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr "(2/6) Entjera kun intervalo"
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
@@ -5489,36 +6185,36 @@ msgstr ""
 "(2/6) Entjera test-opcio kun bilder-unito kaj trudo de intervalo. La "
 "minimuma valoro estas 4, la maksimuma estas 192, la pa�o estas 2."
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr "(3/6) Entjera kun listo"
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 "(3/6) Entjera test-opcio kun bit-mezurunito kaj trudo de valor-listo."
 "lista."
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr "(4/6) Entjera tabelo"
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
 "constraints."
 msgstr "(4/6) Entjera test-opcio kun mm kaj uzo de iu tabelo sen trudoj."
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr "(5/6) Entjera tabelo kun intervalo"
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
@@ -5528,12 +6224,12 @@ msgstr ""
 "tabelo kiu havas trudon de intervalo. La minimuna valoro estas 4, la "
 "maksimuma estas 192 kaj la pa�o estas 2."
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr "(6/6) Entjera tabelo kun listo"
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
@@ -5542,27 +6238,27 @@ msgstr ""
 "(6/6) Entjera test-opcio kun procenta mezurunito kaj tabelo kiu havas "
 "trudon de listo de valoroj."
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr "Test-opcioj laÅ­ fiksa komo"
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr "(1/3) Fiksa komo"
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr "(1/3) LaÅ­ fiksa komo testopcio sen mezurunito kaj sen trudoj."
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr "(2/3) Fiksa komo kun intervalo"
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
@@ -5572,49 +6268,49 @@ msgstr ""
 "de intervalo. La minimuma valoro estas -42,17, la maksimuma estas "
 "32767,9999 kaj la pa�o estas 2,0."
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr "(3/3)Fiksa komo kun listo"
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 "(3/3) LaÅ­ fiksa komo testopcio sen mezurunito kaj kun trudo de listo de "
 "valoroj."
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr "Ĉenaj test-opcioj"
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr "(1/3) Ĉeno"
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr "(1/3) Ĉena test-opcio sen trudoj."
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr "(2/3) Ĉeno kun listo de ĉenoj"
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr "(2/3) Ĉena test-opcio kun trudo de listo de ĉenoj."
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr "(3/3) Ĉeno kun longa listo de ĉenoj"
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
@@ -5623,156 +6319,160 @@ msgstr ""
 "(3/3) Ĉena test-opcio kun trudo de listo de ĉenoj. Ĝi entenas pli enigoj "
 "ol la alia ĉena opcio kun listo..."
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr "Butonaj test-opcioj"
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr "(1/1)Butono"
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr "(1/1) Butona test-opcio. Äœi presas tekston..."
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, no-c-format
 msgid "Color 36"
 msgstr "Koloro je 36 bitoj"
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr "Uzu Kunmetadon de Bildoj"
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr "Du-nivela nigro-blanko (duuma)"
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr "Puntkisma/meznuanca nigro-blanko (stompita meznuanco)"
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr "Plurnivela nigro-blanko (grizgamo)"
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr "Plur-nivela RGB-koloro (unu-pasa koloro)"
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr "Ignoru kalibrigon"
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr "Malebligu preparan fokusigon"
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr "Ne kalibrigu fokusigon"
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr "Mana prepara fokusigo"
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr "Pozicio de fiksa fokuso"
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr "Kalibrigo de la lenso en la loki�o de la dokumento"
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr "Kalibrigo de fokuso de la lenso en la loki�o de la dokumento"
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr "Fokusigo je 0mm (sur la vitro)"
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr "Uzu fokusi�on je 0mm anstataŭ 0.6mm"
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr "Moduso de kalibrigo"
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr "Difinu moduson de kalibrigo"
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr "Ĝi �altas/el�altas la lampon"
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr "Åœaltu UTA"
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr "Ĝi �altas/el�altas la reguligilon de diafaneco"
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr "De�ovo"
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr "Agordoj de de�ovo laŭ kanaloj de koloro"
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, no-c-format
 msgid "Gray offset"
 msgstr "De�ovo laŭ grizo"
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr "Ĝi agordas la de�ovon de la griza kanalo"
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr "Ĝi agordas la de�ovon de la ru�a kanalo"
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr "Ĝi agordas la de�ovon de la verda kanalo"
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr "Ĝi agordas la de�ovon de la blua kanalo"
 
+#, fuzzy
+#~ msgid "IPC mode"
+#~ msgstr "Moduso de antaÅ­montro"
+
 #~ msgid "problem not analyzed (unknown SCSI class)"
 #~ msgstr "la problemo ne estis analizita (nekonata SCSI-klaso)"
 
diff --git a/po/es.gmo b/po/es.gmo
new file mode 100644
index 0000000..7960492
--- /dev/null
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 00339e2..6ecc019 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,12 +5,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
 "PO-Revision-Date: 2009-06-25 10:22+0100\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: GALPon MiniNo <minino@galpon.org>\n"
-"Language: \n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,411 +19,405 @@ msgstr ""
 "X-Poedit-Language: Spanish\n"
 "X-Poedit-Country: SPAIN\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr "Número de opciones"
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr "Estándar"
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "Geometría"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "Mejora"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr "Sensores"
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr "Forzar vista previa monocroma"
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr "Bit de profundidad"
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Modo de escaneo"
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "Velocidad de escaneo"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr "Origen de escaneo"
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr "Forzar retroceso"
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "Arriba-izquierda X"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "Arriba-izquierda Y"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "Abajo-derecha X"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "Abajo-derecha Y"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Resolución de escaneo"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "Resolución X"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Resolución Y"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr "Ancho de página"
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, no-c-format
 msgid "Page height"
 msgstr "Altura de página"
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr "Usar tabla gamma personalizada"
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr "Intensidad de imagen"
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr "Intensidad de rojo"
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr "Intensidad de verde"
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr "Intensidad de azul"
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr "Brillo"
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr "Tamaño del grano"
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr "Medios tonos"
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "Nivel de negro"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "Nivel de blanco"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr "Nivel de blanco para rojo"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
 msgstr "Nivel de blanco para verde"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr "Nivel de blanco para azul"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "Sombra"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr "Sombra para rojo"
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr "Sombra para verde"
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr "Sombra para azul"
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr "Resalte"
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr "Resalte para rojo"
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr "Resalte para verde"
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr "Resalte para azul"
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr "Matiz"
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr "Saturación"
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr "Tamaño del patrón de medios tonos"
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "Patrón de medios tonos"
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr "Enlazar resoluciones X e Y"
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "Negativo"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "Calibración de calidad"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr "Doble resolución óptica"
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr "Enlazar RGB"
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr "Umbral"
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr "Corrección gamma analógica"
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr "Gamma analógico rojo"
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr "Gamma analógico verde"
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr "Gamma analógico azul"
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr "Enlazar gamma analógico"
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr "Calentamiento de lámpara"
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr "Cal. tiempo de exposición"
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr "Cal. tiempo de exposición para rojo"
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr "Cal. tiempo de exposición para verde"
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr "Cal. tiempo de exposición para azul"
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr "Tiempo de exposición para escaneo"
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr "Tiempo de exposición para rojo"
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr "Tiempo de exposición para verde"
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr "Tiempo de exposición para azul"
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr "Ajustar tiempo de exposición"
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr "Cal. densidad de lámpara"
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr "Densidad de lámpara de escaneo"
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr "Ajustar densidad de lámpara"
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr "Apagar la lámpara al salir"
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
@@ -432,37 +426,37 @@ msgstr ""
 "Opción de sólo lectura que establece cuantas opciones soporta un "
 "dispositivo específico."
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "Origen, opciones de modo y resolución"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr "Opciones del área de escaneo y tamaño del soporte"
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, no-c-format
 msgid "Image modification options"
 msgstr "Opciones de modificación de imagen"
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, no-c-format
 msgid "Hardware specific options"
 msgstr "Opciones especificas de hardaware"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr "Sensores y botones del escáner"
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr "Solicitar una vista previa de calidad del escaneo."
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -474,7 +468,7 @@ msgstr ""
 "un escáner de una pasada esto reduce los requisitos de memoria y el "
 "tiempo de escaneo de la vista previa."
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
@@ -483,64 +477,64 @@ msgstr ""
 "Número de bits por muestra, valores típicos son 1 para «linea de arte» y "
 "8 para escaneos multibit."
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr ""
 "Selecciona el modo de escaneo (ej. línea de arte, monocromo, ó color)."
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr "Determina la velocidad a la que se hace el escaneo."
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr ""
 "Selecciona el origen del escaneo (tal como un alimentador de documentos)."
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr "Controla si se fuerza el retroceso"
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "Posición X arriba-izquierda del área de escaneo."
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "Posición Y arriba-izquierda del área de escaneo."
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "Posición X abajo-derecha del área de escaneo."
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "Posición Y abajo-derecha del área de escaneo."
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr "Ajusta la resolución de la imagen escaneada."
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr "Ajusta la resolución horizontal de la imagen escaneada."
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr "Ajusta la resolución vertical de la imagen escaneada."
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
@@ -549,18 +543,18 @@ msgstr ""
 "Especifica la anchura del soporte. Necesario para el centrado automático "
 "de hojas de escaneo."
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, no-c-format
 msgid "Specifies the height of the media."
 msgstr "Especifica la altura del soporte"
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid ""
 "Determines whether a builtin or a custom gamma-table should be used."
 msgstr "Determina si  debe usarse una tabla gamma interna ó personalizada."
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -571,32 +565,32 @@ msgstr ""
 "los canales de rojo, verde y azul simultáneamente (ej. es una tabla de "
 "intensidad gamma)."
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr "Tabla de corrección gamma para la gama roja."
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr "Tabla de corrección gamma para la gama verde."
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr "Tabla de corrección gama para la gamma azul."
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr "Controla el brillo de la imagen obtenida."
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr "Controla el contraste de la imagen obtenida."
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
@@ -605,67 +599,67 @@ msgstr ""
 "Selecciona el «granulado» de la imagen obtenida. Valores más pequeños "
 "dan como resultado imágenes mejor definidas."
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr ""
 "Selecciona si la imagen obtenida debe ser convertida a medios tonos "
 "(punteado)."
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr "Selecciona que nivel de radiancia debe tenerse en cuenta «negro»."
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr "Selecciona que nivel de radiancia debe tenerse en cuenta «blanco»."
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr ""
 "Selecciona que nivel de radiancia rojo debe tenerse en cuenta «blanco»."
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr ""
 "Selecciona que nivel de radiancia verde debe tenerse en cuenta «blanco»."
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr ""
 "Selecciona que nivel de radiancia azul debe tenerse en cuenta «blanco»."
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr ""
 "Selecciona que nivel de radiancia rojo debe tenerse en cuenta «negro»."
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr ""
 "Selecciona que nivel de radiancia verde debe tenerse en cuenta «negro»."
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr ""
 "Selecciona que nivel de radiancia azul debe tenerse en cuenta «negro»."
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr ""
 "Selecciona que nivel de radiancia rojo debe tenerse en cuenta «rojo "
 "total»."
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid ""
 "Selects what green radiance level should be considered \"full green\"."
@@ -673,7 +667,7 @@ msgstr ""
 "Selecciona que nivel de radiancia verde debe tenerse en cuenta «verde "
 "total»."
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid ""
 "Selects what blue radiance level should be considered \"full blue\"."
@@ -681,12 +675,12 @@ msgstr ""
 "Selecciona que nivel de radiancia azul debe tenerse en cuenta «azul "
 "total»."
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr "Contola el «matiz» (nivel de azul) de la imagen obtenida."
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
@@ -696,12 +690,12 @@ msgstr ""
 "que ocurre cuando se obtiene una imagen con una cámara. Valores más "
 "altos producen más florecimiento."
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr "Nombre de archivo de la imagen a cargar."
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
@@ -710,7 +704,7 @@ msgstr ""
 "Ajusta el tamaño del patrón de medios tonos (punteado) usado cuando se "
 "escanean imágenes de medios tonos."
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
@@ -718,287 +712,287 @@ msgstr ""
 "Define el patrón de medios tonos (punteado) para escanear imágenes de "
 "medios tonos."
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr "Usar los mismos valores para la resolución X e Y."
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr "Intercambiar blanco y negro"
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr "Hacer una calibración de calidad de blancos "
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr "Usar lente que duplica la resolución óptica"
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr "En modo RGB usar los mismos valores para cada color"
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr "Seleccionar el brillo mínimo para obtener un punto blanco"
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr "Corrección gamma analógica"
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr "Corrección gamma analógica para rojo"
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr "Corrección gamma analógica para verde"
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr "Corrección gamma analógica para azul"
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr "Calentar la lámpara antes de escanear"
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr "Definir tiempo de exposición para calibración"
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr "Definir tiempo de exposición para calibración de rojo"
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr "Definir tiempo de exposición para calibración de verde"
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr "Definir tiempo de exposición para calibración de azul"
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr "Definir tiempo de exposición para escaneo"
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr "Definir tiempo de exposición para escaneo de rojo"
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr "Definir tiempo de exposición para escaneo de verde"
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr "Definir tiempo de exposición para escaneo de azul"
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr "Activar selección del tiempo de exposición"
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr "Definir densidad de la lámpara para calibración"
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr "Definir densidad de la lámpara para escaneo"
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr "Activar la selección de la densidad de la lámpara"
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr "Apaga la lámpara al salir del programa"
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, no-c-format
 msgid "Scan button"
 msgstr "Botón de control de escaneo"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, no-c-format
 msgid "Email button"
 msgstr "Botón de correo-e"
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, no-c-format
 msgid "Fax button"
 msgstr "Botón de fax"
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, no-c-format
 msgid "Copy button"
 msgstr "Botón de copia"
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr "Botón de PDF"
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr "Botón de cancelar"
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr "Página cargada"
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, no-c-format
 msgid "Cover open"
 msgstr "La tapa está abierta"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "Color"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr "Linea de arte a color"
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr "Medios tonos a color"
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "Gris"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr "Medios tonos"
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "Línea de arte"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr "Importación con éxito"
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, no-c-format
 msgid "Operation not supported"
 msgstr "Operación no soportada"
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr "La operación va a ser cancelada"
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr "Dispositivo ocupado"
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr "Argumento incorrecto"
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr "Fin de archivo alcanzado"
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, no-c-format
 msgid "Document feeder jammed"
 msgstr "Alimentador de documentos atascado"
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, no-c-format
 msgid "Document feeder out of documents"
 msgstr "El alimentador de documentos está vacio"
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, no-c-format
 msgid "Scanner cover is open"
 msgstr "La tapa del escáner está abierta"
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr "Error en dispositivo de E/S"
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr "No queda memoria"
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr "Se ha denegado el acceso al recurso"
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr "La lámpara no está preparada, intentelo de nuevo"
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr "El escáner está bloqueado para transporte"
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "Predeterminados"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr "Ajustar valores predeterminados para los controles de mejora."
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "Calibración"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr "Calibrar antes del siguiente escaneo"
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
@@ -1008,12 +1002,12 @@ msgstr ""
 "En otro caso, la calibración se realizará únicamente antes del primer "
 "escaneo."
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr "Realizar sólo correcciones de sombras"
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -1025,27 +1019,27 @@ msgstr ""
 "desplazamiento y tiempo de exposición, ya sean los que trae incorporados "
 "el programa o los del archivo de configuración."
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr "Botón de estado"
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr "Número de muestra a escanear"
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr "Selecciona el número de muestra a escanear"
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, no-c-format
 msgid "Duplex scan"
 msgstr "Escaneo a dos caras"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid ""
 "Duplex scan provide a scan of the front and back side of the document"
@@ -1053,433 +1047,430 @@ msgstr ""
 "El escaneo a dos caras proporciona un escaneo del anverso y el reverso "
 "del documento"
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr "Calibrar el escáner"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr "Fuerza la calibración del escáner antes de realizar el escaneo"
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr "Escaneo en escala de grises"
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr "Escanea en escala de grises, no en color"
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr "Ganancia analógica"
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr "Aumenta o disminuye la ganancia analógica de la gama CCD"
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "Corrección gamma"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr "Selecciona la curva de transferencia de la corrección gamma"
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr "En bruto"
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr "Color fino"
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, no-c-format
 msgid "No transparency correction"
 msgstr "Sin corrección de transparencia"
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr "Correción de acuerdo con el tipo de película"
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr "Corrección conforme con la tasa de transparencia"
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, no-c-format
 msgid "Negatives"
 msgstr "Negativos"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, no-c-format
 msgid "Slides"
 msgstr "Diapositivas"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, no-c-format
 msgid "Normal speed"
 msgstr "Velocidad normal"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/2 normal speed"
 msgstr "1/2 de la velocidad normal"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/3 normal speed"
 msgstr "1/3 de la velocidad normal"
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, no-c-format
 msgid "rounded parameter"
 msgstr "parámetro redondeado"
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr "desconocido/a"
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, no-c-format
 msgid "ADF jam"
 msgstr "atasco en el alimentador"
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr "la tapa del alimentador está abierta"
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, no-c-format
 msgid "lamp failure"
 msgstr "fallo de lámpara"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr "error en el posicionamiento del cabezal de escaneo"
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr "Error de verificación de CPU"
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr "Error de verificación de RAM"
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr "Error de verificación de ROM"
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr "error de verificación de hardware"
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, no-c-format
 msgid "transparency unit lamp failure"
 msgstr "fallo de la lámpara de unidad de transparencias"
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr ""
 "fallo de posición del cabezal de escaneo de la unidad de transparencias"
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr "error en la longitud de la lista de parámetros"
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr "código de orden de operación incorrecto"
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr "campo incorrecto en CDB"
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr "LUN no soportado"
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr "campo incorrecto en la lista de parámetros"
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr "error en la secuencia de ordenes"
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr "se especificaron demasiadas ventanas"
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr "no se encuentra el soporte"
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr "mensaje de bit de IDENTIFICACIÓN incorrecto"
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr "la opción no conecta"
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr "reiniciar el encendido / reiniciar el bus del dispositivo"
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr "parámetro cambiado por otro iniciador"
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr "sin información adicional"
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr "fallo al volver a escoger"
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr "error de paridad SCSI"
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr "el iniciador detectó la recepción deun mensaje de error"
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr "mensaje de error incorrecto"
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr "error de límite de tiempo"
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, no-c-format
 msgid "transparency unit shading error"
 msgstr "error de sombreado en la unidad de transparencias"
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr "lámpara no estabilizada"
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, no-c-format
 msgid "film scanner"
 msgstr "escáner de películas"
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr "escáner plano"
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr "Tipo de película"
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr "Seleccionar el tipo de película, p.e. negativo o diapositiva"
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, no-c-format
 msgid "Negative film type"
 msgstr "Tipo de película negativo"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, no-c-format
 msgid "Selects the negative film type"
 msgstr "Selecciona el tipo de negativo de película"
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, no-c-format
 msgid "Hardware resolution"
 msgstr "Resolución del hardware"
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "Usar sólo resoluciones de hardware"
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr "Enfoque"
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, no-c-format
 msgid "Auto focus"
 msgstr "Enfoque automático"
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, no-c-format
 msgid "Enable/disable auto focus"
 msgstr "Activar/desactivar enfoque automático"
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr "Enfoque automático solo una vez"
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr "Hacer enfoque automático solo una vez entre expulsiones"
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, no-c-format
 msgid "Manual focus position"
 msgstr "Posición de foco manual"
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr ""
 "Ajustar el sistema óptico de foco en la posición manual (predeterminado: "
 "128)."
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr "Márgenes de escaneo"
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr "Ajustes de color extra"
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "Invertir imagen"
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "Invierte la imagen horizontalmente"
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, no-c-format
 msgid "Auto exposure"
 msgstr "Exposición automática"
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr "Activar/desactivar la característica de exposición automática"
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, no-c-format
 msgid "Calibration now"
 msgstr "Calibrar ahora"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Ejecutar calibración *ahora*"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr "Autodiagnóstico"
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr "Realizar autodiagnóstico del escáner"
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, no-c-format
 msgid "Reset scanner"
 msgstr "Reiniciar  escáner"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, no-c-format
 msgid "Reset the scanner"
 msgstr "Reiniciar el escáner"
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr "Manejar el soporte"
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, no-c-format
 msgid "Eject film after each scan"
 msgstr "Expulsar la película después de cada escaneo"
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr ""
 "Expulsar automáticamente la película del dispositivo después de cada "
 "escaneo"
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr "Expulsar la película antes de salir"
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
@@ -1487,610 +1478,604 @@ msgstr ""
 "Expulsar automáticamente la película del dispositivo antes de salir del "
 "programa"
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr "Expulsar película ahora"
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr "Expulsar la película *ahora*"
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, no-c-format
 msgid "Document feeder extras"
 msgstr "Alimentador de documentos extras"
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, no-c-format
 msgid "Flatbed only"
 msgstr "Sólo plano"
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr ""
 "Desactivar el alimentador automático de documentos y usar sólo el plano"
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, no-c-format
 msgid "Transparency unit"
 msgstr "Unidad de transparencias"
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr ""
 "Activar/desactivar la unidad de transparencias (FAU, unidad adaptadora "
 "de película)"
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, no-c-format
 msgid "Negative film"
 msgstr "Película en negativo"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, no-c-format
 msgid "Positive or negative film"
 msgstr "Película en positivo o en negativo"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr "Control de densidad"
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr "Ajustar el modo de control de densidad"
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, no-c-format
 msgid "Transparency ratio"
 msgstr "Tasa de transparencia"
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, no-c-format
 msgid "Select film type"
 msgstr "Seleccionar tipo de película"
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, no-c-format
 msgid "Select the film type"
 msgstr "Seleccionar el tipo de película"
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "Plana"
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, fuzzy, no-c-format
 msgid "ADF Front"
 msgstr "la tapa del alimentador está abierta"
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, fuzzy, no-c-format
 msgid "ADF Back"
 msgstr "atasco en el alimentador"
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, no-c-format
 msgid "ADF Duplex"
 msgstr "Alimentador a dos caras"
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, fuzzy, no-c-format
 msgid "Card Front"
 msgstr "Imprimir"
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, no-c-format
 msgid "Card Back"
 msgstr ""
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, fuzzy, no-c-format
 msgid "Card Duplex"
 msgstr "Dos caras"
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "Rojo"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "Verde"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "Azul"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, fuzzy, no-c-format
 msgid "Enhance Red"
 msgstr "Mejora"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, fuzzy, no-c-format
 msgid "Enhance Green"
 msgstr "Mejora"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, fuzzy, no-c-format
 msgid "Enhance Blue"
 msgstr "Mejora"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr "Ninguno"
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr ""
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr ""
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr "Una cara"
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr "Dos caras"
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr "Unidad de transparencias"
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr "Alimentador automático de documentos (ADF)"
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "Película en positivo"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "Película en negativo"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr "Enfoque en el cristal"
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr "Enfoque a 2.5mm sobre el cristal"
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr "Medios tonos A (tonos duros)"
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr "Medios tonos B (tonos suaves)"
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr "Medios tonos C (matizado)"
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr "Trama A (4x4 Bayer)"
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr "Trama B (4x4 espiral)"
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr "Trama C (4x4 matizado)"
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr "Trama D (8x4 matizado)"
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr "Tecnología de mejora de texto"
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr "Descargar patrón A"
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr "Descargar patrón B"
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "Sin corrección"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr "Definida por el usuario"
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr "Impresoras matriciales"
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr "Impresoras térmicas"
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "Impresoras de inyección de tinta"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr "Monitores CRT"
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr "Impresión de alta densidad"
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr "Impresión de baja densidad"
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr "Impresión de alto contraste"
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr "Definido por el usuario (gamma=1.0)"
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr "Definido por el usuario (gamma=1.8)"
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr "CD"
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr "A5 vertical"
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr "A5 apaisado"
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr "Carta"
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr "A4"
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "Máx"
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr "Modo de escaneo"
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr "Selecciona medios tonos"
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr "Exclusión"
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr "Seleccionar lo que se va a excluir."
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr "Selecciona el brillo."
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr "Enfoque"
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr "Corrección de color"
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr ""
 "Ajusta la tabla de corrección del color para el dispositivo de salida "
 "seleccionado."
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr "Coeficientes de corrección de color"
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr "Matriz de multiplicación de RGB"
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr "Cambiar de verde a rojo"
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr "Cambiar de verde a azul"
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr "Cambiar de rojo a verde"
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr "Cambiar de rojo a azul"
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr "Cambiar de azul a verde"
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr "Cambiar de azul a rojo"
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr "Controla el nivel de verde"
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr "Añade rojo basándose en el nivel de verde"
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr "Añade azul basándose en el nivel de verde"
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr "Añade verde basándose en el nivel de rojo"
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr "Controla el nivel de rojo"
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr "Añade azul basándose en el nivel de rojo"
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr "Añade verde basándose en el nivel de azul"
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr "Añade rojo basándose en el nivel de azul."
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, no-c-format
 msgid "Controls blue level"
 msgstr "Controla el nivel de azul"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr "Invertir la imagen."
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr "Vista previa rápida"
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr "Segmentación automática de área"
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr "Lista corta de resoluciones"
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr "Mostrar lista corta de resoluciones"
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr "Acercamiento"
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr "Define el factor de zoom que usará el escáner"
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr "Formato rápido"
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr "Equipamiento opcional"
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr "Expulsar"
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr "Expulsar la hoja del alimentador"
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr "Expulsión automática"
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr "Expulsar el documento después del escaneo"
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr "Modo alimentador"
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr "Seleccionar el modo del alimentador (una cara/dos caras)"
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr "Bahía"
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr "Seleccione la bahía para escanear"
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
@@ -2100,12 +2085,12 @@ msgstr ""
 "predefinidos o de una tabla definida por el usuario, que puede ser "
 "descargada al escáner."
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr "Posición del foco"
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
@@ -2113,12 +2098,12 @@ msgstr ""
 "Ajusta la posición del foco, ya sea al cristal o a 2.5mm por encima del "
 "cristal"
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr "Esperar por el botón"
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
@@ -2127,219 +2112,966 @@ msgstr ""
 "Después de enviar la orden de escanear, esperar hasta que se presione el "
 "botón del escáner para empezar realmente el proceso de escaneo."
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr ""
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, no-c-format
 msgid "Positive Slide"
 msgstr "Diapositiva en positivo"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, no-c-format
 msgid "Negative Slide"
 msgstr "Diapositiva en negativo"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr ""
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, fuzzy, no-c-format
 msgid "User defined CCT profile"
 msgstr "Definida por el usuario"
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr "Activo"
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr "Apagado"
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr "Difuminado"
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, fuzzy, no-c-format
 msgid "Diffusion"
 msgstr "Difusión de error"
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, fuzzy, no-c-format
 msgid "White"
 msgstr "Nivel de blanco"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, fuzzy, no-c-format
 msgid "Black"
 msgstr "Nivel de negro"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, fuzzy, no-c-format
 msgid "Continue"
 msgstr "Condicional"
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr ""
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, fuzzy, no-c-format
 msgid "Horizontal bold"
 msgstr "Horizontal"
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, fuzzy, no-c-format
 msgid "Horizontal narrow"
 msgstr "Horizontal"
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr "Vertical"
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, fuzzy, no-c-format
 msgid "Vertical bold"
 msgstr "Vertical"
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr ""
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr ""
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, fuzzy, no-c-format
 msgid "Front"
 msgstr "Imprimir"
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr ""
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
+msgid "Gamma function exponent"
 msgstr ""
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
 #, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
+msgid "Changes intensity of midtones"
+msgstr ""
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr ""
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr ""
+
+#: backend/fujitsu.c:3165
+#, fuzzy, no-c-format
+msgid "Halftone type"
+msgstr "Medios tonos"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr ""
+
+#: backend/fujitsu.c:3210
+#, fuzzy, no-c-format
+msgid "Perform outline extraction"
+msgstr "Calibración de precisión"
+
+#: backend/fujitsu.c:3221
+#, fuzzy, no-c-format
+msgid "Emphasis"
+msgstr "Resalte de imagen"
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr ""
+
+#: backend/fujitsu.c:3240
+#, fuzzy, no-c-format
+msgid "Separation"
+msgstr "Saturación"
+
+#: backend/fujitsu.c:3241
+#, fuzzy, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr ""
+"Activar la determinación automática de umbral para escaneos como línea "
+"de arte."
+
+#: backend/fujitsu.c:3252
+#, fuzzy, no-c-format
+msgid "Mirroring"
+msgstr "Invertir imagen"
+
+#: backend/fujitsu.c:3253
+#, fuzzy, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "Invertir la imagen horizontalmente."
+
+#: backend/fujitsu.c:3270
+#, fuzzy, no-c-format
+msgid "White level follower"
+msgstr "Nivel de blanco para azul"
+
+#: backend/fujitsu.c:3271
+#, fuzzy, no-c-format
+msgid "Control white level follower"
+msgstr "Controla el nivel de rojo"
+
+#: backend/fujitsu.c:3289
+#, fuzzy, no-c-format
+msgid "BP filter"
+msgstr "Filtro de color"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr ""
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr "Suavizado"
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr ""
+
+#: backend/fujitsu.c:3323
+#, fuzzy, no-c-format
+msgid "Gamma curve"
+msgstr "Valor gamma"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, fuzzy, no-c-format
+msgid "Threshold curve"
+msgstr "Umbral"
+
+#: backend/fujitsu.c:3347
+#, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+
+#: backend/fujitsu.c:3369
+#, fuzzy, no-c-format
+msgid "Threshold white"
+msgstr "Umbral"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr ""
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, fuzzy, no-c-format
+msgid "Noise removal"
+msgstr "Reducción de ruido"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr ""
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr ""
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr ""
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr ""
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr ""
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
 msgstr ""
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:3508
+#, fuzzy, no-c-format
+msgid "Auto width detection"
+msgstr "Sin corrección"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr ""
+
+#: backend/fujitsu.c:3526
+#, fuzzy, no-c-format
+msgid "Auto length detection"
+msgstr "Sin corrección"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr ""
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr ""
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr ""
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr ""
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr ""
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr ""
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr ""
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
+msgstr ""
+
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3708
+#, fuzzy, no-c-format
+msgid "DF recovery mode"
+msgstr "la tapa del alimentador está abierta"
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr ""
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3748
+#, fuzzy, no-c-format
+msgid "Advanced paper protection"
+msgstr "Opciones avanzadas"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+
+#: backend/fujitsu.c:3768
+#, fuzzy, no-c-format
+msgid "Staple detection"
+msgstr "Sin corrección"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr ""
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+
+#: backend/fujitsu.c:3809
+#, fuzzy, no-c-format
+msgid "Dropout color"
+msgstr "Exclusión"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+
+#: backend/fujitsu.c:3833
+#, fuzzy, no-c-format
+msgid "Buffer mode"
+msgstr "Modo de alimentación"
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr ""
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr ""
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr ""
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+
+#: backend/fujitsu.c:3911
+#, fuzzy, no-c-format
+msgid "Off timer"
+msgstr "Tiempo de espera de la lámpara"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+
+#: backend/fujitsu.c:3930
+#, fuzzy, no-c-format
+msgid "Duplex offset"
+msgstr "Desviación azul"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr ""
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "Desviación verde"
+
+#: backend/fujitsu.c:3949
+#, fuzzy, no-c-format
+msgid "Adjust green/red offset"
+msgstr "Desviación verde"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr "Desviación azul"
+
+#: backend/fujitsu.c:3967
+#, fuzzy, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "Ajusta el desplazamiento del canal de azul"
+
+#: backend/fujitsu.c:3980
+#, fuzzy, no-c-format
+msgid "Low Memory"
+msgstr "No queda memoria"
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+
+#: backend/fujitsu.c:3996
+#, fuzzy, no-c-format
+msgid "Duplex side"
+msgstr "Escaneo a dos caras"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr ""
+
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr ""
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr ""
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
+msgstr ""
+
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr ""
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+
+#: backend/fujitsu.c:4095
+#, fuzzy, no-c-format
+msgid "Endorser Options"
+msgstr "Opciones avanzadas"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr ""
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr ""
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr ""
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr ""
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr ""
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr ""
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr ""
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr ""
+
+#: backend/fujitsu.c:4253
+#, fuzzy, no-c-format
+msgid "Endorser direction"
+msgstr "Reducción de ruido"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr ""
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr ""
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr ""
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr ""
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr ""
+
+#: backend/fujitsu.c:4344
+#, fuzzy, no-c-format
+msgid "A3 paper"
+msgstr "Del papel"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4356
+#, fuzzy, no-c-format
+msgid "B4 paper"
+msgstr "Del papel"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4368
+#, fuzzy, no-c-format
+msgid "A4 paper"
+msgstr "Del papel"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4380
+#, fuzzy, no-c-format
+msgid "B5 paper"
+msgstr "Del papel"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr ""
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr ""
+
+#: backend/fujitsu.c:4429
+#, fuzzy, no-c-format
+msgid "Scanner in power saving mode"
+msgstr "La tapa del escáner está abierta"
+
+#: backend/fujitsu.c:4452
+#, fuzzy, no-c-format
+msgid "Manual feed"
+msgstr "Foco previo manual"
+
+#: backend/fujitsu.c:4453
+#, fuzzy, no-c-format
+msgid "Manual feed selected"
+msgstr "Foco previo manual"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr ""
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr ""
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr ""
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr ""
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr ""
+
+#: backend/fujitsu.c:4513
+#, fuzzy, no-c-format
+msgid "Hardware error code"
+msgstr "error de verificación de hardware"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr ""
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr ""
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr ""
+
+#: backend/fujitsu.c:4537
+#, fuzzy, no-c-format
+msgid "Imprinter ink level"
+msgstr "Nivel de blanco"
+
+#: backend/fujitsu.c:4548
+#, fuzzy, no-c-format
+msgid "Density"
+msgstr "Control de densidad"
+
+#: backend/fujitsu.c:4549
+#, fuzzy, no-c-format
+msgid "Density dial"
+msgstr "Control de densidad"
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, fuzzy, no-c-format
+msgid "Duplex switch"
+msgstr "Escaneo a dos caras"
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, no-c-format
 msgid "Extras"
 msgstr "Extras"
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, fuzzy, no-c-format
-msgid "Threshold curve"
-msgstr "Umbral"
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr ""
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
 "instead on hardware lineart."
 msgstr ""
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, no-c-format
 msgid "Disable interpolation"
 msgstr "Desactivar interpolación"
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
@@ -2348,45 +3080,45 @@ msgstr ""
 "Cuando se usan altas resoluciones en las que la resolución horizontal es "
 "más pequeña que la vertical, esto desactiva la interpolación horizontal."
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "Filtro de color"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 "Cuando se usa gris o línea de arte esta opción selecciona el color usado."
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "Calibración"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Define el modo de calibración"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Caché de datos de calibración"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, no-c-format
 msgid "Lamp off time"
 msgstr "Tiempo de espera de la lámpara"
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
@@ -2395,105 +3127,103 @@ msgstr ""
 "La lámpara será apagada después del tiempo dado (en minutos). Un valor "
 "de 0 significa que la lámpara no será apagada"
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, fuzzy, no-c-format
 msgid "Lamp off during scan"
 msgstr "Apagar la lámpara durante la calibración de oscuridad"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, fuzzy, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr "Minutos que tardará la lámpara en apagarse tras el escaneo"
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, no-c-format
 msgid "File button"
 msgstr "Botón de archivo"
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr "Botón de OCR"
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, no-c-format
 msgid "Power button"
 msgstr "Botón de energía"
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "Botón de correo-e"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, fuzzy, no-c-format
 msgid "Need calibration"
 msgstr "Limpiar la calibración"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, fuzzy, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr "Fuerza la calibración del escáner antes de realizar el escaneo"
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, no-c-format
 msgid "Buttons"
 msgstr "Botones"
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr "Calibrar"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "Iniciar calibración usando una hoja especial"
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, no-c-format
 msgid "Clear calibration"
 msgstr "Limpiar la calibración"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, no-c-format
 msgid "Clear calibration cache"
 msgstr "Limpiar la caché de datos de calibración"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr "Adaptador de transparencias"
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr "Color en modo gris"
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 "Selecciona qué color de escaneo se usará en modo gris (predefinido: "
 "verde)."
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr "Opciones de depuración"
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "Calentamiento automático"
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -2502,12 +3232,12 @@ msgstr ""
 "Calentar hasta que el brillo de la lámpara sea constante en vez de "
 "esperar por los 60 segundos de calentamiento."
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "Escaneo completo"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
@@ -2516,12 +3246,12 @@ msgstr ""
 "Escanear todo el área de escaneado incluyendo la franja de calibración. "
 "Tenga cuidado. No seleccione la altura total. Sólo para pruebas."
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Calibración tosca"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2533,12 +3263,12 @@ msgstr ""
 "opciones de ajuste de los parámetros de forma manual en la interfaz "
 "analógica. Esta opción está activada como predefinida. Solo para pruebas."
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "Calibración tosca sólo para el primer escaneo"
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2550,12 +3280,12 @@ msgstr ""
 "de la imagen es diferente con cada escaneo, desactive esta opción. Sólo "
 "para pruebas."
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, no-c-format
 msgid "Backtrack lines"
 msgstr "Lineas de vuelta  atrás"
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2567,85 +3297,85 @@ msgstr ""
 "lo que el equipo puede recibir datos. Valores bajos hacen que los "
 "escaneos sean más rápidos, pero aumentan los riesgos de omitir líneas."
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Valor gamma"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr "Ajusta el valor gamma para todos los canales."
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, no-c-format
 msgid "Geometry Group"
 msgstr "Grupo de geometría"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, no-c-format
 msgid "Scan Mode Group"
 msgstr "Grupo de modo de escaneo"
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr "Diapositiva"
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, no-c-format
 msgid "Scanner model"
 msgstr "Modelo de escáner"
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, fuzzy, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr ""
 "Permite comprobar el comportamiento del dispositivo con otros modelos "
 "soportados"
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr "Las imágenes de color se invertirán"
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, no-c-format
 msgid "Disable gamma correction"
 msgstr "Desactivar corrección gamma"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "La corrección gamma se desactivará"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, no-c-format
 msgid "Disable white shading correction"
 msgstr "Desactivar la corrección de sombra blanca"
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr "La corrección de sombra blanca se desactivará"
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr "Omitir proceso de calentamiento"
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr "El proceso de calentamiento se desactivará"
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr "Forzar profundidad real"
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2656,12 +3386,12 @@ msgstr ""
 "para mejorar la calidad de la imagen y después convertirla a la "
 "profundidad seleccionada. Esta opción evita la emulación de profundidad."
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, no-c-format
 msgid "Emulate Grayscale"
 msgstr "Emular escala de grises"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2672,12 +3402,12 @@ msgstr ""
 "convertida a escala de grises por software. Esto puede mejorar la "
 "calidad de la imagen en algunas circunstancias."
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr "Guardar imágenes de depuración"
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
@@ -2686,359 +3416,353 @@ msgstr ""
 "Si se activa, algunas imágenes implicadas en el proceso de escaneo se "
 "guardarán para analizarlas."
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, no-c-format
 msgid "Reset chipset"
 msgstr "Reiniciar el chipset"
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr "Reiniciar los datos del chipset"
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, no-c-format
 msgid "Information"
 msgstr "Información"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, no-c-format
 msgid "Chipset name"
 msgstr "Nombre del chipset"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr "Muestra el nombre del chipset usado en el dispositivo."
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr "ID del chipset"
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, no-c-format
 msgid "Shows the chipset ID"
 msgstr "Mostrar la ID del chipset"
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, no-c-format
 msgid "Scan counter"
 msgstr "Contador de escaneos"
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr "Mostrar el número de escaneos hechas por el escáner"
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, no-c-format
 msgid "Update information"
 msgstr "Actualizar información"
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr "Actualiza la información acerca del dispositivo"
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr "Esta opción refleja un botón del panel frontal del escáner"
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr "Imagen"
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, no-c-format
 msgid "offset X"
 msgstr "posición X"
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr "Posición X interna en el hardware de la zona de escaneo."
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, no-c-format
 msgid "offset Y"
 msgstr "posición Y"
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr "Posición Y interna en el hardware de la zona de escaneo."
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr "Estado de la lámpara"
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr "Enciende o apaga la lámpara"
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr "Calibrar el nivel de blanco y negro."
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr "Alimentador automático de documentos (ADF)"
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, no-c-format
 msgid "TMA Slides"
 msgstr "Adaptador (TMA) para diapositivas"
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, no-c-format
 msgid "TMA Negatives"
 msgstr "Adaptador (TMA) para negativos"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, no-c-format
 msgid "Color (48 bits)"
 msgstr "Color (48 bits)"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, no-c-format
 msgid "Extend lamp timeout"
 msgstr "Retardar el tiempo de apagado de la lámpara"
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr ""
 "Retarda los tiempos de apagado de la lámpara (de 15 minutos a 1 hora)"
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr "Esperando por el botón"
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, no-c-format
 msgid "Waits for button before scanning"
 msgstr "Esperando por el botón antes de escanear"
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, no-c-format
 msgid "Advanced Options"
 msgstr "Opciones avanzadas"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr "Gruesa"
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr "Fina"
 
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr "Bayer"
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr "NTSC RGB"
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr "Adaptador de transparencias RGB"
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr "A través"
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "NTSC Gris"
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr "Adaptador de transparencias gris"
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "Lento"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "Rápido"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr "Muy rápido"
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr "2-píxeles"
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr "4-píxeles"
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr "8-píxeles"
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr "Imprimir"
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, no-c-format
 msgid "Film-strip"
 msgstr "Tira de película"
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr "Adaptador de transparencias (XPA)"
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr "Condicional"
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, no-c-format
 msgid "Experiment"
 msgstr "Experimento"
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, no-c-format
 msgid "Sharpening"
 msgstr "Nitidez"
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr "Ajustar el valor de nitidez."
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr "Umbral automático"
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr ""
 "Activar la determinación automática de umbral para escaneos como línea "
 "de arte."
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr "Suavizado"
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr "Seleccionar filtro de suavizado."
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr "Descargar soporte después de escanear"
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, no-c-format
 msgid "Unloads the media after a scan."
 msgstr "Descargar los soportes después de escanear."
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, no-c-format
 msgid "Change document"
 msgstr "Cambiar documento"
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr "Cambiar documento."
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr "Descargar"
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr "Descargar documento"
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, no-c-format
 msgid "Start calibration process."
 msgstr "Iniciar proceso de calibración"
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, no-c-format
 msgid "Media"
 msgstr "Soporte"
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr "Ajustar tipo de soporte."
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr "Tiempo de exposición"
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -3051,462 +3775,461 @@ msgstr ""
 "para película en negativo. Para imágenes oscuras (subexpuestas) puede "
 "incrementar este valor."
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, no-c-format
 msgid "Color Matrix"
 msgstr "Matriz de color"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, no-c-format
 msgid "Set the scanners color matrix."
 msgstr "Ajustar la matriz de color del escáner."
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr "Matriz de color personalizada."
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, no-c-format
 msgid "Mono Color Matrix"
 msgstr "Matriz monocromo"
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr "Matriz de color personalizada para escáneres en escala de grises."
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, no-c-format
 msgid "Mirror horizontal"
 msgstr "Inversión horizontal"
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, no-c-format
 msgid "Mirror image horizontally."
 msgstr "Invertir la imagen horizontalmente."
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, no-c-format
 msgid "Mirror vertical"
 msgstr "Inversión vertical"
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, no-c-format
 msgid "Mirror image vertically."
 msgstr "Invertir la imagen verticalmente."
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, no-c-format
 msgid "Update options"
 msgstr "Actualizar opciones"
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, no-c-format
 msgid "Update options."
 msgstr "Actualizar opciones."
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr "Salida de 8 bits"
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr ""
 "Usar bit de profundidad mayor de ocho internamente, pero en la salida "
 "usar sólo ocho bits."
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr "Esperar botón frontal"
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr "Esperar a que se presione en el  botón frontal para escanear."
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr "Apagar lámpara"
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr "Apagar la lámpara del escáner."
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "Tamaño del papel"
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr "Separación automática"
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, fuzzy, no-c-format
 msgid "Landscape"
 msgstr "A5 apaisado"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr ""
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, fuzzy, no-c-format
 msgid "Length control mode"
 msgstr "Ajustar el modo de control de densidad"
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, fuzzy, no-c-format
 msgid "Manual feed mode"
 msgstr "Foco previo manual"
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, fuzzy, no-c-format
 msgid "Manual feed timeout"
 msgstr "Foco previo manual"
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr "Activa el escaneo por las dos caras"
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr "Tamaño físico del papel en el alimentador"
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, fuzzy, no-c-format
 msgid "halftone"
 msgstr "Medios tonos"
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, fuzzy, no-c-format
 msgid "color"
 msgstr "Color"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, fuzzy, no-c-format
 msgid "continuous"
 msgstr "Condicional"
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, fuzzy, no-c-format
 msgid "off"
 msgstr "Apagado"
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, fuzzy, no-c-format
 msgid "bayer_64"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, fuzzy, no-c-format
 msgid "bayer_16"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, fuzzy, no-c-format
 msgid "halftone_32"
 msgstr "Medios tonos"
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, fuzzy, no-c-format
 msgid "halftone_64"
 msgstr "Medios tonos"
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, fuzzy, no-c-format
 msgid "diffusion"
 msgstr "Difusión de error"
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, fuzzy, no-c-format
 msgid "normal"
 msgstr "Normal"
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, fuzzy, no-c-format
 msgid "light"
 msgstr "Resalte"
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, fuzzy, no-c-format
 msgid "From scanner"
 msgstr "escáner de películas"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr "Del papel"
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, fuzzy, no-c-format
 msgid "default"
 msgstr "Predeterminado"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, fuzzy, no-c-format
 msgid "smooth"
 msgstr "Suave"
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, fuzzy, no-c-format
 msgid "low"
 msgstr "Lento"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, fuzzy, no-c-format
 msgid "medium"
 msgstr "Soporte"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, fuzzy, no-c-format
 msgid "red"
 msgstr "Rojo"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, fuzzy, no-c-format
 msgid "green"
 msgstr "Verde"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, fuzzy, no-c-format
 msgid "Sets the scan source"
 msgstr "Origen de escaneo"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr "Modo de alimentación"
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr "Ajusta el modo de alimentación"
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, fuzzy, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr "Activar/desactivar enfoque automático"
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, fuzzy, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr "Ajustar el modo de control de densidad"
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, fuzzy, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "Ajusta el modo de alimentación"
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, fuzzy, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr "Ajusta el modo de alimentación"
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr "Umbral automático"
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
@@ -3515,515 +4238,502 @@ msgstr ""
 "Ajusta automáticamente el brillo, contraste, niveles de blanco, gamma y "
 "reducción de intensidad del ruido de la imagen"
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "Reducción de ruido"
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr "Reduce los puntos aislados de ruido"
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr "Resalte de imagen"
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr "Ajusta el resalte de la imagen"
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, fuzzy, no-c-format
 msgid "Lamp color"
 msgstr "Encender lámpara"
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, fuzzy, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr "Enciende o apaga la lámpara"
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, fuzzy, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "Invertir la imagen verticalmente."
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
 "length of actual paper or logical document length."
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "Corrección gamma"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, fuzzy, no-c-format
 msgid "High sensivity"
 msgstr "Impresión de alta densidad"
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, fuzzy, no-c-format
 msgid "Low sensivity"
 msgstr "Impresión de baja densidad"
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, fuzzy, no-c-format
 msgid "err_diffusion"
 msgstr "Difusión de error"
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, fuzzy, no-c-format
 msgid "No detection"
 msgstr "Sin corrección"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, fuzzy, no-c-format
 msgid "Normal mode"
 msgstr "Normal"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, fuzzy, no-c-format
 msgid "Enhanced mode"
 msgstr "Mejora"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
 "divides long paper by the length which is set in Document Size option."
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, fuzzy, no-c-format
 msgid "Automatic threshold mode"
 msgstr "Umbral automático"
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, fuzzy, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr "Umbral automático"
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, fuzzy, no-c-format
 msgid "Set chroma of red"
 msgstr "Ajustar el orden de las muestras"
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, fuzzy, no-c-format
 msgid "chroma of blue"
 msgstr "Sombra para azul"
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, fuzzy, no-c-format
 msgid "Set chroma of blue"
 msgstr "Cambiar de rojo a azul"
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr "Diamante"
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr "8x8 «Engrasado» tosco"
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr "8x8 «Engrasado» fino"
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr "8x8 Bayer"
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr "8x8 Línea vertical"
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr "Ganancia"
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr "Ajustes de ganancia de los canales de color"
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, no-c-format
 msgid "Gray gain"
 msgstr "Ganancia de gris"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr "Ajusta la ganancia del canal de gris"
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, no-c-format
 msgid "Red gain"
 msgstr "Ganancia de rojo"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr "Ajusta la ganancia del canal de rojo"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, no-c-format
 msgid "Green gain"
 msgstr "Ganancia de Verde"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr "Ajusta la ganancia del canal de verde"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, no-c-format
 msgid "Blue gain"
 msgstr "Ganancia de Azul"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr "Ajusta la ganancia del canal de azul"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr "Trama Bayer 16"
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr "Trama Bayer 64"
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr "Medio tono punto 32"
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr "Medio tono punto 64"
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr "Difusión de error"
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr "Modo 1"
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr "Modo 2"
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr "Modo 3"
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr "De palo blanco"
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr "Suave"
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr "Bajo"
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr "Soporte"
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr "Alto"
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr "CRT"
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "Una página"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "Todas las páginas"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr "escáner con cargador automático"
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr "Escala de grises de 4 bits"
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr "Escala de grises de 8 bits"
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr "Sombras, medias tintas, resalte, tiempo de exposición"
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr "Opciones especiales"
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr "Balance de color"
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr "Desactivar retroceso"
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr "Si se selecciona, el escáner no retrocede cuando pierde una línea"
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr "Conmutar el estado de lámpara del plano"
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr "Conmuta el estado de lámpara del plano"
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr "Calibración por el motor"
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid ""
 "If checked the color calibration before a scan is done by the backend"
@@ -4031,42 +4741,42 @@ msgstr ""
 "Si se selecciona la calibración del color antes del escaneo la hace el "
 "motor"
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr "Usar el adaptador de diapositivas de 35mm"
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr "Esta opción apaga la lámpara del plano durante el escaneo"
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "Escaneo de calidad"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr "La mejor calidad, pero a velocidad lenta"
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "Escaneo rápido"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr "Más rápido, pero de peor calidad"
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr "Ajuste automático de umbral"
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
@@ -4075,70 +4785,70 @@ msgstr ""
 "Si se selecciona, el motor intenta determinar automáticamente un valor "
 "óptimo para el umbral."
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr "Selecciona el modo de corrección gamma"
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr "Asociar gamma"
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr "Usar los mismos valores gamma para todos los canales de colores."
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr "Gamma escalar"
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr "Seleccionar un valor para la corrección gamma escalar."
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr "Gamma escalar rojo"
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr ""
 "Seleccionar un valor para la corrección gamma escalar (canal de rojo)"
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr "Gamma escalar verde"
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr ""
 "Seleccionar un valor para la corrección gamma escalar (canal de verde)"
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr "Gamma escalar azul"
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr ""
 "Seleccionar un valor para la corrección gamma escalar (canal de azul)"
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr "Canal"
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
@@ -4146,212 +4856,212 @@ msgstr ""
 "Selecciona la gama de color, «Master» significa que afecta a todos los "
 "colores."
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr "Medias tintas"
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr "Selecciona que nivel de radiancia debe ser considerado «50% gris»."
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr "Medias tintas para rojo"
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr "Selecciona que nivel de radiancia debe ser considerado «50% rojo»."
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr "Medias tintas para verde"
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr ""
 "Selecciona que nivel de radiancia debe ser considerado «50% verde»."
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr "Medias tintas para azul"
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr "Selecciona que nivel de radiancia debe ser considerado «50% azul»."
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr "Balance de rojo"
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr ""
 "Factor de balance para rojo. Un valor de 100% significa sin corrección."
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr "Balance de  verde"
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr ""
 "Factor de balance para verde. Un valor de 100% significa sin corrección."
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr "Balance de  azul"
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr ""
 "Factor de balance para azul. Un valor de 100% significa sin corrección."
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr "Balance de firmware"
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr ""
 "Ajusta el balance de color a los valores facilitados por el firmware."
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "El más lento"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "Más lento"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "Más rápido"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "El más rápido"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr "8x8 tosco"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr "8x8 normal"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr "8x8 fino"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr "8x8 muy fino"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr "6x6 normal"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr "5x5 tosco"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr "5x5 fino"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr "4x4 tosco"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr "4x4 normal"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr "4x4 fino"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr "3x3 normal"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr "2x2 normal"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr "8x8 personalizado"
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr "6x6 personalizado"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr "5x5 personalizado"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr "4x4 personalizado"
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr "3x3 personalizado"
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr "2x2 personalizado"
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr "Modo gris rápido"
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr "Escanear en modo gris rápido (menor calidad)."
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
@@ -4360,117 +5070,117 @@ msgstr ""
 "Precisa que todas las vistas previas se hagan del modo más rápido (baja "
 "calidad). Este puede ser un modo sin color o un modo de baja resolución."
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr "Tiempo de apagado de lámpara (minutos)"
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr "Ajustar el tiempo (en minutos) tras el que se apagará la lámpara."
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, no-c-format
 msgid "Turn lamp off"
 msgstr "Apagar la lámpara"
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr "Apaga la lámpara inmediatamente."
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr "Brillo de rojo"
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr "Controla el brillo del canal de rojo de la imagen obtenida."
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr "Brillo de verde"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr "Controla el brillo del canal de verde de la imagen obtenida."
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr "Brillo de azul"
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr "Controla el brillo del canal de azul de la imagen obtenida."
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "Contraste de canal de rojo"
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr "Controla el contraste del canal de rojo de la imagen obtenida."
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "Contraste de canal de verde"
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr "Controla el contraste del canal de verde de la imagen obtenida."
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "Contraste de canal de azul"
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr "Controla el contraste del canal de azul de la imagen obtenida."
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr "Color 48"
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr "Color 24"
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr "Gris 16"
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr "Gris 8"
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr "Reflectantes"
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, no-c-format
 msgid "Positive"
 msgstr "Positivo"
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -4479,39 +5189,39 @@ msgstr ""
 "Calentar hasta que el brillo de la lámpara sea constante en vez de "
 "esperar por los 40 segundos de calentamiento."
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, fuzzy, no-c-format
 msgid "Negative color"
 msgstr "Película en negativo"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, fuzzy, no-c-format
 msgid "Negative gray"
 msgstr "Negativo"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, fuzzy, no-c-format
 msgid "48 bits color"
 msgstr "Color fino"
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
 "mode and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr "Botón de control de escaneo"
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4522,248 +5232,239 @@ msgstr ""
 "proceder, haga clic en el botón \"SCAN\" (para MP150) o \"COLOR\" (para "
 "otros modelos). Para cancelar, haga clic en el botón \"GRAY\"."
 
-#: ../backend/pixma_sane_options.c:143
-#, no-c-format
-msgid "Gamma function exponent"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:144
-#, no-c-format
-msgid "Changes intensity of midtones"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:232
 #, no-c-format
 msgid "Update button state"
 msgstr "Actualizar estado del botón"
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:244
 #, no-c-format
 msgid "Button 1"
 msgstr "Botón 1"
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:258
 #, no-c-format
 msgid "Button 2"
 msgstr "Botón 2"
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr ""
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr ""
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr "Transparencia"
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr "Ajustes del dispositivo"
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr "Interruptor de lámpara"
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr "Cambiar la(s) lámpara(s) manualmente."
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "Apagar la lámpara durante la calibración de oscuridad"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr "Apagar siempre la lámpara cuando se calibra la oscuridad."
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, no-c-format
 msgid "Calibration data cache"
 msgstr "Caché de datos de calibración"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr "Activa o desactiva la caché de datos de calibración"
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, no-c-format
 msgid "Performs calibration"
 msgstr "Calibración de precisión"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr "Acelerar el sensor"
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr "Activa o desactiva la aceleración de movimiento del sensor."
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, no-c-format
 msgid "Warmup-time"
 msgstr "Tiempo de calentamiento"
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, no-c-format
 msgid "Warmup-time in seconds."
 msgstr "Tiempo de calentamiento en segundos."
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, no-c-format
 msgid "Lampoff-time"
 msgstr "Tiempo de apagado de lámpara"
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr "Tiempo de apagado de lámpara en segundos."
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, no-c-format
 msgid "Analog frontend"
 msgstr "Interfaz analógica (AFE)"
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr "Valor de ganancia de rojo en el AFE"
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr "Desviación rojo"
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr "Valor de la desviación de rojo en el AFE"
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr "Valor de ganancia de verde en el AFE"
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr "Desviación verde"
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr "Valor de la desviación de verde en el AFE"
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr "Valor de ganancia de azul en el AFE"
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr "Desviación azul"
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr "Valor de la desviación de azul en el AFE"
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, no-c-format
 msgid "Red lamp off"
 msgstr "Apagar lámpara roja"
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr "Define los parámetros de apagado de lámpara roja"
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, no-c-format
 msgid "Green lamp off"
 msgstr "Apagar lámpara verde"
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr "Define los parámetros de apagado de lámpara verde"
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, no-c-format
 msgid "Blue lamp off"
 msgstr "Apagar lámpara azul"
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr "Define los parámetros de apagado de lámpara azul"
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr "Esta opción refleja el estado de los botones del escáner"
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr "Color 36"
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr "Mapa de trama 1"
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr "Mapa de trama 2"
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr "Aleatorio"
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr "Selección de origen"
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr "Mejora de la Imagen"
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr "Agrisar"
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr "Cargar la imagen como escala de grises."
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr "Simulación de tres pasadas"
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
@@ -4772,12 +5473,12 @@ msgstr ""
 "Simula un escáner de tres pasadas devolviendo 3 muestras separadas. Por "
 "diversión, devuelve verde, después azul y finalmente rojo."
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr "Simulación de escáner manual"
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4789,7 +5490,7 @@ msgstr ""
 "retorno -1. Ajustando esta opción permite comprobar si una interfaz "
 "puede manejar esto correctamente."
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid ""
 "Set default values for enhancement controls (brightness & contrast)."
@@ -4797,42 +5498,42 @@ msgstr ""
 "Ajustar los valores predeterminados para los controles de mejora (brillo "
 "y contraste)"
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr "Opción de prueba de sólo lectura"
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr "Veamos si la interfaz puede tratar esto correctamente"
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr "Tablas gamma"
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr "Simulación del código de estado"
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr "No forzar el código de estado"
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr "No forzar al motor a devolver un código de estado."
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr "Devuelve SANE_STATUS_EOF"
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
@@ -4841,12 +5542,12 @@ msgstr ""
 "Forzar al motor a devolver el código de estado de SANE_STATUS_EOF "
 "después de haber sido llamado sane_read()."
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr "Devuelve SANE_STATUS_JAMMED"
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
@@ -4855,12 +5556,12 @@ msgstr ""
 "Forzar al motor a devolver el código de estado de SANE_STATUS_JAMMED "
 "después de haber sido llamado sane_read()."
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr "Devuelve SANE_STATUS_NO_DOCS"
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
@@ -4869,12 +5570,12 @@ msgstr ""
 "Forzar al motor a devolver el código de estado de SANE_STATUS_NO_DOCS "
 "después de haber sido llamado sane_read()."
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr "Devuelve SANE_STATUS_COVER_OPEN"
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
@@ -4883,12 +5584,12 @@ msgstr ""
 "Forzar al motor a devolver el código de estado de SANE_STATUS_COVER_OPEN "
 "después de haber sido llamado sane_read()."
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr "Devuelve SANE_STATUS_IO_ERROR"
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
@@ -4897,12 +5598,12 @@ msgstr ""
 "Forzar al motor a devolver el código de estado de SANE_STATUS_IO_ERROR "
 "después de haber sido llamado sane_read()."
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr "Devuelve SANE_STATUS_NO_MEM"
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
@@ -4911,12 +5612,12 @@ msgstr ""
 "Forzar al motor a devolver el código de estado de SANE_STATUS_NO_MEM "
 "después de haber sido llamado sane_read()."
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr "Devuelve SANE_STATUS_ACCESS_DENIED"
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
@@ -4925,85 +5626,82 @@ msgstr ""
 "Forzar al motor a devolver el código de estado de "
 "SANE_STATUS_ACCESS_DENIED después de haber sido llamado sane_read()."
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr "Esta opción refleja el estado de los botones del escáner"
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr "Encender lámpara"
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr "Enciende la lámpara del escáner"
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr "Apagar lámpara"
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr "Apaga la lámpara del escáner"
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, no-c-format
 msgid "Lamp timeout"
 msgstr "Límite de tiempo de lámpara"
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr "Minutos que tardará la lámpara en apagarse tras el escaneo"
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr "Valor de umbral para el modo de línea de arte"
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr "Alimentador de documentos"
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr "6x4 (pulg.)"
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr "8x10 (pulg.)"
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr "8.5x11 (pulg.)"
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr "Medios tonos no compatibles"
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr "Punto disperso 8x8"
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr "Punto disperso 16x16"
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -5019,27 +5717,27 @@ msgstr ""
 "demasiado alto, basado en interfaces X puede dejar de responder a "
 "eventos de X y su sistema se podría atascar."
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr ""
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr ""
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, fuzzy, no-c-format
 msgid "Focus point for scanning."
 msgstr "Expulsar el documento después del escaneo"
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr "Modo de vista previa"
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
@@ -5049,12 +5747,12 @@ msgstr ""
 "grises proporciona en general, la mejor relación entre velocidad y "
 "detalle."
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr "Ajustes predefinidos"
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
@@ -5063,97 +5761,97 @@ msgstr ""
 "Proporciona superficies de escaneo estándar para fotografías, páginas "
 "impresas, etc."
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr ""
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, fuzzy, no-c-format
 msgid "Frame to be scanned"
 msgstr "escáner plano"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, fuzzy, no-c-format
 msgid "Focus-mode"
 msgstr "Enfoque"
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, fuzzy, no-c-format
 msgid "Auto or manual focus"
 msgstr "Enfoque automático"
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, fuzzy, no-c-format
 msgid "Focus-point"
 msgstr "Posición del foco"
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, fuzzy, no-c-format
 msgid "Focus point"
 msgstr "Posición del foco"
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr "Color, líneas por lectura"
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr "Escala de grises, líneas de por lectura"
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr "cámara web"
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr "Color en BRUTO"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr "Color RGB"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr "Color RGB TEXTO"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr "Negro sólido"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr "Blanco sólido"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr "Patrón de color"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr "Rejilla"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr "Primera entrada"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr "Segunda entrada"
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
@@ -5162,12 +5860,12 @@ msgstr ""
 "Esta tercera entrada es muy larga. Tal vez la interfaz tiene una idea de "
 "cómo mostrarlo"
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr "Simulación de escaneo manual"
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5181,12 +5879,12 @@ msgstr ""
 "puede manejar esto correctamente. Esta opción también permite un ancho "
 "de 11cm."
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr "Simulación de tres pasadas"
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
@@ -5195,18 +5893,18 @@ msgstr ""
 "Simula un escaneo de tres pasadas. En el modo color, se generan tres "
 "muestras."
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr "Ajustar el orden de las muestras"
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr ""
 "Ajustar el orden de las muestras en el modo de tres pasadas de color."
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
@@ -5215,17 +5913,17 @@ msgstr ""
 "Si se selecciona el alimentador automático de documentos, el alimentador "
 "estará «vacío» tras 10 escaneos."
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr "Opciones especiales"
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr "Seleccione la imagen de prueba"
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5243,12 +5941,12 @@ msgstr ""
 "Rejilla: dibuja una rejilla en blanco y negro con un tamaño de 10mm por "
 "cuadrado."
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr "Invertir el orden de los datos"
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5259,45 +5957,45 @@ msgstr ""
 "modo de 16 bits. Esta opción puede utilizarse para la prueba de 16 bits "
 "de los modos de interfaz, p.ej. si la interfaz utiliza el orden correcto."
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr "Límite de lectura"
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 "Limita la cantidad de datos transferidos con cada llamada a sane_read()."
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr "Tamaño del límite de lectura"
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
 msgstr ""
 "Cantidad de datos (máxima) transferida con cada llamada a sane_read()."
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr "Retardo de lectura"
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr "Retardar la transferencia de datos a la canalización."
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr "Duración del retardo de lectura"
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
@@ -5305,12 +6003,12 @@ msgstr ""
 "Cuanto tiempo se esperará después de transferir cada búfer de datos a "
 "través de la canalización."
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr "Valor de retorno de sane_read"
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
@@ -5321,22 +6019,22 @@ msgstr ""
 "normal para hacer el escaneo. Todos los demás códigos de estado son para "
 "probar la forma en que la interfaz se encarga de ellos."
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr "Pérdida de píxeles por línea"
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr "Número de píxeles que se pierden en el extremo de cada línea."
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr "Parámetros difusos"
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
@@ -5345,23 +6043,23 @@ msgstr ""
 "Devuelve líneas difusas y bytes por línea cuando se llama a sane_start() "
 "antes que a sane_parameters()."
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr "Usar E/S no bloqueante"
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 "Usar una E/S no bloqueante para sane_red() si lo permite la interfaz."
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr "Proponer la selección de un descriptor de archivo"
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
@@ -5370,12 +6068,12 @@ msgstr ""
 "Proponer la selección un descriptor de archivo para detectar si "
 "sane_read () devolverá los datos."
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr "Activar opciones de prueba"
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
@@ -5385,27 +6083,27 @@ msgstr ""
 "de las interfaces para ver y modificar los diferentes tipos de opciones "
 "de SANE."
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr "Imprimir las opciones"
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr "Imprimir una lista de todas las opciones"
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr "Opciones de prueba «Booleanas»"
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr "(1/6) Booleana configurable y legible por software"
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
@@ -5414,12 +6112,12 @@ msgstr ""
 "(1/6) Opción de prueba booleana configurable y legible por el software. "
 "Esta es la opción booleana normal. "
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr "(2/6) Booleana configurable por hardware legible por software"
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
@@ -5430,12 +6128,12 @@ msgstr ""
 "el software. Esta opción no puede ser ajustada por la interfaz, pero si "
 "por el usuario  (p.ej. pulsando un botón en el dispositivo)."
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr "(3/6) Booleana configurable por hardware"
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5447,12 +6145,12 @@ msgstr ""
 "pulsando un botón en el dispositivo) tampoco puede ser leída por la "
 "interfaz ."
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr "(4/6) Booleana lexible por software"
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
@@ -5461,12 +6159,12 @@ msgstr ""
 "(4/6) Opción de prueba booleana legible por el software Esta es una "
 "opción de sólo lectura."
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr "(5/6) Booleana configurable y legible por software, emulada"
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
@@ -5475,12 +6173,12 @@ msgstr ""
 "(5/6) Opción de prueba booleana configurable y legible por el software y "
 "emulada."
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr "(6/6) Booleana configurable y legible por software, automática"
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5490,29 +6188,29 @@ msgstr ""
 "(6/6) Opción de prueba booleana configurable y legible por el software y "
 "emulada. Esta opción puede ser ajustada automáticamente por el motor."
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr "Opciones de prueba «Entero»"
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr "(1/6) Entero"
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr ""
 "(1/6) Opción de prueba de valor entero sin unidad ni conjunto de "
 "restricciones."
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr "(2/6) Entero con rango de restricciones"
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
@@ -5521,24 +6219,24 @@ msgstr ""
 "(2/6) Opción de prueba de valor entero con unidad de píxel y con "
 "conjunto de restricciones, El mínimo es 4, el máximo 192 y el salto 2."
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr "(3/6) Entero con restricción de lista de valores"
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 "(3/6) Opción de prueba de valor entero con unidad bits y restricción de "
 "lista de valores"
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr "(4/6) Matriz de enteros"
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
@@ -5547,12 +6245,12 @@ msgstr ""
 "(4/6) Opción de prueba de valor entero con unidad mm usando una matriz "
 "con restricciones."
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr "(5/6) Matriz de enteros con rango de restricciones"
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
@@ -5562,12 +6260,12 @@ msgstr ""
 "matriz con rango de restricciones. El mínimo es 4, el máximo 192, y el "
 "salto 2."
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr "(6/6) Matriz de enteros con restricción de lista de valores"
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
@@ -5576,29 +6274,29 @@ msgstr ""
 "(6/6) Opción de prueba de valor entero con unidad % y usando una matriz "
 "con restricciones en una lista de valores,"
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr "Opción de prueba «Real fijo»"
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr "(1/3) Real fijo"
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr ""
 "(1/3) Opción de prueba de valor real (coma fija) sin unidad ni conjunto "
 "de restricciones."
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr "(2/3) Real fijo con rango de restricción"
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
@@ -5608,50 +6306,50 @@ msgstr ""
 "microsegundo y rango de restricción. El mínimo es  -42,17, el máximo "
 "32767,9999 y el salto 2,0."
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr "(3/3) Real fijo con restricción de lista de valores"
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 "(3/3) Opción de prueba de valor real (coma fija) sin unidad y "
 "restringida por un conjunto de valores de una lista."
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr "Opciones de prueba de cadena"
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr "(1/3) Cadena"
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr "(1/3) Opciones de prueba de cadena sin restricciones."
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr "(2/3) Cadena restringida a lista de cadenas"
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr ""
 "(2/3) Opción de prueba de cadena con restricción de lista de cadenas"
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr "(3/3) Restricción de cadenas lista larga de cadenas"
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
@@ -5660,156 +6358,160 @@ msgstr ""
 "(3/3) Opción de prueba de cadena con restricción de lista de cadenas. "
 "Contiene más entradas..."
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr "Opciones de botón de prueba"
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr "(1/1) Botón"
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr "(1/1) Botón de opción de prueba. Imprime algún texto..."
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, no-c-format
 msgid "Color 36"
 msgstr "Color 36"
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr "Usar composición de imagen"
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr "Dos niveles blanco y negro (modo de línea de arte)"
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr "Difuminado/medios tonos blanco y negro (modo medios tonos)"
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr "Multinivel blanco y negro (modo de escala de grises)"
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr "Multinivel color RGB (color de una pasada)"
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr "Ignorar calibración"
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr "Desactivar foco previo"
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr "No calibrar foco"
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr "Foco previo manual"
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr "Fijar la posición de foco"
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr "Calibración de lentes en la posición del documento"
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr "Calibrar las lentes en la posición del documento"
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr "Marcar la posición del foco a 0mm"
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr "Usar la marca de posición de foco a 0mm en vez de a 0,6mm"
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr "Modo de calibración"
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr "Define el modo de calibración"
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr "Enciende/apaga la lámpara"
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr "UTA Activado"
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr "Ajusta el encendido/apagado UTA"
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr "Desplazamiento"
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr "Ajustes del desplazamiento de los canales de color"
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, no-c-format
 msgid "Gray offset"
 msgstr "Desplazamiento de gris"
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr "Ajusta el desplazamiento del canal de gris"
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr "Ajusta el desplazamiento del canal de rojo"
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr "Ajusta el desplazamiento del canal de verde"
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr "Ajusta el desplazamiento del canal de azul"
 
+#, fuzzy
+#~ msgid "IPC mode"
+#~ msgstr "Modo de vista previa"
+
 #~ msgid "problem not analyzed (unknown SCSI class)"
 #~ msgstr "problema no analizado (clase de SCSI desconocido)"
 
diff --git a/po/fi.gmo b/po/fi.gmo
new file mode 100644
index 0000000..a3616bd
--- /dev/null
+++ b/po/fi.gmo
diff --git a/po/fi.po b/po/fi.po
index 6d73c2f..7aeae26 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,459 +5,453 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends 1.0.11\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
 "PO-Revision-Date: 2007-12-17 23:00+0100\n"
 "Last-Translator: Harri Järvi <harri.jarvi@tut.fi>\n"
 "Language-Team: Debian l10n Finnish <debian-l10n-finnish@lists.debian."
 "org>\n"
-"Language: \n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr "Asetusten määrä"
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr ""
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "Geometria"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "Parannus"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr ""
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "Esikatselu"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr "Pakota yksiväriset esikatselut"
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr "Bittisyvyys"
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Lukutapa"
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "Kuvanlukunopeus"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr "Lähde"
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr "Käytä jäljitystä"
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "Vasen yläkulma x"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "Vasen yläkulma y"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "Oikea alakulma x"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "Oikea alakulma y"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Kuvanluvun tarkkuus"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "X-tarkkuus"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Y-tarkkuus"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr ""
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, fuzzy, no-c-format
 msgid "Page height"
 msgstr "Korostus"
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr "Käytä omaa gammataulukkoa"
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr "Kuvan voimakkuus"
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr "Punaisen voimakkuus"
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr "Vihreän voimakkuus"
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr "Sinisen voimakkuus"
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr "Kirkkaus"
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "Kontrasti"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr "Hiukkaskoko"
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr "Rasterointi"
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "Mustataso"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "Valkotaso"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr "Punaisen valkotaso"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
 msgstr "Vihreän valkotaso"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr "Sinisen valkotaso"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "Varjo"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr "Punaisen varjo"
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr "Vihreän varjo"
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr "Sinisen varjo"
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr "Korostus"
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr "Punaisen korostus"
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr "Vihreän korostus"
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr "Sinisen korostus"
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr "Sävy"
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr "Kylläisyys"
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "Tiedostonimi"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr "Rasterikuvion koko"
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "Rasterikuvio"
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr "Sido X- ja Y-tarkkuus"
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "Negatiivi"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "Laatukalibrointi"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr "Kaksinkertainen optinen tarkkuus"
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr "Sido RGB"
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr "Kynnys"
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr "Analoginen gammakorjaus"
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr "Analoginen gamma (punainen)"
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr "Analoginen gamma (vihreä)"
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr "Analoginen gamma (sininen)"
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr "Sido analoginen gamma"
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr "Lämmitä lamppu"
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr "Kal. valotusaika"
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr "Kal. valotusaika punaiselle"
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr "Kal. valotusaika vihreälle"
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr "Kal. valotusaika siniselle"
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr "Valotusaika"
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr "Punaisen valotusaika"
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr "Vihreän valotusaika"
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr "Sinisen valotusaika"
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr "Aseta valotusaika"
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr "Kal. valomäärä"
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr "Lampun valomäärä"
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr "Aseta lampun valomäärä"
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr "Valo pois lopetettaessa"
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
 "supports."
 msgstr "Asetus, joka määrää kuinka monta asetusta tietty laite tukee."
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, fuzzy, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "Lyhyt tarkkuuslista"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr ""
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, fuzzy, no-c-format
 msgid "Image modification options"
 msgstr "Asetusten määrä"
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, fuzzy, no-c-format
 msgid "Hardware specific options"
 msgstr "Kuvanluvun tarkkuus"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr ""
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr "Pyydä laadukas esikatselukuva."
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -469,7 +463,7 @@ msgstr ""
 "Yksivaihekuvanlukijalla, se vähentää muistinkulutusta ja esikatselun "
 "lukuaikaa."
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
@@ -478,75 +472,75 @@ msgstr ""
 "Bittien määrä näytettä kohden. Tyypillisiä arvoja ovat 1 "
 "viivapiirrokselle ja 8 monibittikuville."
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr ""
 "Valitsee kuvanlukutavan (esim. viivapiirros, mustavalkoinen tai väri)."
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr "Määrää kuvanlukunopeuden."
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr "Määrää kuvanlukulähteen (kuten dokumentin syöttäjän)."
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr "Määrää käytetäänkö jäljitystä."
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "Kuva-alueen vasemman yläkulman x-koordinaatti."
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "Kuva-alueen vasemman yläkulman y-koordinaatti."
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "Kuva-alueen oikean alakulman x-koordinaatti."
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "Kuva-alueen oikean alakulman y-koordinaatti."
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr "Asettaa luettavan kuvan tarkkuus."
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr "Asettaa luettavan kuvan vaakatarkkuuden."
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr "Asettaa luettavan kuvan pystytarkkuuden."
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
 "sheet-fed scans."
 msgstr ""
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, fuzzy, no-c-format
 msgid "Specifies the height of the media."
 msgstr "Asettaa luettavan kuvan tarkkuus."
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid ""
 "Determines whether a builtin or a custom gamma-table should be used."
@@ -554,7 +548,7 @@ msgstr ""
 "Päättää käytetäänkö sisäänrakennettua vai käyttäjän asettamaa "
 "gammataulukkoa."
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -565,32 +559,32 @@ msgstr ""
 "punaiseen, vihreään ja siniseen kanavaan yhtä aikaa. Se on siis "
 "intensiteettigamma-taulukko."
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr "Gamma-korjaustaulukko punaiselle kaistalle."
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr "Gamma-korjaustaulukko vihreälle kaistalle."
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr "Gamma-korjaus taulukko siniselle kaistalle."
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr "Asettaa luettavan kuvan kirkkauden"
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr "Asettaa luettavan kuvan kontrastin."
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
@@ -599,77 +593,77 @@ msgstr ""
 "Asettaa kuvien \"rakeisuuden\". Pienemmät arvot tuottavat terävämpiä "
 "kuvia."
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr "Määrää, rasteroidaanko kuva."
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr "Asettaa kirkkaustason, joka tulkitaan \"mustaksi\"."
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr "Asettaa kirkkaustason, joka tulkitaan \"valkoiseksi\"."
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr "Asettaa punaisen kirkkaustason, joka tulkitaan \"valkoiseksi\"."
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr "Asettaa vihreän kirkkaustason, joka tulkitaan \"valkoiseksi\"."
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr "Asettaa sinisen kirkkaustason, joka tulkitaan \"valkoiseksi\"."
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr "Asettaa punaisen kirkkaustason, joka tulkitaan \"mustaksi\"."
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr "Asettaa vihreän kirkkaustason, joka tulkitaan \"mustaksi\"."
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr "Asettaa sinisen kirkkaustason, joka tulkitaan \"mustaksi\"."
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr ""
 "Asettaa punaisen kirkkaustason, joka tulkitaan \"täysin punaiseksi\"."
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid ""
 "Selects what green radiance level should be considered \"full green\"."
 msgstr ""
 "Asettaa vihreän kirkkaustason, joka tulkitaan \"täysin vihreäksi\"."
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid ""
 "Selects what blue radiance level should be considered \"full blue\"."
 msgstr ""
 "Asettaa sinisen kirkkaustason, joka tulkitaan \"täysin siniseksi\"."
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr "Määrää kuvan \"sävyä\" (sinistasoa)."
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
@@ -678,305 +672,305 @@ msgstr ""
 "Kylläisyystaso vaikuttaa \"puhkipalamiseen\" kameralla kuvattaessa. "
 "Suuremmat arvot aiheuttavat enemmän puhkipalamista."
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr "Ladattavan kuvan tiedostonimi."
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
 "halftoned images."
 msgstr "Asettaa rasterikuvion koon rasterikuvia luettaessa."
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
 msgstr "Asettaa rasterikuvion koon rasterikuvia luettaessa."
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr "Käytä samoja arvoja X- ja Y-tarkkuudelle"
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr "Vaihda musta ja valkoinen keskenään"
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr "Tee tarkka valkokalibrointi"
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr "Käytä linssiä joka tuplaa optisen tarkkuuden"
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr "RGB-tilassa käytä samoja arvoja joka värille"
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr "Valitse valkoisen pisteen pienin kirkkaus"
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr "Analoginen gamma-korjaus"
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr "Analgoinen gamma-korjaus punaiselle"
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr "Analoginen gamma-korjaus vihreälle"
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr "Analoginen gamma-korjaus siniselle"
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr "Lämmitä lamppu ennen kuvanlukua"
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr "Aseta valotusaika kalibroinnille"
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr "Aseta valotusaika punaisen kalibroinnille"
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr "Aseta valotusaika vihreän kalibroinnille"
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr "Aseta valotusaika sinisen kalibroinnille"
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr "Aseta valotusaika kuvanluvulle"
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr "Aseta valotusaika punaiselle kuvanluvulle"
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr "Aseta valotusaika vihreälle kuvanluvulle"
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr "Aseta valotusaika siniselle kuvanluvulle"
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr "Valotusajan asettaminen"
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr "Määritä valomäärä kalibrointia varten"
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr "Määritä valomäärä kuvanlukua varten"
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr "Valomäärän valinta"
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr "Sammuttaa valon ohjelmasta poistuttaessa"
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, fuzzy, no-c-format
 msgid "Scan button"
 msgstr "Kuvanluvun tarkkuus"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, fuzzy, no-c-format
 msgid "Email button"
 msgstr "Odota painiketta"
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, fuzzy, no-c-format
 msgid "Fax button"
 msgstr "Odota painiketta"
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, fuzzy, no-c-format
 msgid "Copy button"
 msgstr "Odota painiketta"
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr ""
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, fuzzy, no-c-format
 msgid "Cover open"
 msgstr "Värikuvio"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "Väri"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr "Väriviivapiirros"
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr "Värirasteri"
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "Harmaasävy"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr "Rasteri"
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "Viivapiirros"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, fuzzy, no-c-format
 msgid "Operation not supported"
 msgstr "Rasterointi ei ole tuettu"
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, fuzzy, no-c-format
 msgid "Document feeder jammed"
 msgstr "Asiakirjan syöttäjä"
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, fuzzy, no-c-format
 msgid "Document feeder out of documents"
 msgstr "Asiakirjan syöttäjä"
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, no-c-format
 msgid "Scanner cover is open"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "Oletukset"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr "Aseta oletusasetukset parantimille."
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "Kalibrointi"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr "Kalibroi ennen seuraavaa kuvanlukua"
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
@@ -985,12 +979,12 @@ msgstr ""
 "Jos asetus on päällä, laite kalibroidaan ennen seuraavaa kuvanlukua. "
 "Muuten kalibrointi suoritetaan vain ensimmäisellä kerralla."
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr "Vain sävykorjaus"
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -1001,1058 +995,1049 @@ msgstr ""
 "Oletusasetukset vahvistukselle, siirtymälle ja valotusajalle, joko "
 "asetustiedostosta tai ohjelman sisäänrakennetuista asetuksista."
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr "Painikkeen tila"
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr "Luettavan kehyksen numero"
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr "Valitsee luettavan kehyksen numeron"
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, fuzzy, no-c-format
 msgid "Duplex scan"
 msgstr "Kaksipuolinen"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid ""
 "Duplex scan provide a scan of the front and back side of the document"
 msgstr ""
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr "Kalibroi kuvanlukija"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr "Pakottaa kalibroinnin ennen kuvanlukua."
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr "Harmaasävy"
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr "Lue harmaasävykuva värikuvan sijaan"
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr "Analoginen vahvistus"
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr "Kasvattaa tai vähentää analogista vahvistusta CCD-kennossa."
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "Gamma-korjaus"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr "Valitsee gamma-korjauskäyrän"
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr ""
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr ""
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, fuzzy, no-c-format
 msgid "No transparency correction"
 msgstr "Värikorjaus"
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr ""
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr ""
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, fuzzy, no-c-format
 msgid "Negatives"
 msgstr "Negatiivi"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, fuzzy, no-c-format
 msgid "Slides"
 msgstr "Dia"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, fuzzy, no-c-format
 msgid "Normal speed"
 msgstr "Normaali"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, fuzzy, no-c-format
 msgid "1/2 normal speed"
 msgstr "2x2 normaali"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, fuzzy, no-c-format
 msgid "1/3 normal speed"
 msgstr "3x3 normaali"
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, fuzzy, no-c-format
 msgid "rounded parameter"
 msgstr "Epämääräiset parametrit"
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr ""
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, fuzzy, no-c-format
 msgid "ADF jam"
 msgstr "ADF"
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr ""
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, fuzzy, no-c-format
 msgid "lamp failure"
 msgstr "Gamma"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr ""
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr ""
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr ""
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr ""
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr ""
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, fuzzy, no-c-format
 msgid "transparency unit lamp failure"
 msgstr "Läpinäkyvyysyksikkö"
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr ""
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr ""
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr ""
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr ""
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr ""
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr ""
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr ""
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr ""
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr ""
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr ""
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr ""
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr ""
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr ""
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr ""
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr ""
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr ""
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr ""
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr ""
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr ""
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, fuzzy, no-c-format
 msgid "transparency unit shading error"
 msgstr "Läpinäkyvyysyksikkö"
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr ""
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, fuzzy, no-c-format
 msgid "film scanner"
 msgstr "Tasokuvanlukija"
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr "Tasokuvanlukija"
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr "Filmin tyyppi"
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr ""
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, fuzzy, no-c-format
 msgid "Negative film type"
 msgstr "Negatiivifilmi"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, fuzzy, no-c-format
 msgid "Selects the negative film type"
 msgstr "Valitse koekuva"
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, fuzzy, no-c-format
 msgid "Hardware resolution"
 msgstr "Kuvanluvun tarkkuus"
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, fuzzy, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "Näyttää lyhyen tarkkuuslistan"
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr ""
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, fuzzy, no-c-format
 msgid "Auto focus"
 msgstr "Automaattinen poisto"
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, fuzzy, no-c-format
 msgid "Enable/disable auto focus"
 msgstr "Poista esitarkennus"
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr ""
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr ""
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, fuzzy, no-c-format
 msgid "Manual focus position"
 msgstr "Korjaa tarkennuspiste"
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr ""
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr ""
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr ""
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "Peilikuva"
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, fuzzy, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "Peilaa kuvan vaakasuunnassa"
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, fuzzy, no-c-format
 msgid "Auto exposure"
 msgstr "Aseta valotusaika"
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, fuzzy, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr "Valotusajan asettaminen"
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, fuzzy, no-c-format
 msgid "Calibration now"
 msgstr "Kalibrointi"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, fuzzy, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Määrää kalibraatiotavan"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr ""
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr ""
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, fuzzy, no-c-format
 msgid "Reset scanner"
 msgstr "arkkisyöttöinen"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, fuzzy, no-c-format
 msgid "Reset the scanner"
 msgstr "arkkisyöttöinen"
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr ""
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, fuzzy, no-c-format
 msgid "Eject film after each scan"
 msgstr "Poista kohde kuvanluvun jälkeen"
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr ""
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr ""
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr ""
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr ""
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr ""
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, fuzzy, no-c-format
 msgid "Document feeder extras"
 msgstr "Asiakirjan syöttäjä"
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, fuzzy, no-c-format
 msgid "Flatbed only"
 msgstr "Taso"
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr ""
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, fuzzy, no-c-format
 msgid "Transparency unit"
 msgstr "Läpinäkyvyysyksikkö"
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr ""
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, fuzzy, no-c-format
 msgid "Negative film"
 msgstr "Negatiivifilmi"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, fuzzy, no-c-format
 msgid "Positive or negative film"
 msgstr "Positiivifilmi"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr ""
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr ""
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, fuzzy, no-c-format
 msgid "Transparency ratio"
 msgstr "Läpinäkyvyysyksikkö"
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, fuzzy, no-c-format
 msgid "Select film type"
 msgstr "Filmin tyyppi"
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, fuzzy, no-c-format
 msgid "Select the film type"
 msgstr "Valitsee rasterin"
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "Taso"
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, no-c-format
 msgid "ADF Front"
 msgstr ""
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, fuzzy, no-c-format
 msgid "ADF Back"
 msgstr "ADF"
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, fuzzy, no-c-format
 msgid "ADF Duplex"
 msgstr "Kaksipuolinen"
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, fuzzy, no-c-format
 msgid "Card Front"
 msgstr "Tulosta"
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, no-c-format
 msgid "Card Back"
 msgstr ""
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, fuzzy, no-c-format
 msgid "Card Duplex"
 msgstr "Kaksipuolinen"
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "Punainen"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "Vihreä"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "Sininen"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, fuzzy, no-c-format
 msgid "Enhance Red"
 msgstr "Parannus"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, fuzzy, no-c-format
 msgid "Enhance Green"
 msgstr "Parannus"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, fuzzy, no-c-format
 msgid "Enhance Blue"
 msgstr "Parannus"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr "Ei mikään"
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr ""
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr ""
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr "Yksipuolinen"
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr "Kaksipuolinen"
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr "Läpinäkyvyysyksikkö"
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr "Automaattinen syöttö"
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "Positiivifilmi"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "Negatiivifilmi"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr "Kohdistus lasissa"
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr "Kohdistus 2,5 mm lasin yläpuolella"
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr "Rasteri A (Hard Tone)"
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr "Rasteri B (Soft Tone)"
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr "Rasteri C (Net Screen)"
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr "Rasteri A (4x4 Bayer)"
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr "Rasteri B (4x4 Spiral)"
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr "Rasteri C (4x4 Net Screen)"
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr "Rasteri D (8x4 Net Screen)"
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr "Tekstin parannusmenetelmä"
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr "Ladattu kuvio A"
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr "Ladattu kuvio B"
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "Ei korjausta"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr "Käyttäjän määrittelemä"
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr "Matriisikirjoittimet"
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr "Lämpökirjoittimet"
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "Mustesuihkutulostimet"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr "Loisteputkinäytöt"
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "Oletus"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr "Korkeatarkkuuksinen tulostus"
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr "Matalatarkkuuksinen tulostus"
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr "Suuri kontrastinen tulostus"
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr "Käyttäjän määrittelemä (Gamma=1.0)"
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr "Käyttäjän määrittelemä (Gamma=1.8)"
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr "CD"
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr "A5 pysty"
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr "A5 vaaka"
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr "US-Letter"
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr "A4"
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "Koko alue"
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr "Lukutapa"
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr "Valitsee rasterin"
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr ""
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr ""
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr "Valitsee kirkkauden."
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr "Terävyys"
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr "Värikorjaus"
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr "Valitsee värikorjaustaulukon valitulle tuloslaitteelle."
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr "Värikorjauskertoimet"
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr "Matriisikerroin RGB:lle"
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr "Vihreän siirtymä punaiseen"
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr "Vihreän siirtymä siniseen"
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr "Punaisen siirtymä virheään"
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr "Punaisen siirtymä siniseen"
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr "Sinisen siirtymä vihreään"
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr "Sinisen siirtymä punaiseen"
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr "Määrää vihreän määrän"
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr "Lisää punaista vihreän määrän perusteella"
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr "Lisää sinistä vihreän määrän perusteella"
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr "Lisää vihreää punaisen määrän perusteella"
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr "Määrää punaisen määrän"
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr "Lisää sinistä punaisen määrän perusteella"
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr "Lisää vihreää sinisen määrän perusteella"
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr "Lisää punaista sinisen määrän perusteella"
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, no-c-format
 msgid "Controls blue level"
 msgstr "Määrää sinisen määrän"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr "Peilaa kuvan."
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr "Nopea esikatselu"
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr "Automaattinen osittelu"
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr "Lyhyt tarkkuuslista"
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr "Näyttää lyhyen tarkkuuslistan"
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr "Suurennus"
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr "Määrää kuvanlukijan käyttämän zoom-kertoimen"
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr "Nopea formaatti"
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr "Lisävaruste"
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr "Poista"
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr "Poista kohde syöttölaitteesta"
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr "Automaattinen poisto"
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr "Poista kohde kuvanluvun jälkeen"
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr "Syötttapa"
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr "Valitsee syöttötavan (yksi-/kaksipuolinen)"
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr "Taso"
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr "Valitsee kuvanluvun tasolta"
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
@@ -2061,23 +2046,23 @@ msgstr ""
 "Valitsee gamma-korjauksen esiasetettujen laitteiden listalta tai "
 "käyttäjän määrämän taulukon, joka voidaan siirtää kuvanlukijaan"
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr "Kohdistuspiste"
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
 msgstr "Asettaa kohdistuspisteen joko lasiin tai 2,5 mm sen yläpuolelle"
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr "Odota painiketta"
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
@@ -2086,366 +2071,1109 @@ msgstr ""
 "Kuvanlukukomennon lähettämisen jälkeen, odota kunnes kuvanlukijan "
 "painiketta todella painetaan, ennen kuvanluvun aloittamista."
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr ""
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, fuzzy, no-c-format
 msgid "Positive Slide"
 msgstr "Positiivifilmi"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, fuzzy, no-c-format
 msgid "Negative Slide"
 msgstr "Negatiivifilmi"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr ""
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, fuzzy, no-c-format
 msgid "User defined CCT profile"
 msgstr "Käyttäjän määrittelemä"
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr "Päällä"
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr "Poissa"
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr "Rasteri"
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, no-c-format
 msgid "Diffusion"
 msgstr ""
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, fuzzy, no-c-format
 msgid "White"
 msgstr "Valkotaso"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, fuzzy, no-c-format
 msgid "Black"
 msgstr "Mustataso"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, fuzzy, no-c-format
 msgid "Continue"
 msgstr "Ehdollinen"
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr ""
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr "Vaaka"
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, fuzzy, no-c-format
 msgid "Horizontal bold"
 msgstr "Vaaka"
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, fuzzy, no-c-format
 msgid "Horizontal narrow"
 msgstr "Vaaka"
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr "Pysty"
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, fuzzy, no-c-format
 msgid "Vertical bold"
 msgstr "Pysty"
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr ""
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr ""
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, fuzzy, no-c-format
 msgid "Front"
 msgstr "Tulosta"
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr ""
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
+msgid "Gamma function exponent"
 msgstr ""
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
 #, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
+msgid "Changes intensity of midtones"
+msgstr ""
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr ""
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr ""
+
+#: backend/fujitsu.c:3165
+#, fuzzy, no-c-format
+msgid "Halftone type"
+msgstr "Rasteri"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr ""
+
+#: backend/fujitsu.c:3210
+#, fuzzy, no-c-format
+msgid "Perform outline extraction"
+msgstr "Raakakalibrointi"
+
+#: backend/fujitsu.c:3221
+#, fuzzy, no-c-format
+msgid "Emphasis"
+msgstr "Kuvan korostus"
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr ""
+
+#: backend/fujitsu.c:3240
+#, fuzzy, no-c-format
+msgid "Separation"
+msgstr "Kylläisyys"
+
+#: backend/fujitsu.c:3241
+#, fuzzy, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr "Aseta automaattinen kynnysarvon päättely viivapiirrosta varten."
+
+#: backend/fujitsu.c:3252
+#, fuzzy, no-c-format
+msgid "Mirroring"
+msgstr "Peilikuva"
+
+#: backend/fujitsu.c:3253
+#, fuzzy, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "Peilaa kuvan vaakasuunnassa"
+
+#: backend/fujitsu.c:3270
+#, fuzzy, no-c-format
+msgid "White level follower"
+msgstr "Sinisen valkotaso"
+
+#: backend/fujitsu.c:3271
+#, fuzzy, no-c-format
+msgid "Control white level follower"
+msgstr "Määrää punaisen määrän"
+
+#: backend/fujitsu.c:3289
+#, fuzzy, no-c-format
+msgid "BP filter"
+msgstr "Väriviivapiirros"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr ""
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr "Pehmennys"
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr ""
+
+#: backend/fujitsu.c:3323
+#, fuzzy, no-c-format
+msgid "Gamma curve"
+msgstr "Gamma"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, fuzzy, no-c-format
+msgid "Threshold curve"
+msgstr "Kynnys"
+
+#: backend/fujitsu.c:3347
+#, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+
+#: backend/fujitsu.c:3369
+#, fuzzy, no-c-format
+msgid "Threshold white"
+msgstr "Kynnys"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr ""
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, fuzzy, no-c-format
+msgid "Noise removal"
+msgstr "Kohinan poisto"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr ""
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr ""
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr ""
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr ""
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr ""
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr ""
+
+#: backend/fujitsu.c:3508
+#, fuzzy, no-c-format
+msgid "Auto width detection"
+msgstr "Ei korjausta"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr ""
+
+#: backend/fujitsu.c:3526
+#, fuzzy, no-c-format
+msgid "Auto length detection"
+msgstr "Ei korjausta"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr ""
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr ""
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr ""
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr ""
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr ""
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr ""
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr ""
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
+msgstr ""
+
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3708
+#, fuzzy, no-c-format
+msgid "DF recovery mode"
+msgstr "Syöttötapa"
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr ""
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3748
+#, fuzzy, no-c-format
+msgid "Advanced paper protection"
+msgstr "Päivitä asetukset"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+
+#: backend/fujitsu.c:3768
+#, fuzzy, no-c-format
+msgid "Staple detection"
+msgstr "Ei korjausta"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr ""
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+
+#: backend/fujitsu.c:3809
+#, fuzzy, no-c-format
+msgid "Dropout color"
+msgstr "Valo päälle"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+
+#: backend/fujitsu.c:3833
+#, fuzzy, no-c-format
+msgid "Buffer mode"
+msgstr "Syöttötapa"
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr ""
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr ""
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr ""
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+
+#: backend/fujitsu.c:3911
+#, fuzzy, no-c-format
+msgid "Off timer"
+msgstr "Valo pois"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+
+#: backend/fujitsu.c:3930
+#, fuzzy, no-c-format
+msgid "Duplex offset"
+msgstr "Sinisen siirtymä"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr ""
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "Vihreän siirtymä"
+
+#: backend/fujitsu.c:3949
+#, fuzzy, no-c-format
+msgid "Adjust green/red offset"
+msgstr "Vihreän siirtymä"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr "Sinisen siirtymä"
+
+#: backend/fujitsu.c:3967
+#, fuzzy, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "Asettaa sinisen kanavan siirtymän"
+
+#: backend/fujitsu.c:3980
+#, no-c-format
+msgid "Low Memory"
+msgstr ""
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+
+#: backend/fujitsu.c:3996
+#, fuzzy, no-c-format
+msgid "Duplex side"
+msgstr "Kaksipuolinen"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
 msgstr ""
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr ""
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr ""
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
+msgstr ""
+
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr ""
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+
+#: backend/fujitsu.c:4095
+#, fuzzy, no-c-format
+msgid "Endorser Options"
+msgstr "Päivitä asetukset"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr ""
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr ""
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr ""
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr ""
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr ""
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr ""
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr ""
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr ""
+
+#: backend/fujitsu.c:4253
+#, fuzzy, no-c-format
+msgid "Endorser direction"
+msgstr "Kohinan poisto"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr ""
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr ""
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr ""
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr ""
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr ""
+
+#: backend/fujitsu.c:4344
+#, fuzzy, no-c-format
+msgid "A3 paper"
+msgstr "Paperilta"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4356
+#, fuzzy, no-c-format
+msgid "B4 paper"
+msgstr "Paperilta"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4368
+#, fuzzy, no-c-format
+msgid "A4 paper"
+msgstr "Paperilta"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4380
+#, fuzzy, no-c-format
+msgid "B5 paper"
+msgstr "Paperilta"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr ""
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr ""
+
+#: backend/fujitsu.c:4429
+#, no-c-format
+msgid "Scanner in power saving mode"
+msgstr ""
+
+#: backend/fujitsu.c:4452
+#, fuzzy, no-c-format
+msgid "Manual feed"
+msgstr "Manuaalinen esitarkennus"
+
+#: backend/fujitsu.c:4453
+#, fuzzy, no-c-format
+msgid "Manual feed selected"
+msgstr "Manuaalinen esitarkennus"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr ""
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr ""
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr ""
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr ""
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr ""
+
+#: backend/fujitsu.c:4513
+#, fuzzy, no-c-format
+msgid "Hardware error code"
+msgstr "Kuvanluvun tarkkuus"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr ""
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr ""
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr ""
+
+#: backend/fujitsu.c:4537
+#, fuzzy, no-c-format
+msgid "Imprinter ink level"
+msgstr "Valkotaso"
+
+#: backend/fujitsu.c:4548
+#, fuzzy, no-c-format
+msgid "Density"
+msgstr "Punaisen voimakkuus"
+
+#: backend/fujitsu.c:4549
+#, no-c-format
+msgid "Density dial"
+msgstr ""
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, fuzzy, no-c-format
+msgid "Duplex switch"
+msgstr "Kaksipuolinen"
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, fuzzy, no-c-format
 msgid "Extras"
 msgstr "Hyvin nopea"
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, fuzzy, no-c-format
-msgid "Threshold curve"
-msgstr "Kynnys"
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr ""
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
 "instead on hardware lineart."
 msgstr ""
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, fuzzy, no-c-format
 msgid "Disable interpolation"
 msgstr "Poista peruutus."
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
 "than the vertical resolution this disables horizontal interpolation."
 msgstr ""
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "Väriviivapiirros"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "Kalibrointi"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Määrää kalibraatiotavan"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Kalibrointitila"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, fuzzy, no-c-format
 msgid "Lamp off time"
 msgstr "Valo pois"
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
 "of 0 means, that the lamp won't be turned off."
 msgstr ""
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, fuzzy, no-c-format
 msgid "Lamp off during scan"
 msgstr "Raakakalibrointi"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr ""
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, fuzzy, no-c-format
 msgid "File button"
 msgstr "Odota painiketta"
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr ""
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, fuzzy, no-c-format
 msgid "Power button"
 msgstr "Odota painiketta"
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "Odota painiketta"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, fuzzy, no-c-format
 msgid "Need calibration"
 msgstr "Raakakalibrointi"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, fuzzy, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr "Pakottaa kalibroinnin ennen kuvanlukua."
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, fuzzy, no-c-format
 msgid "Buttons"
 msgstr "Painikkeen tila"
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr "Kalibroi"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, fuzzy, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "Aloita kalibrointi."
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, fuzzy, no-c-format
 msgid "Clear calibration"
 msgstr "Raakakalibrointi"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, fuzzy, no-c-format
 msgid "Clear calibration cache"
 msgstr "Kalibrointitila"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr "Läpinäkyvyysyksikkö"
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr ""
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr "Debug-asetukset"
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "Automaattinen lämmitys"
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -2454,12 +3182,12 @@ msgstr ""
 "Lämmittää kunnes lampun kirkkaus tasaantuu. Muuten lämmitetään 60 "
 "sekuntia."
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "Koko alue"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
@@ -2468,12 +3196,12 @@ msgstr ""
 "Lukee koko alueen, mukaan lukien kalibrointinauha. Ole varovainen. Älä "
 "valitse täyttä korkeutta. Tämä asetus on vain testausta varten."
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Raakakalibrointi"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2484,12 +3212,12 @@ msgstr ""
 "poissa, voit asettaa analogia-asetukset manuaalisesti. Asetus on "
 "oletuksena päällä. Tämä asetus on vain testausta varten."
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "Raakakalibrointi vain ensimmäisellä kuvanluvulla"
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2501,12 +3229,12 @@ msgstr ""
 "kirkkaus on eri joka kerralla, poista tämä asetus. Tämä asetus on "
 "testausta varten."
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, fuzzy, no-c-format
 msgid "Backtrack lines"
 msgstr "Käytä jäljitystä"
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2515,83 +3243,83 @@ msgid ""
 "omitting lines."
 msgstr ""
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Gamma"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr "Asettaa gamma-arvon kaikille kanaville."
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, fuzzy, no-c-format
 msgid "Geometry Group"
 msgstr "Geometria"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, fuzzy, no-c-format
 msgid "Scan Mode Group"
 msgstr "Lukutapa"
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr "Dia"
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, fuzzy, no-c-format
 msgid "Scanner model"
 msgstr "Lukutapa"
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, fuzzy, no-c-format
 msgid "Disable gamma correction"
 msgstr "Analoginen gammakorjaus"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, fuzzy, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "Gammakorjaus"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, fuzzy, no-c-format
 msgid "Disable white shading correction"
 msgstr "Vain sävykorjaus"
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2599,12 +3327,12 @@ msgid ""
 "avoids depth emulation."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, fuzzy, no-c-format
 msgid "Emulate Grayscale"
 msgstr "Harmaasävy"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2612,368 +3340,362 @@ msgid ""
 "circumstances."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
 "analyze them."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, fuzzy, no-c-format
 msgid "Reset chipset"
 msgstr "arkkisyöttöinen"
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, fuzzy, no-c-format
 msgid "Information"
 msgstr "Jätä kalibrointi huomiotta"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, fuzzy, no-c-format
 msgid "Chipset name"
 msgstr "Tiedostonimi"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Unknown"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, fuzzy, no-c-format
 msgid "Shows the chipset ID"
 msgstr "arkkisyöttöinen"
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, fuzzy, no-c-format
 msgid "Scan counter"
 msgstr "Lähde"
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, fuzzy, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr "Valitsee luettavan kehyksen numeron"
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, fuzzy, no-c-format
 msgid "Update information"
 msgstr "Päivitä asetukset"
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, fuzzy, no-c-format
 msgid "offset X"
 msgstr "Siirtymä"
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, fuzzy, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr "Kuva-alueen vasemman yläkulman x-koordinaatti."
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, fuzzy, no-c-format
 msgid "offset Y"
 msgstr "Siirtymä"
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, fuzzy, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr "Kuva-alueen vasemman yläkulman x-koordinaatti."
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, fuzzy, no-c-format
 msgid "Switches the lamp on or off."
 msgstr "Asettaa valon päälle/pois"
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr ""
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr "ADF"
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, fuzzy, no-c-format
 msgid "TMA Slides"
 msgstr "Dia"
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, fuzzy, no-c-format
 msgid "TMA Negatives"
 msgstr "Negatiivi"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, fuzzy, no-c-format
 msgid "Color (48 bits)"
 msgstr "Väri 48"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, fuzzy, no-c-format
 msgid "Extend lamp timeout"
 msgstr "Valo pois"
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr ""
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr "Odota painiketta"
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, fuzzy, no-c-format
 msgid "Waits for button before scanning"
 msgstr "Lämmitä lamppu ennen kuvanlukua"
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, fuzzy, no-c-format
 msgid "Advanced Options"
 msgstr "Päivitä asetukset"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr "Raaka"
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr "Hieno"
 
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr "Bayer"
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr "Oma"
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "Automaattinen"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr "NTSC-RGB"
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr "XPA-RGB"
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr ""
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "NTSC-harmaa"
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr "XPA-harmaa"
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "Hidas"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr "Normaali"
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "Nopea"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr "Hyvin nopea"
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr "2 pikseliä"
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr "4 pikseliä"
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr "8 pikseliä"
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr "Tulosta"
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, no-c-format
 msgid "Film-strip"
 msgstr "Filmiliuska"
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr "XPA"
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr "Ehdollinen"
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, fuzzy, no-c-format
 msgid "Experiment"
 msgstr "Valotusaika"
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, no-c-format
 msgid "Sharpening"
 msgstr "Terävöinti"
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr "Aseta terävöintiarvo."
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr "Automaatinen kynnys"
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr "Aseta automaattinen kynnysarvon päättely viivapiirrosta varten."
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr "Pehmennys"
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr "Valitse pehmennyssuodatin."
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr "Poista media kuvanluvun jälkeen"
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, no-c-format
 msgid "Unloads the media after a scan."
 msgstr "Poistaa median kuvanluvun jälkeen."
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, no-c-format
 msgid "Change document"
 msgstr "Vaihda kohde"
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr "Vaihda kohde."
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr "Poista"
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr "Poista kohde."
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, no-c-format
 msgid "Start calibration process."
 msgstr "Aloita kalibrointi."
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, no-c-format
 msgid "Media"
 msgstr "Media"
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr "Valitse media"
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr "Valotusaika"
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -2986,463 +3708,462 @@ msgstr ""
 "\" negatiivifilmeille. Tummille (alivalottuneille) kuville, voit "
 "kasvattaa tätä arvoa."
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, no-c-format
 msgid "Color Matrix"
 msgstr "Värimatriisi"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, no-c-format
 msgid "Set the scanners color matrix."
 msgstr "Aseta kuvanlukijan värimatriisi."
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr "Oma värimatriisi."
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, no-c-format
 msgid "Mono Color Matrix"
 msgstr "Yksivärinen matriisi"
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr "Oma värimatriisi harmaasävy lukua varten."
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, no-c-format
 msgid "Mirror horizontal"
 msgstr "Peilaa vaakasuunnassa"
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, no-c-format
 msgid "Mirror image horizontally."
 msgstr "Peilaa kuvan vaakasuunnassa"
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, no-c-format
 msgid "Mirror vertical"
 msgstr "Peilaa pystysuunnassa"
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, no-c-format
 msgid "Mirror image vertically."
 msgstr "Peilaa kuvan pystysuunnassa."
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, no-c-format
 msgid "Update options"
 msgstr "Päivitä asetukset"
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, no-c-format
 msgid "Update options."
 msgstr "Päivittää asetukset."
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr "8-bittinen tulos"
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr ""
 "Käyttää sisäisesti kahdeksaa bittiä syvempää esitystä, mutta antaa "
 "tuloksen vain kahdeksanbittisenä."
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr "Odota painiketta"
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr ""
 "Odottaa kuvanlukijan painikkeen painamista ennen kuvanluvun alkamista."
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr "Sulje lamppu"
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr "Sulkee kuvanlukijan lampun."
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "Paperin koko"
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr "Automaattinen osiointi"
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, fuzzy, no-c-format
 msgid "Landscape"
 msgstr "A5 vaaka"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr ""
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, no-c-format
 msgid "Length control mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, fuzzy, no-c-format
 msgid "Manual feed mode"
 msgstr "Manuaalinen esitarkennus"
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, fuzzy, no-c-format
 msgid "Manual feed timeout"
 msgstr "Manuaalinen esitarkennus"
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr "Kaksipuolinen kuvanluku"
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr "Paperin koko syöttölaitteessa"
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, fuzzy, no-c-format
 msgid "halftone"
 msgstr "Rasteri"
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, fuzzy, no-c-format
 msgid "color"
 msgstr "Väri"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, fuzzy, no-c-format
 msgid "continuous"
 msgstr "Ehdollinen"
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, fuzzy, no-c-format
 msgid "off"
 msgstr "Poissa"
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, fuzzy, no-c-format
 msgid "bayer_64"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, fuzzy, no-c-format
 msgid "bayer_16"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, fuzzy, no-c-format
 msgid "halftone_32"
 msgstr "Rasteri"
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, fuzzy, no-c-format
 msgid "halftone_64"
 msgstr "Rasteri"
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, no-c-format
 msgid "diffusion"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, fuzzy, no-c-format
 msgid "normal"
 msgstr "Normaali"
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, fuzzy, no-c-format
 msgid "light"
 msgstr "Korostus"
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, fuzzy, no-c-format
 msgid "From scanner"
 msgstr "Tasokuvanlukija"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr "Paperilta"
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, fuzzy, no-c-format
 msgid "default"
 msgstr "Oletus"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, fuzzy, no-c-format
 msgid "smooth"
 msgstr "Pehmeä"
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, fuzzy, no-c-format
 msgid "low"
 msgstr "Hidas"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, fuzzy, no-c-format
 msgid "medium"
 msgstr "Keskitaso"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, fuzzy, no-c-format
 msgid "red"
 msgstr "Punainen"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, fuzzy, no-c-format
 msgid "green"
 msgstr "Vihreä"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, fuzzy, no-c-format
 msgid "Sets the scan source"
 msgstr "Lähde"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr "Syöttötapa"
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr "Asettaa syöttötavan"
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, fuzzy, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr "Poista esitarkennus"
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, fuzzy, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr "Poista esitarkennus"
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, fuzzy, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "Asettaa syöttötavan"
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, fuzzy, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr "Asettaa syöttötavan"
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr "Automaattinen kynnys"
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
@@ -3451,556 +4172,543 @@ msgstr ""
 "Asettaa automaattisesti kirkkauden, kontrastin, valkotasapainon, gamman, "
 "kohinan poiston ja korostuksen"
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "Kohinan poisto"
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr "Vähentää yksittäistä pistekohinaa"
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr "Kuvan korostus"
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr "Asettaa kuvan korostuksen"
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, fuzzy, no-c-format
 msgid "Lamp color"
 msgstr "Valo päälle"
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, fuzzy, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr "Asettaa valon päälle/pois"
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, fuzzy, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "Peilaa kuvan pystysuunnassa."
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
 "length of actual paper or logical document length."
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "Gammakorjaus"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, fuzzy, no-c-format
 msgid "High sensivity"
 msgstr "Korkeatarkkuuksinen tulostus"
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, fuzzy, no-c-format
 msgid "Low sensivity"
 msgstr "Matalatarkkuuksinen tulostus"
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, no-c-format
 msgid "err_diffusion"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, fuzzy, no-c-format
 msgid "No detection"
 msgstr "Ei korjausta"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, fuzzy, no-c-format
 msgid "Normal mode"
 msgstr "Normaali"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, fuzzy, no-c-format
 msgid "Enhanced mode"
 msgstr "Parannus"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
 "divides long paper by the length which is set in Document Size option."
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, fuzzy, no-c-format
 msgid "Automatic threshold mode"
 msgstr "Automaattinen kynnys"
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, fuzzy, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr "Automaattinen kynnys"
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, fuzzy, no-c-format
 msgid "Set chroma of red"
 msgstr "Aseta kehysten järjestys"
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, fuzzy, no-c-format
 msgid "chroma of blue"
 msgstr "Sinisen varjo"
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, fuzzy, no-c-format
 msgid "Set chroma of blue"
 msgstr "Punaisen siirtymä siniseen"
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr "Timantti"
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr "8x8 raaka lihavointi"
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr "8x8 hieno lihavointi"
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr "8x8 Bayer"
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr "8x8 pystyviiva"
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr "Vahvistus"
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr "Värikanavien vahvistus"
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, no-c-format
 msgid "Gray gain"
 msgstr "Harmaan vahvistus"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr "Asettaa harmaan kanavan vahvistusta"
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, no-c-format
 msgid "Red gain"
 msgstr "Punaisen vahvistus"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr "Asettaa punaisen kanavan vahvistusta"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, no-c-format
 msgid "Green gain"
 msgstr "Vihreän vahvistus"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr "Asettaa vihreän kanavan vahvistusta"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, no-c-format
 msgid "Blue gain"
 msgstr "Sinisen vahvistus"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr "Asettaa sinisen kanavan vahvistusta"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr "Bayer-rasteri 16"
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr "Bayer-rasteri 64"
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr "Taseteripiste 32"
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr "Rasteripiste 64"
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr ""
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr "Tila 1"
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr "Tila 2"
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr "Tila 3"
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr ""
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr "Pehmeä"
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr "Matala"
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr "Keskitaso"
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr "Korkea"
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr "Loisteputki"
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "Yksi sivu"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "Kaikki sivut"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr "arkkisyöttöinen"
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr "Harmaasävy 4 bittiä"
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr "Harmaasävy 8 bittiä"
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr "Varjo, keskisävy, korostus, valotusaika"
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr "Erikoisasetukset"
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr "Väritasapaino"
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr "Poista peruutus."
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr "Kuvanlukija ei peruuta."
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr "Kuvanlukijan valo päälle/pois"
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr "Asettaa kuvanlukijan valon päälle/pois"
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr "Ajuri kalibroi"
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid ""
 "If checked the color calibration before a scan is done by the backend"
 msgstr "Ajuri tekee värikalibroinnin."
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr "Käytä lightlid-35mm sovitinta"
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr "Tämä asetus sulkee kuvanlukijan lampun kuvanluvun ajaksi"
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "Paras laatu"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr "Paras laatu, mutta hitain"
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "Nopea"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr "Nopea, mutta huonolaatuinen"
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr "Automaattinen kynnyksen asetus"
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
@@ -4008,273 +4716,273 @@ msgid ""
 msgstr ""
 "Jos valittu, ajuri yrittää automaattisesti selvittää parhaan kynnyksen."
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr "Valitsee gammakorjaustilan."
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr "Sido gamma"
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr "Käytä gamma-arvoja kaikille värikanaville."
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr "Gamma"
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr "Asettaa arvon gammakorjaukselle."
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr "Gamma punainen"
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr "Asettaa arvon gammakorjaukselle (punainen kanava)"
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr "Gamma vihreä"
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr "Asettaa arvon gammakorjaukselle (vihreä kanava)"
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr "Gamma sininen"
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr "Asettaa arvon gammakorjaukselle (sininen kanava)"
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr "Kanava"
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
 msgstr "Valitsee värikaistan, \"Master\" tarkoittaa kaikkia värejä."
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr "Keskisävy"
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr "Asettaa kirkkaustason, joka tulkitaan \"50% vihreäksi\"."
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr "Punaisen keskisävy"
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr "Asettaa kirkkaustason, joka tulkitaan \"50% punaiseksi\"."
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr "Vihreän keskisävy"
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr "Asettaa kirkkaustason, joka tulkitaan \"50% vihreäksi\"."
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr "Sinisen keskisävy"
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr "Asettaa kirkkaustason, joka tulkitaan \"50% siniseksi\"."
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr "Punatasapaino"
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr "Tasapainokerroin punaiselle. 100% tarkoittaa: ei korjausta."
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr "Vihertasapaino"
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr "Tasapainokerroin vihreälle. 100% tarkoittaa: ei korjausta."
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr "Sinitasapaino"
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr "Tasapainokerroin siniselle. 100% tarkoittaa: ei korjausta."
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr "Firmware-tasapaino"
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr "Asettaa väritasapainot Firmwaressa oleviin arvoihin."
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "Hitain"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "Hitaampi"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "Nopeampi"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "Nopein"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr "8x8 raaka"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr "8x8 normaali"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr "8x8 hieno"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr "8x8 tosi hieno"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr "6x6 normaali"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr "5x5 raaka"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr "5x5 hieno"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr "4x4 raaka"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr "4x4 normaali"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr "4x4 hieno"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr "3x3 normaali"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr "2x2 normaali"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr "8x8 oma"
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr "6x6 oma"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr "5x5 oma"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr "4x4 oma"
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr "3x3 oma"
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr "2x2 oma"
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr "Nopea harmaa"
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr "Lue nopeassa harmaassa tilassa (huonompi laatu)."
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
@@ -4283,117 +4991,117 @@ msgstr ""
 "Kaikki esikatselut luetaan nopeimmalla tavalla (huonoimmalla laadulla). "
 "Tämä voi olla väritön matalatarkkuuksinen tila."
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, fuzzy, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr "Valo pois lopetettaessa"
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr ""
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, fuzzy, no-c-format
 msgid "Turn lamp off"
 msgstr "Asettaa valon päälle/pois"
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, fuzzy, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr "Asettaa kuvanlukijan valon päälle/pois"
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr "Punaisen kirkkaus"
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr "Asettaa punaisen kanavan kirkkauden."
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr "Vihreän kirkkaus"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr "Asettaa vihreän kanavan kirkkauden."
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr "Sinisen kirkkaus"
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr "Asettaa sinisen kanavan kirkkauden."
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "Punaisen kontrasti"
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr "Asettaa punaisen kanavan kontrastin."
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "Vihreän kontrasti"
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr "Asettaa vihreän kanavan kontrastin."
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "Sinisen kontrasti"
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr "Asettaa sinisen kanavan kontrastin."
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr "Väri 48"
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr "Väri 24"
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr "Harmaasävy 16"
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr "Harmaasävy 8"
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, fuzzy, no-c-format
 msgid "Positive"
 msgstr "Positiivifilmi"
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -4402,39 +5110,39 @@ msgstr ""
 "Lämmittää kunnes lampun kirkkaus tasaantuu. Muuten lämmitetään 40 "
 "sekuntia."
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, fuzzy, no-c-format
 msgid "Negative color"
 msgstr "Negatiivifilmi"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, fuzzy, no-c-format
 msgid "Negative gray"
 msgstr "Negatiivi"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, no-c-format
 msgid "48 bits color"
 msgstr ""
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
 "mode and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4442,248 +5150,239 @@ msgid ""
 "cancel, press \"GRAY\" button."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:143
-#, no-c-format
-msgid "Gamma function exponent"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:144
-#, no-c-format
-msgid "Changes intensity of midtones"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:232
 #, fuzzy, no-c-format
 msgid "Update button state"
 msgstr "Painikkeen tila"
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:244
 #, fuzzy, no-c-format
 msgid "Button 1"
 msgstr "Painikkeen tila"
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:258
 #, fuzzy, no-c-format
 msgid "Button 2"
 msgstr "Painikkeen tila"
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr ""
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr ""
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr "Läpinäkyvyys"
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr ""
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr ""
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr ""
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, fuzzy, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "Raakakalibrointi"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr ""
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, fuzzy, no-c-format
 msgid "Calibration data cache"
 msgstr "Kalibrointitila"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr ""
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, fuzzy, no-c-format
 msgid "Performs calibration"
 msgstr "Raakakalibrointi"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr ""
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr ""
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, fuzzy, no-c-format
 msgid "Warmup-time"
 msgstr "Lämmitä lamppu"
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, no-c-format
 msgid "Warmup-time in seconds."
 msgstr ""
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, fuzzy, no-c-format
 msgid "Lampoff-time"
 msgstr "Valo pois"
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr ""
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, fuzzy, no-c-format
 msgid "Analog frontend"
 msgstr "Analoginen gamma (punainen)"
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr "Punaisen siirtymä"
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr "Vihreän siirtymä"
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr "Sinisen siirtymä"
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, fuzzy, no-c-format
 msgid "Red lamp off"
 msgstr "Asettaa valon päälle/pois"
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, fuzzy, no-c-format
 msgid "Green lamp off"
 msgstr "Asettaa valon päälle/pois"
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, fuzzy, no-c-format
 msgid "Blue lamp off"
 msgstr "Asettaa valon päälle/pois"
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr ""
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr "Väri 36"
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr "Rasteri 1"
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr "Rasteri 2"
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr "Satunnaista"
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr "Lähteen valinta"
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr "Kuvan parannus"
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr "Harmaannuta"
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr "Lataa kuva harmaasävykuvana."
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr "Kolmivaihesimulaatio"
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
@@ -4692,12 +5391,12 @@ msgstr ""
 "Simuloi kolmivaiheskanneria palauttamalla kolme erillistä kehystä. Huvin "
 "vuoksi se palauttaa kehykset järjestyksessä: vihreä, sininen, punainen."
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr "Käsikuvanlukijasimulaatio"
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4708,48 +5407,48 @@ msgstr ""
 "etukäteen. Sen sijaan, ne palauttavat kuvan korkeudeksi -1. Tällä "
 "asetuksella voidaan kokeilla, selviääkö käyttöliittymä tästä oikein."
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid ""
 "Set default values for enhancement controls (brightness & contrast)."
 msgstr "Asettaa oletusarvot parantimille (kirkkaus ja kontrasti)"
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr "Vain-luku kokeiluasetus"
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr "Katsotaanko osaako käyttöliittymä käsitellä tämän oikein"
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr "Gammataulukot"
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr "Paluuarvosimulaatio"
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr "Ei pakoteta paluuarvoa"
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr "Ei pakoteta ajuria palauttamaan statuskoodia."
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr "Palauta SANE_STATUS_EOF"
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
@@ -4758,12 +5457,12 @@ msgstr ""
 "Pakota ajuri palauttamaan paluuarvo SANE_STATUS_EOF, kun sane_read() on "
 "kutsuttu."
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr "Palauta SANE_STATUS_JAMMED"
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
@@ -4772,12 +5471,12 @@ msgstr ""
 "Pakota ajuri palauttamaan paluuarvo SANE_STATUS_JAMMED, kun sane_read() "
 "on kutsuttu."
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr "Palauta SANE_STATUS_NO_DOCS"
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
@@ -4786,12 +5485,12 @@ msgstr ""
 "Pakota ajuri palauttamaan paluuarvo SANE_STATUS_NO_DOCS, kun sane_read() "
 "on kutsuttu."
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr "Palauta SANE_STATUS_COVER_OPEN"
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
@@ -4800,12 +5499,12 @@ msgstr ""
 "Pakota ajuri palauttamaan paluuarvo SANE_STATUS_COVER_OPEN, kun "
 "sane_read() on kutsuttu."
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr "Palauta SANE_STATUS_IO_ERROR"
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
@@ -4814,12 +5513,12 @@ msgstr ""
 "Pakota ajuri palauttamaan paluuarvo SANE_STATUS_IO_ERROR, kun "
 "sane_read() on kutsuttu."
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr "Palauta SANE_STATUS_NO_MEM"
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
@@ -4828,12 +5527,12 @@ msgstr ""
 "Pakota ajuri palauttamaan paluuarvo SANE_STATUS_NO_MEM, kun sane_read() "
 "on kutsuttu."
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr "Palauta SANE_STATUS_ACCESS_DENIED"
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
@@ -4842,85 +5541,82 @@ msgstr ""
 "Pakota ajuri palauttamaan paluuarvo SANE_STATUS_ACCESS_DENIED, kun "
 "sane_read() on kutsuttu."
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr ""
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr "Valo päälle"
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr "Laittaa kuvanlukijan valon päälle"
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr "Valo pois"
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr "Sammuttaa kuvanlukijan valon"
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, fuzzy, no-c-format
 msgid "Lamp timeout"
 msgstr "Valo pois"
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr ""
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr "Asiakirjan syöttäjä"
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr "6x4 (tuumaa)"
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr "8x10 (tuumaa)"
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr "8.5x11 (tuumaa)"
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr "Rasterointi ei ole tuettu"
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr "Hajapisteet 8x8"
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr "Hajapisteet 16x16"
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -4936,27 +5632,27 @@ msgstr ""
 "käyttöliittymät voivat lakata vastaamasta X-tapahtumiin ja järjestelmä "
 "saattaa kaatua."
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr ""
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr ""
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, fuzzy, no-c-format
 msgid "Focus point for scanning."
 msgstr "Poista kohde kuvanluvun jälkeen"
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr "Esikatselutila"
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
@@ -4965,12 +5661,12 @@ msgstr ""
 "Valitse esikatselutila. Harmaasävy antaa yleensä parhaan yhdistelmän "
 "nopeutta ja yksityiskohtia"
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr "Esimääritetyt asetukset"
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
@@ -4978,97 +5674,97 @@ msgid ""
 msgstr ""
 "Tarjoaa vakioalueet valokuville ja tulostetuille sivuille ja vastaaville."
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr ""
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, fuzzy, no-c-format
 msgid "Frame to be scanned"
 msgstr "Tasokuvanlukija"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, no-c-format
 msgid "Focus-mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, fuzzy, no-c-format
 msgid "Auto or manual focus"
 msgstr "Automaattinen poisto"
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, fuzzy, no-c-format
 msgid "Focus-point"
 msgstr "Kohdistuspiste"
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, fuzzy, no-c-format
 msgid "Focus point"
 msgstr "Kohdistuspiste"
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr "Väririvejä / luku"
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr "Harmaasävyrivejä / luku"
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr ""
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr "Väri RAW"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr "Väri RGB"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr "Väri RGB TEKSTI"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr "Täysi musta"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr "Täysi valkoinen"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr "Värikuvio"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr "Ruudukko"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr "Ensimmäinen"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr "Toinen"
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
@@ -5077,12 +5773,12 @@ msgstr ""
 "Tämä on erittäin pitkä kolmas rivi. Ehkä käyttöliittymä keksii miten se "
 "näytetään"
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr "Käsikuvanlukijasimulaatio"
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5095,12 +5791,12 @@ msgstr ""
 "mahdollistaa osaako ohjelma käsitellä tätä tilannetta. Tämä asetus "
 "asettaa kuvan leveydeksi 11 cm."
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr "Kolmivaihesimulaatio"
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
@@ -5108,34 +5804,34 @@ msgid ""
 msgstr ""
 "Simuloi kolmivaihekuvanlukijaa. Väritilassa, kolme kehystä lähetetään."
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr "Aseta kehysten järjestys"
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr "Asettaa kehysten järjestyksen kolmivaihetilassa."
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
 "after 10 scans."
 msgstr ""
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr "Erikoisasetukset"
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr "Valitse koekuva"
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5151,12 +5847,12 @@ msgstr ""
 "Värikuvio: piirtää erilaisia värikuvioita tilasta riippuen.\n"
 "Ruudukko: piirtää mustavalkoruudukon 10 mm ruuduilla."
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr "Käännä tavujärjestys"
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5167,55 +5863,55 @@ msgstr ""
 "toiminnolla voidaan kokeilla 16-bittisiä tiloja käyttöliittymissä, esim. "
 "käyttääkö käyttöliittymä oikeaa tavujärjestystä."
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr "Lukuraja"
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 "Rajoittaa tiedon määrää, joka voidaan lukea yhdellä sane_read()-kutsulla."
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr "Lukurajan koko"
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
 msgstr "Suurin tiedon määrä, joka välitetään yhdellä sane_read()-kutsulla."
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr "Lukuviive"
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr "Viivästää tiedon siirtoa."
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr "Lukuviiveen kesto"
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
 msgstr "Kuinka kauan odotetaan jokaisen lähetetyn puskurin jälkeen."
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr "sane_read() paluuarvo"
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
@@ -5226,22 +5922,22 @@ msgstr ""
 "kuvanluvun käsittely. Kaikki muut paluuarvot ovat käyttöliittymän "
 "testaamista varten."
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr "Kadonneita pikseleitä / rivi"
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr "Rivin lopusta puuttuvien pikselien määrä."
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr "Epämääräiset parametrit"
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
@@ -5250,22 +5946,22 @@ msgstr ""
 "Palauttaa epämääräisiä rivejä ja tavuja, kun sane_parameters() kutsutaan "
 "ennen sane_start()."
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr "Käytä non-blocking IO"
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr "sane_read käyttää non-blocking IO:ta."
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr "Tarjoa select file descriptor"
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
@@ -5274,12 +5970,12 @@ msgstr ""
 "Tarjoaa select file descriptorin, jolla voidaan tarkistaa palauttaisiko "
 "sane_read() dataa."
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr "Kokeiluasetukset päälle"
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
@@ -5288,27 +5984,27 @@ msgstr ""
 "Asettaa päälle useita kokeiluasetuksia. Asetuksilla voidaan tarkistaa "
 "käyttöliittymän kyky näyttää ja muokata kaikenlaisia SANE-asetuksia."
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr "Tulostusasetukset"
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr "Tulosta lista kaikista asetuksista"
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr "Boolen kokeiluasetukset"
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr "(1/6) Boolen pehmovalinta pehmotunnistus"
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
@@ -5317,12 +6013,12 @@ msgstr ""
 "(1/6) Boolen kokeiluasetus, jolla on pehmovalinta- ja pehmotunnistus- "
 "ominaisuuksia. Se on vain tavallinen boolen asetus."
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr "(2/6) Boolen kovavalinta pehmotunnistus"
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
@@ -5333,12 +6029,12 @@ msgstr ""
 "tarkoittaa, että käyttöliittymä ei voi itse muttaa asetusta, mutta "
 "käyttäjä voi (esim. painamalla painiketta laitteessa)."
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr "(3/6) Boolen kovavalinta"
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5350,12 +6046,12 @@ msgstr ""
 "painamalla painiketta laitteessa), eikä käyttöliittymä voi lukea "
 "asetusta."
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr "(4/6) Boolen pehmotunnistus"
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
@@ -5364,12 +6060,12 @@ msgstr ""
 "(4/6) Boolen kokeiluasetus, jolla on pehmotunnistus. Se tarkoittaa, että "
 "asetus voidaan vain lukea."
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr "(5/6) Boolen pehmovalinta ja pehmotunnistus emuloita"
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
@@ -5378,12 +6074,12 @@ msgstr ""
 "(5/6) Boolen kokeiluasetus, jolla on pehmovalinta, pehmotunnistus ja "
 "emulointi."
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr "(6/6) Boolen pehmovalinta pehmotunnistus auto"
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5393,27 +6089,27 @@ msgstr ""
 "(6/6) Boolen kokeiluasetus, jolla on pehmovalinta, pehmotunnitus ja "
 "automaattiominaisuudet. Ajuri voi säätää tätä asetusta automaattisesti."
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr "Kokonaislukukokeiluasetukset"
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr "(1/6) Kokonaisluku"
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr "(1/6) Kokonaisluku ilman yksikköä ja rajoituksia."
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr "(2/6) Kokonaisluku aluerajoituksella"
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
@@ -5422,22 +6118,22 @@ msgstr ""
 "(2/6) Koknaisluku pikseli-yksiköllä ja aluerajoituksella. Minimi on 4, "
 "maksimi 192, ja askel on 2."
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr "(3/6) Kokonaisluku sanalistalla"
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr "(3/6) Kokonaisluku bitti-yksiköllä ja sanalistarajoituksella."
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr "(4/6) Kokonaislukutaulukko"
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
@@ -5445,12 +6141,12 @@ msgid ""
 msgstr ""
 "(4/6) Kokonaisluku mm-yksiköllä käyttäen taulukkoa ilman rajoituksia."
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr "(5/6) Kokonaislukutaulukko aluerajoituksella"
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
@@ -5459,12 +6155,12 @@ msgstr ""
 "(5/6) Kokonaisluku dpi-yksiköllä ja taulukolla aluerajoituksella. Minimi "
 "on 4, maksimi 192, ja askel on 2."
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr "(6/6) Kokonaislukutaulukko sanalistalla"
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
@@ -5473,27 +6169,27 @@ msgstr ""
 "(6/6) Kokonaisluku prosenttiyksiköllä ja taulukolla "
 "sanalistarajoituksella."
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr "Murtolukukokeiluasetukset"
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr "(1/3) Murtoluku"
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr "(1/3) Murtoluku kokeiluasetus ilman yksikköä ja rajoituksia."
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr "(2/3) Murtoluku aluerajoituksella"
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
@@ -5502,205 +6198,209 @@ msgstr ""
 "(2/3) Murtoluku kokeiluasetus mikrosekunti-yksiköllä ja "
 "aluerajoituksella. Minimi on -42,17, maksimi 32767,9999, ja askel on 2,0."
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr "(3/3) Murtoluku rajoituksella ja sanalistalla"
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 "(3/3) Murtolukukokeiluasetus ilman yksikköä, rajoituksella ja "
 "sanalistalla."
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr "Merkkijonokokeiluasetukset"
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr "(1/3) Merkkijono"
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr "(1/3) Merkkijono ilman rajoituksia."
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr "(2/3) Merkkijono sanalistalla"
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr "(2/3) Merkkijono sanalistarajoituksella"
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr "(3/3) Merkkijono pitkällä sanalistalla"
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
 "entries..."
 msgstr "(3/3) Merkkijono sanalistalla. Sanalista sisältää enemmän sanoja."
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr "Painikekokeiluasetukset"
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr "(1/1) Painike"
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr "(1/1) Painike. Tulostaa tekstiä."
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, no-c-format
 msgid "Color 36"
 msgstr "Väri 36"
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr "Käytä kuvanasettelua"
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr "Kaksitasoinen mustavalko (viivapiirros)"
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr "Rasteroitu mustavalko"
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr "Harmaasävy"
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr "Monitaso RGB-väri (yksivaihe)"
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr "Jätä kalibrointi huomiotta"
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr "Poista esitarkennus"
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr "Ei kalibroida tarkennusta"
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr "Manuaalinen esitarkennus"
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr "Korjaa tarkennuspiste"
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr "Linssin tarkennus kohteeseen"
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr "Tarkentaa linssin tarkennuksen kohteeseen"
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr "Pidikkeen tarkennuspiste 0mm"
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr "Käytä 0mm pidikkeen tarkennuspisteenä 0,6mm sijaan"
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr "Kalibrointitila"
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr "Määrää kalibraatiotavan"
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr "Asettaa valon päälle/pois"
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr "UTA päällä"
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr "Asettaa UTAN päälle/pois"
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr "Siirtymä"
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr "Värikanavien siirtymä"
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, no-c-format
 msgid "Gray offset"
 msgstr "Harmaan siirtymä"
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr "Asettaa harmaan kanavan siirtymän"
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr "Asettaa punaisen kanavan siirtymän"
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr "Asettaa vihreän kanavan siirtymän"
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr "Asettaa sinisen kanavan siirtymän"
 
+#, fuzzy
+#~ msgid "IPC mode"
+#~ msgstr "Esikatselutila"
+
 #~ msgid "Grayscale"
 #~ msgstr "Harmaasävy"
 
diff --git a/po/fr.gmo b/po/fr.gmo
new file mode 100644
index 0000000..ea03247
--- /dev/null
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 80459bb..c921e70 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -43,423 +43,417 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends 1.0.19\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
 "PO-Revision-Date: 2008-01-17 22:25+0100\n"
 "Last-Translator: Yann E. MORIN <yann dot morin dot 1998 at anciens dot "
 "enib dot fr>\n"
 "Language-Team:\n"
-"Language: \n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr "Nombre d'options"
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr "Général"
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "Aire de numérisation"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "Réglages fins"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "Avancé"
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr "Capteurs"
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "Aperçu"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr "Force l'aperçu en noir et blanc"
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr "Profondeur"
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Mode de numérisation"
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "Vitesse de numérisation"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr "Source de numérisation"
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr "Forcer l'utilisation du retour arrière"
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "X haut-gauche"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "Y haut-gauche"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "X bas-droit"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "Y bas-droit"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Echantillonnage"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "Echantillonnage X"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Echantillonnage Y"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr "Largeur de la page"
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, no-c-format
 msgid "Page height"
 msgstr "Hauteur de la page"
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr "Utiliser une table gamma personnalisée"
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr "Intensité de l'image"
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr "Intensité rouge"
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr "Intensité verte"
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr "Intensité bleue"
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr "Luminosité"
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr "Grain"
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr "Demi-teinte"
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "Niveau noir"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "Niveau blanc"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr "Niveau blanc des rouges"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
 msgstr "Niveau blanc des verts"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr "Niveau blanc des bleus"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "Ombré"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr "Ombré rouge"
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr "Ombré vert"
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr "Ombré bleu"
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr "Contraste"
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr "Contraste rouge"
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr "Contraste vert"
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr "Contraste bleu"
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr "Teinte"
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr "Saturation"
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr "Taille du motif demi-teinte"
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "Motif demi-teinte"
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr "Lier les échantillonnage X et Y"
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "Négatif"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "Calibration de la qualité"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr "Doubler la résolution optique"
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr "Lier RVB"
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr "Seuil"
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr "Correction gamma analogique"
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr "Gamma analogique rouge"
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr "Gamma analogique vert"
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr "Gamma analogique bleu"
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr "Lier les gamma analogiques RVB"
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr "Préchauffage de la lampe"
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr "Calibrer le temps d'exposition"
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr "Calibrer le temps d'exposition pour le rouge"
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr "Calibrer le temps d'exposition pour le vert"
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr "Calibrer le temps d'exposition pour le bleu"
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr "Temps d'exposition pendant numérisation"
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr "Temps d'exposition pour le rouge pendant numérisation"
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr "Temps d'exposition pour le vert pendant numérisation"
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr "Temps d'exposition pour le bleu pendant numérisation"
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr "Fixer le temps d'exposition"
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr "Calibrer la puissance de la lampe"
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr "Puissance de la lampe pendant la numérisation"
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr "Fixer la puissance de la lampe"
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr "Eteindre la lampe à la sortie"
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
@@ -468,38 +462,38 @@ msgstr ""
 "Option, lecture seule, qui indique le nombre d'options supportées par un "
 "périphérique spécifique."
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "Options pour la source, le mode et la résolution"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr ""
 "Options de la zone de numérisation et la taille de l'image à numériser"
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, no-c-format
 msgid "Image modification options"
 msgstr "Options modifiant l'image"
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, no-c-format
 msgid "Hardware specific options"
 msgstr "Options spécifiques au matériel"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr "Capteurs et boutons du scanner"
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr "Demande une numérisation de basse qualité"
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -511,7 +505,7 @@ msgstr ""
 "scanner à 1 passe, cela réduit l'espace mémoire nécessaire et le temps "
 "de numérisation de la prévisualisation."
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
@@ -520,23 +514,23 @@ msgstr ""
 "Nombre de bits par échantillon. Les valeurs typiques sont de 1 pour "
 "\"Trait\" et de 8 pour les numérisation \"haute-résolution\""
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr ""
 "Choisit le mode de numérisation (comme Trait, Monochrome ou Couleur)"
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr "Détermine la vitesse de numérisation."
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr "Choisit la source de numérisation."
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr ""
@@ -544,42 +538,42 @@ msgstr ""
 "rapide, cette option ne permettra pas de reprendre la numérisation, et "
 "les données manquantes seront perdues."
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "Position X en haut à gauche de l'aire de numérisation"
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "Position Y en haut à gauche de l'aire de numérisation"
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "Position X en bas à droite de l'aire de numérisation"
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "Position Y en bas à droite de l'aire de numérisation"
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr "Choisit la résolution de l'image à numériser"
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr "Choisit la résolution horizontale de l'image à numériser"
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr "Choisit la résolution verticale de l'image à numériser"
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
@@ -588,12 +582,12 @@ msgstr ""
 "Spécifie la largeur de la source. Requis pour le centrage automatique "
 "des numérisations effectuées à partir du chargeur automatique."
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, no-c-format
 msgid "Specifies the height of the media."
 msgstr "Spécifie la hauteur de la source."
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid ""
 "Determines whether a builtin or a custom gamma-table should be used."
@@ -601,7 +595,7 @@ msgstr ""
 "Détermine si une table gamma standard ou personnalisée doit être "
 "utilisée."
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -612,32 +606,32 @@ msgstr ""
 "simultanément les bandes rouge, verte et bleue (c.-à-d. que c'est une "
 "table gamme d'intensité.)"
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr "Table de correction gamma pour le rouge."
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr "Table de correction gamma pour le vert."
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr "Table de correction gamma pour le bleu"
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr "Contrôle la brillance de l'image à numériser."
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr "Contrôle le contraste de l'image à numériser."
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
@@ -646,73 +640,73 @@ msgstr ""
 "Sélectionne le \"grain\" de l'image numérisée. De petites valeurs "
 "donnent des images plus nettes."
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr "Spécifie si l'image numérisée doit etre en demi-teinte (tramée)"
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr ""
 "Spécifie quel niveau de luminosité est considéré comme étant \"noir\"."
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr ""
 "Spécifie quel niveau de luminosité est considéré comme étant \"blanc\"."
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr ""
 "Spécifie quel niveau de luminosité rouge est considéré comme étant "
 "\"blanc\"."
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr ""
 "Spécifie quel niveau de luminosité verte est considéré comme étant "
 "\"blanc\"."
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr ""
 "Spécifie quel niveau de luminosité bleue est considéré comme étant "
 "\"blanc\"."
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr ""
 "Spécifie quel niveau de luminosité rouge est considéré comme étant \"noir"
 "\"."
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr ""
 "Spécifie quel niveau de luminosité verte est considéré comme étant \"noir"
 "\"."
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr ""
 "Spécifie quel niveau de luminosité bleue est considéré comme étant \"noir"
 "\"."
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr ""
 "Spécifie quel niveau de luminosité rouge est considéré comme étant "
 "\"rouge max.\"."
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid ""
 "Selects what green radiance level should be considered \"full green\"."
@@ -720,7 +714,7 @@ msgstr ""
 "Spécifie quel niveau de luminosité verte est considéré comme étant "
 "\"vert max.\"."
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid ""
 "Selects what blue radiance level should be considered \"full blue\"."
@@ -728,12 +722,12 @@ msgstr ""
 "Spécifie quel niveau de luminosité bleue est considéré comme étant "
 "\"bleu max.\"."
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr "Contrôle la teinte (bleue) de l'image numérisée."
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
@@ -743,12 +737,12 @@ msgstr ""
 "l'acquisition par un appareil-photo. Une valeur importante cause plus "
 "d'éclairage."
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr "Le nom de fichier de l'image à charger."
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
@@ -757,295 +751,295 @@ msgstr ""
 "Choisit la taille du motif de demi-ton utilisé pour numériser les images "
 "demi-ton."
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
 msgstr ""
 "Définit le motif de demi-ton utilisé pour numériser les images demi-ton."
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr "Utilise la même résolution pour X et Y"
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr "Inverse le noir et le blanc"
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr "Faire une calibration de qualité pour les blancs"
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr "Utilise une lentille qui double la résolution optique"
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr "Utilise les même paramètres pour chaque couleur en mode RVB"
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr "Choisit la luminosité minimum pour avoir un point blanc"
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr "Correction gamma analogique"
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr "Correction gamma analogique pour le rouge"
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr "Correction gamma analogique pour le vert"
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr "Correction gamma analogique pour le bleu"
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr "Préchauffer la lampe avant la numérisation"
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr "Définit le temps d'exposition pour la calibration"
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr "Définit le temps d'exposition pour la calibration du rouge"
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr "Définit le temps d'exposition pour la calibration du vert"
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr "Définit le temps d'exposition pour la calibration du bleu"
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr "Définit le temps d'exposition pour la numérisation"
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr "Définit le temps d'exposition pour la numérisation du rouge"
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr "Définit le temps d'exposition pour la numérisation du vert"
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr "Définit le temps d'exposition pour la numérisation du bleu"
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr "Autorise la sélection du temps d'exposition"
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr "Définit la puissance de la lampe pour la calibration"
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr "Définit la puissance de la lampe pour la numérisation"
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr "Autorise la sélection de la puissance de la lampe"
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr "Eteindre la lampe à la sortie du programme"
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, no-c-format
 msgid "Scan button"
 msgstr "Bouton 'numérisation'"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, no-c-format
 msgid "Email button"
 msgstr "Bouton 'courrier électronique'"
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, no-c-format
 msgid "Fax button"
 msgstr "Bouton 'Fax'"
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, no-c-format
 msgid "Copy button"
 msgstr "Bouton 'copie'"
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr "Bouton 'PDF'"
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr "Bouton 'annuler'"
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr "Page chargée"
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, no-c-format
 msgid "Cover open"
 msgstr "Couvercle ouvert"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "Couleur"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr "Trait couleur"
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr "Demi-ton couleur"
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "Gris"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr "Demi-teinte"
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "Trait"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr "Succès"
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, no-c-format
 msgid "Operation not supported"
 msgstr "Opération non-supportée"
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr "Opération annulée"
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr "Périphérique occupé"
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr "Argument incorrect"
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr "Fin de fichier atteinte"
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, no-c-format
 msgid "Document feeder jammed"
 msgstr "Bourrage dans le chargeur automatique de documents"
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, no-c-format
 msgid "Document feeder out of documents"
 msgstr "Chargeur automatique de documents vide"
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, no-c-format
 msgid "Scanner cover is open"
 msgstr "Couvercle du scanner ouvert"
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr "Erreur d'entrée-sortie"
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr "A court de mémoire"
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr "L'accés à la ressource a été refusé"
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr "La lampe n'est pas prète, veuillez ré-essayer"
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr ""
 "Le méchanisme de blocage pour le transport du scanner est vérouillé"
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "Valeurs par défaut"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr "Valeurs par défaut pour les réglages fins."
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "Calibration"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr "Calibrer avant la prochaine numérisation"
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
@@ -1055,12 +1049,12 @@ msgstr ""
 "Sinon la calibration est effectuée seulement avant la première "
 "numérisation."
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr "Effectuer uniquement la correction des ombres"
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -1072,27 +1066,27 @@ msgstr ""
 "d'exposition, internes ou lues dans le fichier de configuration, sont "
 "utilisées."
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr "Etat du bouton"
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr "Numéro de la trame à numériser"
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr "Sélectionner le numéro de la trame à numériser"
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, no-c-format
 msgid "Duplex scan"
 msgstr "Numérisation recto-verso"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid ""
 "Duplex scan provide a scan of the front and back side of the document"
@@ -1100,832 +1094,826 @@ msgstr ""
 "La numérisation recto-verso permet de numériser les deux cotés d'un "
 "document"
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr "Calibrer le scanner"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr "Forcer la calibration du scanner avant la numérisation"
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr "Niveaux de gris"
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr "Effectue une numérisation en niveaux de gris plutôt qu'en couleurs"
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr "Gain analogique"
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr "Augmenter/diminuer le gain analogique du capteur CCD"
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "Correction gamma"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr "Sélectionne la courbe de correction gamma"
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr "Brut"
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr "Couleurs précises"
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, no-c-format
 msgid "No transparency correction"
 msgstr "Pas de correction de transparence"
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr "Correction en fonction du support"
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr "Correction en fonction du rapport de transparence"
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, no-c-format
 msgid "Negatives"
 msgstr "Négatifs"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, no-c-format
 msgid "Slides"
 msgstr "Diapositives"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, no-c-format
 msgid "Normal speed"
 msgstr "Vitesse normale"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/2 normal speed"
 msgstr "Vitesse 1/2"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/3 normal speed"
 msgstr "Vitesse 1/3"
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, no-c-format
 msgid "rounded parameter"
 msgstr "Paramètres arrondis"
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr "inconnu(e)"
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, no-c-format
 msgid "ADF jam"
 msgstr "Bourrage du chargeur automatique"
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr "Couvercle du chargeur automatique ouvert"
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, no-c-format
 msgid "lamp failure"
 msgstr "lampe défectueuse"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr "erreur de positionnement du capteur"
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr "erreur de test du processeur (CPU)"
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr "erreur de test de la mémoire RAM"
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr "erreur de test de la mémoire ROM"
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr "erreur de test du matériel"
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, no-c-format
 msgid "transparency unit lamp failure"
 msgstr "lampe de l'adaptateur de transparent défectueuse"
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr "erreur de positionnement du capteur pour transparents"
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr "longueur de la liste de paramètres incorrecte"
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr "code commande invalide"
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr "champ du bloc de description de commande (CDB) invalide"
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr "Numéro d'unité logique (LUN) non supporté"
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr "champ invalide dans la liste des paramètres"
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr "erreur dans la séquence de commandes"
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr "trop de fenêtres spécifiées"
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr "document absent"
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr "message d'identification (IDENTIFY) invalide"
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr "option non connectée"
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr "Réinitialisation au démarrage / du bus"
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr "paramètre modifié par un autre maître"
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr "pas d'information supplémentaire"
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr "échec de re-sélection"
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr "erreur de parité SCSI"
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr "message d'erreur détecté "
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr "message d'erreur invalide"
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr "erreur de dépassement de temps"
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, no-c-format
 msgid "transparency unit shading error"
 msgstr "erreur de l'adaptateur pour transparents"
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr "lampe non stabilisée"
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, no-c-format
 msgid "film scanner"
 msgstr "numériseur de transparents"
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr "numériseur à plat"
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr "Type de film"
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr "Sélectionne le type de transparents (négatifs ou diapositives)"
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, no-c-format
 msgid "Negative film type"
 msgstr "Film négatif"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, no-c-format
 msgid "Selects the negative film type"
 msgstr "Sélectionne l'utilisation de film négatif"
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, no-c-format
 msgid "Hardware resolution"
 msgstr "Echantillonnage matériel"
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "Utilise seulement les valeurs d'échantillonnage matériel"
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr "Mise au point"
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, no-c-format
 msgid "Auto focus"
 msgstr "Mise au point automatique"
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, no-c-format
 msgid "Enable/disable auto focus"
 msgstr "Activer/désactiver la mise au point automatique"
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr "Une seule mise au point automatique"
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr ""
 "Effectuer la mise au point automatique une seule fois entre chaque "
 "éjection"
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, no-c-format
 msgid "Manual focus position"
 msgstr "Mise au point manuelle"
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr "Effectuer manuellement la mise au point (128 par défaut)"
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr "Marges"
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr "Plus de réglages de couleur"
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "Image miroir"
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "Image miroir horizontal"
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, no-c-format
 msgid "Auto exposure"
 msgstr "Temps d'exposition automatique"
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr "Activer/désactiver le temps d'exposition automatique"
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, no-c-format
 msgid "Calibration now"
 msgstr "Calibrer maintenant"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Effectue la calibration *maintenant*"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr "Diagnostic automatique"
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr "Effectue le diagnostic automatique du scanner"
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, no-c-format
 msgid "Reset scanner"
 msgstr "Réinitialiser le scanner"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, no-c-format
 msgid "Reset the scanner"
 msgstr "Réinitialiser le scanner"
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr "Maniement des documents"
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, no-c-format
 msgid "Eject film after each scan"
 msgstr "Ejecte le film après chaque numérisation"
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr "Ejecte automatiquement le film après chaque numérisation"
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr "Ejecte le film avant de quitter"
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr "Ejecte automatiquement le film avant de quitter le programme"
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr "Ejecte le film maintenant"
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr "Ejecte le film *maintenant*"
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, no-c-format
 msgid "Document feeder extras"
 msgstr "Chargeur automatique de document, options avancées"
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, no-c-format
 msgid "Flatbed only"
 msgstr "A plat seulement"
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr ""
 "Ne pas utiliser le chargeur automatique, seulement le scanner à plat"
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, no-c-format
 msgid "Transparency unit"
 msgstr "Adaptateur pour transparents"
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr "Allumer/éteindre l'adaptateur pour transparents"
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, no-c-format
 msgid "Negative film"
 msgstr "Film négatif"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, no-c-format
 msgid "Positive or negative film"
 msgstr "Film positif ou négatif"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr "Contrôle de densité"
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr "Positionne le mode de contrôle de la densité"
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, no-c-format
 msgid "Transparency ratio"
 msgstr "Rapport de transparence"
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, no-c-format
 msgid "Select film type"
 msgstr "Type de film"
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, no-c-format
 msgid "Select the film type"
 msgstr "Sélectionne le type de film"
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "A plat"
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, no-c-format
 msgid "ADF Front"
 msgstr "Chargeur automatique de documents, recto"
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, no-c-format
 msgid "ADF Back"
 msgstr "Chargeur automatique de documents, verso"
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, no-c-format
 msgid "ADF Duplex"
 msgstr "Chargeur automatique de documents, recto-verso"
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, fuzzy, no-c-format
 msgid "Card Front"
 msgstr "Avant"
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, fuzzy, no-c-format
 msgid "Card Back"
 msgstr "Arrière"
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, fuzzy, no-c-format
 msgid "Card Duplex"
 msgstr "Recto-verso"
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "Rouge"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "Vert"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "Bleu"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, no-c-format
 msgid "Enhance Red"
 msgstr "Augmente le rouge"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, no-c-format
 msgid "Enhance Green"
 msgstr "Augmente le vert"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, no-c-format
 msgid "Enhance Blue"
 msgstr "Augmente le bleu"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr "Aucun(e)"
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr "JPEG"
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr ""
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr ""
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr "Recto"
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr "Recto-verso"
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr "Adaptateur pour transparents"
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr "Chargeur automatique de document"
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "Positif"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "Négatif"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr "Mettre au point sur la vitre"
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr "Mettre au point 2,5 mm au-dessus de la vitre"
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr "Motif demi-teinte A (teinte dure)"
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr "Motif demi-teinte B (teinte douce)"
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr "Motif demi-teinte C"
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr "/wiki/Filmstrip A (Bayer 4x4)"
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr "'Dither' B (Spiral 4x4)"
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr "'Dither' C ('Net Screen' 4x4)"
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr "'Dither' C ('Net Screen' 4x4)"
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr "Technologie d'amélioration du texte"
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr "Télécharger le motif A"
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr "Télécharger le motif B"
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "Pas de correction"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr "Spécifié par l'utilisateur"
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr "Imprimantes à impact"
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr "Imprimantes thermiques"
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "Imprimantes à jet d'encre"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr "Moniteurs à tube cathodique"
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "Valeur par défaut"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr "Impression haute définition"
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr "Impression basse définition"
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr "Impression avec contraste élevé"
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr "Spécifié par l'utilisateur (gamma=1,0)"
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr "Spécifié par l'utilisateur (gamma=1,8)"
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr "CD"
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr "A5 - portrait"
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr "A5 - paysage"
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr "Letter"
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr "A4"
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "Max"
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr "Mode de numérisation"
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr "Sélectionne la demi-teinte."
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr "Exclusion"
@@ -1933,209 +1921,206 @@ msgstr "Exclusion"
 # Dictionnary gives me 'marginal' for dropout. Sounds like
 # a part of the scan area is 'droped out', I mean excluded.
 # No, it is one of the colours that is excluded.
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr "Sélectionne le couleur exclu."
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr "Sélectionne la brillance."
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr "Netteté"
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr "Correction de couleur"
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr ""
 "Remplit la table de correction de couleur pour le périphérique de "
 "destination sélectionné."
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr "Coefficients de correction de couleur"
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr "Matrice de multiplication RGB"
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr "Décalage vert -> rouge"
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr "Décalage vert -> bleu"
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr "Décalage rouge -> vert"
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr "Décalage rouge -> bleu"
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr "Décalage bleu -> vert"
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr "Décalage bleu -> rouge"
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr "Contrôle le niveau de vert"
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr "Ajoute au rouge en fonction du niveau de vert"
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr "Ajoute au bleu en fonction du niveau de vert"
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr "Ajoute au vert en fonction du niveau de rouge"
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr "Contrôle le niveau de rouge"
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr "Ajoute au bleu en fonction du niveau de rouge"
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr "Ajoute au vert en fonction du niveau de bleu"
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr "Ajoute au rouge en fonction du niveau de bleu"
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, no-c-format
 msgid "Controls blue level"
 msgstr "Contrôle le niveau de bleu"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr "Effectue une symétrie verticale de l'image."
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr "Aperçu rapide"
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr "Séparation automatique"
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr "Liste réduite de résolutions"
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr "Affiche une liste réduite d'échantillonnage"
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr "Définit le facteur de zoom utilisé par le scanner"
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr "Format rapide"
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr "Equipement optionnel"
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr "Ejecter"
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr "Ejecter la feuille du chargeur automatique"
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr "Ejection automatique"
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr "Ejecte le document après la numérisation"
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr "Mode du chargeur automatique de documents"
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr ""
 "Sélectionne le mode du chargeur automatique de documents (recto/recto-"
 "verso)"
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr "Baie"
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr "Sélectionne la baie contenant le document à numériser"
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
@@ -2145,23 +2130,23 @@ msgstr ""
 "pré-configurés ou de la table utilisateur, et qui sera téléchargée dans "
 "le scanner"
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr "Mise-au-point"
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
 msgstr "Effectue la mise-au-point soit sur la vitre, soit 2,5 mm au-dessus"
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr "Attendre le bouton"
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
@@ -2170,208 +2155,956 @@ msgstr ""
 "Aprés avoir envoyé la commande de numérisation, attendre l'appui du "
 "bouton avant de commencer la numérisation."
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr "Infra-rouge"
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, no-c-format
 msgid "Positive Slide"
 msgstr "Diapositive positive"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, no-c-format
 msgid "Negative Slide"
 msgstr "Diapositive négative"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr "Profil de température de couleurs interne"
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, no-c-format
 msgid "User defined CCT profile"
 msgstr "Profil de température de couleurs utilsateur"
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr "Activé"
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr "Aucun"
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr "Seuil dynamique (DTC)"
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr "Seuil dynamique simplifié (SDTC)"
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr "Tramage"
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, no-c-format
 msgid "Diffusion"
 msgstr "Diffusion d'erreur"
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, no-c-format
 msgid "White"
 msgstr "Blanc"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, no-c-format
 msgid "Black"
 msgstr "Noir"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, no-c-format
 msgid "Continue"
 msgstr "Continuer"
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr "Arréter"
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr "10mm"
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr "15mm"
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr "20mm"
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, no-c-format
 msgid "Horizontal bold"
 msgstr "Horizontal large"
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, no-c-format
 msgid "Horizontal narrow"
 msgstr "Horizontal étroit"
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr "Vertical"
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, no-c-format
 msgid "Vertical bold"
 msgstr "Vertical large"
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr "De haut en bas"
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr "De bas en haut"
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, no-c-format
 msgid "Front"
 msgstr "Avant"
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr "Arrière"
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
+msgid "Gamma function exponent"
 msgstr ""
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
 #, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
+msgid "Changes intensity of midtones"
+msgstr ""
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr ""
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr ""
+
+#: backend/fujitsu.c:3165
+#, fuzzy, no-c-format
+msgid "Halftone type"
+msgstr "Demi-teinte"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr ""
+
+#: backend/fujitsu.c:3210
+#, fuzzy, no-c-format
+msgid "Perform outline extraction"
+msgstr "Effectue la calibration"
+
+#: backend/fujitsu.c:3221
+#, fuzzy, no-c-format
+msgid "Emphasis"
+msgstr "Accentuation de l'image"
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr ""
+
+#: backend/fujitsu.c:3240
+#, fuzzy, no-c-format
+msgid "Separation"
+msgstr "Saturation"
+
+#: backend/fujitsu.c:3241
+#, fuzzy, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr ""
+"Active la détection automatique du seuil pour la numérisation en mode "
+"trait."
+
+#: backend/fujitsu.c:3252
+#, fuzzy, no-c-format
+msgid "Mirroring"
+msgstr "Image miroir"
+
+#: backend/fujitsu.c:3253
+#, fuzzy, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "Renverse l'image horizontalement."
+
+#: backend/fujitsu.c:3270
+#, fuzzy, no-c-format
+msgid "White level follower"
+msgstr "Niveau blanc des bleus"
+
+#: backend/fujitsu.c:3271
+#, fuzzy, no-c-format
+msgid "Control white level follower"
+msgstr "Contrôle le niveau de rouge"
+
+#: backend/fujitsu.c:3289
+#, fuzzy, no-c-format
+msgid "BP filter"
+msgstr "Filtre de couleur"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr ""
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr "Lissage"
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr ""
+
+#: backend/fujitsu.c:3323
+#, fuzzy, no-c-format
+msgid "Gamma curve"
+msgstr "Valeur de gamma"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, no-c-format
+msgid "Threshold curve"
+msgstr "Courbe du seuil"
+
+#: backend/fujitsu.c:3347
+#, fuzzy, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+"Courbe dynamique de seuil, de clair à foncé, normallement entre 50-65"
+
+#: backend/fujitsu.c:3369
+#, fuzzy, no-c-format
+msgid "Threshold white"
+msgstr "Seuil"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr ""
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, fuzzy, no-c-format
+msgid "Noise removal"
+msgstr "Réduction du bruit"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr ""
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr ""
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr ""
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr ""
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr ""
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr ""
+
+#: backend/fujitsu.c:3508
+#, fuzzy, no-c-format
+msgid "Auto width detection"
+msgstr "Pas de correction"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr ""
+
+#: backend/fujitsu.c:3526
+#, fuzzy, no-c-format
+msgid "Auto length detection"
+msgstr "Pas de correction"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr ""
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr ""
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr ""
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr ""
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr ""
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr ""
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr ""
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
+msgstr ""
+
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3708
+#, fuzzy, no-c-format
+msgid "DF recovery mode"
+msgstr "Couvercle du chargeur automatique ouvert"
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr ""
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3748
+#, fuzzy, no-c-format
+msgid "Advanced paper protection"
+msgstr "Options avancées"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+
+#: backend/fujitsu.c:3768
+#, fuzzy, no-c-format
+msgid "Staple detection"
+msgstr "Pas de correction"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr ""
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+
+#: backend/fujitsu.c:3809
+#, fuzzy, no-c-format
+msgid "Dropout color"
+msgstr "Exclusion"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+
+#: backend/fujitsu.c:3833
+#, fuzzy, no-c-format
+msgid "Buffer mode"
+msgstr "Mode de chargement"
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr ""
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr ""
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr ""
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+
+#: backend/fujitsu.c:3911
+#, fuzzy, no-c-format
+msgid "Off timer"
+msgstr "Temps avant extinction de la lampe"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+
+#: backend/fujitsu.c:3930
+#, fuzzy, no-c-format
+msgid "Duplex offset"
+msgstr "Décalage des bleus"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr ""
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "Décalage des verts"
+
+#: backend/fujitsu.c:3949
+#, fuzzy, no-c-format
+msgid "Adjust green/red offset"
+msgstr "Décalage des verts"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr "Décalage des bleus"
+
+#: backend/fujitsu.c:3967
+#, fuzzy, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "Fixe le décalage pour le bleu"
+
+#: backend/fujitsu.c:3980
+#, fuzzy, no-c-format
+msgid "Low Memory"
+msgstr "A court de mémoire"
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+
+#: backend/fujitsu.c:3996
+#, fuzzy, no-c-format
+msgid "Duplex side"
+msgstr "Numérisation recto-verso"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr ""
+
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr ""
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
 msgstr ""
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
+msgstr ""
+
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr ""
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+
+#: backend/fujitsu.c:4095
+#, fuzzy, no-c-format
+msgid "Endorser Options"
+msgstr "Options avancées"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr ""
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr ""
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr ""
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr ""
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr ""
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr ""
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr ""
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr ""
+
+#: backend/fujitsu.c:4253
+#, fuzzy, no-c-format
+msgid "Endorser direction"
+msgstr "Réduction du bruit"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr ""
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr ""
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr ""
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr ""
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr ""
+
+#: backend/fujitsu.c:4344
+#, fuzzy, no-c-format
+msgid "A3 paper"
+msgstr "Avec du papier"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4356
+#, fuzzy, no-c-format
+msgid "B4 paper"
+msgstr "Avec du papier"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4368
+#, fuzzy, no-c-format
+msgid "A4 paper"
+msgstr "Avec du papier"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4380
+#, fuzzy, no-c-format
+msgid "B5 paper"
+msgstr "Avec du papier"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr ""
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr ""
+
+#: backend/fujitsu.c:4429
+#, fuzzy, no-c-format
+msgid "Scanner in power saving mode"
+msgstr "Couvercle du scanner ouvert"
+
+#: backend/fujitsu.c:4452
+#, fuzzy, no-c-format
+msgid "Manual feed"
+msgstr "Mise au point manuelle"
+
+#: backend/fujitsu.c:4453
+#, fuzzy, no-c-format
+msgid "Manual feed selected"
+msgstr "Mise au point manuelle"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr ""
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr ""
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr ""
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr ""
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr ""
+
+#: backend/fujitsu.c:4513
+#, fuzzy, no-c-format
+msgid "Hardware error code"
+msgstr "erreur de test du matériel"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr ""
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr ""
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr ""
+
+#: backend/fujitsu.c:4537
+#, fuzzy, no-c-format
+msgid "Imprinter ink level"
+msgstr "Niveau blanc"
+
+#: backend/fujitsu.c:4548
+#, fuzzy, no-c-format
+msgid "Density"
+msgstr "Contrôle de densité"
+
+#: backend/fujitsu.c:4549
+#, fuzzy, no-c-format
+msgid "Density dial"
+msgstr "Contrôle de densité"
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, fuzzy, no-c-format
+msgid "Duplex switch"
+msgstr "Numérisation recto-verso"
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, no-c-format
 msgid "Extras"
 msgstr "Extras"
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, no-c-format
-msgid "Threshold curve"
-msgstr "Courbe du seuil"
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
 "Courbe dynamique de seuil, de clair à foncé, normallement entre 50-65"
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr "Désactiver le mode Trait dynamique"
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
@@ -2380,12 +3113,12 @@ msgstr ""
 "Utilise le mode Trait du matériel, au lieu d'utiliser un algorithme "
 "logiciel adaptatif."
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, no-c-format
 msgid "Disable interpolation"
 msgstr "Désactiver l'interpolation"
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
@@ -2395,45 +3128,45 @@ msgstr ""
 "plus faible que la résolution verticale, ne pas faire d'interpolation "
 "horizontale."
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "Filtre de couleur"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 "En niveaux de gris ou en mode trait, sélectionne la couleur à utiliser."
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "Calibration"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Définit le mode de calibration"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Cache des données de calibration"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, no-c-format
 msgid "Lamp off time"
 msgstr "Temps avant extinction de la lampe"
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
@@ -2442,104 +3175,102 @@ msgstr ""
 "La lampe sera éteinte après ce laps de temps (en minutes). Entrer 0 pour "
 "ne pas éteindre la lampe automatiquement."
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, fuzzy, no-c-format
 msgid "Lamp off during scan"
 msgstr "Eteindre la lampe durant la calibration des noirs"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, fuzzy, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr "Délai en minutes avant d'éteindre la lampe après une numérisation."
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, no-c-format
 msgid "File button"
 msgstr "Bouton 'fichier'"
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr "Bouton 'reconnaissance de caractères (OCR)'"
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, no-c-format
 msgid "Power button"
 msgstr "Bouton 'marche'"
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "Bouton 'courrier électronique'"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, no-c-format
 msgid "Need calibration"
 msgstr "Calibration requise"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr "Le scanner a besoin d'être calibré avec les paramètres actuels"
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, no-c-format
 msgid "Buttons"
 msgstr "Boutons"
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr "Calibration"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "Démarrer la calibration avec la feuille spéciale"
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, no-c-format
 msgid "Clear calibration"
 msgstr "Effacer la calibration"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, no-c-format
 msgid "Clear calibration cache"
 msgstr "Efface le cache des données de calibration"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr "Adaptateur pour transparents"
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr "Couleur du mode niveaux de gris"
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 "Sélectionne la couleur à utiliser en niveaux de gris (défaut: vert)."
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr "Options de déboggage"
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "Préchauffage automatique"
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -2548,12 +3279,12 @@ msgstr ""
 "Préchauffer jusqu'à ce que l'intensité de la lampe soit constante, au "
 "lieu d'attendre 60 secondes."
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "Numérisation complète"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
@@ -2563,12 +3294,12 @@ msgstr ""
 "calibration. ATTENTION! Ne pas sélectionner la hauteur complète. "
 "Seulement pour tester."
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Calibration grossière"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2580,13 +3311,13 @@ msgstr ""
 "manuellement les paramètres gain et décalage dans l'application. Activée "
 "par défaut. Pour tester seulement."
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr ""
 "Utiliser la calibration grosière seulement à la première numérisation"
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2598,12 +3329,12 @@ msgstr ""
 "gagner du temps. Si l'intensité de chaque image est différente, "
 "désactiver cette option. Seulement pour tester."
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, no-c-format
 msgid "Backtrack lines"
 msgstr "Nombre de lignes de retour arrière"
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2616,85 +3347,85 @@ msgstr ""
 "numérisation. Des valeurs petites permettent une numérisation plus "
 "rapide, au risque de perdre quelques lignes."
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Valeur de gamma"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr "Sélectionne la valeur de gamma pour tous les canaux."
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, no-c-format
 msgid "Geometry Group"
 msgstr "Géométrie"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, no-c-format
 msgid "Scan Mode Group"
 msgstr "Mode de numérisation"
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr "Diapositive"
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, no-c-format
 msgid "Scanner model"
 msgstr "Modèle de scanner"
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, fuzzy, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr ""
 "Permet de tester le comportement du périphérique en l'utilisant comme un "
 "autre modèle compatible"
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr "Les couleurs de l'image seront inversées"
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, no-c-format
 msgid "Disable gamma correction"
 msgstr "Désactiver la correction gamma"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "La correction gamma sera désactivée"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, no-c-format
 msgid "Disable white shading correction"
 msgstr "Désactiver la correction des ombres blanches"
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr "La correction des ombres blanches sera désactivée"
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr "Omettre le préchauffage"
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr "Le préchauffage sera désactivé"
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr "Forcer l'utilisation de la profondeur réelle"
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2706,12 +3437,12 @@ msgstr ""
 "puis convertie dans la profondeur demandée. Cette option évite de "
 "simuler la profondeur."
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, no-c-format
 msgid "Emulate Grayscale"
 msgstr "Simuler en niveaux de gris"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2722,12 +3453,12 @@ msgstr ""
 "de gris par logiciel. Cela peut permettre d'améliorer la qualité de "
 "l'image dans certaines circonstances."
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr "Sauver les images de déboggage"
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
@@ -2736,360 +3467,354 @@ msgstr ""
 "Si activé, les images intermédiaires utilisées pendant la numérisation "
 "seront sauvegardées pour analyse."
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, no-c-format
 msgid "Reset chipset"
 msgstr "Réinitialiser la puce"
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr "Réinitialise les données de la puce"
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, no-c-format
 msgid "Information"
 msgstr "Informations"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, no-c-format
 msgid "Chipset name"
 msgstr "Nom de la puce"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr "Affiche le nom de la puce utilisée dans le périphérique"
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Unknown"
 msgstr "Inconnu(e)"
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr "Identifiant de la puce"
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, no-c-format
 msgid "Shows the chipset ID"
 msgstr "Affiche l'identifiant de la puce"
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, no-c-format
 msgid "Scan counter"
 msgstr "Compteur de numérisations"
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr "Affiche le nombre de numérisations effectuées par le scanner"
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, no-c-format
 msgid "Update information"
 msgstr "Rafraîchir les informations"
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr "Rafraîchit les informations du périphérique"
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr "Cette option reflète l'état d'un bouton de la façade du scanner"
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr "Image"
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, no-c-format
 msgid "offset X"
 msgstr "décalage en X"
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr "Position X en haut à gauche de l'aire de numérisation"
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, no-c-format
 msgid "offset Y"
 msgstr "décalage en Y"
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr "Position Y en haut à gauche de l'aire de numérisation"
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr "Etat de la lampe"
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr "Allume/éteint la lampe."
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr "Calibration des niveaux noir et blanc."
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr "Chargeur automatique de documents"
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, no-c-format
 msgid "TMA Slides"
 msgstr "Adaptateur pour transparents - diapositives"
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, no-c-format
 msgid "TMA Negatives"
 msgstr "Adaptateur pour transparents - négatifs"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, no-c-format
 msgid "Color (48 bits)"
 msgstr "Couleur (48 bits)"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, no-c-format
 msgid "Extend lamp timeout"
 msgstr "Délai allongé avant extinction de la lampe"
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr ""
 "Allonge le délai avant l'extinction de la lampe (de 15 minutes à une "
 "heure)."
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr "Attendre le bouton"
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, no-c-format
 msgid "Waits for button before scanning"
 msgstr "Attend l'appui sur le bouton avant la numérisation"
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, no-c-format
 msgid "Advanced Options"
 msgstr "Options avancées"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr "Grossier"
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr "Précis"
 
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr "Bayer"
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "Automatique"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr "RVB NTSC"
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr "RVB (pour transparents)"
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr "Direct"
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "Gris NTSC"
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr "Gris (pour transparents)"
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "Lent"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "Rapide"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr "Très rapide"
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr "2 pixels"
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr "4 pixels"
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr "8 pixels"
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr "Imprimer"
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, no-c-format
 msgid "Film-strip"
 msgstr "Film-strip"
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr "Adaptateur pour transparents"
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr "Conditionnel"
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, no-c-format
 msgid "Experiment"
 msgstr "Essais"
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, no-c-format
 msgid "Sharpening"
 msgstr "Netteté"
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr "Choisir la netteté"
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr "Seuil automatique"
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr ""
 "Active la détection automatique du seuil pour la numérisation en mode "
 "trait."
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr "Lissage"
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr "Sélectionne le filtre de lissage."
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr "Ejecter le document après la numérisation"
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, no-c-format
 msgid "Unloads the media after a scan."
 msgstr "Ejecte le document après la numérisation."
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, no-c-format
 msgid "Change document"
 msgstr "Changer de document"
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr "Change de document."
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr "Ejecter"
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr "Ejecter le document."
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, no-c-format
 msgid "Start calibration process."
 msgstr "Démarrer la calibration."
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, no-c-format
 msgid "Media"
 msgstr "Document"
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr "Sélectionne le type de document."
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr "Temps d'exposition"
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -3102,461 +3827,460 @@ msgstr ""
 "pour des diapositives normales, et \"Négatif\" pour des négatifs. Pour "
 "les images sombres (sous-exposées), vous pouvez augmenter cette valeur."
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, no-c-format
 msgid "Color Matrix"
 msgstr "Matrice de couleurs"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, no-c-format
 msgid "Set the scanners color matrix."
 msgstr "Sélectionne la matrice de couleurs du scanner."
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr "Matrice personnalisée."
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, no-c-format
 msgid "Mono Color Matrix"
 msgstr "Matrice monochrome"
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr "Matrice personnalisée pour numérisation en niveaux de gris."
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, no-c-format
 msgid "Mirror horizontal"
 msgstr "Miroir horizontal"
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, no-c-format
 msgid "Mirror image horizontally."
 msgstr "Renverse l'image horizontalement."
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, no-c-format
 msgid "Mirror vertical"
 msgstr "Miroir vertical"
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, no-c-format
 msgid "Mirror image vertically."
 msgstr "Renverse l'image verticalement."
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, no-c-format
 msgid "Update options"
 msgstr "Mettre les options à jour"
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, no-c-format
 msgid "Update options."
 msgstr "Mets à jour les options."
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr "Sortie en 8 bits"
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr ""
 "Utilise plus de 8 bits de profondeur en interne, mais sort en 8 bits."
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr "Attente de bouton avant"
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr "Attendre l'appui sur le bouton du scanner avant de numériser."
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr "Eteindre la lampe"
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr "Eteint la lampe du scanner."
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "Taille du papier"
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr "Séparation automatique"
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, fuzzy, no-c-format
 msgid "Landscape"
 msgstr "A5 - paysage"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr ""
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, fuzzy, no-c-format
 msgid "Length control mode"
 msgstr "Positionne le mode de contrôle de la densité"
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, fuzzy, no-c-format
 msgid "Manual feed mode"
 msgstr "Mise au point manuelle"
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, fuzzy, no-c-format
 msgid "Manual feed timeout"
 msgstr "Mise au point manuelle"
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr "Active la numérisation recto-verso"
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr "Taille physique du papier dans le chargeur"
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, fuzzy, no-c-format
 msgid "halftone"
 msgstr "Demi-teinte"
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, fuzzy, no-c-format
 msgid "color"
 msgstr "Couleur"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, fuzzy, no-c-format
 msgid "continuous"
 msgstr "Continuer"
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, fuzzy, no-c-format
 msgid "off"
 msgstr "Aucun"
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, fuzzy, no-c-format
 msgid "bayer_64"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, fuzzy, no-c-format
 msgid "bayer_16"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, fuzzy, no-c-format
 msgid "halftone_32"
 msgstr "Demi-teinte"
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, fuzzy, no-c-format
 msgid "halftone_64"
 msgstr "Demi-teinte"
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, fuzzy, no-c-format
 msgid "diffusion"
 msgstr "Diffusion d'erreur"
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, fuzzy, no-c-format
 msgid "normal"
 msgstr "Normal"
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, fuzzy, no-c-format
 msgid "light"
 msgstr "Contraste"
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, fuzzy, no-c-format
 msgid "From scanner"
 msgstr "numériseur de transparents"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr "Avec du papier"
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, fuzzy, no-c-format
 msgid "default"
 msgstr "Valeur par défaut"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, fuzzy, no-c-format
 msgid "smooth"
 msgstr "Lisse"
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, fuzzy, no-c-format
 msgid "low"
 msgstr "Lent"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, fuzzy, no-c-format
 msgid "medium"
 msgstr "Moyen"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, fuzzy, no-c-format
 msgid "red"
 msgstr "Rouge"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, fuzzy, no-c-format
 msgid "green"
 msgstr "Vert"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, fuzzy, no-c-format
 msgid "Sets the scan source"
 msgstr "Source de numérisation"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr "Mode de chargement"
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr "Sélectionne le mode de chargement"
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, fuzzy, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr "Activer/désactiver la mise au point automatique"
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, fuzzy, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr "Positionne le mode de contrôle de la densité"
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, fuzzy, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "Sélectionne le mode de chargement"
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, fuzzy, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr "Sélectionne le mode de chargement"
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr "Seuil automatique"
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
@@ -3565,515 +4289,502 @@ msgstr ""
 "Fixe automatiquement la luminosité, le contraste, le niveau du blanc, le "
 "gamma, la réduction du bruit et l'accentuation de l'image"
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "Réduction du bruit"
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr "Réduit le bruit isolé"
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr "Accentuation de l'image"
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr "Sélectionne l'accentuation de l'image"
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, fuzzy, no-c-format
 msgid "Lamp color"
 msgstr "Lampe allumée"
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, fuzzy, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr "Allume/éteint la lampe."
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, fuzzy, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "Renverse l'image verticalement."
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
 "length of actual paper or logical document length."
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "Correction gamma"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, fuzzy, no-c-format
 msgid "High sensivity"
 msgstr "Impression haute définition"
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, fuzzy, no-c-format
 msgid "Low sensivity"
 msgstr "Impression basse définition"
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, fuzzy, no-c-format
 msgid "err_diffusion"
 msgstr "Diffusion d'erreur"
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, fuzzy, no-c-format
 msgid "No detection"
 msgstr "Pas de correction"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, fuzzy, no-c-format
 msgid "Normal mode"
 msgstr "Normal"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, fuzzy, no-c-format
 msgid "Enhanced mode"
 msgstr "Réglages fins"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
 "divides long paper by the length which is set in Document Size option."
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, fuzzy, no-c-format
 msgid "Automatic threshold mode"
 msgstr "Seuil automatique"
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, fuzzy, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr "Seuil automatique"
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, fuzzy, no-c-format
 msgid "Set chroma of red"
 msgstr "Fixe l'orde des trames"
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, fuzzy, no-c-format
 msgid "chroma of blue"
 msgstr "Ombré bleu"
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, fuzzy, no-c-format
 msgid "Set chroma of blue"
 msgstr "Décalage rouge -> bleu"
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr "Diamant"
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr "\"Graissage\" grossier 8x8"
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr "\"Graissage\" fin 8x8"
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr "Bayer 8x8"
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr "Ligne verticale 8x8"
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr "Gain"
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr "Réglages de gain des couleurs"
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, no-c-format
 msgid "Gray gain"
 msgstr "Gain des gris"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr "Fixe le gain pour le gris"
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, no-c-format
 msgid "Red gain"
 msgstr "Gain des rouges"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr "Fixe le gain pour le rouge"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, no-c-format
 msgid "Green gain"
 msgstr "Gain des verts"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr "Fixe le gain pour le vert"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, no-c-format
 msgid "Blue gain"
 msgstr "Gain des bleus"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr "Fixe le gain pour le bleu"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr "'Dither' Bayer 16"
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr "'Dither' Bayer 64"
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr "Demi-ton 32 points"
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr "Demi-ton 64 points"
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr "Diffusion d'erreur"
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr "Mode 1"
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr "Mode 2"
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr "Mode 3"
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr "Avec le batonnet blanc"
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr "Lisse"
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr "Bas"
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr "Moyen"
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr "Haut"
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr "Tube cathodique"
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "Une page"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "Toutes les pages"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr "scanner avec chargeur automatique"
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr "Niveau de gris 4 bits"
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr "Niveau de gris 8 bits"
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr "Ombrage, teinte moyenne, contraste, temps d'exposition"
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr "Options spéciales"
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr "Balance des couleurs"
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr "Ne pas utiliser de retour arrière"
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr "Si sélectionné, le scanner ne fera pas de retour arrière"
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr "Allumer/éteindre la lampe du scanner"
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr "Allumer/éteindre la lampe du scanner"
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr "Calibration par le pilote"
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid ""
 "If checked the color calibration before a scan is done by the backend"
@@ -4081,43 +4792,43 @@ msgstr ""
 "Lorsque sélectionné, la calibration avant numérisation est effectuée par "
 "le pilote"
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr "Utiliser l'adaptateur de diapositives"
 
 # flatbed is un-necessary here. Isn't it?
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr "Cette option éteint la lampe pendant la numérisation"
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "Numérisation de qualité"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr "Qualité maximale, mais vitesse réduite"
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "Numérisation rapide"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr "Vitesse maximale, mais qualité réduite"
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr "Seuil automatique"
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
@@ -4126,70 +4837,70 @@ msgstr ""
 "Lorsque sélectionné, le pilote détermine automatiquement la meilleure "
 "valeur du seuil."
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr "Sélectionne le mode de correction gamma."
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr "Lier les valeurs gamma"
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr "Utilise la même valeur gamma pour toutes les couleurs."
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr "Valeur de gamma"
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr "Sélectionne une valeur numérique pour la correction gamma"
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr "Valeur de gamma rouge"
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr ""
 "Sélectionne une valeur numérique pour la correction gamma (canal rouge)"
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr "Valeur de gamma vert"
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr ""
 "Sélectionne une valeur numérique pour la correction gamma (canal vert)"
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr "Valeur de gamma bleu"
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr ""
 "Sélectionne une valeur numérique pour la correction gamma (canal bleu)"
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr "Canal"
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
@@ -4197,207 +4908,207 @@ msgstr ""
 "Sélectionne la bande de couleur, \"Toutes\" signifie que toutes les "
 "couleurs sont affectées."
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr "Teinte moyenne"
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr "Sélectionne le niveau de luminosité équivalant à \"50% gris\"."
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr "Teinte moyenne rouge"
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr "Sélectionne le niveau de luminosité équivalant à \"50% rouge\"."
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr "Teinte moyenne verte"
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr "Sélectionne le niveau de luminosité équivalant à \"50% vert\"."
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr "Teinte moyenne bleue"
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr "Sélectionne le niveau de luminosité équivalant à \"50% bleu\"."
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr "Balance des rouges"
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr "Facteur de balance des rouges. 100% équivaut à pas de correction."
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr "balance des verts"
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr "Facteur de balance des verts. 100% équivaut à pas de correction."
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr "balance des bleus"
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr "Facteur de balance des bleus. 100% équivaut à pas de correction."
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr "Balance (valeurs d'usines)"
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr "Règle les valeurs de balance avec les valeurs d'usine."
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "Le plus lent"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "Plus lent"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "Plus rapide"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "Le plus rapide"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr "8x8 - Grossier"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr "8x8 - Normal"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr "8x8 - Précis"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr "8x8 - Très précis"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr "6x6 - Normal"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr "5x5 - Grossier"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr "5x5 - Précis"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr "4x4 - Grossier"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr "4x4 - Normal"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr "4x4 - Précis"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr "3x3 - Normal"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr "2x2 - Normal"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr "8x8 - Personnalisé"
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr "6x6 - Personnalisé"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr "5x5 - Personnalisé"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr "4x4 - Personnalisé"
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr "3x3 - Personnalisé"
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr "2x2 - Personnalisé"
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr "Mode gris rapide"
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr "Numérise rapidement en mode gris (qualité réduite)."
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
@@ -4407,117 +5118,117 @@ msgstr ""
 "qualité). Ce peut etre en noir et blanc, et/ou dans une basse en "
 "résolution."
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr "Temps avant extinction de la lampe (en minutes)"
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr "Fixe le temps (en minutes) au-delà du quel la lampe est éteinte."
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, no-c-format
 msgid "Turn lamp off"
 msgstr "Eteint la lampe."
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr "Eteint la lampe du scanner maintenant"
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr "Luminosité des rouges"
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr "Contrôle la brillance rouge de l'image à numériser."
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr "Luminosité des verts"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr "Contrôle la brillance verte de l'image à numériser."
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr "Luminosité des bleus"
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr "Contrôle la brillance bleue de l'image à numériser."
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "Contraste - rouge"
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr "Contrôle le contraste rouge de l'image à numériser."
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "Contraste - vert"
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr "Contrôle le contraste vert de l'image à numériser."
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "Contraste - bleu"
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr "Contrôle le contraste bleu de l'image à numériser."
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr "Couleur 48 bits"
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr "Couleur 24 bits"
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr "Gris 16 bits"
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr "Gris 8 bits"
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr "Réfléchissant"
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, no-c-format
 msgid "Positive"
 msgstr "Positif"
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -4526,39 +5237,39 @@ msgstr ""
 "Préchauffer jusqu'à ce que l'intensité de la lampe soit constante, au "
 "lieu d'attendre 40 secondes."
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, fuzzy, no-c-format
 msgid "Negative color"
 msgstr "Film négatif"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, fuzzy, no-c-format
 msgid "Negative gray"
 msgstr "Négatif"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, fuzzy, no-c-format
 msgid "48 bits color"
 msgstr "Couleurs précises"
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
 "mode and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr "Numérisation contrôlée par le bouton du scanner"
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4569,248 +5280,239 @@ msgstr ""
 "\" (MP150), ou du bouton \"COLOR\" (autres modèles). Appuyez sur le "
 "bouton \"GRAY\" pour annuler la numérisation."
 
-#: ../backend/pixma_sane_options.c:143
-#, no-c-format
-msgid "Gamma function exponent"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:144
-#, no-c-format
-msgid "Changes intensity of midtones"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:232
 #, no-c-format
 msgid "Update button state"
 msgstr "Rafraîchir l'état du bouton"
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:244
 #, no-c-format
 msgid "Button 1"
 msgstr "Bouton 1"
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:258
 #, no-c-format
 msgid "Button 2"
 msgstr "Bouton 2"
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr ""
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr ""
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr "Transparence"
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr "Paramètres du périphérique"
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr "Eteindre/allumer la (les) lampes"
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr "Eteindre/allumer la (les) lampes manuellement."
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "Eteindre la lampe durant la calibration des noirs"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr "Toujours éteindre la lampe durant la calibration des noirs"
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, no-c-format
 msgid "Calibration data cache"
 msgstr "Cache des données de calibration"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr "Active/désactive le cache des données de calibration"
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, no-c-format
 msgid "Performs calibration"
 msgstr "Effectue la calibration"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr "Accélérer le capteur"
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr "Active l'accélération du mouvement du capteur."
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, no-c-format
 msgid "Warmup-time"
 msgstr "Temps de préchauffage"
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, no-c-format
 msgid "Warmup-time in seconds."
 msgstr "Temps de préchauffage en secondes."
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, no-c-format
 msgid "Lampoff-time"
 msgstr "Temps avant extinction de la lampe"
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr "Temps avant extinction de la lampe en secondes."
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, no-c-format
 msgid "Analog frontend"
 msgstr "Frontal analogique (AFE)"
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr "Gain des rouges du frontal analogique (AFE)"
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr "Décalage des rouges"
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr "Décalage des rouges du frontal analogique (AFE)"
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr "Gain des verts du frontal analogique (AFE)"
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr "Décalage des verts"
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr "Décalage des verts du frontal analogique (AFE)"
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr "Gain des bleus du frontal analogique (AFE)"
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr "Décalage des bleus"
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr "Décalage des bleus du frontal analogique (AFE)"
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, no-c-format
 msgid "Red lamp off"
 msgstr "Délai avant extinction de la lampe rouge."
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr "Définit le délai avant extinction de la lampe rouge."
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, no-c-format
 msgid "Green lamp off"
 msgstr "Délai avant extinction de la lampe verte."
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr "Définit le délai avant extinction de la lampe verte."
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, no-c-format
 msgid "Blue lamp off"
 msgstr "Délai avant extinction de la lampe bleue."
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr "Définit le délai avant extinction de la lampe bleue."
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr "Cette option affiche l'état des boutons du scanner."
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr "Couleur 36 bits"
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr "Carte de 'dither' 1"
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr "Carte de 'dither' 2"
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr "Aléatoire"
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr "Sélection de la source"
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr "Amélioration de l'image"
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr "Griser"
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr "Charger l'image en tant que niveaux de gris."
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr "Simulation d'une numérisation à trois passes"
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
@@ -4819,12 +5521,12 @@ msgstr ""
 "Simule une numérisation à trois passes, en renvoyant 3 trames séparées. "
 "Pour le fun, renvoie la trame verte, puis bleue, puis rouge."
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr "Simulation de scanner à main."
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4836,7 +5538,7 @@ msgstr ""
 "renvoient une hauteur de -1. Sélectionner cette option permet de tester "
 "si une interface peut le supporter correctement."
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid ""
 "Set default values for enhancement controls (brightness & contrast)."
@@ -4844,42 +5546,42 @@ msgstr ""
 "Sélectionne les valeurs par défaut pour les contrles d'amélioration "
 "(luminosité et contraste)."
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr "Option de test de lecture seule"
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr "Voyons si l'interface traite correctement ceci"
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr "Tables de gamma"
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr "Simulation du code d'état"
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr "Ne pas forcer le code d'état"
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr "Ne pas obliger le pilote à renvoyer un code d'état."
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr "Renvoie SANE_STATUS_EOF"
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
@@ -4888,12 +5590,12 @@ msgstr ""
 "Oblige le pilote à renvoyer le code SANE_STATUS_EOF (fin de fichier) "
 "après un appel à sane_read()."
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr "Renvoie SANE_STATUS_JAMMED"
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
@@ -4902,12 +5604,12 @@ msgstr ""
 "Oblige le pilote à renvoyer le code SANE_STATUS_JAMMED (bourrage) après "
 "un appel à sane_read()."
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr "Renvoie SANE_STATUS_NO_DOCS"
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
@@ -4916,12 +5618,12 @@ msgstr ""
 "Oblige le pilote à renvoyer le code SANE_STATUS_NO_DOCS (pas de <DOCS>) "
 "après un appel à sane_read()."
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr "Renvoie SANE_STATUS_COVER_OPEN"
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
@@ -4930,12 +5632,12 @@ msgstr ""
 "Oblige le pilote à renvoyer le code SANE_STATUS_COVER_OPEN (couvercle "
 "soulevé) après un appel à sane_read()."
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr "Renvoie SANE_SATUS_IO_ERROR"
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
@@ -4944,12 +5646,12 @@ msgstr ""
 "Oblige le pilote à renvoyer le code SANE_STATUS_IO_ERROR (erreur "
 "d'entrée/sortie après un appel à sane_read()."
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr "Renvoie SANE_STATUS_NO_MEM"
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
@@ -4958,12 +5660,12 @@ msgstr ""
 "Oblige le pilote à renvoyer le code SANE_STATUS_NO_MEM (pas de mémoire) "
 "après un appel à sane_read()."
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr "Renvoie SANE_STATUS_ACCESS_DENIED"
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
@@ -4972,85 +5674,82 @@ msgstr ""
 "Oblige le pilote à renvoyer le code SANE_STATUS_ACCESS_DENIED (acces "
 "refusé) après un appel à sane_read()."
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr "Cette option affiche l'état d'un bouton du scanner."
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr "Lampe allumée"
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr "Allume la lampe du scanner"
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr "Lampe éteinte"
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr "Eteint la lampe du scanner"
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, no-c-format
 msgid "Lamp timeout"
 msgstr "Délai avant extinction de la lampe"
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr "Délai en minutes avant d'éteindre la lampe après une numérisation."
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr "Seuil pour le mode trait"
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr "Chargeur automatique de document"
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr "6\"x4\" (~15x10 cm)"
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr "8\"x10\" (~20x25 cm)"
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr "8.5\"x11\" (~21x28 cm)"
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr "Demi-teinte non-supportée"
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr "Points dispersés 8x8"
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr "Points dispersés 16x16"
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -5066,27 +5765,27 @@ msgstr ""
 "pourrait empécher les applications Xwindow de traiter les évènements X, "
 "et votre système pourrait s'écrouler."
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr ""
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr ""
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, fuzzy, no-c-format
 msgid "Focus point for scanning."
 msgstr "Ejecte le document après la numérisation"
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr "Aperçu"
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
@@ -5095,12 +5794,12 @@ msgstr ""
 "Sélectionne le mode de prévisualisation. Les aperçus en niveaux de gris "
 "donnent habituellement le meilleur compromis entre vitesse et détails."
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr "Valeurs prédéfinies"
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
@@ -5109,97 +5808,97 @@ msgstr ""
 "Fournit des emplacements standards pour la numérisation de photos, de "
 "pages imprimées, etc..."
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr ""
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, fuzzy, no-c-format
 msgid "Frame to be scanned"
 msgstr "numériseur à plat"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, fuzzy, no-c-format
 msgid "Focus-mode"
 msgstr "Mise au point"
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, fuzzy, no-c-format
 msgid "Auto or manual focus"
 msgstr "Mise au point automatique"
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, fuzzy, no-c-format
 msgid "Focus-point"
 msgstr "Mise-au-point"
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, fuzzy, no-c-format
 msgid "Focus point"
 msgstr "Mise-au-point"
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr "Nombre de lignes en couleurs par cycle de lecture"
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr "Nombre de lignes en niveaux de gris par cycle de lecture"
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr "webcam"
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr "Couleur RAW"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr "Couleur RGB"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr "Couleur RGB TEXTE"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr "Noir pur"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr "Blanc pur"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr "Motif couleur"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr "Grille"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr "Premier choix"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr "Second choix"
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
@@ -5208,12 +5907,12 @@ msgstr ""
 "Ceci est la troisième entrée, la plus longue. Peut-etre l'application "
 "sait-elle comment l'afficher..."
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr "Simulation de scanner à main"
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5227,12 +5926,12 @@ msgstr ""
 "supporter correctement. Cette option fixe aussi la largeur de "
 "numérisation à 11 cm."
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr "Simulation d'une numérisation à trois passes"
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
@@ -5240,17 +5939,17 @@ msgid ""
 msgstr ""
 "Simule une numérisation à trois passes, en renvoyant 3 trames séparées."
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr "Fixe l'orde des trames"
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr "Fixe l'ordre des trames dans une numérisation à trois passes."
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
@@ -5259,17 +5958,17 @@ msgstr ""
 "Si le chargeur de document est sélectionné, il sera 'vide' après 10 "
 "numérisations."
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr "Options spéciales"
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr "Sélectionne l'image de test"
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5289,14 +5988,14 @@ msgstr ""
 
 # YEM-20030211 : As foolish as it may appear, endian has been translated
 # into french as 'indien', although it has nothing to do with 'Indians'.
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr "Inversion petit/grand indien"
 
 # YEM-20030211 : As foolish as it may appear, endian has been translated
 # into french as 'indien', although it has nothing to do with 'Indians'.
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5307,57 +6006,57 @@ msgstr ""
 "à 1- bits. Ce peut-etre utile pour tester le support petit/grand indien "
 "d'une interface."
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr "Limite de lecture"
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 "Limite la quantité de données qui sont transmises à chaque appel à "
 "sane_read()"
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr "Taille de la limite de lecture"
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
 msgstr ""
 "La taille maximale des données transférées à chaque appel à sane_read()."
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr "Délai à la lecture"
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr "Retarde le transfert des données lues."
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr "Durée du délai de lecture"
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
 msgstr "Temps à attendre après avoir transféré les données lues."
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr "Valeur de retour de sane_read()"
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
@@ -5368,22 +6067,22 @@ msgstr ""
 "fonctionnement normal pour la numérisation. Toute autre valeur permet de "
 "tester les applications."
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr "Nombre de pixels perdus par ligne"
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr "Le nombre de pixels perdus à la fin de chaque ligne lue."
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr "Paramètres délirants"
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
@@ -5392,24 +6091,24 @@ msgstr ""
 "Renvoie des valeurs abhérantes pour le nombre de lignes et d'octets par "
 "ligne quand sane_parameters() est appelé avant sane_start()."
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr "E/S non bloquantes"
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 "Utilise un méchanisme d'E/S non bloquantes pour sane_read(), si supporté "
 "par l'application."
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr "Proposer un descripteur de fichier pour select(2)"
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
@@ -5418,12 +6117,12 @@ msgstr ""
 "Présente un descripteur de fichier de type select(2) pour tester si un "
 "appel a sane_read() renverra des données."
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr "Active les options de test"
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
@@ -5432,27 +6131,27 @@ msgstr ""
 "Active diverses options de test. Pour tester la capacité des "
 "applications à obtenir et modifier tous les types d'options de SANE."
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr "Liste des options"
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr "Affiche une liste de toutes les options."
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr "Options test - booléens"
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr "(1/6) Modification et lecture logicielles"
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
@@ -5461,12 +6160,12 @@ msgstr ""
 "(1/6) Option booléenne lisible et modifiable par l'application. C'est "
 "juste une option 'normale'."
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr "(2/6) Modification matérielle et lecture logicielle"
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
@@ -5476,12 +6175,12 @@ msgstr ""
 "(2/6) Option booléenne lisible par l'application et modifiable par le "
 "matériel (ex. un bouton sur le périphérique)."
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr "(3/6) Option booléenne modifiable par le matériel."
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5491,12 +6190,12 @@ msgstr ""
 "(3/6) Option booléenne modifiable par le matériel (ex. un bouton sur le "
 "périphérique) et dont le status ne peut pas etre lu par l'application."
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr "(4/6) Option booléenne lisible par logiciel"
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
@@ -5505,12 +6204,12 @@ msgstr ""
 "(4/6) Option booléenne lisible par le logiciel. Cette option est en "
 "lecture seule."
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr "(5/6) Option booléenne émulée"
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
@@ -5518,12 +6217,12 @@ msgid ""
 msgstr ""
 "(5/6) Options booléenne émulée, lisible et modifiable par le logiciel."
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr "(6/6) Option booléenne automatique"
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5533,27 +6232,27 @@ msgstr ""
 "(6/6) Option booléenne lisible et modifiable par le logiciel. Cette "
 "option peut être modifiée automatiquement par le pilote."
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr "Options test - entiers"
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr "(1/6) Entier"
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr "(1/6) Option à valeur entière sans unité ni domaine de variations."
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr "(2/6) Entière avec domaine."
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
@@ -5562,24 +6261,24 @@ msgstr ""
 "(2/6) Option à valeur entière avec domaine de variations. Unité: pixel. "
 "Min: 4. Max: 192. Pas: 2."
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr "(3/6) Entier listé"
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 "(3/6) Option à valeur entière dont les valeurs possibles sont contenues "
 "dans une liste. Untié : bit."
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr "(4/6) Tableau d'entiers"
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
@@ -5588,12 +6287,12 @@ msgstr ""
 "(4/6) Tableau d'options à valeur entière sans domaine de variations. "
 "Unité : mm."
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr "(5/6) Tableau d'entiers avec domaine"
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
@@ -5602,12 +6301,12 @@ msgstr ""
 "(5/6) Tableau d'options à valeur entière avec domaine de variations. "
 "Unité: dpi. Min: 4. Max: 192. Pas: 2."
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr "(6/6) Tableau d'entiers à valeurs listées"
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
@@ -5617,29 +6316,29 @@ msgstr ""
 "contenues dans des listes. Unité : %."
 
 # YEM-20030216 : I understand that 'fixed' is to be opposed to 'float'.
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr "Options test - réels fixes"
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr "(1/3) Réel fixe"
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr ""
 "(1/3) Option à valeur réelle (virgule fixe) sans unité ni domaine de "
 "variations."
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr "(2/3) Réel fixe avec domaine"
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
@@ -5648,51 +6347,51 @@ msgstr ""
 "(2/3) Option à valeur réelle (virgule fixe) avec domaine de variations. "
 "Unité: µs. Min: -42,17. Max: 32767,9999. Pas: 2,0."
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr "(3/3) Réel fixe listé"
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 "(3/3) Option à valeur réelle (vurgule fixe) sans unité et dont les "
 "valeurs possibles sont dans une liste."
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr "Options test - chaînes de caractères"
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr "(1/3) Chaîne"
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr "(1/3) Chaîne de caractères sans contrainte."
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr "(2/3) Chaîne listée"
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr ""
 "(2/3) Chaîne de caractères dont les valeurs possibles sont dans une "
 "liste."
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr "(3/3) Chaine listée (longue)"
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
@@ -5701,156 +6400,160 @@ msgstr ""
 "(3/3) Chaine de caractères dont les valeurs possibles sont dans une "
 "liste. Plus de choix..."
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr "Options test - boutons"
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr "(1/1) Bouton"
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr "(1/1) Bouton de test. Affiche du texte..."
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, no-c-format
 msgid "Color 36"
 msgstr "Couleur 36 bits"
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr "Utiliser la composition d'images"
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr "Noir et blanc (mode trait)"
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr "Noir et blanc (mode tramé)"
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr "Niveaux de gris"
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr "Couleur RVB (une passe)"
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr "Ignorer la calibration"
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr "Désactiver la mise au point"
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr "Ne calibre pas la mise au point"
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr "Mise au point manuelle"
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr "Mise au point fixe"
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr "Calibration de la lentille en mode document"
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr "Calibre la lentille en mode document."
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr "Mise au point au niveau de la vitre"
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr "Effectue la mise au point à 0mm de la vitre au lieu de 0.6mm"
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr "Mode de calibration"
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr "Définit le mode de calibration"
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr "Allume/éteint la lampe."
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr "Activer l'UTA"
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr "Activer/déactiver l'adaptateur universel de transparents (UTA)"
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr "Décalage"
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr "Réglages de décalage des couleurs"
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, no-c-format
 msgid "Gray offset"
 msgstr "Décalage des gris"
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr "Fixe le décalage pour le gris"
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr "Fixe le décalage pour le rouge"
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr "Fixe le décalage pour le vert"
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr "Fixe le décalage pour le bleu"
 
+#, fuzzy
+#~ msgid "IPC mode"
+#~ msgstr "Aperçu"
+
 #~ msgid "problem not analyzed (unknown SCSI class)"
 #~ msgstr "problème non traité (classe SCSI inconnue)"
 
diff --git a/po/gl.gmo b/po/gl.gmo
new file mode 100644
index 0000000..8c21b80
--- /dev/null
+++ b/po/gl.gmo
diff --git a/po/gl.po b/po/gl.po
index c96487c..8ed8e5d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
 "PO-Revision-Date: 2009-06-25 10:22+0100\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -20,411 +20,405 @@ msgstr ""
 "X-Poedit-Language: Galician\n"
 "X-Poedit-Country: SPAIN\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr "Número de opcións"
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr "Estándar"
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "Xeometría"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "Optimización"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr "Sensores"
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "Vista previa"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr "Forzar vista previa monocroma"
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr "Bit de profundidade"
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Modo de escaneo"
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "Velocidade de escaneo"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr "Orixe de escaneo"
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr "Forzar retroceso"
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "Arriba-esquerda X"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "Arriba-esquerda Y"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "Abaixo-dereita X"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "Abaixo-dereita Y"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Resolución de escaneo"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "Resolución X"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Resolución Y"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr "Ancho de páxina"
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, no-c-format
 msgid "Page height"
 msgstr "Altura de páxina"
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr "Usar táboa gamma personalizada"
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr "Intensidade da imaxe"
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr "Intensidade de vermello"
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr "Intensidade de verde"
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr "Intensidade de azul"
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr "Brillo"
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr "Tamaño do gran"
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr "Medios tons"
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "Nivel do negro"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "Nivel do branco"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr "Nivel do branco para vermello"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
 msgstr "Nivel do branco para verde"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr "Nivel do branco para azul"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "Sombra"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr "Sombra para vermello"
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr "Sombra para verde"
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr "Sombra para azul"
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr "Resaltar"
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr "Resalte para vermello"
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr "Resalte para verde"
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr "Resalte para azul"
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr "Matiz"
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr "Saturación"
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr "Tamaño do patrón de medios tons"
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "Patrón de medios tons"
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr "Ligar resolucións X e Y"
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "Negativo"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "Calibración da calidade"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr "Dobre resolución óptica"
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr "Ligar RGB"
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr "Limiar"
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr "Corrección gamma analóxica"
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr "Gamma analóxica vermella"
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr "Gamma analóxica verde"
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr "Gamma analóxica azul"
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr "Ligar gamma analógico"
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr "Quecemento da lámpada"
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr "Cal. tempo de exposición"
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr "Cal. tempo de exposición para vermello"
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr "Cal. tempo de exposición para verde"
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr "Cal. tempo de exposición para azul"
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr "Tempo de exposición para escaneo"
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr "Tempo de exposición para vermello"
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr "Tempo de exposición para verde"
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr "Tempo de exposición para azul"
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr "Axustar tempo de exposición"
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr "Cal. densidade da lámpada"
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr "Densidade da lámpada de escaneo"
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr "Axustar a densidade da lámpada"
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr "Apagar a lámpada ao saír"
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
@@ -433,37 +427,37 @@ msgstr ""
 "Opción de só lectura que define cantas opcións soporta un dispositivo "
 "específico."
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "Orixe, opcións de modo e resolución"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr "Opcións da área de escaneo e tamaño do soporte"
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, no-c-format
 msgid "Image modification options"
 msgstr "Opcións de modificación de imaxe"
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, no-c-format
 msgid "Hardware specific options"
 msgstr "Opcións especificas de hardaware"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr "Sensores e botóns do escáner"
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr "Solicitar unha vista previa de calidade d escaneo."
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -475,7 +469,7 @@ msgstr ""
 "nun escáner dunha pasada isto reduce o requisitos de memoria e o tempo "
 "de escaneo da vista previa."
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
@@ -484,65 +478,65 @@ msgstr ""
 "Número de bits por mostra, valores típicos son 1 para «liña de arte» e 8 "
 "para escaneos multibit."
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr ""
 "Selecciona o modo de escaneo (ex. liña de arte, monocromo, ou cor)."
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr "Determina a velocidade á que se fai o escaneo."
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr ""
 "Selecciona a orixe do escaneo (como pode ser un alimentador de "
 "documentos)."
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr "Controla se se forza o retroceso"
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "Posición X arriba-esquerda da área de escaneo."
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "Posición Y arriba-esquerda da área de escaneo."
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "Posición X abaixo-dereita da área de escaneo."
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "Posición Y abaixo-dereita da área de escaneo."
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr "Axusta a resolución da imaxe escaneada."
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr "Axusta a resolución horizontal da imaxe escaneada."
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr "Axusta a resolución vertical da imaxe escaneada."
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
@@ -551,19 +545,19 @@ msgstr ""
 "Especifica a anchura do soporte. É preciso para o centrado automático de "
 "follas de escaneo."
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, no-c-format
 msgid "Specifies the height of the media."
 msgstr "Especifica a altura do soporte"
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid ""
 "Determines whether a builtin or a custom gamma-table should be used."
 msgstr ""
 "Determina se se debe usarse unha táboa gamma interna ou personalizada."
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -574,32 +568,32 @@ msgstr ""
 "canles vermella, verde e azul de vez (ex. é unha táboa de intensidade "
 "gamma)."
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr "Táboa de corrección gamma para a gama vermella."
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr "Táboa de corrección gamma para a gama verde."
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr "Táboa de corrección gamma para a gama azul."
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr "Controla o brillo da imaxe obtida."
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr "Controla o contraste da imaxe obtida."
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
@@ -608,71 +602,71 @@ msgstr ""
 "Escolle o «granulado» da imaxe obtida. Valores máis pequenos fornecen "
 "imaxes máis nitidas."
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr ""
 "Define se a imaxe obtida debe ser convertida a medios tons (punteado)."
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr ""
 "Selecciona que nivel de radiancia debe ser tida en conta \"negro\"."
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr ""
 "Selecciona que nivel de radiancia debe ser tida en conta \"branco\"."
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr ""
 "Selecciona que nivel de radiancia vermella debe ser tida en conta "
 "\"branco\"."
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr ""
 "Selecciona que nivel de radiancia verde debe ser tida en conta \"branco"
 "\"."
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr ""
 "Selecciona que nivel de radiancia azul debe ser tida en conta \"branco\"."
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr ""
 "Selecciona que nivel de radiancia vermella debe ser tida en conta \"negro"
 "\"."
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr ""
 "Selecciona que nivel de radiancia verde debe ser tida en conta \"negro\"."
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr ""
 "Selecciona que nivel de radiancia azul debe ser tida en conta \"negro\"."
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr ""
 "Selecciona que nivel de radiancia vermella debe ser tida en conta "
 "\"vermello total\"."
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid ""
 "Selects what green radiance level should be considered \"full green\"."
@@ -680,7 +674,7 @@ msgstr ""
 "Selecciona que nivel de radiancia verde debe ser tida en conta \"verde "
 "total\"."
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid ""
 "Selects what blue radiance level should be considered \"full blue\"."
@@ -688,12 +682,12 @@ msgstr ""
 "Selecciona que nivel de radiancia azul debe ser tida en conta \"azul "
 "total\"."
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr "Controla o \"matiz\" (nivel de azul) da imaxe obtida."
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
@@ -703,12 +697,12 @@ msgstr ""
 "ocorre cando se obtén unha imaxe cunha cámara. Valores máis altos "
 "producen máis florecemento."
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr "Nome do ficheiro da imaxe a cargar."
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
@@ -717,7 +711,7 @@ msgstr ""
 "Axusta o tamaño do patrón de medios tons (punteado) usado cando se "
 "escanean as imaxes de medios tons."
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
@@ -725,287 +719,287 @@ msgstr ""
 "Define o patrón de medios tons (punteado) para escanear as imaxes de "
 "medios tons."
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr "Usar os mesmos valores para a resolución X e Y."
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr "Intercambiar branco e negro"
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr "Facer unha calibración de calidade dos brancos"
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr "Usar lente que duplica a resolución óptica"
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr "En modo RGB usar os mesmos valores para cada cor"
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr "Seleccionar o brillo mínimo para obter un punto branco"
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr "Corrección gamma analóxica"
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr "Corrección gamma analóxica para vermello"
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr "Corrección gamma analóxica para verde"
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr "Corrección gamma analóxica para azul"
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr "Quecer a lámpada antes de escanear"
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr "Definir tempo de exposición para a calibración"
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr "Definir tempo de exposición para a calibración vermella"
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr "Definir tempo de exposición para a calibración verde"
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr "Definir tempo de exposición para a calibración azul"
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr "Definir tempo de exposición para o escaneo"
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr "Definir tempo de exposición para o escaneo vermello"
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr "Definir tempo de exposición para o escaneo verde"
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr "Definir tempo de exposición para o escaneo azul"
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr "Activar selección do tempo de exposición"
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr "Definir densidade da lámpada para a calibración"
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr "Definir densidade da lámpada para o escaneo"
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr "Activar a selección da densidade da lámpada"
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr "Apaga a lámpada ao saír do programa"
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, no-c-format
 msgid "Scan button"
 msgstr "Botón de control de escaneo"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, no-c-format
 msgid "Email button"
 msgstr "Botón de correo-e"
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, no-c-format
 msgid "Fax button"
 msgstr "Botón de fax"
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, no-c-format
 msgid "Copy button"
 msgstr "Botón de copia"
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr "Botón de PDF"
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr "Botón de cancelar"
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr "Páxina cargada"
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, no-c-format
 msgid "Cover open"
 msgstr "A tapa está aberta"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "Cor"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr "Liña de arte coloreada"
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr "Medios tons coloreados"
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "Gris"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr "Medios tons"
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "Liña de arte"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr "Éxito"
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, no-c-format
 msgid "Operation not supported"
 msgstr "Operación non compatible"
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr "A operación vai ser cancelada"
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr "Dispositivo ocupado"
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr "Argumento incorrecto"
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr "Acadouse o fin do ficheiro"
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, no-c-format
 msgid "Document feeder jammed"
 msgstr "Alimentador de documentos atrancado"
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, no-c-format
 msgid "Document feeder out of documents"
 msgstr "O alimentador de documentos está baleiro"
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, no-c-format
 msgid "Scanner cover is open"
 msgstr "A tapa do escáner está aberta"
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr "Erro en dispositivo de E/S"
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr "Non queda memoria"
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr "Denegouse o acceso ao recurso"
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr "A lámpada non está preparada, tenteo de novo"
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr "O escáner está bloqueado para transporte"
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "Predeterminados"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr "Axustar valores predeterminados para os controis de optimización."
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "Calibración"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr "Calibrar antes do seguinte escaneo"
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
@@ -1014,12 +1008,12 @@ msgstr ""
 "Se se activa, o dispositivo hase calibrar antes do seguinte escaneo. "
 "Noutro caso, a calibración farase unicamente antes do primeiro escaneo."
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr "Facer só correccións de sombras"
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -1031,1069 +1025,1060 @@ msgstr ""
 "desprazamento e tempo de exposición, xa sexan os que trae incorporados o "
 "programa ou os do ficheiro de configuración."
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr "Botón de estado"
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr "Número de mostra a escanear"
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr "Escolle o número de mostra a escanear"
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, no-c-format
 msgid "Duplex scan"
 msgstr "Escaneo dúplex"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid ""
 "Duplex scan provide a scan of the front and back side of the document"
 msgstr ""
 "O escaneo dúplex fornece un escaneo do anverso e o reverso do documento"
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr "Calibrar o escáner"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr "Forza a calibrar o escáner antes de facer o escaneo"
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr "Escaneo en escala de grises"
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr "Escanea en escala de grises, non en cores"
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr "Ganancia analóxica"
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr "Aumenta o diminúe a ganancia analóxica da gama CCD"
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "Corrección gamma"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr "Selecciona a curva de transferencia da corrección gamma"
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr "En bruto"
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr "Cor fina"
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, no-c-format
 msgid "No transparency correction"
 msgstr "Sen corrección de transparencia"
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr "Corrección conforme co tipo de filme"
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr "Corrección conforme coa taxa de transparencia"
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, no-c-format
 msgid "Negatives"
 msgstr "Negativos"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, no-c-format
 msgid "Slides"
 msgstr "Diapositivas"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, no-c-format
 msgid "Normal speed"
 msgstr "Velocidade normal"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/2 normal speed"
 msgstr "1/2 da velocidade normal"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/3 normal speed"
 msgstr "1/3 da velocidade normal"
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, no-c-format
 msgid "rounded parameter"
 msgstr "parámetro redondeado"
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr "descoñecido"
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, no-c-format
 msgid "ADF jam"
 msgstr "Atoamento no alimentador"
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr "A tapa do alimentador está aberta"
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, no-c-format
 msgid "lamp failure"
 msgstr "fallo de lámpada"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr "erro no posicionamento do cabezal de escaneo"
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr "erro de verificación de CPU"
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr "erro de verificación de RAM"
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr "erro de verificación de ROM"
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr "erro de verificación de hardware"
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, no-c-format
 msgid "transparency unit lamp failure"
 msgstr "fallo da lámpada da unidade de transparencias"
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr ""
 "fallo de posición do cabezal de escaneo da unidade de transparencias"
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr "erro na lonxitude da lista de parámetros"
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr "código de orde de operación incorrecto"
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr "campo incorrecto en CDB"
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr "LUN non é compatíbel"
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr "campo incorrecto na lista de parámetros"
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr "erro na secuencia de ordes"
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr "especifícanse demasiadas xanelas"
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr "non se atopa o soporte"
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr "mensaxe de bit de IDENTIFICACIÓN incorrecta"
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr "a opción non conecta"
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr "reiniciar o acendido / reiniciar o bus do dispositivo"
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr "parámetro cambiado por outro iniciador"
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr "información sen senso adicional"
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr "Fallou a volta a escoller"
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr "erro de paridade SCSI"
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr "o iniciador detectou a recepción dunha mensaxe de erro"
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr "mensaxe de erro incorrecta"
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr "erro de límite de tempo"
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, no-c-format
 msgid "transparency unit shading error"
 msgstr "erro de sombreado na unidade de transparencias"
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr "lámpada non estabilizada"
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, no-c-format
 msgid "film scanner"
 msgstr "escáner de filmes"
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr "escáner plano"
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr "Tipo de filme"
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr "Escoller o tipo de filme, p.e. negativo ou diapositiva"
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, no-c-format
 msgid "Negative film type"
 msgstr "Tipo de filme negativo"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, no-c-format
 msgid "Selects the negative film type"
 msgstr "Selecciona o tipo de negativo de filme"
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, no-c-format
 msgid "Hardware resolution"
 msgstr "Resolución do hardware"
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "Usar só resolucións do hardware"
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr "Enfoque"
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, no-c-format
 msgid "Auto focus"
 msgstr "Enfoque automático"
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, no-c-format
 msgid "Enable/disable auto focus"
 msgstr "Activar/desactivar enfoque automático"
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr "Enfoque automático só unha vez"
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr "Facer enfoque automático só unha vez entre expulsións"
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, no-c-format
 msgid "Manual focus position"
 msgstr "Posición de foco manual"
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr ""
 "Axustar o sistema óptico de foco na posición manual (predeterminado: "
 "128)."
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr "Marxes de escaneo"
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr "Axustes de cor extra"
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "Reflectir a imaxe horizontalmente"
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "Inverter a imaxe horizontalmente"
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, no-c-format
 msgid "Auto exposure"
 msgstr "Exposición automática"
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr "Activar/desactivar a característica de exposición automática"
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, no-c-format
 msgid "Calibration now"
 msgstr "Calibrar agora"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Executar a calibración *agora*"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr "Diagnose automatica"
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr "Facer unha diagnose automatica do escáner"
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, no-c-format
 msgid "Reset scanner"
 msgstr "Reiniciar o escáner"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, no-c-format
 msgid "Reset the scanner"
 msgstr "Reiniciar o escáner"
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr "Manexar o soporte"
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, no-c-format
 msgid "Eject film after each scan"
 msgstr "Expulsar o filme despois de cada escaneo"
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr ""
 "Expulsar automaticamente o filme do dispositivo despois de cada escaneo"
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr "Expulsar o filme antes de saír"
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr ""
 "Expulsar automaticamente o filme do dispositivo antes de saír do programa"
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr "Expulsar o filme agora"
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr "Expulsar o filme *agora*"
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, no-c-format
 msgid "Document feeder extras"
 msgstr "Alimentador de documentos extras"
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, no-c-format
 msgid "Flatbed only"
 msgstr "Só plano"
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr ""
 "Desactivar o alimentador automático de documentos e usar só o plano"
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, no-c-format
 msgid "Transparency unit"
 msgstr "Unidade de transparencias"
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr ""
 "Activar/desactivar a unidade de transparencias (FAU, unidade adaptadora "
 "de filme)"
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, no-c-format
 msgid "Negative film"
 msgstr "Filme en negativo"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, no-c-format
 msgid "Positive or negative film"
 msgstr "Filme en positivo ou en negativo"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr "Control de densidade"
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr "Axustar o modo de control de densidade"
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, no-c-format
 msgid "Transparency ratio"
 msgstr "Taxa de transparencia"
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, no-c-format
 msgid "Select film type"
 msgstr "Escoller tipo de filme"
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, no-c-format
 msgid "Select the film type"
 msgstr "Escoller o tipo de filme"
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "Plano"
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, fuzzy, no-c-format
 msgid "ADF Front"
 msgstr "A tapa do alimentador está aberta"
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, fuzzy, no-c-format
 msgid "ADF Back"
 msgstr "Atoamento no alimentador"
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, no-c-format
 msgid "ADF Duplex"
 msgstr "Alimentador dúplex"
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, fuzzy, no-c-format
 msgid "Card Front"
 msgstr "Imprimir"
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, no-c-format
 msgid "Card Back"
 msgstr ""
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, fuzzy, no-c-format
 msgid "Card Duplex"
 msgstr "Duas caras"
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "Vermello"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "Verde"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "Azul"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, fuzzy, no-c-format
 msgid "Enhance Red"
 msgstr "Optimización"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, fuzzy, no-c-format
 msgid "Enhance Green"
 msgstr "Optimización"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, fuzzy, no-c-format
 msgid "Enhance Blue"
 msgstr "Optimización"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr "Ningún"
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr ""
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr ""
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr "Unha cara"
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr "Duas caras"
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr "Unidade de transparencias"
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr "Alimentador automático de documentos (ADF)"
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "Filme en positivo"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "Filme en negativo"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr "Enfoque no cristal"
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr "Enfoque a 2.5mm sobre o cristal"
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr "Medios tons A (tons duros)"
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr "Medios tons B (tons suaves)"
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr "Medios tons C (matizado)"
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr "Trama A (4x4 Bayer)"
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr "Trama B (4x4 espiral)"
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr "Trama C (4x4 matizado)"
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr "Trama D (8x4 matizado)"
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr "Tecnoloxia de optimización de texto"
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr "Descargar patrón A"
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr "Descargar patrón B"
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "Sen corrección"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr "Definida polo usuario"
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr "Impresoras matriciais"
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr "Impresoras térmicas"
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "Impresoras de inxección de tinta"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr "Monitores CRT"
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr "Impresión de alta densidade"
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr "Impresión de baixa densidade"
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr "Impresión de alto contraste"
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr "Definido polo usuario (gamma=1.0)"
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr "Definido polo usuario (gamma=1.8)"
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr "CD"
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr "A5 vertical"
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr "A5 apaisado"
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr "Carta"
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr "A4"
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "Máx"
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr "Modo de escaneo"
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr "Escolle o medios tons"
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr "Exclusión"
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr "Escoller o que se vai a excluir"
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr "Escoller o brillo"
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr "Nitidez"
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr "Corrección da cor"
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr ""
 "Axusta a táboa de corrección da cor para o dispositivo de saída "
 "seleccionado."
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr "Coeficientes de corrección da cor"
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr "Matriz de multiplicación de RGB"
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr "Cambiar de verde a vermello"
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr "Cambiar de verde a azul"
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr "Cambiar de vermello a verde"
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr "Cambiar de vermello a azul"
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr "Cambiar de azul a verde"
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr "Cambiar de azul a vermello"
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr "Controla o nivel de verde"
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr "Engade vermello baseándose no nivel de verde"
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr "Engade azul baseándose no nivel de verde"
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr "Engade verde baseándose no nivel de vermello"
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr "Controla o nivel de vermello"
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr "Engade azul baseándose no nivel de vermello"
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr "Engade verde baseándose no nivel de azul"
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr "Engade vermello baseándose no nivel de azul"
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, no-c-format
 msgid "Controls blue level"
 msgstr "Controla o nivel de azul"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr "Reflectir a imaxe."
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr "Vista previa rápida"
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr "Segmentación automática da área"
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr "Lista curta de resolucións"
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr "Amosar lista curta de resolucións"
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr "Define o factor de zoom que vai usar o escáner"
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr "Formato rápido"
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr "Equipamento opcional"
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr "Expulsar"
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr "Expulsar a folla do alimentador"
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr "Expulsión automática"
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr "Expulsar o documento despois do escaneo"
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr "Modo alimentador"
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr "Escoller o modo do alimentador (unha cara/duas caras)"
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr "Badía"
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr "Escolla a badía para escanear"
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
@@ -2103,12 +2088,12 @@ msgstr ""
 "predefinidos ou dunha táboa definida polo usuario, que pode ser "
 "descargada ao escáner."
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr "Posición do foco"
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
@@ -2116,12 +2101,12 @@ msgstr ""
 "Axusta a posición do foco, xa sexa ao cristal ou a 2.5mm por riba do "
 "cristal"
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr "Agardar ao botón"
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
@@ -2130,219 +2115,966 @@ msgstr ""
 "Despois de enviar a orde de escaneo, agardar até que se prema no botón "
 "do escáner para comezar verdadeiramente o proceso de escaneo."
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr ""
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, no-c-format
 msgid "Positive Slide"
 msgstr "Diapositiva en positivo"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, no-c-format
 msgid "Negative Slide"
 msgstr "Diapositiva en negativo"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr ""
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, fuzzy, no-c-format
 msgid "User defined CCT profile"
 msgstr "Definida polo usuario"
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr "Activado"
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr "Desactivado"
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr "Esfumado"
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, fuzzy, no-c-format
 msgid "Diffusion"
 msgstr "Difusión de erro"
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, fuzzy, no-c-format
 msgid "White"
 msgstr "Nivel do branco"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, fuzzy, no-c-format
 msgid "Black"
 msgstr "Nivel do negro"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, fuzzy, no-c-format
 msgid "Continue"
 msgstr "Condicional"
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr ""
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, fuzzy, no-c-format
 msgid "Horizontal bold"
 msgstr "Horizontal"
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, fuzzy, no-c-format
 msgid "Horizontal narrow"
 msgstr "Horizontal"
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr "Vertical"
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, fuzzy, no-c-format
 msgid "Vertical bold"
 msgstr "Vertical"
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr ""
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr ""
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, fuzzy, no-c-format
 msgid "Front"
 msgstr "Imprimir"
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr ""
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
+msgid "Gamma function exponent"
 msgstr ""
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
 #, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
+msgid "Changes intensity of midtones"
+msgstr ""
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr ""
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr ""
+
+#: backend/fujitsu.c:3165
+#, fuzzy, no-c-format
+msgid "Halftone type"
+msgstr "Medios tons"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr ""
+
+#: backend/fujitsu.c:3210
+#, fuzzy, no-c-format
+msgid "Perform outline extraction"
+msgstr "Calibración de precisión"
+
+#: backend/fujitsu.c:3221
+#, fuzzy, no-c-format
+msgid "Emphasis"
+msgstr "Destaque da imaxe"
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr ""
+
+#: backend/fujitsu.c:3240
+#, fuzzy, no-c-format
+msgid "Separation"
+msgstr "Saturación"
+
+#: backend/fujitsu.c:3241
+#, fuzzy, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr ""
+"Activar a determinación automática do limiar para escaneos como liña de "
+"arte."
+
+#: backend/fujitsu.c:3252
+#, fuzzy, no-c-format
+msgid "Mirroring"
+msgstr "Reflectir a imaxe horizontalmente"
+
+#: backend/fujitsu.c:3253
+#, fuzzy, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "Reflectir a imaxe en horizontal"
+
+#: backend/fujitsu.c:3270
+#, fuzzy, no-c-format
+msgid "White level follower"
+msgstr "Nivel do branco para azul"
+
+#: backend/fujitsu.c:3271
+#, fuzzy, no-c-format
+msgid "Control white level follower"
+msgstr "Controla o nivel de vermello"
+
+#: backend/fujitsu.c:3289
+#, fuzzy, no-c-format
+msgid "BP filter"
+msgstr "Filtro de cor"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr ""
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr "Suavizado"
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr ""
+
+#: backend/fujitsu.c:3323
+#, fuzzy, no-c-format
+msgid "Gamma curve"
+msgstr "Valor gamma"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, fuzzy, no-c-format
+msgid "Threshold curve"
+msgstr "Limiar"
+
+#: backend/fujitsu.c:3347
+#, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+
+#: backend/fujitsu.c:3369
+#, fuzzy, no-c-format
+msgid "Threshold white"
+msgstr "Limiar"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr ""
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, fuzzy, no-c-format
+msgid "Noise removal"
+msgstr "Redución de ruído"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr ""
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr ""
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr ""
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr ""
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr ""
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
 msgstr ""
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:3508
+#, fuzzy, no-c-format
+msgid "Auto width detection"
+msgstr "Sen corrección"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr ""
+
+#: backend/fujitsu.c:3526
+#, fuzzy, no-c-format
+msgid "Auto length detection"
+msgstr "Sen corrección"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr ""
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr ""
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr ""
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr ""
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr ""
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr ""
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr ""
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
+msgstr ""
+
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3708
+#, fuzzy, no-c-format
+msgid "DF recovery mode"
+msgstr "A tapa do alimentador está aberta"
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr ""
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3748
+#, fuzzy, no-c-format
+msgid "Advanced paper protection"
+msgstr "Opcions avanzadas"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+
+#: backend/fujitsu.c:3768
+#, fuzzy, no-c-format
+msgid "Staple detection"
+msgstr "Sen corrección"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr ""
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+
+#: backend/fujitsu.c:3809
+#, fuzzy, no-c-format
+msgid "Dropout color"
+msgstr "Exclusión"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+
+#: backend/fujitsu.c:3833
+#, fuzzy, no-c-format
+msgid "Buffer mode"
+msgstr "Modo de alimentación"
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr ""
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr ""
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr ""
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+
+#: backend/fujitsu.c:3911
+#, fuzzy, no-c-format
+msgid "Off timer"
+msgstr "Tempo para apagado da lámpada"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+
+#: backend/fujitsu.c:3930
+#, fuzzy, no-c-format
+msgid "Duplex offset"
+msgstr "Desviación azul"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr ""
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "Desviación verde"
+
+#: backend/fujitsu.c:3949
+#, fuzzy, no-c-format
+msgid "Adjust green/red offset"
+msgstr "Desviación verde"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr "Desviación azul"
+
+#: backend/fujitsu.c:3967
+#, fuzzy, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "Axusta o desprazamento da canle azul"
+
+#: backend/fujitsu.c:3980
+#, fuzzy, no-c-format
+msgid "Low Memory"
+msgstr "Non queda memoria"
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+
+#: backend/fujitsu.c:3996
+#, fuzzy, no-c-format
+msgid "Duplex side"
+msgstr "Escaneo dúplex"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr ""
+
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr ""
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr ""
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
+msgstr ""
+
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr ""
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+
+#: backend/fujitsu.c:4095
+#, fuzzy, no-c-format
+msgid "Endorser Options"
+msgstr "Opcions avanzadas"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr ""
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr ""
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr ""
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr ""
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr ""
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr ""
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr ""
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr ""
+
+#: backend/fujitsu.c:4253
+#, fuzzy, no-c-format
+msgid "Endorser direction"
+msgstr "Redución de ruído"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr ""
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr ""
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr ""
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr ""
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr ""
+
+#: backend/fujitsu.c:4344
+#, fuzzy, no-c-format
+msgid "A3 paper"
+msgstr "De papel"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4356
+#, fuzzy, no-c-format
+msgid "B4 paper"
+msgstr "De papel"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4368
+#, fuzzy, no-c-format
+msgid "A4 paper"
+msgstr "De papel"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4380
+#, fuzzy, no-c-format
+msgid "B5 paper"
+msgstr "De papel"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr ""
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr ""
+
+#: backend/fujitsu.c:4429
+#, fuzzy, no-c-format
+msgid "Scanner in power saving mode"
+msgstr "A tapa do escáner está aberta"
+
+#: backend/fujitsu.c:4452
+#, fuzzy, no-c-format
+msgid "Manual feed"
+msgstr "Foco previo manual"
+
+#: backend/fujitsu.c:4453
+#, fuzzy, no-c-format
+msgid "Manual feed selected"
+msgstr "Foco previo manual"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr ""
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr ""
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr ""
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr ""
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr ""
+
+#: backend/fujitsu.c:4513
+#, fuzzy, no-c-format
+msgid "Hardware error code"
+msgstr "erro de verificación de hardware"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr ""
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr ""
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr ""
+
+#: backend/fujitsu.c:4537
+#, fuzzy, no-c-format
+msgid "Imprinter ink level"
+msgstr "Nivel do branco"
+
+#: backend/fujitsu.c:4548
+#, fuzzy, no-c-format
+msgid "Density"
+msgstr "Control de densidade"
+
+#: backend/fujitsu.c:4549
+#, fuzzy, no-c-format
+msgid "Density dial"
+msgstr "Control de densidade"
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, fuzzy, no-c-format
+msgid "Duplex switch"
+msgstr "Escaneo dúplex"
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, no-c-format
 msgid "Extras"
 msgstr "Extras"
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, fuzzy, no-c-format
-msgid "Threshold curve"
-msgstr "Limiar"
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr ""
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
 "instead on hardware lineart."
 msgstr ""
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, no-c-format
 msgid "Disable interpolation"
 msgstr "Desactivar interpolación"
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
@@ -2351,45 +3083,45 @@ msgstr ""
 "Cando se usan altas resolucións nas que a resolución horizontal é máis "
 "pequena que a vertical, isto desactiva a interpolación horizontal."
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "Filtro de cor"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 "Cando se usa gris ou liña de arte esta opción selecciona a cor a usar."
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "Calibración"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Definir o modo de calibración"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Caché de datos de calibración"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, no-c-format
 msgid "Lamp off time"
 msgstr "Tempo para apagado da lámpada"
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
@@ -2398,105 +3130,103 @@ msgstr ""
 "A lámpada vai ser apagada despois do tempo indicado (en minutos). Un "
 "valor de 0 significa que a lámpada no vai ser apagada."
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, fuzzy, no-c-format
 msgid "Lamp off during scan"
 msgstr "Apagar a lámpada durante a calibración de escuridade"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, fuzzy, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr "Minutos que tardará a lámpada en apagarse despois do escaneo"
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, no-c-format
 msgid "File button"
 msgstr "Botón de ficheiro"
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr "Botón de OCR"
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, no-c-format
 msgid "Power button"
 msgstr "Botón de enerxía"
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "Botón de correo-e"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, fuzzy, no-c-format
 msgid "Need calibration"
 msgstr "Limpar a calibración"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, fuzzy, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr "Forza a calibrar o escáner antes de facer o escaneo"
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, no-c-format
 msgid "Buttons"
 msgstr "Botóns"
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr "Calibrar"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "Iniciar a calibración usando unha folla especial"
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, no-c-format
 msgid "Clear calibration"
 msgstr "Limpar a calibración"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, no-c-format
 msgid "Clear calibration cache"
 msgstr "Limpar a caché de datos de calibración"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr "Adaptador de transparencias"
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr "Cor en modo gris"
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 "Escolle que cor de escaneo vai ser usada en modo gris (predefinido: "
 "verde)."
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr "Opcións de depuración"
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "Quecemento automático"
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -2505,12 +3235,12 @@ msgstr ""
 "Quecer até que o brillo da lámpada sexa constante no canto de agardar "
 "polos 60 segundos de quecemento."
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "Escaneo completo"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
@@ -2519,12 +3249,12 @@ msgstr ""
 "Escanear toda a área de escaneo incluindo a franxa de calibración. Teña "
 "cuidado. Non seleccione a altura total. Só para probas."
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Calibración grosa"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2536,12 +3266,12 @@ msgstr ""
 "parámetros de xeito manual na interface analóxica. Esta opción está "
 "activada como predefinida. Só para probas."
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "Calibración grosa só para o primeiro escaneo"
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2553,12 +3283,12 @@ msgstr ""
 "imaxe é diferente con cada escaneo, desactive esta opción. Só para "
 "probas."
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, no-c-format
 msgid "Backtrack lines"
 msgstr "Liñas de retroceso"
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2573,38 +3303,38 @@ msgstr ""
 "recibir datos. Valores baixos fan que os escaneos sexan más rápidos, "
 "pero aumentan os riscos de omitir liñas."
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Valor gamma"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr "Axusta o valor gamma para todas as canles."
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, no-c-format
 msgid "Geometry Group"
 msgstr "Grupo de xeometría"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, no-c-format
 msgid "Scan Mode Group"
 msgstr "Grupo de modo de escaneo"
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr "Diapositiva"
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, no-c-format
 msgid "Scanner model"
 msgstr "Modelo de escáner"
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, fuzzy, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr ""
@@ -2612,47 +3342,47 @@ msgstr ""
 "compatíbeisPermite comprobar o comportamento do dispositivo con outros "
 "modelos compatíbeis"
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr "As imaxes a cor hanse inverter"
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, no-c-format
 msgid "Disable gamma correction"
 msgstr "Desactivar a corrección gamma"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "A corrección gamma hase desactivar"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, no-c-format
 msgid "Disable white shading correction"
 msgstr "Desactivar a corrección de sombra branca"
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr "A corrección de sombra branca hase desactivar"
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr "Omitir proceso de quecemento"
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr "O proceso de quecemento hase desactivar"
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr "Forzar a profundidade real"
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2663,12 +3393,12 @@ msgstr ""
 "para mellorar a calidade da imaxe e despois convertila á profundidade "
 "seleccionada. Esta opción evita a emulación da profundidade."
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, no-c-format
 msgid "Emulate Grayscale"
 msgstr "Emular escala de grises"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2679,12 +3409,12 @@ msgstr ""
 "convertida a escala de grises por software. Isto pode mellorar a "
 "calidade da imaxe nalgunhas circunstancias."
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr "Gardar as imaxes de depuración"
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
@@ -2693,358 +3423,352 @@ msgstr ""
 "Se se activa, algunhas imaxes implicadas no proceso de escaneo "
 "gardaranse para analizalas."
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, no-c-format
 msgid "Reset chipset"
 msgstr "Reiniciar o chipset"
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr "Reiniciar os datos do chipset"
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, no-c-format
 msgid "Information"
 msgstr "Información"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, no-c-format
 msgid "Chipset name"
 msgstr "Nome do chipset"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr "Amosa o nome do chipset usado no dispositivo."
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr "ID do chipset"
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, no-c-format
 msgid "Shows the chipset ID"
 msgstr "Amosa o ID do chipset"
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, no-c-format
 msgid "Scan counter"
 msgstr "Contador de escaneos"
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr "Amosa o número de escaneos feitas polo escáner"
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, no-c-format
 msgid "Update information"
 msgstr "Actualizar a información"
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr "Actualiza a información acerca do dispositivo"
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr "Esta opción reflicte un botón do panel frontal do escáner"
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr "Imaxe"
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr "Miscelánea"
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, no-c-format
 msgid "offset X"
 msgstr "posición X"
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr "Posición X interna no hardware da zona de escaneo."
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, no-c-format
 msgid "offset Y"
 msgstr "posición Y"
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr "Posición Y interna no hardware da zona de escaneo."
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr "Estado da lámpada"
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr "Acende ou apaga a lámpada"
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr "Calibrar o nivel de branco e negro."
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr "Alimentador automático de documentos (ADF)"
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, no-c-format
 msgid "TMA Slides"
 msgstr "Adaptador (TMA) para diapositivas"
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, no-c-format
 msgid "TMA Negatives"
 msgstr "Adaptador (TMA) para negativos"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, no-c-format
 msgid "Color (48 bits)"
 msgstr "Cor (48 bits)"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, no-c-format
 msgid "Extend lamp timeout"
 msgstr "Retardar o tempo de apagado da lámpada"
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr "Retarda os tempos de apagado da lámpada (de 15 minutos a 1 hora)"
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr "Agardando polo botón"
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, no-c-format
 msgid "Waits for button before scanning"
 msgstr "Agardando polo botón antes de escanear"
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, no-c-format
 msgid "Advanced Options"
 msgstr "Opcions avanzadas"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr "Groso"
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr "Fina"
 
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr "Bayer"
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "Automático"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr "NTSC RGB"
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr "Adaptador de transparencias RGB"
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr "A través"
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "NTSC Gris"
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr "Adaptador de transparencias gris"
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "Lento"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "Rápido"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr "Moi rápido"
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr "2-píxeles"
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr "4-píxeles"
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr "8-píxeles"
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr "Imprimir"
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, no-c-format
 msgid "Film-strip"
 msgstr "Tira de filme"
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr "Adaptador de transparencias (XPA)"
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr "Condicional"
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, no-c-format
 msgid "Experiment"
 msgstr "Experimento"
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, no-c-format
 msgid "Sharpening"
 msgstr "Nitidez"
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr "Axustar o valor de nitidez."
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr "Limiar automático"
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr ""
 "Activar a determinación automática do limiar para escaneos como liña de "
 "arte."
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr "Suavizado"
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr "Escoller filtro de suavizado."
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr "Descargar os soportes despois de escanear."
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, no-c-format
 msgid "Unloads the media after a scan."
 msgstr "Descargar as unidades despois de escanear."
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, no-c-format
 msgid "Change document"
 msgstr "Cambiar o documento"
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr "Cambiar o documento."
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr "Descargar"
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr "Descargar o documento"
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, no-c-format
 msgid "Start calibration process."
 msgstr "Iniciar proceso de calibración"
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, no-c-format
 msgid "Media"
 msgstr "Soporte"
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr "Axustar tipo de soporte."
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr "Tempo de exposición"
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -3057,462 +3781,461 @@ msgstr ""
 "«Negativo» para filme en negativo. Para imaxes escuras (subexpostas) "
 "pode incrementar este valor."
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, no-c-format
 msgid "Color Matrix"
 msgstr "Matriz de cor"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, no-c-format
 msgid "Set the scanners color matrix."
 msgstr "Axustar a matriz de cor do escáner."
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr "Matriz de cor personalizada."
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, no-c-format
 msgid "Mono Color Matrix"
 msgstr "Matriz monocroma"
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr "Matriz de cor personalizada para escáneres en escala de grises."
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, no-c-format
 msgid "Mirror horizontal"
 msgstr "Espello horizontal"
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, no-c-format
 msgid "Mirror image horizontally."
 msgstr "Reflectir a imaxe en horizontal"
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, no-c-format
 msgid "Mirror vertical"
 msgstr "Espello vertical"
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, no-c-format
 msgid "Mirror image vertically."
 msgstr "Reflectir a imaxe en verticalv"
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, no-c-format
 msgid "Update options"
 msgstr "Actualizar as opcións"
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, no-c-format
 msgid "Update options."
 msgstr "Actualizar as opcións."
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr "Saída de 8 bits"
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr ""
 "Usar profundidade de bits maior de oito internamente, mais na saída usar "
 "só oito bits."
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr "Agardar botón frontal"
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr "Agardar a que se prema no botón frontal para escanear."
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr "Apagar lámpada"
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr "Apagar a lámpada do escáner."
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "Tamaño do papel"
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr "Separación automática"
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, fuzzy, no-c-format
 msgid "Landscape"
 msgstr "A5 apaisado"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr ""
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, fuzzy, no-c-format
 msgid "Length control mode"
 msgstr "Axustar o modo de control de densidade"
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, fuzzy, no-c-format
 msgid "Manual feed mode"
 msgstr "Foco previo manual"
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, fuzzy, no-c-format
 msgid "Manual feed timeout"
 msgstr "Foco previo manual"
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr "Activa o escaneo polas dúas caras"
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr "Tamaño físico do papel no alimentador"
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, fuzzy, no-c-format
 msgid "halftone"
 msgstr "Medios tons"
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, fuzzy, no-c-format
 msgid "color"
 msgstr "Cor"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, fuzzy, no-c-format
 msgid "continuous"
 msgstr "Condicional"
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, fuzzy, no-c-format
 msgid "off"
 msgstr "Desactivado"
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, fuzzy, no-c-format
 msgid "bayer_64"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, fuzzy, no-c-format
 msgid "bayer_16"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, fuzzy, no-c-format
 msgid "halftone_32"
 msgstr "Medios tons"
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, fuzzy, no-c-format
 msgid "halftone_64"
 msgstr "Medios tons"
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, fuzzy, no-c-format
 msgid "diffusion"
 msgstr "Difusión de erro"
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, fuzzy, no-c-format
 msgid "normal"
 msgstr "Normal"
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, fuzzy, no-c-format
 msgid "light"
 msgstr "Resaltar"
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, fuzzy, no-c-format
 msgid "From scanner"
 msgstr "escáner de filmes"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr "De papel"
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, fuzzy, no-c-format
 msgid "default"
 msgstr "Predeterminado"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, fuzzy, no-c-format
 msgid "smooth"
 msgstr "Suave"
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, fuzzy, no-c-format
 msgid "low"
 msgstr "Lento"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, fuzzy, no-c-format
 msgid "medium"
 msgstr "Soporte"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, fuzzy, no-c-format
 msgid "red"
 msgstr "Vermello"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, fuzzy, no-c-format
 msgid "green"
 msgstr "Verde"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, fuzzy, no-c-format
 msgid "Sets the scan source"
 msgstr "Orixe de escaneo"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr "Modo de alimentación"
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr "Axusta o modo de alimentación"
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, fuzzy, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr "Activar/desactivar enfoque automático"
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, fuzzy, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr "Axustar o modo de control de densidade"
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, fuzzy, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "Axusta o modo de alimentación"
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, fuzzy, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr "Axusta o modo de alimentación"
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr "Limiar automático"
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
@@ -3521,557 +4244,544 @@ msgstr ""
 "Axusta automaticamente o brillo, contraste, niveis de branco, gamma e "
 "redución da intensidade do ruído da imaxe"
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "Redución de ruído"
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr "Reduce os puntos illados de ruído"
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr "Destaque da imaxe"
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr "Axusta o destaque da imaxe"
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, fuzzy, no-c-format
 msgid "Lamp color"
 msgstr "Acender lámpada"
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, fuzzy, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr "Acende ou apaga a lámpada"
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, fuzzy, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "Reflectir a imaxe en verticalv"
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
 "length of actual paper or logical document length."
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "Corrección gamma"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, fuzzy, no-c-format
 msgid "High sensivity"
 msgstr "Impresión de alta densidade"
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, fuzzy, no-c-format
 msgid "Low sensivity"
 msgstr "Impresión de baixa densidade"
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, fuzzy, no-c-format
 msgid "err_diffusion"
 msgstr "Difusión de erro"
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, fuzzy, no-c-format
 msgid "No detection"
 msgstr "Sen corrección"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, fuzzy, no-c-format
 msgid "Normal mode"
 msgstr "Normal"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, fuzzy, no-c-format
 msgid "Enhanced mode"
 msgstr "Optimización"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
 "divides long paper by the length which is set in Document Size option."
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, fuzzy, no-c-format
 msgid "Automatic threshold mode"
 msgstr "Limiar automático"
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, fuzzy, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr "Limiar automático"
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, fuzzy, no-c-format
 msgid "Set chroma of red"
 msgstr "Axustar a orde das mostras"
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, fuzzy, no-c-format
 msgid "chroma of blue"
 msgstr "Sombra para azul"
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, fuzzy, no-c-format
 msgid "Set chroma of blue"
 msgstr "Cambiar de vermello a azul"
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr "Diamante"
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr "8x8 «Engraxado» groso"
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr "8x8 «Engraxado» fino"
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr "8x8 Bayer"
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr "8x8 Liña vertical"
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr "Ganancia"
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr "Axustes de ganancia das canles de cor"
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, no-c-format
 msgid "Gray gain"
 msgstr "Ganancia de gris"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr "Axusta a ganancia da canle de gris"
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, no-c-format
 msgid "Red gain"
 msgstr "Ganancia vermella"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr "Axustar a ganancia da canle vermella"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, no-c-format
 msgid "Green gain"
 msgstr "Ganancia verde"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr "Axusta a ganancia da canle verde"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, no-c-format
 msgid "Blue gain"
 msgstr "Ganancia azul"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr "Axusta a ganancia da canle azul"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr "Trama Bayer 16"
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr "Trama Bayer 64"
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr "Medio ton punto 32"
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr "Medio ton punto 64"
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr "Difusión de erro"
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr "Modo 1"
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr "Modo 2"
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr "Modo 3"
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr "De pau branco"
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr "Suave"
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr "Baixo"
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr "Soporte"
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr "Alta"
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr "CRT"
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "Unha páxina"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "Todas as páxinas"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr "escáner con cargador automático"
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr "Escala de grises de 4 bits"
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr "Escala de grises de 8 bits"
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr "Sombras, medias tintas, destaque, tempo de exposición"
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr "Opciós especiais"
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr "Balance de cor"
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr "Desactivar o retroceso"
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr "Se se activa, o escáner non retrocede cando perde unha liña"
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr "Alternar o estado da lámpada do plano"
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr "Alterna o estado da lámpada do plano"
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr "Calibración polo motor"
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid ""
 "If checked the color calibration before a scan is done by the backend"
 msgstr ""
 "Se se selecciona a calibración da cor antes do escaneo faina o motor"
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr "Usar o adaptador de diapositivas de 35mm"
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr "Esta opción apaga a lámpada do plano durante o escaneo"
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "Escaneo de calidade"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr "A mellor calidade, pero a velocidade lenta"
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "Escaneo rápido"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr "Máis rápido, pero de pior calidade"
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr "Axuste automático de limiar"
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
@@ -4080,280 +4790,280 @@ msgstr ""
 "Se se selecciona, o motor tenta determinar automaticamente un valor "
 "óptimo para o limiar."
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr "Selecciona o modo de corrección gamma"
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr "Conectar gamma"
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr "Usar os mesmos valores gamma para todas as canles de cores."
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr "Gamma escalar"
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr "Escolle un valor para a corrección gamma escalar."
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr "Gamma escalar vermella"
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr "Escolle un valor para a corrección gamma escalar (canle vermella)"
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr "Gamma escalar verde"
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr "Escolle un valor para a corrección gamma escalar (canle verde)"
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr "Gamma escalar azul"
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr "Escolle un valor para a corrección gamma escalar (canle azul)"
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr "Canle"
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
 msgstr ""
 "Escolle a gama de cor, «Master» significa que afecta a todas as cores."
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr "Medios tons"
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr "Selecciona o nivel de radiancia a ter en conta \"50% gris\"."
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr "Medios tons para vermello"
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr "Selecciona o nivel de radiancia a ter en conta \"50% vermello\"."
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr "Medios tons para verde"
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr "Selecciona o nivel de radiancia a ter en conta \"50% verde\"."
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr "Medios tons para azul"
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr ""
 "Selecciona o nivel de radiancia a ter en conta \"50% azul\".Selecciona o "
 "nivel de radiancia a ter en conta \"50% azul\"."
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr "Balance de vermello"
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr ""
 "Factor de balance para vermello. Un valor de 100% significa sen "
 "corrección."
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr "Balance de verde"
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr ""
 "Factor de balance para verde. Un valor de 100% significa sen corrección."
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr "Balance de azul"
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr ""
 "Factor de balance para azul. Un valor de 100% significa sen corrección."
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr "Balance de firmware"
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr "Axusta o balance de cor aos valores fornecidos polo firmware."
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "O máis lento"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "Máis lento"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "Máis rápido"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "O máis rápido"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr "8x8 groso"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr "8x8 normal"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr "8x8 fino"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr "8x8 moi fino"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr "6x6 normal"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr "5x5 groso"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr "5x5 fino"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr "4x4 groso"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr "4x4 normal"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr "4x4 fino"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr "3x3 normal"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr "2x2 normal"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr "8x8 personalizado"
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr "6x6 personalizado"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr "5x5 personalizado"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr "4x4 personalizado"
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr "3x3 personalizado"
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr "2x2 personalizado"
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr "Modo gris rápido"
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr "Escanear en modo gris rápido (menor calidade)."
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
@@ -4362,117 +5072,117 @@ msgstr ""
 "Precisa que todas as vistas previas se fagan do modo máis rápido (baixa "
 "calidade). Este pode ser un modo sen cor ou un modo de baixa resolución."
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr "Tempo de apagado de lámpada (minutos)"
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr "Axusta o tempo (en minutos) tras o que se apagará a lámpada."
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, no-c-format
 msgid "Turn lamp off"
 msgstr "Apagar a lámpada"
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr "Apaga a lámpada inmediatamente."
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr "Brillo de vermello"
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr "Controla o brillo da canle de vermello da imaxe obtida."
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr "Brillo de verde"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr "Controla o brillo da canle de verde da imaxe obtida."
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr "Brillo de azul"
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr "Controla o brillo da canle de azul da imaxe obtida."
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "Contraste da canle vermella"
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr "Controla o contraste da canle vermella da imaxe obtida."
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "Contraste da canle verde"
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr "Controla o contraste da canle verde da imaxe obtida."
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "Contraste da canle azul"
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr "Controla o contraste da canle azul da imaxe obtida."
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr "Color48"
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr "Color24"
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr "Gris 16"
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr "Gris 8"
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr "Reflectantes"
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, no-c-format
 msgid "Positive"
 msgstr "Positivo"
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -4481,39 +5191,39 @@ msgstr ""
 "Quecer até que o brillo da lámpada sexa constante no canto de agardar "
 "polos 40 segundos de quecemento."
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, fuzzy, no-c-format
 msgid "Negative color"
 msgstr "Filme en negativo"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, fuzzy, no-c-format
 msgid "Negative gray"
 msgstr "Negativo"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, fuzzy, no-c-format
 msgid "48 bits color"
 msgstr "Cor fina"
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
 "mode and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr "Botón de control de escaneo"
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4524,248 +5234,239 @@ msgstr ""
 "proceder, faga clic no botón «SCAN» (para MP150) ou «COLOR» (para outros "
 "modelos). Para cancelar, prema no botón «GRAY»."
 
-#: ../backend/pixma_sane_options.c:143
-#, no-c-format
-msgid "Gamma function exponent"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:144
-#, no-c-format
-msgid "Changes intensity of midtones"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:232
 #, no-c-format
 msgid "Update button state"
 msgstr "Actualizar estado do botón"
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:244
 #, no-c-format
 msgid "Button 1"
 msgstr "Botón 1"
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:258
 #, no-c-format
 msgid "Button 2"
 msgstr "Botón 2"
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr ""
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr ""
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr "Transparencia"
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr "Axustes do dispositivo"
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr "Interruptor de lámpada"
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr "Cambiar a(s) lámpada(s) manualmente."
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "Apagar a lámpada durante a calibración de escuridade"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr "Apagar sempre a lámpada cando se calibra a escuridade."
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, no-c-format
 msgid "Calibration data cache"
 msgstr "Caché de datos de calibración"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr "Activa ou desactiva a caché de datos de calibración"
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, no-c-format
 msgid "Performs calibration"
 msgstr "Calibración de precisión"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr "Acelerar o sensor"
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr "Activa ou desactiva a aceleración de movimento do sensor."
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, no-c-format
 msgid "Warmup-time"
 msgstr "Tempo de quecemento"
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, no-c-format
 msgid "Warmup-time in seconds."
 msgstr "Tempo de quecemento en segundos"
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, no-c-format
 msgid "Lampoff-time"
 msgstr "Tempo de apagado da lámpada"
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr "Tempo de apagado da lámpada en segundos"
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, no-c-format
 msgid "Analog frontend"
 msgstr "Interface analóxica (AFE)"
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr "Valor de ganancia vermella no AFE"
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr "Desviación vermella"
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr "Valor da desviación vermella no AFE"
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr "Valor de ganancia verde no AFE"
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr "Desviación verde"
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr "Valor da desviación verde no AFE"
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr "Valor de ganancia azul no AFE"
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr "Desviación azul"
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr "Valor da desviación azul no AFE"
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, no-c-format
 msgid "Red lamp off"
 msgstr "Apagar  alámpada vermella"
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr "Define os parámetros de apagado da lámpada vermella"
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, no-c-format
 msgid "Green lamp off"
 msgstr "Apagar lámpada verde"
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr "Define os parámetros de apagado da lámpada verde"
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, no-c-format
 msgid "Blue lamp off"
 msgstr "Apagar lámpada azul"
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr "Define os parámetros de apagado da lámpada azul"
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr "Esta opción reflicte o estado dos botóns do escáner"
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr "Color36"
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr "Mapa de trama 1"
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr "Mapa de trama 2"
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr "Aleatorio"
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr "Escoller a orixe"
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr "Optimización da imaxe"
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr "Agrisar"
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr "Cargar a imaxe como escala de grises."
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr "Simulación de tres pasadas"
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
@@ -4774,12 +5475,12 @@ msgstr ""
 "Semella un escáner de tres pasadas devolvendo 3 mostras separadas. Por "
 "diversión, devolve verde, despois azul y finalmente vermello."
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr "Simulación de escáner de man"
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4791,7 +5492,7 @@ msgstr ""
 "-1. Axustar esta opción permítelle comprobar se unha interface pode "
 "manexar isto correctamente."
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid ""
 "Set default values for enhancement controls (brightness & contrast)."
@@ -4799,42 +5500,42 @@ msgstr ""
 "Axustar os valores predeterminados para os controis de optimización "
 "(brillo e contraste)"
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr "Opción de proba de só lectura"
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr "Vexamos se a interface pode tratar isto correctamente"
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr "Táboas gamma"
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr "Simulación do código de estado"
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr "Non forzar o código de estado"
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr "Non forzar o motor a devolver un código de estado."
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr "Devolve SANE_STATUS_EOF"
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
@@ -4843,12 +5544,12 @@ msgstr ""
 "Forzar o motor a devolver o código de estado de SANE_STATUS_EOF despois "
 "de ter sido chamado sane_read()."
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr "Devolve SANE_STATUS_JAMMED"
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
@@ -4857,12 +5558,12 @@ msgstr ""
 "Forzar o motor a devolver o código de estado de SANE_STATUS_JAMMED "
 "despois de ter sido chamado sane_read()."
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr "Devolve SANE_STATUS_NO_DOCS"
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
@@ -4871,12 +5572,12 @@ msgstr ""
 "Forzar o motor a devolver o código de estado de SANE_STATUS_NO_DOCS "
 "despois de ter sido chamado sane_read()."
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr "Devolve SANE_STATUS_COVER_OPEN"
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
@@ -4885,12 +5586,12 @@ msgstr ""
 "Forzar o motor a devolver o código de estado de SANE_STATUS_COVER_OPEN "
 "despois de ter sido chamado sane_read()."
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr "Devolve SANE_STATUS_IO_ERROR"
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
@@ -4899,12 +5600,12 @@ msgstr ""
 "Forzar o motor a devolver o código de estado de SANE_STATUS_IO_ERROR "
 "despois de ter sido chamado sane_read()."
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr "Devolve SANE_STATUS_NO_MEM"
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
@@ -4913,12 +5614,12 @@ msgstr ""
 "Forzar o motor a devolver o código de estado de SANE_STATUS_NO_MEM "
 "despois de ter sido chamado sane_read()."
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr "Devolve SANE_STATUS_ACCESS_DENIED"
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
@@ -4927,85 +5628,82 @@ msgstr ""
 "Forzar o motor a devolver o código de estado de "
 "SANE_STATUS_ACCESS_DENIED despois de ter sido chamado sane_read()."
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr "Esta opción reflicte o estado dos botóns do escáner"
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr "Acender lámpada"
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr "Acende a lámpada do escáner"
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr "Apagar lámpada"
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr "Apaga a lámpada do escáner"
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, no-c-format
 msgid "Lamp timeout"
 msgstr "Límite de tempo da lámpada"
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr "Minutos que tardará a lámpada en apagarse despois do escaneo"
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr "Valor do limiar para o modo de liña de arte"
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr "Alimentador de documentos"
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr "6x4 (polg.)"
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr "8x10 (polg.)"
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr "8.5x11 (polg.)"
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr "Medios tons non compatíbeis"
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr "Punto disperso 8x8"
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr "Punto disperso 16x16"
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -5021,27 +5719,27 @@ msgstr ""
 "demasiado alto, baseado en interfaces X pode deixar de responder a "
 "eventos de X e o seu sistema poderíase atoar."
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr ""
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr ""
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, fuzzy, no-c-format
 msgid "Focus point for scanning."
 msgstr "Expulsar o documento despois do escaneo"
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr "Modo de previsualización"
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
@@ -5050,12 +5748,12 @@ msgstr ""
 "Escolle o modo para previsualización. A previsualización en escala de "
 "grises fornece en xeral, a mellor relación entre velocidade e detalle."
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr "Axustes predefinidos"
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
@@ -5064,97 +5762,97 @@ msgstr ""
 "Fornece superficies de escaneado estándar para fotografías, páxinas "
 "impresas, etc."
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr ""
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, fuzzy, no-c-format
 msgid "Frame to be scanned"
 msgstr "escáner plano"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, fuzzy, no-c-format
 msgid "Focus-mode"
 msgstr "Enfoque"
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, fuzzy, no-c-format
 msgid "Auto or manual focus"
 msgstr "Enfoque automático"
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, fuzzy, no-c-format
 msgid "Focus-point"
 msgstr "Posición do foco"
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, fuzzy, no-c-format
 msgid "Focus point"
 msgstr "Posición do foco"
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr "Cor, liñas por lectura"
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr "Escala de grises, liñas por lectura"
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr "cámara web"
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr "Cor de texto RGB"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr "Cor RGB"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr "Cor RGB TEXTO"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr "Negro sólido"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr "Branco sólido"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr "Patrón de cor"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr "Grade"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr "Primeira entrada"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr "Segunda entrada"
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
@@ -5163,12 +5861,12 @@ msgstr ""
 "Esta terceira entrada é moi longa. Quizais a interface ten unha idea de "
 "como amosalo"
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr "Simulación de escáner manual"
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5181,12 +5879,12 @@ msgstr ""
 "-1. Axustar esta opción permítelle comprobar se unha interface pode "
 "manexar isto correctamente. Esta opción tamén permite un ancho de 11cm."
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr "Simulación de tres pasadas"
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
@@ -5195,17 +5893,17 @@ msgstr ""
 "Semella un escáner de tres pasadas devolvendo 3 mostras separadas. Por "
 "diversión, devolve verde, despois azul e para rematar vermello."
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr "Axustar a orde das mostras"
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr "Axustar a orde das mostras no modo de tres pasadas de cor."
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
@@ -5214,17 +5912,17 @@ msgstr ""
 "Se escolle o alimentador automático de documentos, o alimentador estará "
 "\"baleiro\" despois de 10 escaneos."
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr "Opcións especiais"
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr "Escolla a imaxe de proba"
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5241,12 +5939,12 @@ msgstr ""
 "Grade: debuxa unha grade en branco e negro cun tamaño de 10mm por "
 "cadrado."
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr "Inverter a orde dos datos"
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5257,45 +5955,45 @@ msgstr ""
 "de 16 bits. Esta opción pode utilizarse para a proba de 16 bits dos "
 "modos de interface, p.ex. se a interface utiliza a orde correcta."
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr "Límite de lectura"
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 "Limita a cantidade de datos transferidos con cada chamada a sane_read()."
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr "Tamaño do límite de lectura"
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
 msgstr ""
 "Cantidade de datos (máxima) transferida con cada chamada a sane_read()."
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr "Retardo de lectura"
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr "Retardar a transferencia de datos á canalización."
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr "Duración do retardo de lectura"
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
@@ -5303,12 +6001,12 @@ msgstr ""
 "Canto tempo se vai agardar despois de transferir cada búfer de datos a "
 "través da canalización."
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr "Valor de retorno de sane_read"
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
@@ -5319,22 +6017,22 @@ msgstr ""
 "para facer o escaneo. Todos os demáis códigos de estado son para probar "
 "a forma en que a interface se fai cargo deles"
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr "Perda de píxeles por liña"
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr "Número de píxeles que se perden no extremo de cada liña."
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr "Parámetros dubidosos"
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
@@ -5343,23 +6041,23 @@ msgstr ""
 "Devolve liñas dubidosas e bytes por liña cando se chama a sane_start() "
 "antes que a sane_parameters()."
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr "Usar E/S non bloqueante"
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 "Usar unha E/S non bloqueante para sane_red() se o permite a interface."
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr "Propor a selección dun descritor de ficheiro"
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
@@ -5368,12 +6066,12 @@ msgstr ""
 "Propor un descritor de fichero para detectar si sane_read () devolverá "
 "os datos."
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr "Activar opcións de proba"
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
@@ -5382,27 +6080,27 @@ msgstr ""
 "Activa varias opcións de proba. Isto úsase para probar a capacidade das "
 "interfaces para ver e modificar os diferentes tipos de opcións de SANE."
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr "Imprimir as opcións"
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr "Imprimir unha lista de todas ls opcións"
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr "Opcións de proba booleanas"
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr "(1/6) Booleana configurábel e lexíbel por software"
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
@@ -5411,12 +6109,12 @@ msgstr ""
 "(1/6) Opción de proba booleana configurábel e lexíbel por software. Esta "
 "é a opción booleana normal."
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr "(2/6) Booleana configurábel por hardware lexíbel por software"
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
@@ -5427,12 +6125,12 @@ msgstr ""
 "software. Esta opción non pode ser configurada pola interface, mais si "
 "polo usuario  (p.ex. premendo un botón no dispositivo)."
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr "(3/6) Booleana configurábel por hardware"
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5443,12 +6141,12 @@ msgstr ""
 "non pode ser configurada pola interface, mais si polo usuario  (p.ex. "
 "premendo un botón no dispositivo) tampouco pode ser lida pola interface."
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr "(4/6) Booleana lexíbel por software"
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
@@ -5457,12 +6155,12 @@ msgstr ""
 "(4/6) Opción de proba booleana lexíbel por software. Esta é unha opción "
 "de só lectura."
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr "(5/6) Booleana configurábel e lexíbel por software, emulada"
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
@@ -5471,12 +6169,12 @@ msgstr ""
 "(5/6) Opción de proba booleana configurábel e lexíbel por software e "
 "emulada."
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr "(6/6) Booleana configurábel e lexíbel por software, automática"
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5486,29 +6184,29 @@ msgstr ""
 "(6/6) Opción de proba booleana configurábel e lexíbel por software e "
 "emulada. Esta opción pode ser configurada automaticamente polo motor."
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr "Opción de proba «Enteiro»"
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr "(1/6) Enteiro"
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr ""
 "(1/6) Opción de proba de valor enteiro sen unidade nin conxunto de "
 "restricións."
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr "(2/6) Enteiro con rango de restricións"
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
@@ -5517,24 +6215,24 @@ msgstr ""
 "(2/6) Opción de proba de valor enteiro con unidade de píxel e con "
 "conxunto de restricións. O mínimo é 4, o máximo 192 e o salto 2."
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr "(3/6) Enteiro con restrición de lista de valores"
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 "(3/6) Opción de proba de valor enteiro con unidade bits e restrición de "
 "lista de valores"
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr "(4/6) Matriz de enteiros"
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
@@ -5543,12 +6241,12 @@ msgstr ""
 "(4/6) Opción de proba de valor enteiro con unidade mm usando unha Matriz "
 "con restricións."
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr "(5/6) Matriz de enteiros con rango de restriciónsv"
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
@@ -5558,12 +6256,12 @@ msgstr ""
 "matriz con intervalo de restricións. O mínimo é 4, o máximo 192, e o "
 "salto 2.v"
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr "(6/6) Matriz de enteiros con restrición de lista de valores"
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
@@ -5572,29 +6270,29 @@ msgstr ""
 "(6/6) Opción de proba de valor enteiro con unidade e% e  usando unha "
 "matriz con restricións nunha lista de valores."
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr "Opcións de proba «reais fixos»"
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr "(1/3) Real fixo"
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr ""
 "(1/3) Opción de proba de valor real (coma fixa) sen unidade nin conxunto "
 "de restricións."
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr "(2/3) Real fixo con intervalo de restrición"
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
@@ -5604,49 +6302,49 @@ msgstr ""
 "microsegundo e intervalo de restrición. O mínimo é  -42,17, o máximo "
 "32767,9999 e o salto 2,0."
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr "(3/3) Real fixo con restrición de lista de valores"
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 "(3/3) Opción de proba de valor real (coma fixa) sen unidade e "
 "restrinxida por un conxunto de valores dunha lista."
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr "Opcións de proba de cadea"
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr "(1/3) Cadea"
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr "(1/3) Opcións de proba de cadea sen restricións."
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr "(2/3) Cadea restrinxida a lista de cadeas"
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr "(2/3) Opción de proba de cadea con restrición de lista de cadeas"
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr "(3/3) Restrición de cadeas lista longa de cadeas"
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
@@ -5655,156 +6353,160 @@ msgstr ""
 "(3/3) Opción de proba de cadea con restrición de lista de cadeas. Conten "
 "máis entradas..."
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr "Opcións de botón de proba"
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr "(1/1) Botón"
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr "(1/1) Botón de opción de proba. Imprime algún texto..."
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, no-c-format
 msgid "Color 36"
 msgstr "Color 36"
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr "Usar composición de imaxe"
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr "Dous niveis branco e negro (modo de liña de arte)"
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr "Esfumado/medios tons de branco e negro (modo de medios tons)"
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr "Multinivel de branco e negro (modo de escala de grises)"
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr "Multinivel de cor RGB (cor dunha pasada)"
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr "Ignorar calibración"
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr "Desactivar foco previo"
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr "Non calibrar o foco"
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr "Foco previo manual"
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr "Fixar a posición do foco"
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr "Calibración de lentes na posición do documento"
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr "Calibrar as lentes na posición do documento"
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr "Marcar a posición do foco a 0mm"
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr "Usar a marca de posición de foco a 0mm no canto de a 0,6mm"
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr "Modo de calibración"
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr "Definir o modo de calibración"
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr "Acende/apaga a lámpada"
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr "UTA Activado"
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr "Axusta o acendido/apagado UTA"
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr "Desprazamento"
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr "Axustes do desprazamento das canles de cor"
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, no-c-format
 msgid "Gray offset"
 msgstr "Desprazamento de gris"
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr "Axusta o desprazamento da canle gris"
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr "Axusta o desprazamento da canle vermello"
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr "Axusta o desprazamento da canle verde"
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr "Axusta o desprazamento da canle azul"
 
+#, fuzzy
+#~ msgid "IPC mode"
+#~ msgstr "Modo de previsualización"
+
 #~ msgid "problem not analyzed (unknown SCSI class)"
 #~ msgstr "problema sen analizar (clase de SCSI descoñecida)"
 
diff --git a/po/hu.gmo b/po/hu.gmo
new file mode 100644
index 0000000..7210ba6
--- /dev/null
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index 5e63a72..5a67f0d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
 "PO-Revision-Date: 2011-04-06 19:50+0200\n"
 "Last-Translator: Németh Tamás <ntomasz@uhuklub.hu>\n"
 "Language-Team: Hungarian <NONE>\n"
@@ -16,448 +16,442 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr ""
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr "�ltalános"
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "Geometria"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "Haladó"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "Haladó"
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr "Szenzorok"
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "Előnézet"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr "Monokróm előnézet"
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr "Színmélység"
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Szkennelési üzemmód"
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "Szkennelési sebesség"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr ""
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr ""
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "Bal-felső x"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "Bal-felső y"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "Jobb-alsó x"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "Jobb-alsó y"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Szkennelés felbontása"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "X felbontás"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Y felbontás"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr "Lapszélesség"
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, no-c-format
 msgid "Page height"
 msgstr "Lapmagasság"
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr ""
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr ""
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr "Vörös intenzitás"
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr "Zöld intenzitás"
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr "Kék intenzitás"
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr "Fényerő"
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "Kontraszt"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr "Szemcseméret"
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr ""
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "Feketeszint"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "Fehérszint"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, fuzzy, no-c-format
 msgid "White level for red"
 msgstr "Fehérszint"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, fuzzy, no-c-format
 msgid "White level for green"
 msgstr "Fehérszint"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, fuzzy, no-c-format
 msgid "White level for blue"
 msgstr "Fehérszint"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "�rnyék"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr ""
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr ""
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr "Kiemelés"
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr ""
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr ""
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr "�rnyalat"
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr "Telítettség"
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr ""
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr ""
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr ""
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "Negatív"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "Precíz beállítás"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr ""
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr ""
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr "Küszöb"
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr ""
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr ""
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr ""
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr ""
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr ""
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr ""
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr ""
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr ""
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr ""
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr ""
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr ""
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr ""
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr ""
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr ""
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr ""
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr ""
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
 "supports."
 msgstr ""
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, fuzzy, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "Szkennelés felbontása"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr ""
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, no-c-format
 msgid "Image modification options"
 msgstr ""
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, fuzzy, no-c-format
 msgid "Hardware specific options"
 msgstr "Speciális beállítások"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr ""
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr ""
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -465,87 +459,87 @@ msgid ""
 "scanner, it reduces the memory requirements and scan-time of the preview."
 msgstr ""
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
 "for multibit scans."
 msgstr ""
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr ""
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr ""
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr ""
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr ""
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "A beolvasási terület bal-felső x pozíciója"
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "A beolvasási terület bal-felső y pozíciója"
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "A beolvasási terület jobb-alsó x pozíciója"
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "A beolvasási terület jobb-alsó y pozíciója"
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
 "sheet-fed scans."
 msgstr ""
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, no-c-format
 msgid "Specifies the height of the media."
 msgstr ""
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid ""
 "Determines whether a builtin or a custom gamma-table should be used."
 msgstr ""
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -553,423 +547,423 @@ msgid ""
 "gamma table)."
 msgstr ""
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr ""
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr ""
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr ""
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
 "in sharper images."
 msgstr ""
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr ""
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid ""
 "Selects what green radiance level should be considered \"full green\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid ""
 "Selects what blue radiance level should be considered \"full blue\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
 "when acquiring an image with a camera. Larger values cause more blooming."
 msgstr ""
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr ""
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
 "halftoned images."
 msgstr ""
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
 msgstr ""
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr ""
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr "A fekete és fehér felcserélése"
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr ""
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr ""
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr ""
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr ""
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr ""
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr ""
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr ""
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr ""
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr ""
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr ""
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr ""
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr ""
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr ""
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr ""
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr ""
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, no-c-format
 msgid "Scan button"
 msgstr "Szkennel gomb"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, no-c-format
 msgid "Email button"
 msgstr "Email gomb"
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, no-c-format
 msgid "Fax button"
 msgstr "Fax gomb"
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, no-c-format
 msgid "Copy button"
 msgstr "Másol gomb"
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr "PDF gomb"
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr "Mégse gomb"
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr "Oldal betöltve"
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, no-c-format
 msgid "Cover open"
 msgstr "Fedél nyitás"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "Színes"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr ""
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr ""
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "Szürke"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr ""
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "Vonalas"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, no-c-format
 msgid "Operation not supported"
 msgstr "A művelet nem támogatott"
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr "A művelet megszakítva"
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, no-c-format
 msgid "Document feeder jammed"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, no-c-format
 msgid "Document feeder out of documents"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, no-c-format
 msgid "Scanner cover is open"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr "Nincs elég memória"
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "Alapértelmezett"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "Kalibráció"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr "Kalibrálás a következő szkennelés előtt"
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
 "Otherwise, calibration is performed only before the first start."
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -977,1471 +971,2205 @@ msgid ""
 "or from the configuration file, are used."
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr ""
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr ""
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr ""
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, fuzzy, no-c-format
 msgid "Duplex scan"
 msgstr "Teljes szkennelés"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid ""
 "Duplex scan provide a scan of the front and back side of the document"
 msgstr ""
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr "Szkenner kalibrálása"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr ""
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr "Szürkeskálás szkennelés"
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr ""
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr "Analóg erősítés"
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr ""
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "Gamma korrekció"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr ""
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr "Nyers"
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr ""
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, fuzzy, no-c-format
 msgid "No transparency correction"
 msgstr "Erősítés korrekció"
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr ""
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr ""
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, fuzzy, no-c-format
 msgid "Negatives"
 msgstr "Negatív"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, fuzzy, no-c-format
 msgid "Slides"
 msgstr "Lassabb"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "Automata"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, fuzzy, no-c-format
 msgid "Normal speed"
 msgstr "Normál"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/2 normal speed"
 msgstr ""
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/3 normal speed"
 msgstr ""
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, no-c-format
 msgid "rounded parameter"
 msgstr ""
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, fuzzy, no-c-format
 msgid "ADF jam"
 msgstr "ADF"
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr ""
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, fuzzy, no-c-format
 msgid "lamp failure"
 msgstr "Gamma érték"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr ""
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr ""
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr ""
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr ""
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr ""
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, no-c-format
 msgid "transparency unit lamp failure"
 msgstr ""
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr ""
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr ""
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr ""
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr ""
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr ""
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr ""
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr ""
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr ""
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr ""
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr ""
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr ""
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr ""
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr ""
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr ""
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr ""
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr ""
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr ""
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr ""
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr ""
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, no-c-format
 msgid "transparency unit shading error"
 msgstr ""
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr ""
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, fuzzy, no-c-format
 msgid "film scanner"
 msgstr "lapolvasó"
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr "síkágyas lapolvasó"
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr "Filmtípus"
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr ""
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, fuzzy, no-c-format
 msgid "Negative film type"
 msgstr "Negatív film"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, no-c-format
 msgid "Selects the negative film type"
 msgstr ""
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, no-c-format
 msgid "Hardware resolution"
 msgstr "Eszköz felbontása"
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, no-c-format
 msgid "Use only hardware resolutions"
 msgstr ""
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr ""
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, no-c-format
 msgid "Auto focus"
 msgstr ""
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, no-c-format
 msgid "Enable/disable auto focus"
 msgstr ""
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr ""
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr ""
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, no-c-format
 msgid "Manual focus position"
 msgstr ""
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr ""
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr ""
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr ""
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "Kép tükrözése"
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, fuzzy, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "A kép vízszintes tükrözése."
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, no-c-format
 msgid "Auto exposure"
 msgstr ""
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr ""
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, fuzzy, no-c-format
 msgid "Calibration now"
 msgstr "Kalibráció"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, fuzzy, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Precíz beállítás"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr ""
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr ""
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, fuzzy, no-c-format
 msgid "Reset scanner"
 msgstr "lapolvasó"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, fuzzy, no-c-format
 msgid "Reset the scanner"
 msgstr "lapolvasó"
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr ""
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, no-c-format
 msgid "Eject film after each scan"
 msgstr ""
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr ""
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr ""
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr ""
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr ""
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr ""
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, no-c-format
 msgid "Document feeder extras"
 msgstr ""
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, no-c-format
 msgid "Flatbed only"
 msgstr "Csak síkágyas"
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr ""
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, fuzzy, no-c-format
 msgid "Transparency unit"
 msgstr "�tlátszó"
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr ""
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, fuzzy, no-c-format
 msgid "Negative film"
 msgstr "Negatív film"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, fuzzy, no-c-format
 msgid "Positive or negative film"
 msgstr "Pozitív film"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr ""
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr ""
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, fuzzy, no-c-format
 msgid "Transparency ratio"
 msgstr "�tlátszó"
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, fuzzy, no-c-format
 msgid "Select film type"
 msgstr "Filmtípus"
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, no-c-format
 msgid "Select the film type"
 msgstr ""
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "Síkágyas"
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, no-c-format
 msgid "ADF Front"
 msgstr ""
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, no-c-format
 msgid "ADF Back"
 msgstr ""
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, no-c-format
 msgid "ADF Duplex"
 msgstr ""
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, fuzzy, no-c-format
 msgid "Card Front"
 msgstr "Nyomtatás"
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, no-c-format
 msgid "Card Back"
 msgstr ""
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, no-c-format
 msgid "Card Duplex"
 msgstr ""
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "Vörös"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "Zöld"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "Kék"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, fuzzy, no-c-format
 msgid "Enhance Red"
 msgstr "Haladó"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, fuzzy, no-c-format
 msgid "Enhance Green"
 msgstr "Haladó"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, fuzzy, no-c-format
 msgid "Enhance Blue"
 msgstr "Haladó"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr "Nincs"
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr ""
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr ""
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr ""
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr ""
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr ""
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr "Automatikus dokumentum adagoló"
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "Pozitív film"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "Negatív film"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr "Fókusz az üvegen"
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr "Fókusz 2,5mm-el az üveg felett"
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr ""
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr ""
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr ""
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr ""
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr ""
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr ""
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr ""
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr ""
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr ""
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr ""
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "Nincs korrekció"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr ""
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr ""
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr "Hőnyomtató"
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "Tintasugaras nyomtató"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr "CRT monitor"
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr ""
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr ""
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr ""
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr ""
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr ""
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr ""
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr "A% álló"
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr "A5 fekvő"
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr "Letter"
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr "A4"
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "Max"
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr " Szkennelési üzemmód "
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr ""
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr ""
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr ""
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr ""
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr ""
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr "Színkorrekció"
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr ""
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr ""
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr ""
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr ""
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr ""
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr ""
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr ""
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr ""
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr ""
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr ""
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr ""
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr ""
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr ""
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr ""
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr ""
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr ""
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr ""
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, fuzzy, no-c-format
 msgid "Controls blue level"
 msgstr "A kék csatorna kontrasztja"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr "Kép tükrözése."
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr "Gyors előnézet"
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr ""
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr ""
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr ""
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr "Nagyítás"
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr ""
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr ""
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr ""
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr ""
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr ""
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr ""
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr ""
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr ""
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr ""
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr ""
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr ""
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
 "the user defined table, which can be downloaded to the scanner"
 msgstr ""
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr ""
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
 msgstr ""
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr ""
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
 "pressed to actually start the scan process."
 msgstr ""
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr ""
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, fuzzy, no-c-format
 msgid "Positive Slide"
 msgstr "Pozitív film"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, fuzzy, no-c-format
 msgid "Negative Slide"
 msgstr "Negatív film"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr ""
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, no-c-format
 msgid "User defined CCT profile"
 msgstr ""
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr "Be"
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr "Ki"
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr "DTC"
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr "SDTC"
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr ""
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, no-c-format
 msgid "Diffusion"
 msgstr ""
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, fuzzy, no-c-format
 msgid "White"
 msgstr "Fehérszint"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, fuzzy, no-c-format
 msgid "Black"
 msgstr "Feketeszint"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, no-c-format
 msgid "Continue"
 msgstr "Folytatás"
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr "Megállít"
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr "10mm"
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr "15mm"
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr "20mm"
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr "Vízszintes"
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, fuzzy, no-c-format
 msgid "Horizontal bold"
 msgstr "Vízszintes"
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, fuzzy, no-c-format
 msgid "Horizontal narrow"
 msgstr "Vízszintes"
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr "Függőleges"
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, fuzzy, no-c-format
 msgid "Vertical bold"
 msgstr "Függőleges"
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr ""
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr ""
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, fuzzy, no-c-format
 msgid "Front"
 msgstr "Nyomtatás"
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr ""
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
+msgid "Gamma function exponent"
 msgstr ""
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
 #, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
+msgid "Changes intensity of midtones"
+msgstr ""
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr ""
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr ""
+
+#: backend/fujitsu.c:3165
+#, no-c-format
+msgid "Halftone type"
+msgstr ""
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr ""
+
+#: backend/fujitsu.c:3210
+#, fuzzy, no-c-format
+msgid "Perform outline extraction"
+msgstr "Finom beállítás"
+
+#: backend/fujitsu.c:3221
+#, no-c-format
+msgid "Emphasis"
+msgstr ""
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr ""
+
+#: backend/fujitsu.c:3240
+#, fuzzy, no-c-format
+msgid "Separation"
+msgstr "Telítettség"
+
+#: backend/fujitsu.c:3241
+#, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr ""
+
+#: backend/fujitsu.c:3252
+#, fuzzy, no-c-format
+msgid "Mirroring"
+msgstr "Kép tükrözése"
+
+#: backend/fujitsu.c:3253
+#, fuzzy, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "A kép vízszintes tükrözése."
+
+#: backend/fujitsu.c:3270
+#, fuzzy, no-c-format
+msgid "White level follower"
+msgstr "Fehérszint"
+
+#: backend/fujitsu.c:3271
+#, fuzzy, no-c-format
+msgid "Control white level follower"
+msgstr "A kék csatorna kontrasztja"
+
+#: backend/fujitsu.c:3289
+#, fuzzy, no-c-format
+msgid "BP filter"
+msgstr "Színmátrix"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
 msgstr ""
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr ""
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr ""
+
+#: backend/fujitsu.c:3323
+#, fuzzy, no-c-format
+msgid "Gamma curve"
+msgstr "Gamma érték"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, no-c-format
+msgid "Threshold curve"
+msgstr ""
+
+#: backend/fujitsu.c:3347
+#, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+
+#: backend/fujitsu.c:3369
+#, fuzzy, no-c-format
+msgid "Threshold white"
+msgstr "Küszöb"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr ""
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, fuzzy, no-c-format
+msgid "Noise removal"
+msgstr "Zajszűrés"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr ""
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr ""
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr ""
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr ""
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr ""
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr ""
+
+#: backend/fujitsu.c:3508
+#, fuzzy, no-c-format
+msgid "Auto width detection"
+msgstr "Nincs korrekció"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr ""
+
+#: backend/fujitsu.c:3526
+#, fuzzy, no-c-format
+msgid "Auto length detection"
+msgstr "Nincs korrekció"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr ""
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr ""
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr ""
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr ""
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr ""
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr ""
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr ""
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
+msgstr ""
+
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3708
+#, fuzzy, no-c-format
+msgid "DF recovery mode"
+msgstr "Előnézeti mód"
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr ""
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3748
+#, fuzzy, no-c-format
+msgid "Advanced paper protection"
+msgstr "Haladó"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+
+#: backend/fujitsu.c:3768
+#, fuzzy, no-c-format
+msgid "Staple detection"
+msgstr "Nincs korrekció"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr ""
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+
+#: backend/fujitsu.c:3809
+#, no-c-format
+msgid "Dropout color"
+msgstr ""
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+
+#: backend/fujitsu.c:3833
+#, no-c-format
+msgid "Buffer mode"
+msgstr ""
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr ""
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr ""
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr ""
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+
+#: backend/fujitsu.c:3911
+#, no-c-format
+msgid "Off timer"
+msgstr ""
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+
+#: backend/fujitsu.c:3930
+#, fuzzy, no-c-format
+msgid "Duplex offset"
+msgstr "Teljes szkennelés"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr ""
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr ""
+
+#: backend/fujitsu.c:3949
+#, fuzzy, no-c-format
+msgid "Adjust green/red offset"
+msgstr "A zöld csatorna kontrasztja"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr ""
+
+#: backend/fujitsu.c:3967
+#, fuzzy, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "A kék csatorna kontrasztja"
+
+#: backend/fujitsu.c:3980
+#, fuzzy, no-c-format
+msgid "Low Memory"
+msgstr "Nincs elég memória"
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+
+#: backend/fujitsu.c:3996
+#, fuzzy, no-c-format
+msgid "Duplex side"
+msgstr "Teljes szkennelés"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr ""
+
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr ""
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr ""
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
+msgstr ""
+
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr ""
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+
+#: backend/fujitsu.c:4095
+#, fuzzy, no-c-format
+msgid "Endorser Options"
+msgstr "Haladó"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr ""
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr ""
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr ""
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr ""
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr ""
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr ""
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr ""
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr ""
+
+#: backend/fujitsu.c:4253
+#, fuzzy, no-c-format
+msgid "Endorser direction"
+msgstr "Zajszűrés"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr ""
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr ""
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr ""
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr ""
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr ""
+
+#: backend/fujitsu.c:4344
+#, no-c-format
+msgid "A3 paper"
+msgstr ""
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4356
+#, no-c-format
+msgid "B4 paper"
+msgstr ""
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4368
+#, no-c-format
+msgid "A4 paper"
+msgstr ""
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4380
+#, no-c-format
+msgid "B5 paper"
+msgstr ""
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr ""
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr ""
+
+#: backend/fujitsu.c:4429
+#, no-c-format
+msgid "Scanner in power saving mode"
+msgstr ""
+
+#: backend/fujitsu.c:4452
+#, no-c-format
+msgid "Manual feed"
+msgstr ""
+
+#: backend/fujitsu.c:4453
+#, no-c-format
+msgid "Manual feed selected"
+msgstr ""
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr ""
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr ""
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr ""
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr ""
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr ""
+
+#: backend/fujitsu.c:4513
+#, fuzzy, no-c-format
+msgid "Hardware error code"
+msgstr "Eszköz felbontása"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr ""
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr ""
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr ""
+
+#: backend/fujitsu.c:4537
+#, fuzzy, no-c-format
+msgid "Imprinter ink level"
+msgstr "Fehérszint"
+
+#: backend/fujitsu.c:4548
+#, fuzzy, no-c-format
+msgid "Density"
+msgstr "Vörös intenzitás"
+
+#: backend/fujitsu.c:4549
+#, no-c-format
+msgid "Density dial"
+msgstr ""
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, fuzzy, no-c-format
+msgid "Duplex switch"
+msgstr "Teljes szkennelés"
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, fuzzy, no-c-format
 msgid "Extras"
 msgstr "Extra gyors"
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, no-c-format
-msgid "Threshold curve"
-msgstr ""
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr ""
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
 "instead on hardware lineart."
 msgstr ""
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, fuzzy, no-c-format
 msgid "Disable interpolation"
 msgstr "Tesztbeállítások engedélyezése"
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
 "than the vertical resolution this disables horizontal interpolation."
 msgstr ""
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "Színmátrix"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "Kalibráció"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Precíz beállítás"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Kalibráció"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, no-c-format
 msgid "Lamp off time"
 msgstr ""
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
 "of 0 means, that the lamp won't be turned off."
 msgstr ""
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, fuzzy, no-c-format
 msgid "Lamp off during scan"
 msgstr "Finom beállítás"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr ""
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, no-c-format
 msgid "File button"
 msgstr "Fájl gomb"
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr "OCR gomb"
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, no-c-format
 msgid "Power button"
 msgstr ""
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "Email gomb"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, fuzzy, no-c-format
 msgid "Need calibration"
 msgstr "Finom beállítás"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr ""
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, no-c-format
 msgid "Buttons"
 msgstr "Gombok"
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr "Kalibrálás"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, fuzzy, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "Kalibrálási folyamat indítása."
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, fuzzy, no-c-format
 msgid "Clear calibration"
 msgstr "Finom beállítás"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, fuzzy, no-c-format
 msgid "Clear calibration cache"
 msgstr "Finom beállítás"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr ""
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr ""
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr " Nyomkövetési beállítások "
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr ""
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
 "60 seconds warm-up time."
 msgstr ""
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "Teljes szkennelés"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
 "Don't select the full height. For testing only."
 msgstr ""
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Finom beállítás"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2449,12 +3177,12 @@ msgid ""
 "are provided. This option is enabled by default. For testing only."
 msgstr ""
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "Finom beállítás csak az első szkeneléskor"
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2462,12 +3190,12 @@ msgid ""
 "different with each scan, disable this option. For testing only."
 msgstr ""
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, no-c-format
 msgid "Backtrack lines"
 msgstr ""
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2476,83 +3204,83 @@ msgid ""
 "omitting lines."
 msgstr ""
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Gamma érték"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr ""
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, fuzzy, no-c-format
 msgid "Geometry Group"
 msgstr "Geometria"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, fuzzy, no-c-format
 msgid "Scan Mode Group"
 msgstr " Szkennelési üzemmód "
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, fuzzy, no-c-format
 msgid "Scanner model"
 msgstr "Szkennelési üzemmód"
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, fuzzy, no-c-format
 msgid "Disable gamma correction"
 msgstr "Gamma korrekció"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, fuzzy, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "Gamma korrekció"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, no-c-format
 msgid "Disable white shading correction"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2560,12 +3288,12 @@ msgid ""
 "avoids depth emulation."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, fuzzy, no-c-format
 msgid "Emulate Grayscale"
 msgstr "Szürkeárnyalatos"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2573,368 +3301,362 @@ msgid ""
 "circumstances."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
 "analyze them."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, no-c-format
 msgid "Reset chipset"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, no-c-format
 msgid "Information"
 msgstr "Információ"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, no-c-format
 msgid "Chipset name"
 msgstr "Chipset név"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, no-c-format
 msgid "Shows the chipset ID"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, fuzzy, no-c-format
 msgid "Scan counter"
 msgstr " Szkennelési üzemmód "
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, no-c-format
 msgid "Update information"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr "Kép"
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr "Egyéb"
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, no-c-format
 msgid "offset X"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, fuzzy, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr "A beolvasási terület bal-felső x pozíciója"
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, no-c-format
 msgid "offset Y"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, fuzzy, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr "A beolvasási terület bal-felső x pozíciója"
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr ""
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr ""
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr "ADF"
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, no-c-format
 msgid "TMA Slides"
 msgstr ""
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, fuzzy, no-c-format
 msgid "TMA Negatives"
 msgstr "Negatív"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, fuzzy, no-c-format
 msgid "Color (48 bits)"
 msgstr "Színes 42/48"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, no-c-format
 msgid "Extend lamp timeout"
 msgstr ""
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr ""
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr ""
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, no-c-format
 msgid "Waits for button before scanning"
 msgstr ""
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, fuzzy, no-c-format
 msgid "Advanced Options"
 msgstr "Haladó"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr ""
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr ""
 
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr ""
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr "Egyedi"
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "Automatikus"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr "NTSC RGB"
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr "XPA RGB"
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr ""
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr ""
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr ""
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "Lassú"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr "Normál"
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "Gyors"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr "Extra gyors"
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr "2-pixel"
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr "4-pixel"
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr "8-pixel"
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, no-c-format
 msgid "Film-strip"
 msgstr ""
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr "XPA"
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr ""
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, no-c-format
 msgid "Experiment"
 msgstr ""
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, no-c-format
 msgid "Sharpening"
 msgstr ""
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr ""
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr ""
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr ""
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr ""
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr ""
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr ""
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, no-c-format
 msgid "Unloads the media after a scan."
 msgstr ""
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, no-c-format
 msgid "Change document"
 msgstr ""
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr ""
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr ""
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr ""
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, no-c-format
 msgid "Start calibration process."
 msgstr "Kalibrálási folyamat indítása."
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, no-c-format
 msgid "Media"
 msgstr ""
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr ""
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr ""
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -2943,1445 +3665,1431 @@ msgid ""
 "value."
 msgstr ""
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, no-c-format
 msgid "Color Matrix"
 msgstr "Színmátrix"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, no-c-format
 msgid "Set the scanners color matrix."
 msgstr ""
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr "Egyéni színmátrix."
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, no-c-format
 msgid "Mono Color Matrix"
 msgstr ""
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr ""
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, no-c-format
 msgid "Mirror horizontal"
 msgstr "Vízszintes tükrözés"
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, no-c-format
 msgid "Mirror image horizontally."
 msgstr "A kép vízszintes tükrözése."
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, no-c-format
 msgid "Mirror vertical"
 msgstr "Függőleges tükrözés"
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, no-c-format
 msgid "Mirror image vertically."
 msgstr "A kép függőleges tükrözése."
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, no-c-format
 msgid "Update options"
 msgstr ""
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, no-c-format
 msgid "Update options."
 msgstr ""
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr ""
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr ""
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr ""
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr ""
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr ""
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr ""
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "Papír mérete"
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr ""
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, fuzzy, no-c-format
 msgid "Landscape"
 msgstr "A5 fekvő"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr ""
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, no-c-format
 msgid "Length control mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, no-c-format
 msgid "Manual feed mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, no-c-format
 msgid "Manual feed timeout"
 msgstr ""
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr ""
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, no-c-format
 msgid "halftone"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, fuzzy, no-c-format
 msgid "color"
 msgstr "Színes"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, fuzzy, no-c-format
 msgid "continuous"
 msgstr "Folytatás"
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, fuzzy, no-c-format
 msgid "off"
 msgstr "Ki"
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, no-c-format
 msgid "bayer_64"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, no-c-format
 msgid "bayer_16"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, no-c-format
 msgid "halftone_32"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, no-c-format
 msgid "halftone_64"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, no-c-format
 msgid "diffusion"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, fuzzy, no-c-format
 msgid "normal"
 msgstr "Normál"
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, fuzzy, no-c-format
 msgid "light"
 msgstr "Kiemelés"
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, fuzzy, no-c-format
 msgid "From scanner"
 msgstr "lapolvasó"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, fuzzy, no-c-format
 msgid "default"
 msgstr "Alapértelmezett"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, no-c-format
 msgid "smooth"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, fuzzy, no-c-format
 msgid "low"
 msgstr "Lassú"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, fuzzy, no-c-format
 msgid "medium"
 msgstr "Közepes"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, fuzzy, no-c-format
 msgid "red"
 msgstr "Vörös"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, fuzzy, no-c-format
 msgid "green"
 msgstr "Zöld"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, fuzzy, no-c-format
 msgid "Sets the scan source"
 msgstr "lapolvasó"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, no-c-format
 msgid "Sets the manual feed mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
 "reduction and image emphasis"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "Zajszűrés"
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, no-c-format
 msgid "Lamp color"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, fuzzy, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "A kép függőleges tükrözése."
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
 "length of actual paper or logical document length."
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "Gamma korrekció"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, no-c-format
 msgid "High sensivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, no-c-format
 msgid "Low sensivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, no-c-format
 msgid "err_diffusion"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, fuzzy, no-c-format
 msgid "No detection"
 msgstr "Nincs korrekció"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, fuzzy, no-c-format
 msgid "Normal mode"
 msgstr "Normál"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, fuzzy, no-c-format
 msgid "Enhanced mode"
 msgstr "Haladó"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
 "divides long paper by the length which is set in Document Size option."
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, no-c-format
 msgid "Automatic threshold mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, no-c-format
 msgid "Set chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, no-c-format
 msgid "chroma of blue"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, no-c-format
 msgid "Set chroma of blue"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr "Gyémánt"
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr ""
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr ""
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr ""
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr ""
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr ""
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr ""
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, fuzzy, no-c-format
 msgid "Gray gain"
 msgstr "Szürke"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr ""
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, fuzzy, no-c-format
 msgid "Red gain"
 msgstr "Vörös balansz"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, fuzzy, no-c-format
 msgid "Sets red channel gain"
 msgstr "A vörös csatorna kontrasztja"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, fuzzy, no-c-format
 msgid "Green gain"
 msgstr "Zöld balansz"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, fuzzy, no-c-format
 msgid "Sets green channel gain"
 msgstr "A zöld csatorna kontrasztja"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, fuzzy, no-c-format
 msgid "Blue gain"
 msgstr "Kék balansz"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, fuzzy, no-c-format
 msgid "Sets blue channel gain"
 msgstr "A kék csatorna kontrasztja"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr ""
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr ""
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr ""
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr ""
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr ""
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr "Mode 1"
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr "Mode 2"
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr "Mode 3"
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr ""
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr ""
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr "Alacsony"
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr "Közepes"
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr "Magas"
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr "CRT"
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "Egy oldal"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "Minden oldal"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr ""
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr ""
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr ""
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr ""
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr "Speciális beállítások"
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr ""
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr ""
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr ""
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr ""
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr ""
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr ""
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid ""
 "If checked the color calibration before a scan is done by the backend"
 msgstr ""
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr ""
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr ""
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "Minőségi szkennelés"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr "Minőségi szkennelés alacsony sebességgel"
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "Gyors szkennelés"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr "Gyors sebesség alacsony minőséggel"
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr ""
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
 "for the threshold."
 msgstr ""
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr ""
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr ""
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr ""
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr ""
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr ""
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr ""
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr ""
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr ""
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr ""
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr ""
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr ""
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr "Csatorna"
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
 msgstr ""
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr ""
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr ""
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr ""
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr ""
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr ""
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr ""
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr ""
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr ""
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr "Vörös balansz"
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr ""
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr "Zöld balansz"
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr ""
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr "Kék balansz"
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr ""
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr ""
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr ""
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "Lassabb"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "Lassú"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "Gyors"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "Gyorsabb"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr ""
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr ""
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr ""
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr ""
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr ""
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr ""
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr ""
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr ""
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr ""
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr ""
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr ""
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr ""
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr ""
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr ""
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr ""
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr ""
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr ""
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr ""
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr ""
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr ""
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
 "This may be a non-color mode or a low resolution mode."
 msgstr ""
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr ""
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr ""
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, no-c-format
 msgid "Turn lamp off"
 msgstr ""
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr ""
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr "Vörös fényerő"
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr "Zöld fényerő"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr "Kék fényerő"
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "A vörös csatorna kontrasztja"
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "A zöld csatorna kontrasztja"
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "A kék csatorna kontrasztja"
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, fuzzy, no-c-format
 msgid "Color48"
 msgstr "Színes"
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, fuzzy, no-c-format
 msgid "Color24"
 msgstr "Színes"
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, fuzzy, no-c-format
 msgid "Gray16"
 msgstr "Szürke"
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, fuzzy, no-c-format
 msgid "Gray8"
 msgstr "Szürke"
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, no-c-format
 msgid "Positive"
 msgstr "Pozitív"
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
 "40 seconds warm-up time."
 msgstr ""
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, fuzzy, no-c-format
 msgid "Negative color"
 msgstr "Negatív film"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, fuzzy, no-c-format
 msgid "Negative gray"
 msgstr "Negatív"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, no-c-format
 msgid "48 bits color"
 msgstr ""
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
 "mode and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4389,260 +5097,251 @@ msgid ""
 "cancel, press \"GRAY\" button."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:143
+#: backend/pixma_sane_options.c:232
 #, no-c-format
-msgid "Gamma function exponent"
+msgid "Update button state"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:144
+#: backend/pixma_sane_options.c:244
 #, no-c-format
-msgid "Changes intensity of midtones"
+msgid "Button 1"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:258
 #, no-c-format
-msgid "Update button state"
+msgid "Button 2"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:272
 #, no-c-format
-msgid "Button 1"
+msgid "Type of original to scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:286
 #, no-c-format
-msgid "Button 2"
+msgid "Target operation type"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:348
 #, no-c-format
-msgid "Type of original to scan"
+msgid "ADF Waiting Time"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:349
 #, no-c-format
-msgid "Target operation type"
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
 msgstr ""
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr "�tlátszó"
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr ""
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr ""
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr ""
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, fuzzy, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "Finom beállítás"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr ""
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, fuzzy, no-c-format
 msgid "Calibration data cache"
 msgstr "Kalibráció"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr ""
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, fuzzy, no-c-format
 msgid "Performs calibration"
 msgstr "Finom beállítás"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr ""
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr ""
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, no-c-format
 msgid "Warmup-time"
 msgstr ""
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, no-c-format
 msgid "Warmup-time in seconds."
 msgstr ""
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, no-c-format
 msgid "Lampoff-time"
 msgstr ""
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr ""
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, fuzzy, no-c-format
 msgid "Analog frontend"
 msgstr "Analóg erősítés"
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr ""
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr ""
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr ""
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, no-c-format
 msgid "Red lamp off"
 msgstr ""
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, no-c-format
 msgid "Green lamp off"
 msgstr ""
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, no-c-format
 msgid "Blue lamp off"
 msgstr ""
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr ""
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr ""
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr ""
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr ""
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr ""
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr "Forrás kijelölése"
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr ""
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr ""
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr ""
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr ""
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
 "kicks, it returns green, then blue, then red."
 msgstr ""
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr ""
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4650,205 +5349,202 @@ msgid ""
 "option allows one to test whether a frontend can handle this correctly."
 msgstr ""
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid ""
 "Set default values for enhancement controls (brightness & contrast)."
 msgstr ""
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr ""
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr ""
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr ""
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr ""
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr ""
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr ""
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr ""
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr ""
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr ""
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr ""
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr ""
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr ""
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr ""
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
 "after sane_read() has been called."
 msgstr ""
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr ""
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr ""
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr ""
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr ""
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr ""
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, no-c-format
 msgid "Lamp timeout"
 msgstr ""
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr ""
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr ""
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr "6x4 (inch)"
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr "8x10 (inch)"
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr "8.5x11 (inch)"
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr ""
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr ""
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr ""
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -4858,148 +5554,148 @@ msgid ""
 "frontends may stop responding to X events and your system could bog down."
 msgstr ""
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr ""
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr ""
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, no-c-format
 msgid "Focus point for scanning."
 msgstr ""
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr "Előnézeti mód"
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
 "combination of speed and detail."
 msgstr ""
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr ""
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
 "like."
 msgstr ""
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr ""
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, fuzzy, no-c-format
 msgid "Frame to be scanned"
 msgstr "síkágyas lapolvasó"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, no-c-format
 msgid "Focus-mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, no-c-format
 msgid "Auto or manual focus"
 msgstr ""
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, no-c-format
 msgid "Focus-point"
 msgstr ""
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, fuzzy, no-c-format
 msgid "Focus point"
 msgstr "Fókusz az üvegen"
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr ""
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr ""
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr ""
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, fuzzy, no-c-format
 msgid "Color RAW"
 msgstr "Színes"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, fuzzy, no-c-format
 msgid "Color RGB"
 msgstr "Színes"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr ""
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr ""
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr ""
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr ""
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr "Rács"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr "Első bejegyzés"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr "Második bejegyzés"
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
 "display it"
 msgstr ""
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr "Kézi szkenner szimuláció"
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5008,46 +5704,46 @@ msgid ""
 "option also enables a fixed width of 11 cm."
 msgstr ""
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr ""
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
 "transmitted."
 msgstr ""
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr ""
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr ""
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
 "after 10 scans."
 msgstr ""
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr "Speciális beállítások"
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr ""
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5058,12 +5754,12 @@ msgid ""
 "square."
 msgstr ""
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr ""
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5071,54 +5767,54 @@ msgid ""
 "uses the correct endianness."
 msgstr ""
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr ""
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr ""
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
 msgstr ""
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr ""
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr ""
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr ""
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
 msgstr ""
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr ""
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
@@ -5126,95 +5822,95 @@ msgid ""
 "frontend handles them."
 msgstr ""
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr ""
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr ""
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr ""
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
 "before sane_start()."
 msgstr ""
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr ""
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr ""
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
 "data."
 msgstr ""
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr "Tesztbeállítások engedélyezése"
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
 "frontends to view and modify all the different SANE option types."
 msgstr ""
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr "Nyomtatási beállítások"
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr ""
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr ""
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr ""
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
 "advanced) capabilities. That's just a normal bool option."
 msgstr ""
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr ""
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
@@ -5222,12 +5918,12 @@ msgid ""
 "frontend but by the user (e.g. by pressing a button at the device)."
 msgstr ""
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr ""
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5235,36 +5931,36 @@ msgid ""
 "by pressing a button at the device) and can't be read by the frontend."
 msgstr ""
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr ""
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
 "That means the option is read-only."
 msgstr ""
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr ""
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
 "(and advanced) capabilities."
 msgstr ""
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr ""
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5272,299 +5968,303 @@ msgid ""
 "backend."
 msgstr ""
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr ""
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr ""
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr ""
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr ""
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
 "is 4, maximum 192, and quant is 2."
 msgstr ""
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr ""
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr ""
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
 "constraints."
 msgstr ""
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr ""
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
 "constraint. Minimum is 4, maximum 192, and quant is 2."
 msgstr ""
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr ""
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
 "list constraint."
 msgstr ""
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr ""
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr ""
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr ""
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr ""
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
 "Minimum is -42.17, maximum 32767.9999, and quant is 2.0."
 msgstr ""
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr ""
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr ""
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr ""
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr ""
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr ""
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr ""
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr ""
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
 "entries..."
 msgstr ""
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr ""
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr ""
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr ""
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, fuzzy, no-c-format
 msgid "Color 36"
 msgstr "Színes"
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr ""
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr ""
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr ""
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr ""
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr ""
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr ""
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr ""
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr ""
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr ""
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr ""
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr ""
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr ""
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr ""
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr ""
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr ""
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr ""
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr ""
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr ""
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr ""
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, fuzzy, no-c-format
 msgid "Offset"
 msgstr "Ki"
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr ""
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, fuzzy, no-c-format
 msgid "Gray offset"
 msgstr "Szürke kontraszt"
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr ""
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, fuzzy, no-c-format
 msgid "Sets red channel offset"
 msgstr "A vörös csatorna kontrasztja"
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, fuzzy, no-c-format
 msgid "Sets green channel offset"
 msgstr "A zöld csatorna kontrasztja"
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, fuzzy, no-c-format
 msgid "Sets blue channel offset"
 msgstr "A kék csatorna kontrasztja"
+
+#, fuzzy
+#~ msgid "IPC mode"
+#~ msgstr "Előnézeti mód"
diff --git a/po/insert-header.sin b/po/insert-header.sin
new file mode 100644
index 0000000..b26de01
--- /dev/null
+++ b/po/insert-header.sin
@@ -0,0 +1,23 @@
+# Sed script that inserts the file called HEADER before the header entry.
+#
+# At each occurrence of a line starting with "msgid ", we execute the following
+# commands. At the first occurrence, insert the file. At the following
+# occurrences, do nothing. The distinction between the first and the following
+# occurrences is achieved by looking at the hold space.
+/^msgid /{
+x
+# Test if the hold space is empty.
+s/m/m/
+ta
+# Yes it was empty. First occurrence. Read the file.
+r HEADER
+# Output the file's contents by reading the next line. But don't lose the
+# current line while doing this.
+g
+N
+bb
+:a
+# The hold space was nonempty. Following occurrences. Do nothing.
+x
+:b
+}
diff --git a/po/it.gmo b/po/it.gmo
new file mode 100644
index 0000000..07d72d4
--- /dev/null
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index 316a4e5..6c083c7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,421 +5,415 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends 1.0.18\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
 "PO-Revision-Date: 2007-08-28 23:11+0200\n"
 "Last-Translator: Giuseppe Sacco <eppesuig@debian.org>\n"
 "Language-Team: italian translation project <tp@lists.linux.it>\n"
-"Language: \n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr "Numero di opzioni"
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr ""
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "Geometria"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "Miglioramento"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr ""
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "Anteprima"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr "Forza anteprima in bianco e nero"
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr "Profondità in bit"
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Modalità di scansione"
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "Velocità scanner"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr "Sorgente scanner"
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr "Forza il backtracking"
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "X in alto a sinistra"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "Y in alto a sinistra"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "X in basso a destra"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "Y in basso a destra"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Risoluzione della scansione"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "Risoluzione X"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Risoluzione Y"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr ""
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, fuzzy, no-c-format
 msgid "Page height"
 msgstr "Contrasto"
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr "Personalizzare la correzione gamma"
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr "Intensità dell'immagine"
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr "Intensità del rosso"
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr "Intensità del verde"
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr "Intensità del blu"
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr "Brillantezza"
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "Contrasto"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr "Grana"
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr "Mezzi-toni"
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "Livello nero"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "Livello bianco"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr "Livello di bianco sul rosso"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
 msgstr "Livello di bianco sul verde"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr "Livello di bianco sul blu"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "Ombreggiatura"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr "Ombreggiatura per il rosso"
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr "Ombreggiatura per il verde"
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr "Ombreggiatura per il blu"
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr "Contrasto"
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr "Contrasto per il rosso"
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr "Contrasto per il verde"
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr "Contrasto per il blu"
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr "Tonalità"
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr "Saturazione"
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "Nome file"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr "Dimensione del modello mezzi-toni"
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "Modello mezzi-toni"
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr "Lega la risoluzione X e Y"
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "Negativo"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "Qualità della calibrazione"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr "Raddoppia la risoluzione ottica"
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr "Lega i canali RGB"
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr "Soglia"
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr "Correzione gamma analogica"
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr "Correzione gamma del rosso analogica"
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr "Correzione gamma del verde analogica"
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr "Correzione gamma del blu analogica"
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr "Lega i valori gamma RGB"
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr "Preriscaldamento lampada"
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr "Cal. tempo di esposizione"
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr "Cal. tempo di esposizione per il rosso"
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr "Cal. tempo di esposizione per il verde"
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr "Cal. tempo di esposizione per il blu"
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr "Tempo di esposizione in scansione"
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr "Tempo di esposizione in scansione per il rosso"
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr "Tempo di esposizione in scansione per il verde"
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr "Tempo di esposizione in scansione per il blu"
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr "Determinare il tempo di esposizione"
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr "Cal. potenza della lampada"
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr "Potenza della lampada in scansione"
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr "Determina la potenza della lampada in scansione"
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr "Lampada spenta in uscita"
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
@@ -428,37 +422,37 @@ msgstr ""
 "Opzione che visualizza quante opzioni sono supportate da uno specifico "
 "dispositivo."
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, fuzzy, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "Lista ridotta delle risoluzioni disponibili"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr ""
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, fuzzy, no-c-format
 msgid "Image modification options"
 msgstr "Numero di opzioni"
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, fuzzy, no-c-format
 msgid "Hardware specific options"
 msgstr "Risoluzione hardware"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr ""
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr "Richiede la qualità in anteprima di scansione."
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -470,7 +464,7 @@ msgstr ""
 "sola, invece in quelli ad una passata riduce la memoria e il tempo "
 "richiesti per l'anteprima."
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
@@ -479,78 +473,78 @@ msgstr ""
 "Numero di bit per campione, il valore usuale è 1 per \"Binario\" e 8 per "
 "le scansioni ad alta risoluzione."
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr ""
 "Seleziona la modalità di scansione (ad esempio binaria, monocromatica o "
 "colore)."
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr "Determina la velocità di scansione"
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr ""
 "Seleziona la sorgente per la scansione (come ad esempio il vassoio)"
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr "Verifica se il backtracking è stato impostato."
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "Posizione X in alto a sinistra dell'area di scansione."
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "Posizione Y in alto a sinistra dell'area di scansione."
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "Posizione X in basso a destra dell'area di scansione."
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "Posizione Y in basso a destra dell'area di scansione."
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr "Determina la risoluzione di acquisizione dell'immagine."
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr ""
 "Determina la risoluzione orizzontale di acquisizione dell'immagine."
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr "Determina la risoluzione verticale di acquisizione dell'immagine."
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
 "sheet-fed scans."
 msgstr ""
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, fuzzy, no-c-format
 msgid "Specifies the height of the media."
 msgstr "Determina la risoluzione di acquisizione dell'immagine."
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid ""
 "Determines whether a builtin or a custom gamma-table should be used."
@@ -558,7 +552,7 @@ msgstr ""
 "Determina se utilizzare per la correzione gamma dei valori predefiniti "
 "oppure quelli personalizzati dall'utente."
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -569,32 +563,32 @@ msgstr ""
 "in modo simultaneo i 3 canali (rosso, verde, blu) ed è quindi una "
 "tabella gamma di intensità."
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr "Tabella di correzione gamma per il colore rosso."
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr "Tabella di correzione gamma per il colore verde."
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr "Tabella di correzione gamma per il colore blu."
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr "Controlla la brillantezza dell'immagine acquisita."
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr "Controlla il contrasto dell'immagine acquisita."
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
@@ -603,74 +597,74 @@ msgstr ""
 "Seleziona la \"granulosità\" dell'immagine acquisita: valori minori "
 "determinano immagini più nitide."
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr ""
 "Determina se l'immagine acquisita deve essere a mezzi-toni (sfumata)."
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr ""
 "Imposta quale livello di luminosità debba essere considerato \"nero\"."
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr ""
 "Imposta quale livello di luminosità debba essere considerato \"bianco\"."
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr ""
 "Imposta quale livello di luminosità rossa debba essere considerato "
 "\"bianco\"."
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr ""
 "Imposta quale livello di luminosità verde debba essere considerato "
 "\"bianco\"."
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr ""
 "Imposta quale livello di luminosità blu debba essere considerato \"bianco"
 "\"."
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr ""
 "Imposta quale livello di luminosità rossa debba essere considerato \"nero"
 "\"."
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr ""
 "Imposta quale livello di luminosità verde debba essere considerato \"nero"
 "\"."
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr ""
 "Imposta quale livello di luminosità blu debba essere considerato \"nero"
 "\"."
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr ""
 "Imposta quale livello di luminosità rossa debba essere considerato "
 "\"rosso completo\"."
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid ""
 "Selects what green radiance level should be considered \"full green\"."
@@ -678,7 +672,7 @@ msgstr ""
 "Imposta quale livello di luminosità verde debba essere considerato "
 "\"verde completo\"."
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid ""
 "Selects what blue radiance level should be considered \"full blue\"."
@@ -686,12 +680,12 @@ msgstr ""
 "Imposta quale livello di luminosità blu debba essere considerato \"blu "
 "completo\"."
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr "Controlla la tonalità (livello di blu) dell'immagine acquisita."
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
@@ -701,12 +695,12 @@ msgstr ""
 "l'immagine venga acquisita con una fotocamera. Valori maggiori "
 "determinano una fioritura maggiore."
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr "Il nome del file contenente l'immagine da caricare."
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
@@ -715,7 +709,7 @@ msgstr ""
 "Determina la dimensione del modello mezzi-toni (sfumatura) utilizzato "
 "con immagini a mezzi-toni."
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
@@ -723,287 +717,287 @@ msgstr ""
 "Definisce il modello mezzi-toni (sfumatura) utilizzato con immagini a "
 "mezzi-toni."
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr "Usa lo stesso valore per la risoluzione X e Y"
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr "Inverte bianco e nero"
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr "Esegue una calibrazione qualitativa sul bianco"
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr "Utilizzo della lente per duplicare la risoluzione ottica"
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr "Utilizza lo stesso valore per tutti i canali in modalità RGB"
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr "Imposta la brillantezza minima corrispondente a un punto bianco"
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr "Correzione gamma analogica"
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr "Correzione gamma del rosso analogica"
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr "Correzione gamma del verde analogica"
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr "Correzione gamma del blu analogica"
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr "Preriscaldamento della lampada prima della scansione"
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr "Definisce il tempo di esposizione per la calibrazione"
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr "Definisce il tempo di esposizione per la calibrazione del rosso"
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr "Definisce il tempo di esposizione per la calibrazione del verde"
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr "Definisce il tempo di esposizione per la calibrazione del blu"
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr "Definisce il tempo di esposizione per la scansione"
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr "Definisce il tempo di esposizione per la scansione del rosso"
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr "Definisce il tempo di esposizione per la scansione del verde"
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr "Definisce il tempo di esposizione per la scansione del blu"
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr "Abilita la selezione del tempo di esposizione"
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr "Determina l'intensità della lampada per la calibrazione"
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr "Determina l'intensità della lampada in scansione"
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr "Abilita la selezione dell'intensità della lampada"
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr "Spegnere la lampada in uscita dal programma"
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, fuzzy, no-c-format
 msgid "Scan button"
 msgstr "Risoluzione della scansione"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, fuzzy, no-c-format
 msgid "Email button"
 msgstr "Attendi il tasto"
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, fuzzy, no-c-format
 msgid "Fax button"
 msgstr "Attendi il tasto"
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, fuzzy, no-c-format
 msgid "Copy button"
 msgstr "Attendi il tasto"
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr ""
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, fuzzy, no-c-format
 msgid "Cover open"
 msgstr "Coperchio ADF aperto"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "Colore"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr "Colore binario"
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr "Mezzi-toni colore"
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "Grigio"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr "Mezzi toni"
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "Binario"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, fuzzy, no-c-format
 msgid "Operation not supported"
 msgstr "Mezzi-toni non supportati"
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, fuzzy, no-c-format
 msgid "Document feeder jammed"
 msgstr "Opzioni dell'alimentatore automatico"
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, fuzzy, no-c-format
 msgid "Document feeder out of documents"
 msgstr "Opzioni dell'alimentatore automatico"
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, fuzzy, no-c-format
 msgid "Scanner cover is open"
 msgstr "Coperchio ADF aperto"
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "Predefiniti"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr "Imposta i valori predefiniti per i controlli del miglioramento"
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "Calibrazione"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr "Calibrare lo scanner prima della prossima scansione"
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
@@ -1013,12 +1007,12 @@ msgstr ""
 "se tale funzione sarrà abilitata, altrimenti la calibrazione verrà "
 "eseguita solamente alla prima scansione."
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr "Esegue solamente la correzione delle ombre"
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -1030,1066 +1024,1057 @@ msgstr ""
 "verranno utilizzati i valori predefiniti o quelli presenti nel file di "
 "configurazione"
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr "Stato del pulsante"
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr "Numero di fotogrammi da acquisire"
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr "Selezionare il numero di fotogrammi da acquisire"
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, no-c-format
 msgid "Duplex scan"
 msgstr "Scansione Duplex"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid ""
 "Duplex scan provide a scan of the front and back side of the document"
 msgstr "La scansione duplex è quella di entrambi i lati del documento"
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr "Calibrare lo scanner"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr "Forza la calibrazione dello scanner prima della scansione"
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr "Scansione in scala di grigi"
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr "Effettuare una scansione in scala di grigi invece che a colori"
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr "Guadagno analogico"
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr "Aumenta o diminuisce il guadagno analogico del sensore CCD"
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "Correzione gamma"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr "Selezionare la curva di correzione gamma"
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr "Grezzo"
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr "Colore ad alta qualità"
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, no-c-format
 msgid "No transparency correction"
 msgstr "Nessuna correzione della trasparenza"
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr "Correzione in base al tipo di pellicola"
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr "Correzione in base al rapporto di trasparenza"
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, no-c-format
 msgid "Negatives"
 msgstr "Negativi"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, no-c-format
 msgid "Slides"
 msgstr "Diapositive"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "Automatico"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, no-c-format
 msgid "Normal speed"
 msgstr "Velocità normale"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/2 normal speed"
 msgstr "Velocità normale dimezzata"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/3 normal speed"
 msgstr "1/3 della velocità normale"
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, no-c-format
 msgid "rounded parameter"
 msgstr "parametri arrotondati"
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, no-c-format
 msgid "ADF jam"
 msgstr "ADF inceppato"
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr "Coperchio ADF aperto"
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, no-c-format
 msgid "lamp failure"
 msgstr "lampada guasta"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr "errore nel posizionamento della testa di scansione"
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr "Errore nel controllo della CPU"
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr "Error nel controllo della RAM"
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr "Errore nel controllo della ROM"
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr "errore nei controlli hardware"
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, no-c-format
 msgid "transparency unit lamp failure"
 msgstr "guasto della lampada dell'adattatore per trasparenze"
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr ""
 "errore durante il posizionamento della testa di scansione per "
 "l'adatattore per trasparenze"
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr "errore nella lunghezza della lista di parametri"
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr "codice di comando non valido"
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr "campo non valido in CDB"
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr "LUN non supportato"
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr "campo non valido nella lista di parametri"
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr "errore nella sequenza di comandi"
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr "sono state specificate troppe finestre"
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr "supporto non presente"
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr "messaggio con bit IDENTIFY non valido"
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr "opzione non connesso"
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr "reset dell'alimentazione elettrica / reset del bus dei dispositivi"
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr "parametro cambiato da un altro iniziatore"
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr "nessun altra informazione aggiuntiva sul «sense»"
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr "errore durante la reselezione"
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr "errore di parità SCSI"
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr "ricevuto un messaggio di errore per rilevamento di iniziatore"
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr "errore di messaggio non valido"
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr "errore di timeout"
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, no-c-format
 msgid "transparency unit shading error"
 msgstr "errore nel mascheramento della unità per la trasparenza"
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr "lampada non stabilizzata"
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, no-c-format
 msgid "film scanner"
 msgstr "scanner da negativi"
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr "scanner piano"
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr "Pellicola"
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr "Imposta il tipo di pellicola: negativi o diapositive"
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, no-c-format
 msgid "Negative film type"
 msgstr "Tipo di pellicola negativa"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, no-c-format
 msgid "Selects the negative film type"
 msgstr "Seleziona il tipo di pellicola negativa"
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, no-c-format
 msgid "Hardware resolution"
 msgstr "Risoluzione hardware"
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "Mostra solo le risoluzioni hardware"
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr "Fuoco"
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, no-c-format
 msgid "Auto focus"
 msgstr "Autofocus"
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, no-c-format
 msgid "Enable/disable auto focus"
 msgstr "Abilita/disabilita la messa a fuoco automatica"
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr "Autofocus unico"
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr "Effettua l'autofocus una sola volta per ogni pellicola inserita"
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, no-c-format
 msgid "Manual focus position"
 msgstr "Posizione di messa a fuoco manuale"
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr ""
 "Imposta manualmente la posizione del sistema di messa a fuoco "
 "(normalmente alla posizione 128)."
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr "Margini di scansione"
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr "Altre impostazioni del colore"
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "Immagine riflessa"
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "Riflette l'immagine orizzontalmente"
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, no-c-format
 msgid "Auto exposure"
 msgstr "Esposizione automatica"
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr "Abilita/disabilita l'esposizione automatica"
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, no-c-format
 msgid "Calibration now"
 msgstr "Calibrazione immediata"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Esegue adesso la calibrazione"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr "Auto diagnostica"
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr "Effettua i controlli automatici"
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, no-c-format
 msgid "Reset scanner"
 msgstr "Reimposta scanner"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, no-c-format
 msgid "Reset the scanner"
 msgstr "Reimposta lo scanner"
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr "Gestione del supporto"
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, no-c-format
 msgid "Eject film after each scan"
 msgstr "Espelle la pellicola dopo ogni scansione"
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr "Espelle automaticamente la pellicola dopo ogni scansione"
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr "Espelle la pellicola all'uscita"
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr "Espelle automaticamente la pellicola alla chiusura del programma"
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr "Espulsione della pellicola immediata"
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr "Espelle la pellicola adesso"
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, no-c-format
 msgid "Document feeder extras"
 msgstr "Opzioni dell'alimentatore automatico"
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, no-c-format
 msgid "Flatbed only"
 msgstr "Solo piano fisso"
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr "Disabilita l'alimentatore di fogli e usa solo il piano fisso"
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, no-c-format
 msgid "Transparency unit"
 msgstr "Adattatore per trasparenze"
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr ""
 "Abilita/disabilita l'adattatore per le trasparenze (FAU, «film adapter "
 "unit»)"
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, no-c-format
 msgid "Negative film"
 msgstr "Pellicola negativa"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, no-c-format
 msgid "Positive or negative film"
 msgstr "Pellicola positiva o negativa"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr "Controllo della densità"
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr "Imposta la modalità di controllo della densità"
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, no-c-format
 msgid "Transparency ratio"
 msgstr "Rapporto per trasparenze"
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, no-c-format
 msgid "Select film type"
 msgstr "Seleziona tipo pellicola"
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, no-c-format
 msgid "Select the film type"
 msgstr "Seleziona il tipo di pellicola"
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "Piano fisso"
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, fuzzy, no-c-format
 msgid "ADF Front"
 msgstr "Coperchio ADF aperto"
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, fuzzy, no-c-format
 msgid "ADF Back"
 msgstr "ADF inceppato"
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, no-c-format
 msgid "ADF Duplex"
 msgstr "ADF Duplex"
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, fuzzy, no-c-format
 msgid "Card Front"
 msgstr "Stampa"
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, no-c-format
 msgid "Card Back"
 msgstr ""
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, fuzzy, no-c-format
 msgid "Card Duplex"
 msgstr "Fronte e retro"
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "Rosso"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "Verde"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "Blu"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, fuzzy, no-c-format
 msgid "Enhance Red"
 msgstr "Miglioramento"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, fuzzy, no-c-format
 msgid "Enhance Green"
 msgstr "Miglioramento"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, fuzzy, no-c-format
 msgid "Enhance Blue"
 msgstr "Miglioramento"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr "Nessuno"
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr ""
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr ""
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr "Solo fronte"
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr "Fronte e retro"
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr "Adattatore per trasparenze"
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr "Caricatore automatico fogli"
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "Pellicola positiva"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "Pellicola negativa"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr "Messa a fuoco sul piano di vetro"
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr "Messa a fuoco 2,5mm sopra piano di vetro"
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr "Mezzi Toni A (hard tone)"
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr "Mezzi Toni B (soft tone)"
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr "Mezzi Toni C (net screen)"
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr "Dither A (4x4 Bayer)"
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr "Dither B (4x4 Spiral)"
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr "Dither C (4x4 Net Screen)"
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr "Dither D (8x4 Net Screen)"
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr "Tecnologia di miglioramento del testo"
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr "Scarica il modello A"
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr "Scarica il modello B"
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "Nessuna correzione"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr "Definito dall'utente"
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr "Stampanti a impatto"
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr "Stampanti termiche"
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "Stampanti a getto d'inchiostro"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr "Monitor CRT"
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "Default"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr "Stampa ad alta definizione"
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr "Stampa a bassa definizione"
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr "Stampa a contrasto elevato"
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr "Definito dall'utente (gamma=1.0)"
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr "Definito dall'utente (gamma=1.8)"
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr "CD"
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr "A5 verticale"
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr "A5 orizzontale"
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr "Letter"
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr "A4"
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "Massimo"
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr "Modalità di scansione"
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr "Seleziona i mezzi toni"
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr "Esclusione"
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr "Seleziona l'esclusione."
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr "Seleziona la brillantezza."
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr "Nitidezza"
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr "Correzione del colore"
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr ""
 "Imposta la tabella di correzione dei colori per il dispositivo "
 "selezionato."
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr "Coefficienti di correzione del colore"
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr "Moltiplicazione matriciale dei valori RGB"
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr "Spostamento da verde a rosso"
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr "Spostamento da verde a blu"
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr "Spostamento da rosso a verde"
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr "Spostamento da rosso a blu"
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr "Spostamento da blu a verde"
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr "Spostamento da blu a rosso"
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr "Controlla il livello del verde"
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr "Modula il rosso sulla base del livello del verde"
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr "Modula il blu sulla base del livello del verde"
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr "Modula il verde sulla base del livello del rosso"
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr "Controlla il livello del rosso"
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr "Modula il blu sulla base del livello del rosso"
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr "Modula il verde sulla base del livello del blu"
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr "Modula il rosso sulla base del livello del blu"
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, no-c-format
 msgid "Controls blue level"
 msgstr "Controlla del livello del blu"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr "Effettua una riflessione dell'immagine lungo l'asse verticale"
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr "Anteprima veloce"
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr "Sezionamento automatico dell'area"
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr "Lista ridotta delle risoluzioni disponibili"
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr "Mostra la lista ridotta delle risoluzioni disponibili"
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr "Definisce il fattore di zoom usato dallo scanner"
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr "Formato rapido"
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr "Dispositivi opzionali"
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr "Espulsione"
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr "Espelle il foglio dall'alimentatore automatico"
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr "Espulsione automatica"
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr "Espelle il documento dopo la sua scansione"
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr "Modalità ADF"
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr "Seleziona la modalità ADF (solo fronte/fronte-retro)"
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr "Cassetto"
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr "Seleziona il cassetto per la scansione"
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
@@ -2099,24 +2084,24 @@ msgstr ""
 "oppure dalla tabella personalizzata, con la quale verrà configurato lo "
 "scanner"
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr "Posizione della messa a fuoco"
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
 msgstr ""
 "Seleziona la messa a fuoco sul piano di vetro o 2,5mm sopra lo stesso"
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr "Attendi il tasto"
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
@@ -2126,219 +2111,965 @@ msgstr ""
 "premuto il tasto dello scanner per fare partire il processo di "
 "acquisizione."
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr ""
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, no-c-format
 msgid "Positive Slide"
 msgstr "Diapositiva positiva"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, no-c-format
 msgid "Negative Slide"
 msgstr "Diapositiva negativa"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr ""
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, fuzzy, no-c-format
 msgid "User defined CCT profile"
 msgstr "Definito dall'utente"
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr "Attivo"
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr "Disattivo"
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr "Sfumatura"
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, fuzzy, no-c-format
 msgid "Diffusion"
 msgstr "Diffusione d'errore"
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, fuzzy, no-c-format
 msgid "White"
 msgstr "Livello bianco"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, fuzzy, no-c-format
 msgid "Black"
 msgstr "Livello nero"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, fuzzy, no-c-format
 msgid "Continue"
 msgstr "Condizionale"
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr ""
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr "Orizzontale"
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, fuzzy, no-c-format
 msgid "Horizontal bold"
 msgstr "Orizzontale"
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, fuzzy, no-c-format
 msgid "Horizontal narrow"
 msgstr "Orizzontale"
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr "Verticale"
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, fuzzy, no-c-format
 msgid "Vertical bold"
 msgstr "Verticale"
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr ""
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr ""
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, fuzzy, no-c-format
 msgid "Front"
 msgstr "Stampa"
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr ""
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
+msgid "Gamma function exponent"
 msgstr ""
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
 #, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
+msgid "Changes intensity of midtones"
+msgstr ""
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr ""
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr ""
+
+#: backend/fujitsu.c:3165
+#, fuzzy, no-c-format
+msgid "Halftone type"
+msgstr "Mezzi toni"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr ""
+
+#: backend/fujitsu.c:3210
+#, fuzzy, no-c-format
+msgid "Perform outline extraction"
+msgstr "Effettua calibrazione"
+
+#: backend/fujitsu.c:3221
+#, fuzzy, no-c-format
+msgid "Emphasis"
+msgstr "Accentuazione dell'immagine"
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr ""
+
+#: backend/fujitsu.c:3240
+#, fuzzy, no-c-format
+msgid "Separation"
+msgstr "Saturazione"
+
+#: backend/fujitsu.c:3241
+#, fuzzy, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr ""
+"Abilita la valutazione automatica della soglia per la scansione binaria."
+
+#: backend/fujitsu.c:3252
+#, fuzzy, no-c-format
+msgid "Mirroring"
+msgstr "Immagine riflessa"
+
+#: backend/fujitsu.c:3253
+#, fuzzy, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "Riflette l'immagine orizzontalmente."
+
+#: backend/fujitsu.c:3270
+#, fuzzy, no-c-format
+msgid "White level follower"
+msgstr "Livello di bianco sul blu"
+
+#: backend/fujitsu.c:3271
+#, fuzzy, no-c-format
+msgid "Control white level follower"
+msgstr "Controlla il livello del rosso"
+
+#: backend/fujitsu.c:3289
+#, fuzzy, no-c-format
+msgid "BP filter"
+msgstr "Filtro colore"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
 msgstr ""
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr "Ammorbidimento"
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr ""
+
+#: backend/fujitsu.c:3323
+#, fuzzy, no-c-format
+msgid "Gamma curve"
+msgstr "Valore gamma"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, fuzzy, no-c-format
+msgid "Threshold curve"
+msgstr "Soglia"
+
+#: backend/fujitsu.c:3347
+#, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+
+#: backend/fujitsu.c:3369
+#, fuzzy, no-c-format
+msgid "Threshold white"
+msgstr "Soglia"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr ""
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, fuzzy, no-c-format
+msgid "Noise removal"
+msgstr "Riduzione del rumore"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr ""
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr ""
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr ""
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr ""
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr ""
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr ""
+
+#: backend/fujitsu.c:3508
+#, fuzzy, no-c-format
+msgid "Auto width detection"
+msgstr "Nessuna correzione"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr ""
+
+#: backend/fujitsu.c:3526
+#, fuzzy, no-c-format
+msgid "Auto length detection"
+msgstr "Nessuna correzione"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr ""
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr ""
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr ""
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr ""
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr ""
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr ""
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr ""
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
+msgstr ""
+
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3708
+#, fuzzy, no-c-format
+msgid "DF recovery mode"
+msgstr "Coperchio ADF aperto"
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr ""
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3748
+#, fuzzy, no-c-format
+msgid "Advanced paper protection"
+msgstr "Opzioni avanzate"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+
+#: backend/fujitsu.c:3768
+#, fuzzy, no-c-format
+msgid "Staple detection"
+msgstr "Nessuna correzione"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr ""
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+
+#: backend/fujitsu.c:3809
+#, fuzzy, no-c-format
+msgid "Dropout color"
+msgstr "Esclusione"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+
+#: backend/fujitsu.c:3833
+#, fuzzy, no-c-format
+msgid "Buffer mode"
+msgstr "Modalità di caricamento"
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr ""
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr ""
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr ""
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+
+#: backend/fujitsu.c:3911
+#, fuzzy, no-c-format
+msgid "Off timer"
+msgstr "Durata spegnimento lampada"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+
+#: backend/fujitsu.c:3930
+#, fuzzy, no-c-format
+msgid "Duplex offset"
+msgstr "Scarto sul blu"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr ""
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "Scarto sul verde"
+
+#: backend/fujitsu.c:3949
+#, fuzzy, no-c-format
+msgid "Adjust green/red offset"
+msgstr "Scarto sul verde"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr "Scarto sul blu"
+
+#: backend/fujitsu.c:3967
+#, fuzzy, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "Imposta lo scarto sul blu"
+
+#: backend/fujitsu.c:3980
+#, no-c-format
+msgid "Low Memory"
+msgstr ""
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+
+#: backend/fujitsu.c:3996
+#, fuzzy, no-c-format
+msgid "Duplex side"
+msgstr "Scansione Duplex"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr ""
+
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr ""
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr ""
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
+msgstr ""
+
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr ""
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+
+#: backend/fujitsu.c:4095
+#, fuzzy, no-c-format
+msgid "Endorser Options"
+msgstr "Opzioni avanzate"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr ""
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr ""
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr ""
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr ""
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr ""
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr ""
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr ""
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr ""
+
+#: backend/fujitsu.c:4253
+#, fuzzy, no-c-format
+msgid "Endorser direction"
+msgstr "Riduzione del rumore"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr ""
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr ""
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr ""
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr ""
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr ""
+
+#: backend/fujitsu.c:4344
+#, fuzzy, no-c-format
+msgid "A3 paper"
+msgstr "Da carta"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4356
+#, fuzzy, no-c-format
+msgid "B4 paper"
+msgstr "Da carta"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4368
+#, fuzzy, no-c-format
+msgid "A4 paper"
+msgstr "Da carta"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4380
+#, fuzzy, no-c-format
+msgid "B5 paper"
+msgstr "Da carta"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr ""
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr ""
+
+#: backend/fujitsu.c:4429
+#, fuzzy, no-c-format
+msgid "Scanner in power saving mode"
+msgstr "Coperchio ADF aperto"
+
+#: backend/fujitsu.c:4452
+#, fuzzy, no-c-format
+msgid "Manual feed"
+msgstr "Messa a fuoco preliminare manuale"
+
+#: backend/fujitsu.c:4453
+#, fuzzy, no-c-format
+msgid "Manual feed selected"
+msgstr "Messa a fuoco preliminare manuale"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr ""
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr ""
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr ""
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr ""
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr ""
+
+#: backend/fujitsu.c:4513
+#, fuzzy, no-c-format
+msgid "Hardware error code"
+msgstr "errore nei controlli hardware"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr ""
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr ""
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr ""
+
+#: backend/fujitsu.c:4537
+#, fuzzy, no-c-format
+msgid "Imprinter ink level"
+msgstr "Livello bianco"
+
+#: backend/fujitsu.c:4548
+#, fuzzy, no-c-format
+msgid "Density"
+msgstr "Controllo della densità"
+
+#: backend/fujitsu.c:4549
+#, fuzzy, no-c-format
+msgid "Density dial"
+msgstr "Controllo della densità"
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, fuzzy, no-c-format
+msgid "Duplex switch"
+msgstr "Scansione Duplex"
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, no-c-format
 msgid "Extras"
 msgstr "Extra"
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, fuzzy, no-c-format
-msgid "Threshold curve"
-msgstr "Soglia"
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr ""
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
 "instead on hardware lineart."
 msgstr ""
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, no-c-format
 msgid "Disable interpolation"
 msgstr "Disattiva interpolazione"
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
@@ -2347,46 +3078,46 @@ msgstr ""
 "Quando si usano alte risoluzione con quella orizzontale minore della "
 "verticale, l'interpolazione orizzontale viene disabilitata."
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "Filtro colore"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 "Quando si usano i grigi o il binario questa opzione seleziona il colore "
 "usato."
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "Calibrazione"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Definire la modalità di calibrazione"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Cache per la calibrazione"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, no-c-format
 msgid "Lamp off time"
 msgstr "Durata spegnimento lampada"
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
@@ -2395,106 +3126,104 @@ msgstr ""
 "La lampada verrà spenta allo scadere del tempo impostato (in minuti). Il "
 "valore 0 indica che la lampada non deve mai essere spenta."
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, fuzzy, no-c-format
 msgid "Lamp off during scan"
 msgstr "Calibrazione granulosa"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, fuzzy, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr ""
 "Numero di minuti prima che la lampada venga spenta dopo la scansione"
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, fuzzy, no-c-format
 msgid "File button"
 msgstr "Attendi il tasto"
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr ""
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, fuzzy, no-c-format
 msgid "Power button"
 msgstr "Attendi il tasto"
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "Attendi il tasto"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, fuzzy, no-c-format
 msgid "Need calibration"
 msgstr "Calibrazione granulosa"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, fuzzy, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr "Forza la calibrazione dello scanner prima della scansione"
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, no-c-format
 msgid "Buttons"
 msgstr "Pulsanti"
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr "Calibrazione"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, fuzzy, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "Inizia la calibrazione."
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, fuzzy, no-c-format
 msgid "Clear calibration"
 msgstr "Calibrazione granulosa"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, fuzzy, no-c-format
 msgid "Clear calibration cache"
 msgstr "Cache per la calibrazione"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr "Adattatore per trasparenza"
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr "Modalità a scala di grigi"
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 "Seleziona il colore di scansione da usare per la scala di grigi "
 "(predefinito: verde)."
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr "Opzioni per il debugging"
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "Preriscaldamento automatico"
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -2503,12 +3232,12 @@ msgstr ""
 "Preriscalda fino a che la luminisità della lampada sia costante invece "
 "di attendere 60 secondi."
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "Scansione completa"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
@@ -2518,12 +3247,12 @@ msgstr ""
 "calibrazione. Fare attenzione a non selezionare l'altezza completa. Da "
 "usare solo per effettuare test."
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Calibrazione granulosa"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2535,12 +3264,12 @@ msgstr ""
 "opzioni per la parametrizzazione manuale analogica. Questa opzione è "
 "attiva in maniera predefinita. Da usare solo per effettuare test."
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "Calibrazione granulosa solo per la prima scansione"
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2552,12 +3281,12 @@ msgstr ""
 "parecchio tempo. Disabilitarla se la brillantezza è diversa per ciascuna "
 "delle immagini da acquisire. Da usare solo per effettuare test."
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, no-c-format
 msgid "Backtrack lines"
 msgstr "Linee del backtrack"
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2570,83 +3299,83 @@ msgstr ""
 "computer durante la ricezione dei dati. Valori bassi permettono una "
 "scansione più veloce, ma aumentano il rischio di linee mancanti."
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Valore gamma"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr "Imposta il valore gamma per tutti i canali."
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, fuzzy, no-c-format
 msgid "Geometry Group"
 msgstr "Geometria"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, fuzzy, no-c-format
 msgid "Scan Mode Group"
 msgstr "Modalità di scansione"
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr "Diapositiva"
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, fuzzy, no-c-format
 msgid "Scanner model"
 msgstr "Modalità di scansione"
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, fuzzy, no-c-format
 msgid "Disable gamma correction"
 msgstr "Correzione gamma analogica"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, fuzzy, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "Correzione gamma"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, fuzzy, no-c-format
 msgid "Disable white shading correction"
 msgstr "Esegue solamente la correzione delle ombre"
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2654,12 +3383,12 @@ msgid ""
 "avoids depth emulation."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, fuzzy, no-c-format
 msgid "Emulate Grayscale"
 msgstr "Scala di grigi"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2667,371 +3396,365 @@ msgid ""
 "circumstances."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
 "analyze them."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, fuzzy, no-c-format
 msgid "Reset chipset"
 msgstr "Reimposta scanner"
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, fuzzy, no-c-format
 msgid "Information"
 msgstr "Ignora la calibrazione"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, fuzzy, no-c-format
 msgid "Chipset name"
 msgstr "Nome file"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, fuzzy, no-c-format
 msgid "Unknown"
 msgstr "sconosciuto"
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, fuzzy, no-c-format
 msgid "Shows the chipset ID"
 msgstr "Reimposta scanner"
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, fuzzy, no-c-format
 msgid "Scan counter"
 msgstr "Sorgente scanner"
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, fuzzy, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr "Selezionare il numero di fotogrammi da acquisire"
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, fuzzy, no-c-format
 msgid "Update information"
 msgstr "Opzioni di aggiornamento"
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, fuzzy, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr "Queste opzioni riflettono lo stato dei pulsanti dello scanner."
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr "Immagine"
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr "Varie"
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, no-c-format
 msgid "offset X"
 msgstr "Scarto X"
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr "Posizione interna X dell'area di scansione."
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, no-c-format
 msgid "offset Y"
 msgstr "Scarto Y"
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr "Posizione interna Y dell'area di scansione."
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr "Stato della lampada"
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr "Accendi o spegni la lampada"
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr "Calibrare i livelli del bianco e nero"
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr "ADF"
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, fuzzy, no-c-format
 msgid "TMA Slides"
 msgstr "Diapositive"
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, fuzzy, no-c-format
 msgid "TMA Negatives"
 msgstr "Negativi"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, fuzzy, no-c-format
 msgid "Color (48 bits)"
 msgstr "Colore a 48 bit"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, fuzzy, no-c-format
 msgid "Extend lamp timeout"
 msgstr "Timeout della lampada"
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr ""
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, fuzzy, no-c-format
 msgid "Wait for button"
 msgstr "Attendi il tasto"
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, fuzzy, no-c-format
 msgid "Waits for button before scanning"
 msgstr "Preriscaldamento della lampada prima della scansione"
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, no-c-format
 msgid "Advanced Options"
 msgstr "Opzioni avanzate"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr "Granuloso"
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr "A grana fine"
 
 # Bayer è il nome della persona che ha inventato questa matrice per il
 # dithering.
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr "Bayer"
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr "Personalizzato"
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "Automatico"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr "NTSC RGB"
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr "XPA RGB"
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr "Passante"
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "Grigio NTSC"
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr "XPA Grigio"
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "Lento"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr "Normale"
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "Veloce"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr "Extra veloce"
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr "2-pixel"
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr "4-pixel"
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr "8-pixel"
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr "Stampa"
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, no-c-format
 msgid "Film-strip"
 msgstr "Pellicola"
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr "XPA"
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr "Condizionale"
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, no-c-format
 msgid "Experiment"
 msgstr "Esperimento"
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, no-c-format
 msgid "Sharpening"
 msgstr "Nitidezza"
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr "Imposta il valore di nitidezza."
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr "Soglia automatica"
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr ""
 "Abilita la valutazione automatica della soglia per la scansione binaria."
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr "Ammorbidimento"
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr "Seleziona il filtro per l'ammorbidimento (smoothing)."
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr "Espelle il supporto dopo la scansione"
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, no-c-format
 msgid "Unloads the media after a scan."
 msgstr "Estrae il supporto originale dopo aver effettuato la scansione."
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, no-c-format
 msgid "Change document"
 msgstr "Cambia il documento"
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr "Cambia il documento."
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr "Espulsione"
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr "Espelle il documento."
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, no-c-format
 msgid "Start calibration process."
 msgstr "Inizia la calibrazione."
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, no-c-format
 msgid "Media"
 msgstr "Supporto"
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr "Imposta il tipo di supporto."
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr "Tempo di esposizione"
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -3044,466 +3767,465 @@ msgstr ""
 "normali diapositive e \"Negativo\" per le pellicole. Per immagini scure "
 "(sottoesposte) si può aumentare questo valore."
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, no-c-format
 msgid "Color Matrix"
 msgstr "Matrice del colore"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, no-c-format
 msgid "Set the scanners color matrix."
 msgstr "Imposta la matrice del colore."
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr "Matrice personalizzata del colore."
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, no-c-format
 msgid "Mono Color Matrix"
 msgstr "Matrice del colore mono"
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr "Matrice personalizzata del colore per scansioni a scale di grigi."
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, no-c-format
 msgid "Mirror horizontal"
 msgstr "Specchio orizzontale"
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, no-c-format
 msgid "Mirror image horizontally."
 msgstr "Riflette l'immagine orizzontalmente."
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, no-c-format
 msgid "Mirror vertical"
 msgstr "Specchio verticale"
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, no-c-format
 msgid "Mirror image vertically."
 msgstr "Riflette l'immagine verticalmente."
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, no-c-format
 msgid "Update options"
 msgstr "Opzioni di aggiornamento"
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, no-c-format
 msgid "Update options."
 msgstr "Opzioni di aggiornamento."
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr "uscita a 8 bit"
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr "Usa internamente più di 8 bit, ma produce solo 8 bit."
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr "Attesa del bottone frontale"
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr ""
 "Viene attesa la pressione del bottone frontale prima di effettuare la "
 "scansione."
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr "Spegnimento della lampada"
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr "Spegne la lampada dello scanner."
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "Dimensione del foglio"
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr "Separazione automatica"
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, fuzzy, no-c-format
 msgid "Landscape"
 msgstr "A5 orizzontale"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr ""
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, fuzzy, no-c-format
 msgid "Length control mode"
 msgstr "Imposta la modalità di controllo della densità"
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, fuzzy, no-c-format
 msgid "Manual feed mode"
 msgstr "Messa a fuoco preliminare manuale"
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, fuzzy, no-c-format
 msgid "Manual feed timeout"
 msgstr "Messa a fuoco preliminare manuale"
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr "Attiva la scansione fronte-retro"
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr "Dimensione del foglio nel caricatore automatico"
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, fuzzy, no-c-format
 msgid "halftone"
 msgstr "Mezzi toni"
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, fuzzy, no-c-format
 msgid "color"
 msgstr "Colore"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, fuzzy, no-c-format
 msgid "continuous"
 msgstr "Condizionale"
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, fuzzy, no-c-format
 msgid "off"
 msgstr "Disattivo"
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr ""
 
 # Bayer è il nome della persona che ha inventato questa matrice per il
 # dithering.
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, fuzzy, no-c-format
 msgid "bayer_64"
 msgstr "Bayer"
 
 # Bayer è il nome della persona che ha inventato questa matrice per il
 # dithering.
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, fuzzy, no-c-format
 msgid "bayer_16"
 msgstr "Bayer"
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, fuzzy, no-c-format
 msgid "halftone_32"
 msgstr "Mezzi toni"
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, fuzzy, no-c-format
 msgid "halftone_64"
 msgstr "Mezzi toni"
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, fuzzy, no-c-format
 msgid "diffusion"
 msgstr "Diffusione d'errore"
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, fuzzy, no-c-format
 msgid "normal"
 msgstr "Normale"
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, fuzzy, no-c-format
 msgid "light"
 msgstr "Contrasto"
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, fuzzy, no-c-format
 msgid "From scanner"
 msgstr "scanner da negativi"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr "Da carta"
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, fuzzy, no-c-format
 msgid "default"
 msgstr "Default"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, fuzzy, no-c-format
 msgid "smooth"
 msgstr "Morbido"
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, fuzzy, no-c-format
 msgid "low"
 msgstr "Lento"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, fuzzy, no-c-format
 msgid "medium"
 msgstr "Medio"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, fuzzy, no-c-format
 msgid "red"
 msgstr "Rosso"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, fuzzy, no-c-format
 msgid "green"
 msgstr "Verde"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, fuzzy, no-c-format
 msgid "Sets the scan source"
 msgstr "Sorgente scanner"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr "Modalità di caricamento"
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr "Selezionare la modalità di caricamento"
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, fuzzy, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr "Abilita/disabilita la messa a fuoco automatica"
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, fuzzy, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr "Imposta la modalità di controllo della densità"
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, fuzzy, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "Selezionare la modalità di caricamento"
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, fuzzy, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr "Selezionare la modalità di caricamento"
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr "Soglia automatica"
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
@@ -3513,515 +4235,502 @@ msgstr ""
 "del rumore e accentuazione dell'immagine vengono determinati "
 "automaticamente"
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "Riduzione del rumore"
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr "Riduce il rumore dei punti isolati"
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr "Accentuazione dell'immagine"
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr "Imposta l'accentuazione dell'immagine"
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, fuzzy, no-c-format
 msgid "Lamp color"
 msgstr "Lampada accesa"
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, fuzzy, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr "Accendi o spegni la lampada"
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, fuzzy, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "Riflette l'immagine verticalmente."
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
 "length of actual paper or logical document length."
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "Correzione gamma"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, fuzzy, no-c-format
 msgid "High sensivity"
 msgstr "Stampa ad alta definizione"
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, fuzzy, no-c-format
 msgid "Low sensivity"
 msgstr "Stampa a bassa definizione"
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, fuzzy, no-c-format
 msgid "err_diffusion"
 msgstr "Diffusione d'errore"
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, fuzzy, no-c-format
 msgid "No detection"
 msgstr "Nessuna correzione"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, fuzzy, no-c-format
 msgid "Normal mode"
 msgstr "Normale"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, fuzzy, no-c-format
 msgid "Enhanced mode"
 msgstr "Miglioramento"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
 "divides long paper by the length which is set in Document Size option."
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, fuzzy, no-c-format
 msgid "Automatic threshold mode"
 msgstr "Soglia automatica"
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, fuzzy, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr "Soglia automatica"
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, fuzzy, no-c-format
 msgid "Set chroma of red"
 msgstr "Determina l'ordine delle immagini"
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, fuzzy, no-c-format
 msgid "chroma of blue"
 msgstr "Ombreggiatura per il blu"
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, fuzzy, no-c-format
 msgid "Set chroma of blue"
 msgstr "Spostamento da rosso a blu"
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr "Diamante"
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr "8x8 grana grossa"
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr "8x8 grana fine"
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr "8x8 Bayer"
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr "8x8 linea verticale"
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr "Guadagno"
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr "Regolazione del guadagno sui canali di colore"
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, no-c-format
 msgid "Gray gain"
 msgstr "Guadagno sul grigio"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr "Imposta il guadagno sul canale grigio"
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, no-c-format
 msgid "Red gain"
 msgstr "Guadagno sul rosso"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr "Imposta il guadagno sul canale rosso"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, no-c-format
 msgid "Green gain"
 msgstr "Guadagno sul verde"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr "Imposta il guadagno sul canale verde"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, no-c-format
 msgid "Blue gain"
 msgstr "Guadagno sul blu"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr "Imposta il guadagno sul canale blu"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr "Dither Bayer 16"
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr "Dither Bayer 64"
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr "Halftone Dot 32"
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr "Halftone Dot 64"
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr "Diffusione d'errore"
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr "Modo 1"
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr "Modo 2"
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr "Modo 3"
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr "Da bastoncino bianco"
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr "Morbido"
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr "Basso"
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr "Medio"
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr "Alto"
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr "CRT"
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "Pagina singola"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "Tutte le pagine"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr "Scanner con alimentatore automatico dei fogli"
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr "Scala di grigi a 4 bit"
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr "Scala di grigi a 8 bit"
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr "Ombre, toni medi, contrasto, tempo di esposizione"
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr "Opzioni speciali"
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr "Bilanciamento del colore"
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr "Disattiva backtracking"
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr "Se abilitato lo scanner non esegue il backtracking"
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr "Commuta lo stato della lampada dello scanner"
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr "Commuta lo stato della lampada dello scanner (accesa/spenta)"
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr "Calibrazione automatica"
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid ""
 "If checked the color calibration before a scan is done by the backend"
@@ -4029,42 +4738,42 @@ msgstr ""
 "Se abilitato la calibrazione del colore viene eseguita automaticamente "
 "prima della scansione"
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr "Utilizza l'adattatore per diapositive"
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr "Questa opzione spegne la lampada del piano durante la scansione"
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "Qualità di scansione"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr "Massima qualità/Bassa velocità"
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "Scansione rapida"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr "Massima velocità/Bassa qualità"
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr "Determinazione automatica della soglia"
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
@@ -4073,67 +4782,67 @@ msgstr ""
 "Se abilitato viene determinato in maniera automatica il valore ottimale "
 "della soglia."
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr "Selezionare la modalità di correzione gamma."
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr "Fissa il valore gamma"
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr "Utilizza lo stesso valore di correzione gamma per tutti i canali."
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr "Scalare gamma"
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr "Selezionare il valore per la correzione gamma scalare."
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr "Valore gamma per il canale rosso"
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr "Selezionare il valore per la correzione gamma (canale rosso)"
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr "Valore gamma per il canale verde"
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr "Selezionare il valore per la correzione gamma (canale verde)"
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr "Valore gamma per il canale blu"
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr "Selezionare il valore per la correzione gamma (canale blu)"
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr "Canale"
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
@@ -4141,212 +4850,212 @@ msgstr ""
 "Selezionare la banda di colore, \"Master\" significa che tutti i colori "
 "saranno influenzati."
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr "Mezzi toni"
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr "Imposta il livello di luminosità da considerare \"50% grigio\"."
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr "Mezzi toni rossi"
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr "Imposta il livello di luminosità da considerare \"50 % rosso\"."
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr "Mezzi toni verdi"
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr "Imposta il livello di luminosità da considerare \"50 % verde\"."
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr "Mezzi toni blu"
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr "Selezionare il livello di luminosità da considerare \"50 % blu\"."
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr "Bilanciamento del rosso"
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr ""
 "Fattore di bilanciamento per il rosso. 100% equivale a nessuna "
 "correzione."
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr "Bilanciamento del verde"
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr ""
 "Fattore di bilanciamento per il verde. 100% equivale a nessuna "
 "correzione."
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr "Bilanciamento del blu"
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr ""
 "Fattore di bilanciamento per il blu. 100% equivale a nessuna correzione."
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr "Bilanciamento (valori preimpostati)"
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr "Resetta i valori di bilanciamento ai valori preimpostati"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "Lentissimo"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "Più lento"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "Più veloce"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "Velocissimo"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr "8x8 di massima"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr "8x8 normale"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr "8x8 preciso"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr "8x8 molto preciso"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr "6x6 normale"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr "5x5 di massima"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr "5x5 preciso"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr "4x4 di massima"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr "4x4 normale"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr "4x4 preciso"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr "3x3 normale"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr "2x2 normale"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr "8x8 personalizzato"
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr "6x6 personalizzato"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr "5x5 personalizzato"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr "4x4 personalizzato"
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr "3x3 personalizzato"
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr "2x2 personalizzato"
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr "Scala di grigi rapido"
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr "Scansione rapida con scala di grigi (bassa qualità)."
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
@@ -4356,117 +5065,117 @@ msgstr ""
 "possibile (a bassa qualità). Questa potrebbe essere senza i colori o a "
 "bassa risoluzione."
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr "Durata in minuti dello spegnimento della lampada."
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr "Imposta il ritardo (in minuti) dopo il quale spegnere la lampada."
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, no-c-format
 msgid "Turn lamp off"
 msgstr "Spegne la lampada"
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr "Spegne subito la lampada."
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr "Luminosità del rosso"
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr "Controlla la luminosità del canale rosso dell'immagine acquisita."
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr "Luminosità del verde"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr "Controlla la luminosità del canale verde dell'immagine acquisita."
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr "Luminosità del blu"
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr "Controlla la luminosità del canale blu dell'immagine acquisita."
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "Contrasto canale rosso"
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr "Controlla il contrasto del canale rosso dell'immagine acquisita."
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "Contrasto canale verde"
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr "Controlla il contrasto del canale verde dell'immagine acquisita."
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "Contrasto canale blu"
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr "Controlla il contrasto del canale blu dell'immagine acquisita."
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr "Colore a 48 bit"
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr "Colore a 24 bit"
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr "Grigio a 16 bit"
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr "Grigio a 8 bit"
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr "Riflesso"
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, no-c-format
 msgid "Positive"
 msgstr "Pellicola positiva"
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -4475,39 +5184,39 @@ msgstr ""
 "Preriscalda fino a che la luminisità della lampada sia costante invece "
 "di attendere 40 secondi."
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, fuzzy, no-c-format
 msgid "Negative color"
 msgstr "Pellicola negativa"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, fuzzy, no-c-format
 msgid "Negative gray"
 msgstr "Negativo"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, fuzzy, no-c-format
 msgid "48 bits color"
 msgstr "Colore ad alta qualità"
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
 "mode and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr "Scansione controllata da pulsante"
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4518,248 +5227,239 @@ msgstr ""
 "procedere premere il pulsante \"SCAN\" (per ML150) oppure \"COLOR\" (per "
 "altri modelli). Per annullare premere il pulsante \"GRAY\"."
 
-#: ../backend/pixma_sane_options.c:143
-#, no-c-format
-msgid "Gamma function exponent"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:144
-#, no-c-format
-msgid "Changes intensity of midtones"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:232
 #, no-c-format
 msgid "Update button state"
 msgstr "Aggiorna lo stato del pulsante"
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:244
 #, no-c-format
 msgid "Button 1"
 msgstr "Pulsante 1"
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:258
 #, no-c-format
 msgid "Button 2"
 msgstr "Pulsante 2"
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr ""
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr ""
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr "Trasparenze"
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr "Impostazioni-dispositivo"
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr "Pulsante lampada"
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr "Accensione manuale della/e lampada/e."
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, fuzzy, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "Calibrazione granulosa"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr ""
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, no-c-format
 msgid "Calibration data cache"
 msgstr "Cache per la calibrazione"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr "Abilita o disabilita la cache per la calibrazione."
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, no-c-format
 msgid "Performs calibration"
 msgstr "Effettua calibrazione"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr "Sensore di accelerazione"
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr "Abilita o disabilita il movimento del sensore di accelerazione."
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, no-c-format
 msgid "Warmup-time"
 msgstr "Durata del preriscaldamento"
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, no-c-format
 msgid "Warmup-time in seconds."
 msgstr "Durata in secondi del preriscaldamento della lampada."
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, no-c-format
 msgid "Lampoff-time"
 msgstr "Durata spegnimento lampada"
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr "Durata in secondi dello spegnimento della lampada."
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, no-c-format
 msgid "Analog frontend"
 msgstr "Frontend analogico"
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr "Valore del guadagno sul rosso per AFE (Analog FrontEnd)"
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr "Scarto sul rosso"
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr "Valore dello scarto sul rosso per AFE (Analog FrontEnd)"
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr "Valore del guadagno sul verde per AFE (Analog FrontEnd)"
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr "Scarto sul verde"
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr "Valore dello scarto sul verde per AFE (Analog FrontEnd)"
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr "Valore del guadagno sul blu per AFE (Analog FrontEnd)"
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr "Scarto sul blu"
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr "Valore dello scarto sul blu per AFE (Analog FrontEnd)"
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, no-c-format
 msgid "Red lamp off"
 msgstr "Lampada rossa spenta"
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr "Imposta il parametro spegnimento della lampada rossa"
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, no-c-format
 msgid "Green lamp off"
 msgstr "Lampada verde spenta"
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr "Imposta il parametro spegnimento lampada verde"
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, no-c-format
 msgid "Blue lamp off"
 msgstr "Lampada blu spenta"
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr "Imposta il parametro spegnimento lampada blu"
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr "Queste opzioni riflettono lo stato dei pulsanti dello scanner."
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr "Colore a 36 bit"
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr "Mappa dither 1"
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr "Mappa dither 2"
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr "Aleatorizzato"
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr "Selezione della sorgente"
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr "Miglioramento dell'immagine"
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr "Rendi grigio"
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr "Caricare l'immagine con scala di grigi"
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr "Simulazione dell'acquisizione in 3 passate"
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
@@ -4768,12 +5468,12 @@ msgstr ""
 "Simula l'acquisizione in 3 passate e ritorna 3 diverse immagini. Per "
 "primo il verde, poi il blue e poi il rosso."
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr "Simulazione di uno scanner manuale"
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4785,7 +5485,7 @@ msgstr ""
 "quindi il valore -1. Impostando questa opzione sarà  possibile "
 "verificare se il frontend funziona correttamente."
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid ""
 "Set default values for enhancement controls (brightness & contrast)."
@@ -4793,42 +5493,42 @@ msgstr ""
 "Imposta i valori predefiniti per il miglioramento della qualità "
 "dell'immagine (brillantezza e contrasto)."
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr "Opzione per il test di sola lettura"
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr "Verifica se in questo caso il frontend funziona correttamente"
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr "Tabelle gamma"
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr "Simulazione del valore di ritorno"
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr "Non forzare il valore di ritorno"
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr "Non obbliga l'interfaccia a fornire un valore di ritorno."
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr "Ritorna SANE_STATUS_EOF"
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
@@ -4837,12 +5537,12 @@ msgstr ""
 "Obbliga il programma a fornire il valore di ritorno SANE_STATUS_EOF dopo "
 "che sia stata chiamata la funzione sane_read()."
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr "Ritorna SANE_STATUS_JAMMED"
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
@@ -4851,12 +5551,12 @@ msgstr ""
 "Obbliga il programma a fornire il valore di ritorno SANE_STATUS_JAMMED "
 "dopo che sia stata chiamata la funzione sane_read()."
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr "Ritorna SANE_STATUS_NO_DOCS"
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
@@ -4865,12 +5565,12 @@ msgstr ""
 "Obbliga il programma a fornire il valore di ritorno SANE_STATUS_NO_DOCS "
 "dopo che sia stata chiamata la funzione sane_read()."
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr "Ritorna SANE_STATUS_COVER_OPEN"
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
@@ -4880,12 +5580,12 @@ msgstr ""
 "SANE_STATUS_COVER_OPEN dopo che sia stata chiamata la funzione "
 "sane_read()."
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr "Ritorna SANE_STATUS_IO_ERROR"
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
@@ -4894,12 +5594,12 @@ msgstr ""
 "Obbliga il programma a fornire il valore di ritorno SANE_STATUS_IO_ERROR "
 "dopo che sia stata chiamata la funzione sane_read()."
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr "Ritorna SANE_STATUS_NO_MEM"
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
@@ -4908,12 +5608,12 @@ msgstr ""
 "Obbliga il programma a fornire il valore di ritorno SANE_STATUS_NO_MEM "
 "dopo che sia stata chiamata la funzione sane_read()."
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr "Ritorna SANE_STATUS_ACCESS_DENIED"
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
@@ -4923,86 +5623,83 @@ msgstr ""
 "SANE_STATUS_ACCESS_DENIED dopo che sia stata chiamata la funzione "
 "sane_read()."
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, fuzzy, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr "Queste opzioni riflettono lo stato dei pulsanti dello scanner."
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr "Lampada accesa"
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr "Accendere la lampada"
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr "Lampada spenta"
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr "Spegnere la lampada"
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, no-c-format
 msgid "Lamp timeout"
 msgstr "Timeout della lampada"
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr ""
 "Numero di minuti prima che la lampada venga spenta dopo la scansione"
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr "Valore soglia per modalità binaria"
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr "Alimentatore automatico dei fogli"
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr "6x4 pollici (~15x10 cm)"
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr "8x10 pollici (~20x25 cm)"
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr "8.5x11 pollici (~21x28 cm)"
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr "Mezzi-toni non supportati"
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr "DispersedDot8x8"
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr "DispersedDot16x16"
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -5017,27 +5714,27 @@ msgstr ""
 "\"a scatti\" dello scanner, un valore troppo grande può bloccare le "
 "interfacce X-Window dal rispondere agli eventi X e bloccare il sistema."
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr ""
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr ""
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, fuzzy, no-c-format
 msgid "Focus point for scanning."
 msgstr "Espelle il documento dopo la sua scansione"
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr "Anteprima"
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
@@ -5046,12 +5743,12 @@ msgstr ""
 "Determina come eseguire l'anteprima: un'anteprima con scala di grigi "
 "fornisce solitamente il miglior rapporto velocità/qualità."
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr "Valori predefiniti"
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
@@ -5060,97 +5757,97 @@ msgstr ""
 "Fornisce le aree di scansione standard per fotografie, pagine stampate, "
 "etc."
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr ""
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, fuzzy, no-c-format
 msgid "Frame to be scanned"
 msgstr "scanner piano"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, fuzzy, no-c-format
 msgid "Focus-mode"
 msgstr "Fuoco"
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, fuzzy, no-c-format
 msgid "Auto or manual focus"
 msgstr "Autofocus"
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, fuzzy, no-c-format
 msgid "Focus-point"
 msgstr "Posizione della messa a fuoco"
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, fuzzy, no-c-format
 msgid "Focus point"
 msgstr "Posizione della messa a fuoco"
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr "Numero di linee colore per ciclo di lettura"
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr "Numero di linee in scala di grigi per ciclo di lettura"
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr "webcam"
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr "Colore RAW"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr "Colore RGB"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr "Colore RGB TESTO"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr "Nero pieno"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr "Bianco pieno"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr "Modello di colori"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr "Griglia"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr "Prima scelta"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr "Seconda scelta"
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
@@ -5159,12 +5856,12 @@ msgstr ""
 "Questa è una terza scelta molto lunga. Il programma potrebbe riuscire a "
 "visualizzarla."
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr "Simulazione di uno scanner manuale"
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5178,12 +5875,12 @@ msgstr ""
 "frontend funziona correttamente. Questa opzione imposta inoltre la "
 "larghezza al valore fisso di 11 cm."
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr "Simulazione di una scansione a 3 passate"
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
@@ -5192,17 +5889,17 @@ msgstr ""
 "Simulazione di uno scanner a 3 passate. In modalità colore verranno "
 "trasmesse 3 immagini."
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr "Determina l'ordine delle immagini"
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr "Determina l'ordine delle immagini in una scansione a 3 passate"
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
@@ -5211,17 +5908,17 @@ msgstr ""
 "Se viene selezionato il caricatore automatico di fogli, questo sarà "
 "vuoto dopo 10 scansioni."
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr "Opzioni speciali"
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr "Seleziona l'immagine di prova"
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5239,12 +5936,12 @@ msgstr ""
 "Griglia: disegna una griglia di quadrati bianchi e neri aventi larghezza "
 "e altezza uguali a 10 mm."
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr "Inversione della «endianness»"
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5255,22 +5952,22 @@ msgstr ""
 "essere utilizzata per verificare la modalità a 16 bit dei frontend, vale "
 "a dire per vedere se il frontend utilizza correttamente l'«endianness»."
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr "Limiti in lettura"
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr "Limita i dati passati ad ogni chiamata della funzione sane_read()."
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr "Dimensione del limite in lettura"
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
@@ -5278,34 +5975,34 @@ msgstr ""
 "La quantità (massima) di dati passati ad ogni chiamata della funzione "
 "sane_read()."
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr "Ritardo in lettura"
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr "Ritarda il trasferimento dei dati"
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr "Durata del ritardo in lettura"
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
 msgstr ""
 "Quanto attendere dopo avere tarsferito ogni singolo pacchetto di dati"
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr "Valore di ritorno della funzione sane_read()"
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
@@ -5317,22 +6014,22 @@ msgstr ""
 "valori di ritorno sono utilizzati per testare come vengono gestiti dal "
 "frontend."
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr "Perdita di pixel per linea"
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr "Numero di pixel sprecati alla fine di ogni linea"
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr "Parametri «fuzzy»"
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
@@ -5341,24 +6038,24 @@ msgstr ""
 "Restituisce dei valori «fuzzy» per il numero di linee e quello di byte "
 "per linea se sane_parameters() è chiamata prima di sane_start()."
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr "Uso dell'I/O asincrono"
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 "Usa la modalità non bloccante di I/O per sane_read() se il frontend la "
 "supporta."
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr "Proponi «select file descriptor»"
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
@@ -5367,12 +6064,12 @@ msgstr ""
 "Propone «select file descriptor» per verificare se sane_read() "
 "restituisce dati."
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr "Abilita le opzioni di test"
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
@@ -5381,27 +6078,27 @@ msgstr ""
 "Abilita le varie opzioni di test. Usabile per verificare la capacità dei "
 "frontend di vedere e modificare tutti i tipi di opzioni di SANE."
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr "Stampa le opzioni"
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr "Stampa un elenco di tutte le opzioni."
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr "Opzioni booleane di test"
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr "(1/6) bool, soft select soft detect"
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
@@ -5410,12 +6107,12 @@ msgstr ""
 "(1/6) opzione booleana di test che ha capacità di soft select e soft "
 "detect (e oltre). Si tratta di una normale opzione booleana."
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr "(2/6) bool, hard select soft detect"
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
@@ -5427,12 +6124,12 @@ msgstr ""
 "dal frontend, ma dall'utente (come, ad esempio, premendo un pulsante sul "
 "dispositivo)."
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr "(3/6) bool, hard select"
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5444,12 +6141,12 @@ msgstr ""
 "(come, ad esempio, la pressione di un pulsante sul dispositivo) e non "
 "può essere letta dal frontend."
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr "(4/6) bool, soft detect"
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
@@ -5458,12 +6155,12 @@ msgstr ""
 "(4/6) opzione booleana di test che ha la capacità di soft detect (e "
 "oltre). Vale a dire che l'opzione è di sola lettura."
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr "(5/6) bool, soft select soft detect emulazione"
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
@@ -5472,12 +6169,12 @@ msgstr ""
 "opzione di test booleana che ha la capacità di soft select, soft detect "
 "e emulazione (e oltre)."
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr "(6/6) bool, soft select soft detect auto"
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5488,27 +6185,27 @@ msgstr ""
 "detect e automatica (e oltre). Questa opzione può essere automaticamente "
 "impostata dal backend."
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr "Opzioni intere di test"
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr "(1/6) intero"
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr "(1/6) opzione intera di test senza unità di misura e vincoli."
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr "(2/6) intero con intervallo"
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
@@ -5517,24 +6214,24 @@ msgstr ""
 "(2/6) opzione intera di test che ha l'unità pixel e un vincolo di "
 "intervallo. Il minimo è 4, il massimo è 192, il passo è 2."
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr "(3/6) intero con valori da una lista"
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 "(3/6) opzione intera con il bit come unità e il vincolo di valori da una "
 "lista."
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr "(4/6) array di interi"
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
@@ -5543,12 +6240,12 @@ msgstr ""
 "(4/6) opzione intera di test con il mm come unità e un array senza "
 "limiti."
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr "(5/6) array di interi con vincolo"
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
@@ -5557,12 +6254,12 @@ msgstr ""
 "(5/6) opzione intera di test con unità punti per pollice e un array con "
 "un vincolo di intervallo. Il minimo è 4, il massimo 192 e il passo 2."
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr "(6/6) array di interi con lista di valori"
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
@@ -5571,27 +6268,27 @@ msgstr ""
 "(6/6) opzione intera di test con unità percentuale e un array con una "
 "lista di valori come vincolo."
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr "Opzioni di test a virgola fissa"
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr "(1/3) virgola fissa"
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr "Opzione a virgola fissa di test senza unità e vincoli."
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr "(2/3) virgola fissa con vincolo di intervallo"
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
@@ -5601,49 +6298,49 @@ msgstr ""
 "vincolo di intervallo. Il minimo è -42,17, il massimo è 32767,9999 e il "
 "passo è 2,0."
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr "(3/3) virgola fissa con lista di valori"
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 "(3/3) opzione a virgola fissa di test senza unità e con il vincolo lista "
 "di valori."
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr "Opzioni stringa di test"
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr "(1/3) stringa"
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr "(1/3) opzione stringa di test senza vincoli."
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr "(2/3) stringa con lista di valori"
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr "(2/3) opzione stringa di test con vincolo lista di valori."
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr "(3/3) stringa con lunga lista di valori"
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
@@ -5652,158 +6349,162 @@ msgstr ""
 "(3/3) opzione stringa di test con vincolo lista di valori. Contiene più "
 "elementi..."
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr "Opzioni pulsanti di test"
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr "(1/1) pulsante"
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr "(1/1) opzione pulsante di test. Stampa un testo..."
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, no-c-format
 msgid "Color 36"
 msgstr "Colore a 36 bit"
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr "Usa la composizione di immagini"
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr "Bianco e nero (binario)"
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr "Bianco e nero (mezzi-toni sfumato)"
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr "Scala di grigi"
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr "Colore RGB (singola passata)"
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr "Ignora la calibrazione"
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr "Disabilita la messa a fuoco preliminare"
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr "Non calibrare la messa a fuoco"
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr "Messa a fuoco preliminare manuale"
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr "Fissa la posizione di messa a fuoco"
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr "Calibrazione della lente sul documento"
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr ""
 "Calibrazione della messa a fuoco della lente nella posizione del "
 "documento"
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr "Messa a fuoco sul piano di vetro"
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr "Messa a fuoco sul piano di vetro invece che 0,6mm sopra il piano"
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr "Modalità di calibrazione"
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr "Definire la modalità di calibrazione"
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr "Commuta lo stato della lampada"
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr "Adattatore per trasparenze acceso"
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr "Accendere/spegnere l'adattatore per trasparenze"
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr "Scarto"
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr "Impostazione dello scarto sui canali del colore"
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, no-c-format
 msgid "Gray offset"
 msgstr "Scarto sul grigio"
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr "Imposta lo scarto sul grigio"
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr "Imposta lo scarto sul rosso"
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr "Imposta lo scarto sul verde"
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr "Imposta lo scarto sul blu"
 
+#, fuzzy
+#~ msgid "IPC mode"
+#~ msgstr "Anteprima"
+
 #~ msgid "problem not analyzed (unknown SCSI class)"
 #~ msgstr "problema non analizzato (classe SCSI sconosciuta)"
 
diff --git a/po/ja.gmo b/po/ja.gmo
new file mode 100644
index 0000000..4cf6b91
--- /dev/null
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index fcfe261..5c589f6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends 1.0.20\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
 "PO-Revision-Date: 2009-10-31 10:30+0900\n"
 "Last-Translator: Hiroshi Miura <miurahr@linux.com>\n"
 "Language-Team: Japanese <japanese@li.org>\n"
@@ -19,411 +19,405 @@ msgstr ""
 "X-Poedit-Country: JAPAN\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr "オプション数"
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr "標準"
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "�置"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "増強"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "上級"
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr "センサー"
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "プレビュー"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr "モノクロームプレビューを強制�る"
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr "ビット深度"
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "走査モード"
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "走査速度"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr "走査�"
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr ""
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "左上�x"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "左上�y"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "�下�x"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "�下�y"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "走査解�度"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "X解�度"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Y解�度"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr "ページ幅"
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, no-c-format
 msgid "Page height"
 msgstr "ページ高"
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr "カスタムガンマテーブルを使�"
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr "画��明暗度"
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr "明暗度赤"
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr "明暗度緑"
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr "明暗度�"
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr "�度"
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "コントラスト"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr "粒径"
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr "�ーフトーン処�"
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "黒レベル"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "ホワイトレベル"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr "ホワイトレベル�赤値"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
 msgstr "ホワイトレベル�緑値"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr "ホワイトレベル��値"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "最��度�影"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr "赤�最��度"
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr "緑�最��度"
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr "��最��度"
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr "�イライト"
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr "赤��イライト"
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr "緑��イライト"
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr "���イライト"
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr "色相"
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr "彩度"
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "ファイル�"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr "�ーフトーンパターン�大��"
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "�ーフトーン�パターン"
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr "X�Y解�度を拘�"
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "�ガ"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "�質較正"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr "２�光学解�度"
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr "RGB値を拘�"
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr "閾値"
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr "アナログガンマ補正"
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr "アナログガンマ赤"
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr "アナログガンマ緑"
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr "アナログガンマ�"
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr "アナログガンマ値を拘�"
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr "ランプ�暖機"
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr "露出時間を較正"
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr "赤�露出時間を較正"
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr "緑�露出時間を較正"
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr "��露出時間を較正"
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr "走査露出時間"
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr "赤�走査露出時間"
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr "緑�走査露出時間"
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr "��走査露出時間"
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr "露出時間を設定"
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr "ランプ密度�校正"
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr "ランプ密度�走査"
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr "ランプ密度�設定"
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr "終了時�ランプを�止�る"
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
@@ -432,37 +426,37 @@ msgstr ""
 "特定�デ�イス�サ�ート�るオプション��れ���る�を指定�る読��り"
 "��オプション"
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "入力元�モード�解�度�オプション"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr "走査領域�メディアサイズ�オプション"
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, no-c-format
 msgid "Image modification options"
 msgstr "イメージ修正オプション"
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, no-c-format
 msgid "Hardware specific options"
 msgstr "�ードウエア独自�オプション"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr "スキャナー�センサーやボタン"
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr "プレビュー�質�走査を�求�る。"
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -470,87 +464,87 @@ msgid ""
 "scanner, it reduces the memory requirements and scan-time of the preview."
 msgstr ""
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
 "for multibit scans."
 msgstr ""
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr ""
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr ""
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr ""
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr ""
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "走査エリア�左上��置"
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "走査エリア��上��置"
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "走査エリア��下�x�置"
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "走査エリア��下��置を決�る。"
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr "走査イメージ�解�度を設定。"
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr "走査��イメージ�水平解�度を設定�る。"
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr "走査��イメージ�垂直改造度を設定�る。"
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
 "sheet-fed scans."
 msgstr ""
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, no-c-format
 msgid "Specifies the height of the media."
 msgstr "媒体�高�を指定"
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid ""
 "Determines whether a builtin or a custom gamma-table should be used."
 msgstr ""
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -558,411 +552,411 @@ msgid ""
 "gamma table)."
 msgstr ""
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr "赤�ンド�ガンマ補正テーブル。"
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr "緑�ンド�ガンマ補正テーブル。"
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr "��ンド�ガンマ補正テーブル。"
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr "�得��画���度を制御�る。"
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr "�得��画��コントラストを制御�る。"
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
 "in sharper images."
 msgstr ""
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr ""
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid ""
 "Selects what green radiance level should be considered \"full green\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid ""
 "Selects what blue radiance level should be considered \"full blue\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
 "when acquiring an image with a camera. Larger values cause more blooming."
 msgstr ""
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr "ロード�れる画��ファイル�"
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
 "halftoned images."
 msgstr ""
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
 msgstr ""
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr ""
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr "黒�白を�転�る"
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr "２�光学解�度�レンズを使�"
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr "RGBモード�����色�対����値を使�"
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr "白�点を得る���最��度を�択"
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr "アナログガンマ補正"
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr "赤�アナログガンマ補正"
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr "緑�アナログガンマ補正"
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr "��アナログガンマ補正"
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr "走査��ランプ�暖機"
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr "赤較正����露出時間�定義"
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr "緑較正����露出時間�定義"
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr "�較正����露出時間�定義"
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr "走査�露出時間を設定"
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr "赤走査�露出時間を設定"
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr "緑スキャン�露出時間を設定"
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr "�スキャン�露出時間を設定"
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr "露出時間��択を有効��る。"
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr "較正�ランプ密度を定義"
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr "走査�ランプ密度を定義"
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr ""
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr "プログラム終了時�ランプをオフ��る"
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, no-c-format
 msgid "Scan button"
 msgstr "スキャンボタン"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, no-c-format
 msgid "Email button"
 msgstr "電�メールボタン"
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, no-c-format
 msgid "Fax button"
 msgstr "ファックスボタン"
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, no-c-format
 msgid "Copy button"
 msgstr "コピーボタン"
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr "PDFボタン"
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr "キャンセルボタン"
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr "ページ�ロード�れ�"
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, no-c-format
 msgid "Cover open"
 msgstr "カ�ー�開���る"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "カラー"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr ""
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr ""
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "グレー"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr "網版"
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "ç·šç”»"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr "�功"
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, no-c-format
 msgid "Operation not supported"
 msgstr "�作�サ�ート�れ����ん。"
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr "�作�キャンセル�れ���。"
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr "デ�イスビジー"
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr "�正�引数"
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr "ファイル�最後�到�"
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, no-c-format
 msgid "Document feeder jammed"
 msgstr "書類�り�詰�り���"
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, no-c-format
 msgid "Document feeder out of documents"
 msgstr "書類�り�空��り���"
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, no-c-format
 msgid "Scanner cover is open"
 msgstr "スキャナー�カ�ー�開�����"
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr "デ�イス入出力中�エラー"
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr "メモリ�足"
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr "資���アクセス�拒��れ���。"
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr "ランプ�準備�整���ん。�度試��������。"
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr "移動�����走査機構をロック�る。"
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "既定"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr "増強制御�既定値を設定�る"
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "æ ¡æ­£"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr "次�走査����校正�る"
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
@@ -971,12 +965,12 @@ msgstr ""
 "有効��れる��デ�イス�次�走査�����ら�校正を行���。����"
 "�れ��校正�最��開始��一度��行�れ��。"
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr "シェーディング補正��を行�"
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -987,1082 +981,1073 @@ msgstr ""
 "フセット�露光時間�既定値��組�込�れ��る値��設定ファイル�ら読�"
 "込�れ�値�使�れ��。"
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr "ボタン�状態"
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr "走査�るフレーム数"
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr "走査�るフレーム�数を�ん�����。"
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, no-c-format
 msgid "Duplex scan"
 msgstr "両�スキャン"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid ""
 "Duplex scan provide a scan of the front and back side of the document"
 msgstr "両�スキャン���文書�表�����走査�行�れ��。"
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr "スキャナー�校正"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr "走査��スキャナ�校正を強制�る"
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr "グレースケール走査"
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr "カラー�代�り��グレースケール�走査���。"
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr "アナログ利得"
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr "CCD�列�アナログ利得を増加���減少"
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "ガンマ校正"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr "ガンマ補正�れ�変�カーブを�択"
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr "無加工"
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr "高精彩"
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, no-c-format
 msgid "No transparency correction"
 msgstr "�明度補正�行���"
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr "フィルム�種類�従��補正"
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr "��率�従���補正�れ��。"
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, no-c-format
 msgid "Negatives"
 msgstr "�ガ画�"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, no-c-format
 msgid "Slides"
 msgstr "スライド"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "自動"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, no-c-format
 msgid "Normal speed"
 msgstr "普通�速度"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/2 normal speed"
 msgstr "�分�速度"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/3 normal speed"
 msgstr "３分�１�速度"
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, no-c-format
 msgid "rounded parameter"
 msgstr "丸�られ�パラメター値"
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr "�明"
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, no-c-format
 msgid "ADF jam"
 msgstr "ADF�詰�り���"
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr "ADF�カ�ー�開�����"
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, no-c-format
 msgid "lamp failure"
 msgstr "ランプ�良"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr "走査ヘッド��置エラー"
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr "CPU�ェックエラー"
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr "RAM�ェックエラー"
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr "ROM�ェックエラー"
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr "�ードウエア�ェックエラー"
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, no-c-format
 msgid "transparency unit lamp failure"
 msgstr "フィルムユニット�ランプ�良"
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr "フィルムユニット�ヘッド�置�良"
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr "パラメターリスト�長�エラー"
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr "�正�コマンド�作コード"
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr "CDB��正�フィールド"
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr "サ�ート�れ��LUN"
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr "パラメターリスト��正�フィールド"
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr "コマンド�順�エラー"
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr "指定�れ�ウインドウ�多����"
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr "媒体�存在���ん"
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr "IDENTIFYメッセージ��正�ビット"
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr "オプション�正���り��ん"
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr "電�ONリセット/�スデ�イスリセット"
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr "����期化プログラム�よ��パラメター�変更�れ���"
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr "追加センサー情報��り��ん。"
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr "��択失敗"
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr "SCSIパリティエラー"
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr "�期化ルー�ン�エラーメッセージを�信����。"
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr "�正�メッセージエラー"
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr "タイムアウトエラー"
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, no-c-format
 msgid "transparency unit shading error"
 msgstr "��ユニット�シェーディングエラー"
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr "ランプ�安定���ん"
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, no-c-format
 msgid "film scanner"
 msgstr "フィルムスキャナー"
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr "フラットベッド（平�型）スキャナ"
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr "フィルム�種類"
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr "フィルム�種類を�択（例��ガ�スライド）"
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, no-c-format
 msgid "Negative film type"
 msgstr "�ガフィルム"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, no-c-format
 msgid "Selects the negative film type"
 msgstr "�ガフィルムを�択"
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, no-c-format
 msgid "Hardware resolution"
 msgstr "�ードウエア解�度"
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "�ードウエア解�度��を使用"
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr "焦点"
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, no-c-format
 msgid "Auto focus"
 msgstr "自動焦点"
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, no-c-format
 msgid "Enable/disable auto focus"
 msgstr "自動焦点を有効�無効"
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr "自動焦点を一回��行�"
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr "排出���る間��一度��自動焦点補正を行���。"
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, no-c-format
 msgid "Manual focus position"
 msgstr "手動焦点�置"
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr "光学系�焦点�置を手動�設定���（既定値：１２８）"
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr "走査�余白"
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr "追加色調整"
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "��画�"
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "水平�画������る"
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, no-c-format
 msgid "Auto exposure"
 msgstr "自動露出"
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr "自動露光機能を有効�無効��る"
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, no-c-format
 msgid "Calibration now"
 msgstr "校正中"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, no-c-format
 msgid "Execute calibration *now*"
 msgstr "較正を「����実行���"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr "自己診断"
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr "スキャナー�自己診断を実行"
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, no-c-format
 msgid "Reset scanner"
 msgstr "スキャナー�リセット"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, no-c-format
 msgid "Reset the scanner"
 msgstr "スキャナーをリセット�る"
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr "媒体�扱�"
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, no-c-format
 msgid "Eject film after each scan"
 msgstr "�走査�後フィルムを排出�る"
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr "自動的���走査�後�フィルムを装置�ら排出�る。"
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr "終了��フィルムを排出�る"
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr "自動的��プログラム終了��装置�らフィルムを排出�る"
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr "フィルムを今排出"
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr "フィルムを今���排出�る。"
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, no-c-format
 msgid "Document feeder extras"
 msgstr "文書供給装置拡張"
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, no-c-format
 msgid "Flatbed only"
 msgstr "フラットベッド��"
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr "自動書類�りを無効���平���を使���"
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, no-c-format
 msgid "Transparency unit"
 msgstr "��ユニット"
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr ""
 "��ユニット�オフ・オンを切り替���。（FAU,フィルムアダプター装置）"
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, no-c-format
 msgid "Negative film"
 msgstr "�ガフィルム"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, no-c-format
 msgid "Positive or negative film"
 msgstr "�ジ�る���ガフィルム"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr "濃度制御"
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr "濃度制御モードを設定"
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, no-c-format
 msgid "Transparency ratio"
 msgstr "��率"
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, no-c-format
 msgid "Select film type"
 msgstr "フィルム�種類を�択"
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, no-c-format
 msgid "Select the film type"
 msgstr "フィルム�種類を��"
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "フラットベッド"
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, no-c-format
 msgid "ADF Front"
 msgstr "ADF表�"
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, no-c-format
 msgid "ADF Back"
 msgstr "ADF��"
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, no-c-format
 msgid "ADF Duplex"
 msgstr "ADF両�"
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, fuzzy, no-c-format
 msgid "Card Front"
 msgstr "ADF表�"
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, fuzzy, no-c-format
 msgid "Card Back"
 msgstr "ADF��"
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, fuzzy, no-c-format
 msgid "Card Duplex"
 msgstr "両�"
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "赤"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "ç·‘"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "�"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, fuzzy, no-c-format
 msgid "Enhance Red"
 msgstr "増強"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, fuzzy, no-c-format
 msgid "Enhance Green"
 msgstr "増強"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, fuzzy, no-c-format
 msgid "Enhance Blue"
 msgstr "増強"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr " ��"
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr ""
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr ""
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr "片�"
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr "両�"
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr "��ユニット"
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr "自動原稿�り装置"
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "�ジフィルム"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "�ガフィルム"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr "ガラス表��焦点を���る"
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr "ガラス�ら2.5mm�場所�焦点を���る"
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr "�ーフトーン　A（�ードトーン）"
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr "�ーフトーンB（ソフトトーン）"
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr "�ーフトーンC（�ットトーン）"
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr "ディザーA（4x4�イエル）"
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr "ディザーB（4x4スパイラル)"
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr "ディザーC（4x4網スクリーン)"
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr "ディザーD（8x4�網スクリーン)"
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr "テキスト強調技術"
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr "パターンA�ダウンロード"
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr "パターンB�ダウンロード"
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "補正を���"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr "ユーザ定義"
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr "ドットインパクトプリンタ"
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr "熱転写プリンタ"
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "インクジェットプリンタ"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr "CRTモニター"
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "既定"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr "高密度�刷"
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr "低密度�刷"
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr "高コントラスト�刷"
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr "ユーザ定義（ガンマ�１．�）"
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr "ユーザ定義（ガンマ�１．８）"
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr "CD"
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr "A5縦"
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr "A5横"
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr "USレターサイズ"
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr "A4"
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "最大"
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr "走査モード"
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr "�ーフトーンを�択�る。"
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr "�り出��"
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr "�り出����択"
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr "�度��択"
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr "鮮鋭度"
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr "カラー補正"
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr "�択��出力デ�イス����色補正テーブルを設定�る。"
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr ""
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr "RGB��率マトリックス"
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr "緑を赤�シフト"
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr "緑を��シフト"
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr "赤を緑�シフト"
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr "赤を��シフト"
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr "�を緑�シフト"
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr "�を赤�シフト"
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr "緑レベル�制御"
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr "緑レベルを基準�赤を増加"
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr "緑レベルを基準��を増加"
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr "赤レベルを基準�緑を増加"
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr "赤レベル�制御"
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr "赤レベルを基準��を増加"
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr "�レベルを基準���緑を増加"
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr "�レベルを基準���赤を増加"
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, no-c-format
 msgid "Controls blue level"
 msgstr "�レベル�制御"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr "��を�る。"
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr "高速プレビュー"
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr "自動領域分割"
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr "短�解�度一覧"
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr "解�度�リストを短�表示"
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr "ズーム"
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr "スキャナー�使���ズーム値を定義"
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr "簡易フォーマット"
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr "光学装置"
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr "排出"
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr "ADF�書類を排出�る"
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr "自動排出"
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr "走査後�書類を排出"
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr "ADFモード"
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr "ADFモード��択（片��両�）"
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr ""
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr ""
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
 "the user defined table, which can be downloaded to the scanner"
 msgstr "ガンマ補正値を事�定義�デ�イス�リスト�ら�択�る。"
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr "焦点�置"
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
 msgstr "焦点�置を�ガラス������ガラス��ら2.5mm��置�設定"
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr "ボタンを待�"
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
@@ -2071,219 +2056,964 @@ msgstr ""
 "スキャンコマンドを�信後�実際�走査処��始�る�スキャナー�ボタン�押"
 "�れる�を��。"
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr ""
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, no-c-format
 msgid "Positive Slide"
 msgstr "�ジスライド"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, no-c-format
 msgid "Negative Slide"
 msgstr "�ガスライド"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr ""
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, fuzzy, no-c-format
 msgid "User defined CCT profile"
 msgstr "ユーザ定義"
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr "オン"
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr "オフ"
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr "ディザー"
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, fuzzy, no-c-format
 msgid "Diffusion"
 msgstr "エラー拡散"
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, fuzzy, no-c-format
 msgid "White"
 msgstr "ホワイトレベル"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, fuzzy, no-c-format
 msgid "Black"
 msgstr "黒レベル"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, fuzzy, no-c-format
 msgid "Continue"
 msgstr "�件付�"
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr ""
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr "水平�"
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, fuzzy, no-c-format
 msgid "Horizontal bold"
 msgstr "水平�"
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, fuzzy, no-c-format
 msgid "Horizontal narrow"
 msgstr "水平�"
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr "垂直�"
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, fuzzy, no-c-format
 msgid "Vertical bold"
 msgstr "垂直�"
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr ""
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr ""
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, fuzzy, no-c-format
 msgid "Front"
 msgstr "ADF表�"
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, fuzzy, no-c-format
 msgid "Back"
 msgstr "ADF��"
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
+msgid "Gamma function exponent"
 msgstr ""
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
 #, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
+msgid "Changes intensity of midtones"
+msgstr ""
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr ""
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr ""
+
+#: backend/fujitsu.c:3165
+#, fuzzy, no-c-format
+msgid "Halftone type"
+msgstr "網版"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr ""
+
+#: backend/fujitsu.c:3210
+#, fuzzy, no-c-format
+msgid "Perform outline extraction"
+msgstr "較正�実行"
+
+#: backend/fujitsu.c:3221
+#, fuzzy, no-c-format
+msgid "Emphasis"
+msgstr "画�強調"
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr ""
+
+#: backend/fujitsu.c:3240
+#, fuzzy, no-c-format
+msgid "Separation"
+msgstr "彩度"
+
+#: backend/fujitsu.c:3241
+#, fuzzy, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr "線画�走査�閾値�自動判定を有効��る"
+
+#: backend/fujitsu.c:3252
+#, fuzzy, no-c-format
+msgid "Mirroring"
+msgstr "��画�"
+
+#: backend/fujitsu.c:3253
+#, fuzzy, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "水平���を�る。"
+
+#: backend/fujitsu.c:3270
+#, fuzzy, no-c-format
+msgid "White level follower"
+msgstr "ホワイトレベル��値"
+
+#: backend/fujitsu.c:3271
+#, fuzzy, no-c-format
+msgid "Control white level follower"
+msgstr "赤レベル�制御"
+
+#: backend/fujitsu.c:3289
+#, fuzzy, no-c-format
+msgid "BP filter"
+msgstr "カラーフィルタ"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr ""
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr "スムージング"
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr ""
+
+#: backend/fujitsu.c:3323
+#, fuzzy, no-c-format
+msgid "Gamma curve"
+msgstr "ガンマ値"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, fuzzy, no-c-format
+msgid "Threshold curve"
+msgstr "閾値"
+
+#: backend/fujitsu.c:3347
+#, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+
+#: backend/fujitsu.c:3369
+#, fuzzy, no-c-format
+msgid "Threshold white"
+msgstr "閾値"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr ""
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, fuzzy, no-c-format
+msgid "Noise removal"
+msgstr "ノイズ除去"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr ""
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr ""
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr ""
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr ""
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr ""
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr ""
+
+#: backend/fujitsu.c:3508
+#, fuzzy, no-c-format
+msgid "Auto width detection"
+msgstr "補正を���"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr ""
+
+#: backend/fujitsu.c:3526
+#, fuzzy, no-c-format
+msgid "Auto length detection"
+msgstr "補正を���"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr ""
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr ""
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr ""
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr ""
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr ""
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr ""
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr ""
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
 msgstr ""
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3708
+#, fuzzy, no-c-format
+msgid "DF recovery mode"
+msgstr "ADF�カ�ー�開�����"
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr ""
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3748
+#, fuzzy, no-c-format
+msgid "Advanced paper protection"
+msgstr "上級オプション"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+
+#: backend/fujitsu.c:3768
+#, fuzzy, no-c-format
+msgid "Staple detection"
+msgstr "補正を���"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr ""
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+
+#: backend/fujitsu.c:3809
+#, fuzzy, no-c-format
+msgid "Dropout color"
+msgstr "�り出��"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+
+#: backend/fujitsu.c:3833
+#, fuzzy, no-c-format
+msgid "Buffer mode"
+msgstr "フィーダーモード"
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr ""
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr ""
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr ""
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+
+#: backend/fujitsu.c:3911
+#, fuzzy, no-c-format
+msgid "Off timer"
+msgstr "ランプをオフ��る時間"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+
+#: backend/fujitsu.c:3930
+#, fuzzy, no-c-format
+msgid "Duplex offset"
+msgstr "赤オフセット"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr ""
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "緑オフセット"
+
+#: backend/fujitsu.c:3949
+#, fuzzy, no-c-format
+msgid "Adjust green/red offset"
+msgstr "緑オフセット"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr ""
+
+#: backend/fujitsu.c:3967
+#, no-c-format
+msgid "Adjust blue/red offset"
+msgstr ""
+
+#: backend/fujitsu.c:3980
+#, fuzzy, no-c-format
+msgid "Low Memory"
+msgstr "メモリ�足"
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+
+#: backend/fujitsu.c:3996
+#, fuzzy, no-c-format
+msgid "Duplex side"
+msgstr "両�スキャン"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr ""
+
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr ""
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr ""
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
+msgstr ""
+
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr ""
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+
+#: backend/fujitsu.c:4095
+#, fuzzy, no-c-format
+msgid "Endorser Options"
+msgstr "上級オプション"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr ""
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr ""
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr ""
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr ""
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr ""
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr ""
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr ""
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr ""
+
+#: backend/fujitsu.c:4253
+#, fuzzy, no-c-format
+msgid "Endorser direction"
+msgstr "ノイズ除去"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr ""
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr ""
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr ""
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr ""
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr ""
+
+#: backend/fujitsu.c:4344
+#, fuzzy, no-c-format
+msgid "A3 paper"
+msgstr "紙�ら"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4356
+#, fuzzy, no-c-format
+msgid "B4 paper"
+msgstr "紙�ら"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4368
+#, fuzzy, no-c-format
+msgid "A4 paper"
+msgstr "紙�ら"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4380
+#, fuzzy, no-c-format
+msgid "B5 paper"
+msgstr "紙�ら"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr ""
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr ""
+
+#: backend/fujitsu.c:4429
+#, fuzzy, no-c-format
+msgid "Scanner in power saving mode"
+msgstr "スキャナー�カ�ー�開�����"
+
+#: backend/fujitsu.c:4452
+#, fuzzy, no-c-format
+msgid "Manual feed"
+msgstr "手動焦点�置"
+
+#: backend/fujitsu.c:4453
+#, fuzzy, no-c-format
+msgid "Manual feed selected"
+msgstr "手動焦点�置"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr ""
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr ""
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr ""
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr ""
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr ""
+
+#: backend/fujitsu.c:4513
+#, fuzzy, no-c-format
+msgid "Hardware error code"
+msgstr "�ードウエア�ェックエラー"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr ""
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr ""
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr ""
+
+#: backend/fujitsu.c:4537
+#, fuzzy, no-c-format
+msgid "Imprinter ink level"
+msgstr "ホワイトレベル"
+
+#: backend/fujitsu.c:4548
+#, fuzzy, no-c-format
+msgid "Density"
+msgstr "濃度制御"
+
+#: backend/fujitsu.c:4549
+#, fuzzy, no-c-format
+msgid "Density dial"
+msgstr "濃度制御"
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, fuzzy, no-c-format
+msgid "Duplex switch"
+msgstr "両�スキャン"
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, no-c-format
 msgid "Extras"
 msgstr "追加"
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, fuzzy, no-c-format
-msgid "Threshold curve"
-msgstr "閾値"
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr ""
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
 "instead on hardware lineart."
 msgstr ""
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, no-c-format
 msgid "Disable interpolation"
 msgstr ""
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
@@ -2292,44 +3022,44 @@ msgstr ""
 "水平解�度�垂直解�度より低�よ��高解�度を使�����水平"
 "interpolationを無効����。"
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "カラーフィルタ"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "æ ¡æ­£"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "較正を「����実行���"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "較正データ�キャッシュ"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, no-c-format
 msgid "Lamp off time"
 msgstr "ランプをオフ��る時間"
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
@@ -2338,103 +3068,101 @@ msgstr ""
 "ランプ�指定�れ�時間（分）�経���らオフ��れ��。値�������"
 "��機能�����ん。"
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, fuzzy, no-c-format
 msgid "Lamp off during scan"
 msgstr "ダーク補正時�ランプをオフ��る"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, fuzzy, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr "走査��後�ランプ�オフ��る���時間（分）"
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, no-c-format
 msgid "File button"
 msgstr "ファイルボタン"
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr "OCRボタン"
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, no-c-format
 msgid "Power button"
 msgstr "電�ボタン"
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "電�メールボタン"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, fuzzy, no-c-format
 msgid "Need calibration"
 msgstr "較正�クリア"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, fuzzy, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr "走査��スキャナ�校正を強制�る"
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, no-c-format
 msgid "Buttons"
 msgstr "ボタン"
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr "較正"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "特殊シートを用��補正を開始"
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, no-c-format
 msgid "Clear calibration"
 msgstr "較正�クリア"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, no-c-format
 msgid "Clear calibration cache"
 msgstr "校正キャッシュを消去�る"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr "��アダプター"
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr "グレーモード色"
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr "��色を用��グレーモードを実��る�を�択（既定：緑）"
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr "デ�ッグオプション"
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "自動暖機"
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -2442,12 +3170,12 @@ msgid ""
 msgstr ""
 "６�秒�暖機時間を使�代�り��ランプ��度�一定��る��暖機���。"
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "全走査"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
@@ -2456,12 +3184,12 @@ msgstr ""
 "補正領域を����全領域を走査���。注�：全高を�択�����。�れ�"
 "テスト用��。"
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "ç²—æ ¡æ­£"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2473,12 +3201,12 @@ msgstr ""
 "�必���。��オプション�既定�有効��れ����。テスト用途�存在�"
 "るオプション��。"
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "粗調整を最��走査��行�"
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2486,12 +3214,12 @@ msgid ""
 "different with each scan, disable this option. For testing only."
 msgstr ""
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, no-c-format
 msgid "Backtrack lines"
 msgstr ""
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2500,83 +3228,83 @@ msgid ""
 "omitting lines."
 msgstr ""
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "ガンマ値"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr "�����ャ�ル�ガンマ値を設定"
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, no-c-format
 msgid "Geometry Group"
 msgstr "�置グループ"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, no-c-format
 msgid "Scan Mode Group"
 msgstr "スキャンモードグループ"
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr "スライド"
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, no-c-format
 msgid "Scanner model"
 msgstr "スキャナーモデル"
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr "イメージカラー��転�れ��"
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, no-c-format
 msgid "Disable gamma correction"
 msgstr "ガンマ補正を無効"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "ガンマ補正�無効��れ��"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, no-c-format
 msgid "Disable white shading correction"
 msgstr "ホワイト・シェーディング較正を無効"
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr "白シャドー補正�無効��れ��。"
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr "暖機プロセスをスキップ"
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr "暖機プロセス�無効��り��"
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr "真�深度を強制���。"
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2587,12 +3315,12 @@ msgstr ""
 "行�れ��。�れ�ら��択�れ�色深度�変��れ��。��オプション��"
 "深度エミュレーションを回����。"
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, no-c-format
 msgid "Emulate Grayscale"
 msgstr "グレースケール�エミュレート"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2603,12 +3331,12 @@ msgstr ""
 "�よ��変��れ��。�れ��一部�環境���画��質を高�る����り"
 "��。"
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr "デ�ッグイメージ��存"
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
@@ -2616,356 +3344,350 @@ msgid ""
 msgstr ""
 "有効��る��スキャナ�処��る画��一部��分������存�れ��。"
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, no-c-format
 msgid "Reset chipset"
 msgstr "�ップセット�リセット"
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr "�ップセットデータをリセット"
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, no-c-format
 msgid "Information"
 msgstr "情報"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, no-c-format
 msgid "Chipset name"
 msgstr "�ップセット�"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr "装置�使�れ��る�ップセット�を表示�る。"
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Unknown"
 msgstr "�明"
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr "�ップセットID"
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, no-c-format
 msgid "Shows the chipset ID"
 msgstr "�ップセットIDを表示"
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, no-c-format
 msgid "Scan counter"
 msgstr "走査カウンター"
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr "スキャナー�行��走査回数を表示���。"
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, no-c-format
 msgid "Update information"
 msgstr "情報更新"
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr "装置�情報を更新"
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr "画�"
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr "�種"
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, no-c-format
 msgid "offset X"
 msgstr "オフセットX"
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr "走査領域��ードウエア�内部X�置"
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, no-c-format
 msgid "offset Y"
 msgstr "オフセットY"
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr "走査領域��ードウエア内部Y�置"
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr "ランプ�状態"
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr "ランプ�オフ�オンを切り替�"
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr "白黒レベルを較正"
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr "ADF"
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, no-c-format
 msgid "TMA Slides"
 msgstr "TMAスライド"
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, no-c-format
 msgid "TMA Negatives"
 msgstr "TMA�ガ"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, no-c-format
 msgid "Color (48 bits)"
 msgstr "カラー（４８ビット）"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, no-c-format
 msgid "Extend lamp timeout"
 msgstr "ランプタイムアウト�拡大"
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr ""
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr "ボタン待�"
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, no-c-format
 msgid "Waits for button before scanning"
 msgstr ""
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, no-c-format
 msgid "Advanced Options"
 msgstr "上級オプション"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr "ç²—"
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr "密"
 
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr "�イエル"
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr "カスタム"
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "自動"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr "NTSC方�RGB"
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr "XPA方�RGB"
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr "パススルー"
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "NTSC�グレー"
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr "XPA�グレー"
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "��"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr "普通"
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "速�"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr "超高速"
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr "２ピクセル"
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr "４ピクセル"
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr "８ピクセル"
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr "�刷"
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, no-c-format
 msgid "Film-strip"
 msgstr "フィルム�一片"
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr "XPA"
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr "�件付�"
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, no-c-format
 msgid "Experiment"
 msgstr "実験的"
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, no-c-format
 msgid "Sharpening"
 msgstr "鮮鋭化"
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr "鮮鋭化値を設定"
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr "自動閾値"
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr "線画�走査�閾値�自動判定を有効��る"
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr "スムージング"
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr "スムージングフィルタを�択"
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr "走査後�メディアを�り出�"
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, no-c-format
 msgid "Unloads the media after a scan."
 msgstr "走査後�メディアを�り出�。"
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, no-c-format
 msgid "Change document"
 msgstr "書類を��る。"
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr "書類を�り��る。"
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr "�り出�"
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr "書類��り出�"
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, no-c-format
 msgid "Start calibration process."
 msgstr "校正プロセスを開始。"
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, no-c-format
 msgid "Media"
 msgstr "メディア"
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr "メディア�種類を設定"
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr "露出時間"
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -2974,460 +3696,459 @@ msgid ""
 "value."
 msgstr ""
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, no-c-format
 msgid "Color Matrix"
 msgstr "カラーマトリックス"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, no-c-format
 msgid "Set the scanners color matrix."
 msgstr "スキャナー�カラーマトリックスを設定�る。"
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr "カスタムカラーマトリックス"
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, no-c-format
 msgid "Mono Color Matrix"
 msgstr "モノクロ・カラーマトリックス"
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr "グレースケール走査�カスタム・カラーマトリックス"
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, no-c-format
 msgid "Mirror horizontal"
 msgstr "水平���"
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, no-c-format
 msgid "Mirror image horizontally."
 msgstr "水平���を�る。"
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, no-c-format
 msgid "Mirror vertical"
 msgstr "垂直��"
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, no-c-format
 msgid "Mirror image vertically."
 msgstr "垂直���を�る。"
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, no-c-format
 msgid "Update options"
 msgstr "オプション�更新"
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, no-c-format
 msgid "Update options."
 msgstr "オプションを更新�る。"
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr "８ビット出力"
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr ""
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr "��ボタンを待�"
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr ""
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr "ランプ��止"
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr "スキャナー�ランプを�止�る。"
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "紙サイズ"
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr ""
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, fuzzy, no-c-format
 msgid "Landscape"
 msgstr "A5横"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr ""
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, fuzzy, no-c-format
 msgid "Length control mode"
 msgstr "濃度制御モードを設定"
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, no-c-format
 msgid "Manual feed mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, fuzzy, no-c-format
 msgid "Manual feed timeout"
 msgstr "手動焦点�置"
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr "両�走査を有効��る。"
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr "ADF��る紙�物�サイズ"
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, fuzzy, no-c-format
 msgid "halftone"
 msgstr "網版"
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, fuzzy, no-c-format
 msgid "color"
 msgstr "カラー"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, fuzzy, no-c-format
 msgid "continuous"
 msgstr "�件付�"
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, fuzzy, no-c-format
 msgid "off"
 msgstr "オフ"
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, fuzzy, no-c-format
 msgid "bayer_64"
 msgstr "�イエル"
 
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, fuzzy, no-c-format
 msgid "bayer_16"
 msgstr "�イエル"
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, fuzzy, no-c-format
 msgid "halftone_32"
 msgstr "網版"
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, fuzzy, no-c-format
 msgid "halftone_64"
 msgstr "網版"
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, fuzzy, no-c-format
 msgid "diffusion"
 msgstr "エラー拡散"
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, fuzzy, no-c-format
 msgid "normal"
 msgstr "普通"
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, fuzzy, no-c-format
 msgid "light"
 msgstr "�イライト"
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, fuzzy, no-c-format
 msgid "From scanner"
 msgstr "フィルムスキャナー"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr "紙�ら"
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, fuzzy, no-c-format
 msgid "default"
 msgstr "既定"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, fuzzy, no-c-format
 msgid "smooth"
 msgstr "スムース"
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, fuzzy, no-c-format
 msgid "low"
 msgstr "��"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, fuzzy, no-c-format
 msgid "medium"
 msgstr "中"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, fuzzy, no-c-format
 msgid "red"
 msgstr "赤"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, fuzzy, no-c-format
 msgid "green"
 msgstr "ç·‘"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, fuzzy, no-c-format
 msgid "Sets the scan source"
 msgstr "走査�"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr "フィーダーモード"
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr "シート�りモード�設定"
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, fuzzy, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr "自動焦点を有効�無効"
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, fuzzy, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr "濃度制御モードを設定"
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, fuzzy, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "シート�りモード�設定"
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, fuzzy, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr "シート�りモード�設定"
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr "自動閾値"
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
@@ -3436,556 +4157,543 @@ msgstr ""
 "自動的��度�コントラスト�ホワイトレベル�ガンマ値�ノイズ低減�イメー"
 "ジ強調を設定�る。"
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "ノイズ除去"
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr "画�強調"
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr "イメージ強調を設定"
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr "ガンマ"
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, fuzzy, no-c-format
 msgid "Lamp color"
 msgstr "ランプをオン"
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, fuzzy, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr "ランプ�オフ�オンを切り替�"
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, fuzzy, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "垂直���を�る。"
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
 "length of actual paper or logical document length."
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "ガンマ補正"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, fuzzy, no-c-format
 msgid "High sensivity"
 msgstr "高密度�刷"
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, fuzzy, no-c-format
 msgid "Low sensivity"
 msgstr "低密度�刷"
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, fuzzy, no-c-format
 msgid "err_diffusion"
 msgstr "エラー拡散"
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, fuzzy, no-c-format
 msgid "No detection"
 msgstr "補正を���"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, fuzzy, no-c-format
 msgid "Normal mode"
 msgstr "普通"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, fuzzy, no-c-format
 msgid "Enhanced mode"
 msgstr "増強"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
 "divides long paper by the length which is set in Document Size option."
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, fuzzy, no-c-format
 msgid "Automatic threshold mode"
 msgstr "自動閾値"
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, fuzzy, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr "自動閾値"
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, fuzzy, no-c-format
 msgid "Set chroma of red"
 msgstr "フレーム�順�を設定"
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, fuzzy, no-c-format
 msgid "chroma of blue"
 msgstr "��最��度"
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, fuzzy, no-c-format
 msgid "Set chroma of blue"
 msgstr "赤を��シフト"
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr "ダイアモンド"
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr "8x8 ç²—Fatting"
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr "8x8 微細fatting"
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr "8x8 �イエル"
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr "8x8縦�線"
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr "利得"
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr "カラー�ャ�ル�利得設定"
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, no-c-format
 msgid "Gray gain"
 msgstr "グレー利得"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr "グレー�ャ�ル利得を設定"
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, no-c-format
 msgid "Red gain"
 msgstr "赤利得"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr "赤�ャ�ル利得を設定"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, no-c-format
 msgid "Green gain"
 msgstr "緑利得"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr "緑�ャ�ル利得を設定"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, no-c-format
 msgid "Blue gain"
 msgstr "�利得"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr "��ャ�ル利得を設定"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr "�イエルディザ 16"
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr "�イエルディザ 64"
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr "�ーフトーンドット32"
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr "�ーフトーンドット64"
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr "エラー拡散"
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr "モード１"
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr "モード２"
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr "モード３"
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr "白サンプル�ら"
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr "スムース"
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr "低"
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr "中"
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr "高"
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr "CRT"
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "１ページ"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "全ページ"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr "シートフィーダスキャナー"
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr "グレースケール４ビット"
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr "グレースケール８ビット"
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr "シャドー�ミッドトーン��イライト�露光時間"
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr "特殊オプション"
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr "カラー�ランス"
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr "�ックトラッキングを無効"
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr ""
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr "平��ランプ切り替�"
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr "平��ランプを切り替�"
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr "�ックエンド�よる較正"
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid ""
 "If checked the color calibration before a scan is done by the backend"
 msgstr ""
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr "lightlid-35mmアダプターを使�"
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr "��オプション��走査中�平��ランプをオフ����。"
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "�質優先走査"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr "最高�質���スピード���"
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "高速走査"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr "最高速度����質�低�"
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr "閾値�自動判定"
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
@@ -3993,429 +4701,429 @@ msgid ""
 msgstr ""
 "も��ェック�れる���ックエンド�自動的�最��閾値を探������。"
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr "ガンマ補正モードを�択�る。"
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr "ガンマ値�比を固定"
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr ""
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr "スカラーガンマ"
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr ""
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr "ガンマ赤スカラー"
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr ""
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr "ガンマ緑スカラー"
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr ""
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr "ガンマ�スカラー"
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr ""
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr "�ャ�ル"
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
 msgstr ""
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr ""
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr ""
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr ""
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr ""
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr ""
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr ""
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr ""
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr ""
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr "赤�ランス"
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr ""
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr "緑�ランス"
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr ""
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr "��ランス"
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr ""
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr "ファームウエア�ランス"
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr ""
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "最�"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "��"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "速�"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "最速"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr ""
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr ""
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr ""
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr ""
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr ""
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr ""
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr ""
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr "4x4 ç²—"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr "4x4 通常"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr "4x4 微細"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr "3x3 通常"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr "2x2 通常"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr "8x8 カスタム"
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr "6x6 カスタム"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr "5x5 カスタム"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr "4x4 カスタム"
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr "3x3 カスタム"
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr "2x2 カスタム"
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr "高速グレーモード"
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr "高速グレーモード�走査（低�質）"
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
 "This may be a non-color mode or a low resolution mode."
 msgstr "����プレビューを最高速モード（低�質）�行�よ���る。"
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr "ランプオフ時間（分）"
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr "ランプ��止�る���時間（分）を設定�る"
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, no-c-format
 msgid "Turn lamp off"
 msgstr "ランプをオフ�"
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr "���ランプをオフ��る。"
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr "赤��度"
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr "�得�れ�画��赤�ャ�ル��度を制御���。"
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr "緑��度"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr "�得�れ�画��緑�ャ�ル��度を制御���。"
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr "���度"
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr "�得�れ�画����ャ�ル��度を制御���。"
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr ""
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr ""
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr ""
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, no-c-format
 msgid "Positive"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
 "40 seconds warm-up time."
 msgstr ""
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, fuzzy, no-c-format
 msgid "Negative color"
 msgstr "�ガフィルム"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, fuzzy, no-c-format
 msgid "Negative gray"
 msgstr "�ガ"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, fuzzy, no-c-format
 msgid "48 bits color"
 msgstr "高精彩"
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
 "mode and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr "ボタン制御走査"
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4423,248 +5131,239 @@ msgid ""
 "cancel, press \"GRAY\" button."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:143
-#, no-c-format
-msgid "Gamma function exponent"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:144
-#, no-c-format
-msgid "Changes intensity of midtones"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:232
 #, no-c-format
 msgid "Update button state"
 msgstr "ボタン状態�更新"
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:244
 #, no-c-format
 msgid "Button 1"
 msgstr "ボタン１"
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:258
 #, no-c-format
 msgid "Button 2"
 msgstr "ボタン２"
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr ""
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr ""
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr "��性"
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr "装置設定"
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr "ランプ�スイッ�"
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr "ランプを手動�オフオン�る"
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "ダーク補正時�ランプをオフ��る"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr ""
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, no-c-format
 msgid "Calibration data cache"
 msgstr "較正データ�キャッシュ"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr ""
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, no-c-format
 msgid "Performs calibration"
 msgstr "較正�実行"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr "センサーをスピードアップ"
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr ""
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, no-c-format
 msgid "Warmup-time"
 msgstr "暖機時間"
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, no-c-format
 msgid "Warmup-time in seconds."
 msgstr "暖機時間を秒�設定。"
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, no-c-format
 msgid "Lampoff-time"
 msgstr "ランプオフ時間"
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr "ランプオフ時間を秒�設定。"
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, no-c-format
 msgid "Analog frontend"
 msgstr "アナログフロントエンド"
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr "AFE�赤�利得値"
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr "赤オフセット"
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr "AFE�赤�オフセット値"
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr "AFE�緑�利得値"
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr "緑オフセット"
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr "AFE�緑�オフセット値"
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr "AFE���利得値"
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr ""
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, no-c-format
 msgid "Red lamp off"
 msgstr ""
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, no-c-format
 msgid "Green lamp off"
 msgstr "緑ランプをオフ"
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr "緑ランプオフパラメータを定義"
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, no-c-format
 msgid "Blue lamp off"
 msgstr "�ランプをオフ"
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr "�ランプオフパラメータを定義"
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr ""
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr "色３６"
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr "ディザ　マップ１"
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr "ディザ　マップ２"
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr "ランダマイズ"
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr "情報��択"
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr "イメージ強調"
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr "グレー化"
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr "イメージをグレースケール���読�込む"
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr "３パス　シミュレーション"
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
@@ -4673,12 +5372,12 @@ msgstr ""
 "３��分割�れ�フレームを返�３パススキャナーをシミュレート���。�も"
 "���分��緑�����赤�順��返���。"
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr "�ンドスキャナー　シミュレーション"
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4690,48 +5389,48 @@ msgstr ""
 "���。��オプションを設定�る��フロントエンド�正���れを扱�る"
 "��テスト���。"
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid ""
 "Set default values for enhancement controls (brightness & contrast)."
 msgstr ""
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr ""
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr ""
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr "ガンマテーブル"
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr "ステータスコード　シミュレーション"
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr "ステータスコードを強制���"
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr ""
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr "SANE_STATUS_EOFを返�。"
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
@@ -4740,12 +5439,12 @@ msgstr ""
 "�ックエンド�対��sane_read()�呼�れ�後��ステータスコード����"
 "SANE_STATUS_EOFを返�よ�強制�る。"
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr "SANE_STATUS_JAMMEDを返�"
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
@@ -4754,12 +5453,12 @@ msgstr ""
 "�ックエンド�対���ステータスコード���SANE_STATUS_JAMMEDを返�よ�"
 "�強制�る。"
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr "SANE_STATUS_NO_DOCSを返�"
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
@@ -4768,133 +5467,130 @@ msgstr ""
 "sane_read()�呼�れ�後�SANE_STATUS_NO_DOCS状態コードを返�よ��ックエ"
 "ンドを強制���。"
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr "SANE_STATUS_COVER_OPENを返�"
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr "SANE_STATUS_IO_ERRORを返�"
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr "SANE_STATUS_NO_MEMを返�"
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr "SANE_STATUS_ACCESS_DENIEDを返�"
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
 "after sane_read() has been called."
 msgstr ""
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr "��オプション��スキャナーボタン�状態を�映���。"
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr "ランプをオン"
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr "スキャナー�ランプをオン��る。"
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr "ランプオフ"
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr "スキャナー�ランプをオフ��る。"
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, no-c-format
 msgid "Lamp timeout"
 msgstr "ランプ�タイムアウト��"
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr "走査��後�ランプ�オフ��る���時間（分）"
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr "線画モード�閾値"
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr "書類�り装置"
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr "６x4（イン�）"
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr "8x10（イン�）"
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr "8.5x11（イン�）"
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr "�ーフトーン�サ�ート�れ��ん"
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr ""
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr ""
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -4904,27 +5600,27 @@ msgid ""
 "frontends may stop responding to X events and your system could bog down."
 msgstr ""
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr ""
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr ""
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, fuzzy, no-c-format
 msgid "Focus point for scanning."
 msgstr "走査後�書類を排出"
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr "プレビューモード"
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
@@ -4933,121 +5629,121 @@ msgstr ""
 "プレビューモードを�択。グレースケールプレビュー�通常も��もよ�速度�"
 "詳細�を�供���。"
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr "事�定義�れ�設定"
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
 "like."
 msgstr "写真や�刷物���標準的�走査領域を�供���。"
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr ""
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, fuzzy, no-c-format
 msgid "Frame to be scanned"
 msgstr "フラットベッド（平�型）スキャナ"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, fuzzy, no-c-format
 msgid "Focus-mode"
 msgstr "焦点"
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, fuzzy, no-c-format
 msgid "Auto or manual focus"
 msgstr "自動焦点"
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, fuzzy, no-c-format
 msgid "Focus-point"
 msgstr "焦点�置"
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, fuzzy, no-c-format
 msgid "Focus point"
 msgstr "焦点�置"
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr ""
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr ""
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr "ウエブカメラ"
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr "カラー RAW"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr "カラーRGB"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr "カラーRGB TEXT"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr ""
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr ""
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr "カラーパターン"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr "グリッド"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr "最��エントリー"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr "２���エントリー"
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
 "display it"
 msgstr ""
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr "�ンドスキャナーをシミュレート"
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5056,12 +5752,12 @@ msgid ""
 "option also enables a fixed width of 11 cm."
 msgstr ""
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr "３パスシミュレーション"
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
@@ -5070,34 +5766,34 @@ msgstr ""
 "３パススキャナーをシミュレート。カラーモード�����３フレーム�転��"
 "れる。"
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr "フレーム�順�を設定"
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr "３パスカラーモード�����フレーム�順�を設定。"
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
 "after 10 scans."
 msgstr ""
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr "特殊オプション"
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr "テスト画�を�択"
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5108,12 +5804,12 @@ msgid ""
 "square."
 msgstr ""
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr "エンディアンを�転"
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5121,54 +5817,54 @@ msgid ""
 "uses the correct endianness."
 msgstr ""
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr "読��り制�"
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr "sane_read()�呼�出����転���るデータ��制�"
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr "読�込�制�サイズ"
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
 msgstr "�sane_read()���る転���る（最大）データ�"
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr "読��り�延"
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr "パイプ�データを転��る�延"
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr "読��り�延�大��"
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
 msgstr "パイプを通���データ��ッファ�転��れ�後��れ�ら�待��。"
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr "sane_read�返値"
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
@@ -5176,22 +5872,22 @@ msgid ""
 "frontend handles them."
 msgstr ""
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr "ライン���ピクセル��失"
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr ""
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr "曖昧�パラメータ"
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
@@ -5200,24 +5896,24 @@ msgstr ""
 "sane_start()を呼�出����sane_parameters()を呼ん�����曖昧�ライン"
 "や��ライン�対��曖昧��イトを返�。"
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr "ノンブロッキングIOを使�"
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 "フロントエンド�サ�ート�る����sane_read()�ノンブロッキングIOを使"
 "�。"
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr "ファイルディスクリプタ��択を�供�る"
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
@@ -5226,12 +5922,12 @@ msgstr ""
 "sane_read()�データを返�����検出�る����ファイルディスクリプタ�"
 "�択を�供�る。"
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr "テストオプション有効"
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
@@ -5241,39 +5937,39 @@ msgstr ""
 "異�るSANEオプションタイプ�表示や変更���る�テスト�る用途�使�れ�"
 "�。"
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr "オプション表示"
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr "����オプション�リストを表示�る。"
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr ""
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr ""
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
 "advanced) capabilities. That's just a normal bool option."
 msgstr ""
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr ""
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
@@ -5281,12 +5977,12 @@ msgid ""
 "frontend but by the user (e.g. by pressing a button at the device)."
 msgstr ""
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr ""
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5294,36 +5990,36 @@ msgid ""
 "by pressing a button at the device) and can't be read by the frontend."
 msgstr ""
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr ""
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
 "That means the option is read-only."
 msgstr ""
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr ""
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
 "(and advanced) capabilities."
 msgstr ""
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr ""
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5331,303 +6027,307 @@ msgid ""
 "backend."
 msgstr ""
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr ""
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr ""
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr ""
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr ""
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
 "is 4, maximum 192, and quant is 2."
 msgstr ""
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr ""
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr ""
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
 "constraints."
 msgstr ""
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr ""
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
 "constraint. Minimum is 4, maximum 192, and quant is 2."
 msgstr ""
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr ""
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
 "list constraint."
 msgstr ""
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr ""
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr ""
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr ""
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr ""
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
 "Minimum is -42.17, maximum 32767.9999, and quant is 2.0."
 msgstr ""
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr ""
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr ""
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr ""
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr ""
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr ""
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr ""
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr ""
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
 "entries..."
 msgstr ""
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr ""
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr ""
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr ""
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, no-c-format
 msgid "Color 36"
 msgstr ""
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr ""
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr ""
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr ""
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr ""
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr ""
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr ""
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr ""
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr ""
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr ""
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr ""
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr ""
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr ""
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr ""
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr ""
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr ""
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr ""
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr ""
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr ""
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr ""
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr ""
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr ""
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, no-c-format
 msgid "Gray offset"
 msgstr ""
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr ""
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr ""
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr ""
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr ""
 
+#, fuzzy
+#~ msgid "IPC mode"
+#~ msgstr "プレビューモード"
+
 #~ msgid "problem not analyzed (unknown SCSI class)"
 #~ msgstr "�題�解�����ん���（�明�SCSIクラス）"
 
diff --git a/po/nb.gmo b/po/nb.gmo
new file mode 100644
index 0000000..5ec66f2
--- /dev/null
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index 6ac30d3..84fb1ce 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,458 +4,452 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends 1.0.12\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
 "PO-Revision-Date: 2007-12-17 23:01+0100\n"
 "Last-Translator: Sigurd Stordal <polarbear42@phreaker.net>\n"
 "Language-Team: \n"
-"Language: \n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr ""
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr ""
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "Geometri"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "Forbedring"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "Avansert"
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr ""
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "Forvisning"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr "Fremtving enfarge forvisning"
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr "Bit dybde"
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr ""
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "Skanhastighet"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr "Skankilde"
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr ""
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "Topp-venstre x"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "Topp-venstre y"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "Bunn-høyre x"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "Bunn-høyre y"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Skanoppløsning"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "X-oppløsning"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Y-oppløsning"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr ""
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, no-c-format
 msgid "Page height"
 msgstr ""
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr ""
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr ""
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr ""
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr ""
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr ""
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr ""
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr "Kornstørrelse"
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr ""
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "Svartnivå"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "Hvitnivå"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr "Hvitnivå for rød"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
 msgstr "Hvitnivå for grønn"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr "Hvitnivå for blå"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "Skygge"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr "Skygge for rød"
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr "Skygge for grønn"
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr "Skygge for blå"
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr ""
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr ""
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr ""
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr ""
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "Filnavn"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr ""
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr ""
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr ""
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "Negativ"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "Kvalitets kalibrering"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr "Dobble Optisk Oppløsning"
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr ""
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr ""
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr ""
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr ""
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr ""
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr ""
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr "Varmopp lampe"
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr ""
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr ""
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr ""
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr ""
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr ""
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr ""
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr ""
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr ""
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr ""
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr ""
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr "Lampen slås av ved avslutning"
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
 "supports."
 msgstr ""
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, fuzzy, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "Kort liste over oppløsninger"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr ""
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, no-c-format
 msgid "Image modification options"
 msgstr ""
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, fuzzy, no-c-format
 msgid "Hardware specific options"
 msgstr "Skanoppløsning"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr ""
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr ""
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -463,87 +457,87 @@ msgid ""
 "scanner, it reduces the memory requirements and scan-time of the preview."
 msgstr ""
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
 "for multibit scans."
 msgstr ""
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr ""
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr ""
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr "Velger skan kilde (slik som arkmater)"
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr ""
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "venstre topp x posisjon av skan-areal"
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "Venstre topp y posisjon av skan-areal"
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "Høyre bunn x posisjon av skan-areal"
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "Høyre bunn y posisjon av skan-areal"
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
 "sheet-fed scans."
 msgstr ""
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, no-c-format
 msgid "Specifies the height of the media."
 msgstr ""
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid ""
 "Determines whether a builtin or a custom gamma-table should be used."
 msgstr ""
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -551,423 +545,423 @@ msgid ""
 "gamma table)."
 msgstr ""
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr ""
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr ""
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr ""
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
 "in sharper images."
 msgstr ""
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr ""
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid ""
 "Selects what green radiance level should be considered \"full green\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid ""
 "Selects what blue radiance level should be considered \"full blue\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
 "when acquiring an image with a camera. Larger values cause more blooming."
 msgstr ""
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr "Filnavnet på bildet som skal lastes opp"
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
 "halftoned images."
 msgstr ""
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
 msgstr ""
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr "Bruk samme verdier for X og Y oppløsning"
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr "Bytt svart og hvitt"
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr "Foreta en kvalitets hvit-kalibrering"
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr "Bruk linser som dobbler den optiske oppløsningen"
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr ""
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr ""
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr ""
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr ""
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr ""
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr "Varm opp lampen før skanning"
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr ""
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr ""
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr ""
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr ""
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr ""
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr ""
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr ""
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr "Slå av lampen når programmet avslutter"
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, fuzzy, no-c-format
 msgid "Scan button"
 msgstr "Skanoppløsning"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, fuzzy, no-c-format
 msgid "Email button"
 msgstr "Vent på knappen"
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, fuzzy, no-c-format
 msgid "Fax button"
 msgstr "Vent på knappen"
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, fuzzy, no-c-format
 msgid "Copy button"
 msgstr "Vent på knappen"
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr ""
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, fuzzy, no-c-format
 msgid "Cover open"
 msgstr "Fargemønster"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "Farge"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr "Fargestrektegning"
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr ""
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "Grå"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr ""
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "Strektegning"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, no-c-format
 msgid "Operation not supported"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, fuzzy, no-c-format
 msgid "Document feeder jammed"
 msgstr "Dokumentmater"
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, fuzzy, no-c-format
 msgid "Document feeder out of documents"
 msgstr "Dokumentmater"
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, no-c-format
 msgid "Scanner cover is open"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "Standard"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr "Velg standard verdier for kontroll av forbedring"
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "Kalibrering"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr "Kalibrer før neste scan"
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
 "Otherwise, calibration is performed only before the first start."
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr "Bare utfør skygge-korrigering"
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -975,1081 +969,1072 @@ msgid ""
 "or from the configuration file, are used."
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr "Knappstatus"
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr "Rammenummer å skanne"
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr "Velger rammenummer å skanne"
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, fuzzy, no-c-format
 msgid "Duplex scan"
 msgstr "Full skan"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid ""
 "Duplex scan provide a scan of the front and back side of the document"
 msgstr ""
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, fuzzy, no-c-format
 msgid "Calibrate Scanner"
 msgstr "Kalibrering"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, fuzzy, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr "Grov kalibrering kun for første skan"
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr "Gråskala scan"
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr "Gjør et gråskala heller enn farge scan"
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr ""
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr ""
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "Gamma korreksjon"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr "Velger den gamma korrigerte overførsels kurven"
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr ""
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr ""
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, fuzzy, no-c-format
 msgid "No transparency correction"
 msgstr "Farge korreksjon"
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr ""
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr ""
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, fuzzy, no-c-format
 msgid "Negatives"
 msgstr "Negativ"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, fuzzy, no-c-format
 msgid "Slides"
 msgstr "Treigest"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, fuzzy, no-c-format
 msgid "Normal speed"
 msgstr "Skanhastighet"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/2 normal speed"
 msgstr ""
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/3 normal speed"
 msgstr ""
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, no-c-format
 msgid "rounded parameter"
 msgstr ""
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr ""
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, no-c-format
 msgid "ADF jam"
 msgstr ""
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr ""
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, fuzzy, no-c-format
 msgid "lamp failure"
 msgstr "Gammaverdi"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr ""
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr ""
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr ""
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr ""
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr ""
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, no-c-format
 msgid "transparency unit lamp failure"
 msgstr ""
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr ""
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr ""
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr ""
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr ""
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr ""
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr ""
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr ""
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr ""
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr ""
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr ""
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr ""
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr ""
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr ""
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr ""
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr ""
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr ""
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr ""
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr ""
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr ""
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, no-c-format
 msgid "transparency unit shading error"
 msgstr ""
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr ""
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, no-c-format
 msgid "film scanner"
 msgstr ""
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr ""
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr "Filmtype"
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr ""
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, fuzzy, no-c-format
 msgid "Negative film type"
 msgstr "Negativ Film"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, fuzzy, no-c-format
 msgid "Selects the negative film type"
 msgstr "Velger rammenummer å skanne"
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, fuzzy, no-c-format
 msgid "Hardware resolution"
 msgstr "Skanoppløsning"
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, fuzzy, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "Vis kort liste over oppløsninger"
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr ""
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, fuzzy, no-c-format
 msgid "Auto focus"
 msgstr "Automatisk utløsning"
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, no-c-format
 msgid "Enable/disable auto focus"
 msgstr ""
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr ""
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr ""
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, fuzzy, no-c-format
 msgid "Manual focus position"
 msgstr "Fokuseringposisjon"
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr ""
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr ""
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr ""
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "Speilbilde"
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, fuzzy, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "Speilbilde"
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, fuzzy, no-c-format
 msgid "Auto exposure"
 msgstr "Automatisk utløsning"
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr ""
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, fuzzy, no-c-format
 msgid "Calibration now"
 msgstr "Kalibrering"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, fuzzy, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Kvalitets kalibrering"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr ""
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr ""
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, fuzzy, no-c-format
 msgid "Reset scanner"
 msgstr "Raskt skan"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, no-c-format
 msgid "Reset the scanner"
 msgstr ""
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr ""
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, fuzzy, no-c-format
 msgid "Eject film after each scan"
 msgstr "Løs ut dokoment etter skanning"
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr ""
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr ""
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr ""
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr ""
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr ""
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, fuzzy, no-c-format
 msgid "Document feeder extras"
 msgstr "Dokumentmater"
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, no-c-format
 msgid "Flatbed only"
 msgstr ""
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr ""
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, no-c-format
 msgid "Transparency unit"
 msgstr ""
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr ""
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, fuzzy, no-c-format
 msgid "Negative film"
 msgstr "Negativ Film"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, fuzzy, no-c-format
 msgid "Positive or negative film"
 msgstr "Lysbilde Film"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr ""
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr ""
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, no-c-format
 msgid "Transparency ratio"
 msgstr ""
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, fuzzy, no-c-format
 msgid "Select film type"
 msgstr "Filmtype"
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, no-c-format
 msgid "Select the film type"
 msgstr ""
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr ""
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, no-c-format
 msgid "ADF Front"
 msgstr ""
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, no-c-format
 msgid "ADF Back"
 msgstr ""
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, no-c-format
 msgid "ADF Duplex"
 msgstr ""
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, no-c-format
 msgid "Card Front"
 msgstr ""
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, no-c-format
 msgid "Card Back"
 msgstr ""
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, no-c-format
 msgid "Card Duplex"
 msgstr ""
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "Rød"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "Grønn"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "Blå"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, fuzzy, no-c-format
 msgid "Enhance Red"
 msgstr "Forbedring"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, fuzzy, no-c-format
 msgid "Enhance Green"
 msgstr "Forbedring"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, fuzzy, no-c-format
 msgid "Enhance Blue"
 msgstr "Forbedring"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr "Ingen"
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr ""
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr ""
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr ""
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr ""
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr ""
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr ""
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "Lysbilde Film"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "Negativ Film"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr "Fokuser på glasset"
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr "Fokuser 2.5mm over glasset"
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr ""
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr ""
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr ""
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr ""
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr ""
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr ""
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr ""
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr "Tekst Fremhevings Teknologi"
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr "Last ned mønster A"
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr "Last ned mønster B"
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "Ingen korrigering"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr "Brukerdefinert"
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr ""
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr ""
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "Blekkskrivere"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr ""
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "Standard"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr "Høy densitets utskrift"
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr "lav densitets utskrift"
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr "Høy kontrasts utskrift"
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr "Brukerdefinert (Gamma=1.0)"
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr "Brukerdefinert (Gamma=1.8)"
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr ""
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr "A5 portrett"
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr "A5 landskap"
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr ""
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr ""
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "Maks"
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr ""
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr ""
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr ""
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr ""
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr ""
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr "Skarphet"
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr "Farge korreksjon"
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr ""
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr "Farge korreksjons koeffisienter"
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr ""
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr ""
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr ""
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr ""
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr ""
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr ""
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr ""
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr "Kontrollerer grønn-nivå"
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr "Legger til rødt basert på grønn-nivå"
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr "Legger til blått basert på grønn-nivå"
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr "Legger til grønt basert på rød-nivå"
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr "Kontrollerer rød-nivå"
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr "Legger til blått basert på rød-nivå"
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr "Legger til grønt basert på blå-nivå"
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr "Legger til rødt basert på blå-nivå"
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, no-c-format
 msgid "Controls blue level"
 msgstr "Kontrollerer blå-nivå"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr "Speil bildet"
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr "Rask forvisning"
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr "Automatisk oppdeling av areal i delareal"
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr "Kort liste over oppløsninger"
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr "Vis kort liste over oppløsninger"
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr ""
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr ""
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr ""
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr "Tilleggsutstyr"
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr "Utløs"
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr "Utløs arket i ADF"
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr "Automatisk utløsning"
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr "Løs ut dokoment etter skanning"
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr ""
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr ""
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr ""
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr ""
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
 "the user defined table, which can be downloaded to the scanner"
 msgstr ""
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr "Fokuseringposisjon"
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
 msgstr ""
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr "Vent på knappen"
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
@@ -2058,390 +2043,1133 @@ msgstr ""
 "Etter at kommandoen for skan er sendt, vent til skannerens knapp "
 "ertrykket før skanings prossesen startes."
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr ""
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, fuzzy, no-c-format
 msgid "Positive Slide"
 msgstr "Lysbilde Film"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, fuzzy, no-c-format
 msgid "Negative Slide"
 msgstr "Negativ Film"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr ""
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, fuzzy, no-c-format
 msgid "User defined CCT profile"
 msgstr "Brukerdefinert"
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr ""
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr ""
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr ""
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, no-c-format
 msgid "Diffusion"
 msgstr ""
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, fuzzy, no-c-format
 msgid "White"
 msgstr "Hvitnivå"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, fuzzy, no-c-format
 msgid "Black"
 msgstr "Svartnivå"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, no-c-format
 msgid "Continue"
 msgstr ""
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr ""
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr ""
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, no-c-format
 msgid "Horizontal bold"
 msgstr ""
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, no-c-format
 msgid "Horizontal narrow"
 msgstr ""
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr ""
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, no-c-format
 msgid "Vertical bold"
 msgstr ""
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr ""
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr ""
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, no-c-format
 msgid "Front"
 msgstr ""
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr ""
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
+msgid "Gamma function exponent"
 msgstr ""
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
 #, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
+msgid "Changes intensity of midtones"
+msgstr ""
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr ""
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr ""
+
+#: backend/fujitsu.c:3165
+#, no-c-format
+msgid "Halftone type"
+msgstr ""
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr ""
+
+#: backend/fujitsu.c:3210
+#, fuzzy, no-c-format
+msgid "Perform outline extraction"
+msgstr "Grov kalibrering"
+
+#: backend/fujitsu.c:3221
+#, no-c-format
+msgid "Emphasis"
+msgstr ""
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr ""
+
+#: backend/fujitsu.c:3240
+#, fuzzy, no-c-format
+msgid "Separation"
+msgstr "Kalibrering"
+
+#: backend/fujitsu.c:3241
+#, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr ""
+
+#: backend/fujitsu.c:3252
+#, fuzzy, no-c-format
+msgid "Mirroring"
+msgstr "Speilbilde"
+
+#: backend/fujitsu.c:3253
+#, fuzzy, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "Speilbilde"
+
+#: backend/fujitsu.c:3270
+#, fuzzy, no-c-format
+msgid "White level follower"
+msgstr "Hvitnivå for blå"
+
+#: backend/fujitsu.c:3271
+#, fuzzy, no-c-format
+msgid "Control white level follower"
+msgstr "Kontrollerer rød-nivå"
+
+#: backend/fujitsu.c:3289
+#, fuzzy, no-c-format
+msgid "BP filter"
+msgstr "Fargestrektegning"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr ""
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr ""
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr ""
+
+#: backend/fujitsu.c:3323
+#, fuzzy, no-c-format
+msgid "Gamma curve"
+msgstr "Gammaverdi"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, no-c-format
+msgid "Threshold curve"
+msgstr ""
+
+#: backend/fujitsu.c:3347
+#, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+
+#: backend/fujitsu.c:3369
+#, no-c-format
+msgid "Threshold white"
+msgstr ""
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr ""
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, fuzzy, no-c-format
+msgid "Noise removal"
+msgstr "Støyreduksjon"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr ""
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr ""
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr ""
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr ""
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr ""
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr ""
+
+#: backend/fujitsu.c:3508
+#, fuzzy, no-c-format
+msgid "Auto width detection"
+msgstr "Ingen korrigering"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr ""
+
+#: backend/fujitsu.c:3526
+#, fuzzy, no-c-format
+msgid "Auto length detection"
+msgstr "Ingen korrigering"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr ""
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr ""
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr ""
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr ""
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr ""
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr ""
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr ""
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
+msgstr ""
+
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3708
+#, no-c-format
+msgid "DF recovery mode"
+msgstr ""
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr ""
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3748
+#, fuzzy, no-c-format
+msgid "Advanced paper protection"
+msgstr "Spesielle valg"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+
+#: backend/fujitsu.c:3768
+#, fuzzy, no-c-format
+msgid "Staple detection"
+msgstr "Ingen korrigering"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr ""
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+
+#: backend/fujitsu.c:3809
+#, fuzzy, no-c-format
+msgid "Dropout color"
+msgstr "Lampe på"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+
+#: backend/fujitsu.c:3833
+#, no-c-format
+msgid "Buffer mode"
+msgstr ""
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr ""
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr ""
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr ""
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+
+#: backend/fujitsu.c:3911
+#, fuzzy, no-c-format
+msgid "Off timer"
+msgstr "Lampe av"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+
+#: backend/fujitsu.c:3930
+#, fuzzy, no-c-format
+msgid "Duplex offset"
+msgstr "Lampe av"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr ""
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, fuzzy, no-c-format
+msgid "Green offset"
+msgstr "Lampe av"
+
+#: backend/fujitsu.c:3949
+#, fuzzy, no-c-format
+msgid "Adjust green/red offset"
+msgstr "Lampe av"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, fuzzy, no-c-format
+msgid "Blue offset"
+msgstr "Lampe av"
+
+#: backend/fujitsu.c:3967
+#, fuzzy, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "Kontrast blåkanal"
+
+#: backend/fujitsu.c:3980
+#, no-c-format
+msgid "Low Memory"
+msgstr ""
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+
+#: backend/fujitsu.c:3996
+#, fuzzy, no-c-format
+msgid "Duplex side"
+msgstr "Full skan"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr ""
+
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr ""
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr ""
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
 msgstr ""
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr ""
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+
+#: backend/fujitsu.c:4095
+#, fuzzy, no-c-format
+msgid "Endorser Options"
+msgstr "Spesielle valg"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr ""
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr ""
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr ""
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr ""
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr ""
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr ""
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr ""
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr ""
+
+#: backend/fujitsu.c:4253
+#, fuzzy, no-c-format
+msgid "Endorser direction"
+msgstr "Støyreduksjon"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr ""
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr ""
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr ""
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr ""
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr ""
+
+#: backend/fujitsu.c:4344
+#, fuzzy, no-c-format
+msgid "A3 paper"
+msgstr "Fra papir"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4356
+#, fuzzy, no-c-format
+msgid "B4 paper"
+msgstr "Fra papir"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4368
+#, fuzzy, no-c-format
+msgid "A4 paper"
+msgstr "Fra papir"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4380
+#, fuzzy, no-c-format
+msgid "B5 paper"
+msgstr "Fra papir"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr ""
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr ""
+
+#: backend/fujitsu.c:4429
+#, no-c-format
+msgid "Scanner in power saving mode"
+msgstr ""
+
+#: backend/fujitsu.c:4452
+#, fuzzy, no-c-format
+msgid "Manual feed"
+msgstr "Manuell førfokus"
+
+#: backend/fujitsu.c:4453
+#, fuzzy, no-c-format
+msgid "Manual feed selected"
+msgstr "Manuell førfokus"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr ""
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr ""
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr ""
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr ""
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr ""
+
+#: backend/fujitsu.c:4513
+#, fuzzy, no-c-format
+msgid "Hardware error code"
+msgstr "Skanoppløsning"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr ""
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr ""
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr ""
+
+#: backend/fujitsu.c:4537
+#, fuzzy, no-c-format
+msgid "Imprinter ink level"
+msgstr "Hvitnivå"
+
+#: backend/fujitsu.c:4548
+#, fuzzy, no-c-format
+msgid "Density"
+msgstr "lav densitets utskrift"
+
+#: backend/fujitsu.c:4549
+#, no-c-format
+msgid "Density dial"
+msgstr ""
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, fuzzy, no-c-format
+msgid "Duplex switch"
+msgstr "Full skan"
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, no-c-format
 msgid "Extras"
 msgstr ""
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, no-c-format
-msgid "Threshold curve"
-msgstr ""
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr ""
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
 "instead on hardware lineart."
 msgstr ""
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, no-c-format
 msgid "Disable interpolation"
 msgstr ""
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
 "than the vertical resolution this disables horizontal interpolation."
 msgstr ""
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "Fargestrektegning"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "Kalibrering"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Kvalitets kalibrering"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Kalibrering"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, fuzzy, no-c-format
 msgid "Lamp off time"
 msgstr "Lampe av"
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
 "of 0 means, that the lamp won't be turned off."
 msgstr ""
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, fuzzy, no-c-format
 msgid "Lamp off during scan"
 msgstr "Grov kalibrering"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr ""
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, fuzzy, no-c-format
 msgid "File button"
 msgstr "Vent på knappen"
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr ""
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, fuzzy, no-c-format
 msgid "Power button"
 msgstr "Vent på knappen"
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "Vent på knappen"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, fuzzy, no-c-format
 msgid "Need calibration"
 msgstr "Grov kalibrering"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, fuzzy, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr "Grov kalibrering kun for første skan"
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, fuzzy, no-c-format
 msgid "Buttons"
 msgstr "Knappstatus"
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, fuzzy, no-c-format
 msgid "Calibrate"
 msgstr "Kalibrering"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, fuzzy, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "Grov kalibrering"
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, fuzzy, no-c-format
 msgid "Clear calibration"
 msgstr "Grov kalibrering"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, fuzzy, no-c-format
 msgid "Clear calibration cache"
 msgstr "Kalibrering"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr ""
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr ""
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr ""
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "Automatisk oppvarming"
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
 "60 seconds warm-up time."
 msgstr ""
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "Full skan"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
 "Don't select the full height. For testing only."
 msgstr ""
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Grov kalibrering"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2449,12 +3177,12 @@ msgid ""
 "are provided. This option is enabled by default. For testing only."
 msgstr ""
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "Grov kalibrering kun for første skan"
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2462,12 +3190,12 @@ msgid ""
 "different with each scan, disable this option. For testing only."
 msgstr ""
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, no-c-format
 msgid "Backtrack lines"
 msgstr ""
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2476,83 +3204,83 @@ msgid ""
 "omitting lines."
 msgstr ""
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Gammaverdi"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr ""
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, fuzzy, no-c-format
 msgid "Geometry Group"
 msgstr "Geometri"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, no-c-format
 msgid "Scan Mode Group"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, no-c-format
 msgid "Scanner model"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, fuzzy, no-c-format
 msgid "Disable gamma correction"
 msgstr "Gamma korreksjon"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, fuzzy, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "Gamma korreksjon"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, fuzzy, no-c-format
 msgid "Disable white shading correction"
 msgstr "Bare utfør skygge-korrigering"
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2560,12 +3288,12 @@ msgid ""
 "avoids depth emulation."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, fuzzy, no-c-format
 msgid "Emulate Grayscale"
 msgstr "Gråskala"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2573,368 +3301,362 @@ msgid ""
 "circumstances."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
 "analyze them."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, fuzzy, no-c-format
 msgid "Reset chipset"
 msgstr "Raskt skan"
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, fuzzy, no-c-format
 msgid "Information"
 msgstr "Se bort fra kalibrering"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, fuzzy, no-c-format
 msgid "Chipset name"
 msgstr "Filnavn"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Unknown"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, fuzzy, no-c-format
 msgid "Shows the chipset ID"
 msgstr "Raskt skan"
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, fuzzy, no-c-format
 msgid "Scan counter"
 msgstr "Skankilde"
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, fuzzy, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr "Velger rammenummer å skanne"
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, fuzzy, no-c-format
 msgid "Update information"
 msgstr "Spesielle valg"
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, fuzzy, no-c-format
 msgid "offset X"
 msgstr "Lampe av"
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, fuzzy, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr "venstre topp x posisjon av skan-areal"
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, fuzzy, no-c-format
 msgid "offset Y"
 msgstr "Lampe av"
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, fuzzy, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr "venstre topp x posisjon av skan-areal"
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr ""
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr ""
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr ""
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, fuzzy, no-c-format
 msgid "TMA Slides"
 msgstr "Treigest"
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, fuzzy, no-c-format
 msgid "TMA Negatives"
 msgstr "Negativ"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, fuzzy, no-c-format
 msgid "Color (48 bits)"
 msgstr "Farge 48"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, fuzzy, no-c-format
 msgid "Extend lamp timeout"
 msgstr "Lampe av"
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr ""
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr "Vent på knappen"
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, fuzzy, no-c-format
 msgid "Waits for button before scanning"
 msgstr "Varm opp lampen før skanning"
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, fuzzy, no-c-format
 msgid "Advanced Options"
 msgstr "Spesielle valg"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr "Grov"
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr "Fin"
 
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr ""
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr "Valgfri"
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "Automatisk"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr ""
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr ""
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr ""
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "NTSC-grå"
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr "XPA-grå"
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "Treig"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr ""
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "Rask"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr ""
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr ""
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr ""
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr ""
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr ""
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, fuzzy, no-c-format
 msgid "Film-strip"
 msgstr "Filmtype"
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr ""
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr ""
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, no-c-format
 msgid "Experiment"
 msgstr ""
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, fuzzy, no-c-format
 msgid "Sharpening"
 msgstr "Skarphet"
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr ""
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr ""
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr ""
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr ""
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr ""
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr ""
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, fuzzy, no-c-format
 msgid "Unloads the media after a scan."
 msgstr "Last bildet som gråskala"
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, fuzzy, no-c-format
 msgid "Change document"
 msgstr "Forbedring"
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr ""
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr ""
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr ""
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, fuzzy, no-c-format
 msgid "Start calibration process."
 msgstr "Grov kalibrering"
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, fuzzy, no-c-format
 msgid "Media"
 msgstr "Middels"
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr ""
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr ""
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -2943,1448 +3665,1434 @@ msgid ""
 "value."
 msgstr ""
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, fuzzy, no-c-format
 msgid "Color Matrix"
 msgstr "Fargemønster"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, fuzzy, no-c-format
 msgid "Set the scanners color matrix."
 msgstr "Kontrast rødkanal"
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr ""
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, fuzzy, no-c-format
 msgid "Mono Color Matrix"
 msgstr "Fargemønster"
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr ""
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, fuzzy, no-c-format
 msgid "Mirror horizontal"
 msgstr "Speilbilde"
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, fuzzy, no-c-format
 msgid "Mirror image horizontally."
 msgstr "Speilbilde"
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, fuzzy, no-c-format
 msgid "Mirror vertical"
 msgstr "Speilbilde"
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, fuzzy, no-c-format
 msgid "Mirror image vertically."
 msgstr "Speilbilde"
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, fuzzy, no-c-format
 msgid "Update options"
 msgstr "Spesielle valg"
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, fuzzy, no-c-format
 msgid "Update options."
 msgstr "Spesielle valg"
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr ""
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr ""
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr ""
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr ""
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr ""
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr "Slå av skanner lampen."
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "Papirstørrelse"
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr ""
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, fuzzy, no-c-format
 msgid "Landscape"
 msgstr "A5 landskap"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr ""
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, no-c-format
 msgid "Length control mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, fuzzy, no-c-format
 msgid "Manual feed mode"
 msgstr "Manuell førfokus"
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, fuzzy, no-c-format
 msgid "Manual feed timeout"
 msgstr "Manuell førfokus"
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr ""
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr "Fysisk størrelse av papir i ADF"
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, no-c-format
 msgid "halftone"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, fuzzy, no-c-format
 msgid "color"
 msgstr "Farge"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, no-c-format
 msgid "continuous"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, no-c-format
 msgid "off"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, no-c-format
 msgid "bayer_64"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, no-c-format
 msgid "bayer_16"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, no-c-format
 msgid "halftone_32"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, no-c-format
 msgid "halftone_64"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, no-c-format
 msgid "diffusion"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, no-c-format
 msgid "normal"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, no-c-format
 msgid "light"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, fuzzy, no-c-format
 msgid "From scanner"
 msgstr "Fra papir"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr "Fra papir"
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, fuzzy, no-c-format
 msgid "default"
 msgstr "Standard"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, no-c-format
 msgid "smooth"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, fuzzy, no-c-format
 msgid "low"
 msgstr "Treig"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, fuzzy, no-c-format
 msgid "medium"
 msgstr "Middels"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, fuzzy, no-c-format
 msgid "red"
 msgstr "Rød"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, fuzzy, no-c-format
 msgid "green"
 msgstr "Grønn"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, fuzzy, no-c-format
 msgid "Sets the scan source"
 msgstr "Skankilde"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, fuzzy, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "Velger måten å foreta gamma korreksjon på"
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
 "reduction and image emphasis"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "Støyreduksjon"
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, fuzzy, no-c-format
 msgid "Lamp color"
 msgstr "Lampe på"
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, fuzzy, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "Speilbilde"
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
 "length of actual paper or logical document length."
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "Gamma korreksjon"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, fuzzy, no-c-format
 msgid "High sensivity"
 msgstr "Høy densitets utskrift"
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, fuzzy, no-c-format
 msgid "Low sensivity"
 msgstr "lav densitets utskrift"
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, no-c-format
 msgid "err_diffusion"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, fuzzy, no-c-format
 msgid "No detection"
 msgstr "Ingen korrigering"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, fuzzy, no-c-format
 msgid "Normal mode"
 msgstr "Skanhastighet"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, fuzzy, no-c-format
 msgid "Enhanced mode"
 msgstr "Forbedring"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
 "divides long paper by the length which is set in Document Size option."
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, fuzzy, no-c-format
 msgid "Automatic threshold mode"
 msgstr "Automatisk oppvarming"
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, fuzzy, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr "Velger måten å foreta gamma korreksjon på"
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, no-c-format
 msgid "Set chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, fuzzy, no-c-format
 msgid "chroma of blue"
 msgstr "Skygge for blå"
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, fuzzy, no-c-format
 msgid "Set chroma of blue"
 msgstr "Skygge for blå"
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr "Diamant"
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr ""
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr ""
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr ""
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr ""
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr ""
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr ""
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, fuzzy, no-c-format
 msgid "Gray gain"
 msgstr "Grønn"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, fuzzy, no-c-format
 msgid "Sets gray channel gain"
 msgstr "Kontrast grønnkanal"
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, fuzzy, no-c-format
 msgid "Red gain"
 msgstr "Rødbalanse"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, fuzzy, no-c-format
 msgid "Sets red channel gain"
 msgstr "Kontrast rødkanal"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, fuzzy, no-c-format
 msgid "Green gain"
 msgstr "Grønn"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, fuzzy, no-c-format
 msgid "Sets green channel gain"
 msgstr "Kontrast grønnkanal"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, fuzzy, no-c-format
 msgid "Blue gain"
 msgstr "Blå"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, fuzzy, no-c-format
 msgid "Sets blue channel gain"
 msgstr "Kontrast blåkanal"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr ""
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr ""
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr ""
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr ""
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr ""
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr ""
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr ""
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr ""
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr ""
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr ""
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr "Lav"
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr "Middels"
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr "Høy"
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr ""
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "En side"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "Alle sider"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr ""
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr "Gråskala 4 bits"
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr "Gråskala 8 bits"
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr ""
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr "Spesielle valg"
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr "Fargebalanse"
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr ""
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr ""
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr ""
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr ""
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr ""
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid ""
 "If checked the color calibration before a scan is done by the backend"
 msgstr ""
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr ""
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr ""
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "Kvalitetsskan"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr "Høyest kvalitet men laver hastighet"
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "Raskt skan"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr "Høyest hastighet men lavest kvalitet"
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr ""
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
 "for the threshold."
 msgstr ""
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr "Velger måten å foreta gamma korreksjon på"
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr ""
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr "Bruk samme gamma verdi for alle farge kanalene"
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr ""
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr ""
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr ""
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr ""
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr ""
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr ""
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr ""
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr ""
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
 msgstr ""
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr ""
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr ""
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr ""
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr ""
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr ""
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr ""
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr ""
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr ""
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr "Rødbalanse"
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr ""
 "Balansefaktor for rødt. Med en verdi på 100 % menes ingen korreksjon"
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr "Grønnbalanse"
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr ""
 "Balansefaktor for grønt. Med en verdi på 100% menes ingen korreksjon"
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr "Blåbalanse"
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr ""
 "Balansefaktor for blått. Med en verdi på 100% menes ingen korreksjon"
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr ""
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr ""
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "Treigest"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "Treigere"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "Raskere"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "Raskest"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr "8x8 grov"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr ""
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr "8x8 fin"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr "8x8 veldig fin"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr ""
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr "5x5 grov"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr "5x5 fin"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr "4x4 grov"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr ""
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr "4x4 fin"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr ""
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr ""
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr "8x8 valgfri"
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr "6x6 valgfri"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr "5x5 valgfri"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr "4x4 valgfri"
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr "3x3 valgfri"
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr "2x2 valgfri"
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr ""
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr ""
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
 "This may be a non-color mode or a low resolution mode."
 msgstr ""
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, fuzzy, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr "Varmopp lampe"
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr ""
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, fuzzy, no-c-format
 msgid "Turn lamp off"
 msgstr "Lampe av"
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr ""
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr ""
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, fuzzy, no-c-format
 msgid "Green brightness"
 msgstr "Grønnbalanse"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr ""
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "Kontrast rødkanal"
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "Kontrast grønnkanal"
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "Kontrast blåkanal"
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr "Farge 48"
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr "Farge 24"
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr "Grå 16"
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr "Grå 8"
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, fuzzy, no-c-format
 msgid "Positive"
 msgstr "Lysbilde Film"
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
 "40 seconds warm-up time."
 msgstr ""
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, fuzzy, no-c-format
 msgid "Negative color"
 msgstr "Negativ Film"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, fuzzy, no-c-format
 msgid "Negative gray"
 msgstr "Negativ"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, no-c-format
 msgid "48 bits color"
 msgstr ""
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
 "mode and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4392,260 +5100,251 @@ msgid ""
 "cancel, press \"GRAY\" button."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:143
-#, no-c-format
-msgid "Gamma function exponent"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:144
-#, no-c-format
-msgid "Changes intensity of midtones"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:232
 #, fuzzy, no-c-format
 msgid "Update button state"
 msgstr "Knappstatus"
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:244
 #, fuzzy, no-c-format
 msgid "Button 1"
 msgstr "Knappstatus"
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:258
 #, fuzzy, no-c-format
 msgid "Button 2"
 msgstr "Knappstatus"
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr ""
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr ""
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr ""
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr ""
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr ""
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr ""
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, fuzzy, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "Grov kalibrering"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr ""
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, fuzzy, no-c-format
 msgid "Calibration data cache"
 msgstr "Kalibrering"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr ""
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, fuzzy, no-c-format
 msgid "Performs calibration"
 msgstr "Grov kalibrering"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr ""
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr ""
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, fuzzy, no-c-format
 msgid "Warmup-time"
 msgstr "Varmopp lampe"
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, fuzzy, no-c-format
 msgid "Warmup-time in seconds."
 msgstr "Varmopp lampe"
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, fuzzy, no-c-format
 msgid "Lampoff-time"
 msgstr "Lampe av"
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, fuzzy, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr "Varmopp lampe"
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, no-c-format
 msgid "Analog frontend"
 msgstr ""
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, fuzzy, no-c-format
 msgid "Red offset"
 msgstr "Lampe av"
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, fuzzy, no-c-format
-msgid "Green offset"
-msgstr "Lampe av"
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, fuzzy, no-c-format
-msgid "Blue offset"
-msgstr "Lampe av"
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, fuzzy, no-c-format
 msgid "Red lamp off"
 msgstr "Lampe av"
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, fuzzy, no-c-format
 msgid "Green lamp off"
 msgstr "Lampe av"
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, fuzzy, no-c-format
 msgid "Blue lamp off"
 msgstr "Lampe av"
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr ""
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr "Farge 36"
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr ""
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr ""
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr ""
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr "Valg av kilde"
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr ""
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr ""
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr "Last bildet som gråskala"
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr "Trepass simulering"
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
 "kicks, it returns green, then blue, then red."
 msgstr ""
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr "HÃ¥ndskanner simulering"
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4653,205 +5352,202 @@ msgid ""
 "option allows one to test whether a frontend can handle this correctly."
 msgstr ""
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid ""
 "Set default values for enhancement controls (brightness & contrast)."
 msgstr ""
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr ""
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr ""
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr ""
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr "Status Kode Simulering"
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr "Ikke fremtving status kode"
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr ""
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr ""
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr ""
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr ""
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr ""
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr ""
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr ""
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr ""
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
 "after sane_read() has been called."
 msgstr ""
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr ""
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr "Lampe på"
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr "Slå på skanner lampen"
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr "Lampe av"
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr "Slå av skanner lampen"
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, fuzzy, no-c-format
 msgid "Lamp timeout"
 msgstr "Lampe av"
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr ""
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr "Dokumentmater"
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr ""
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr ""
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr ""
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr ""
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr ""
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr ""
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -4861,148 +5557,148 @@ msgid ""
 "frontends may stop responding to X events and your system could bog down."
 msgstr ""
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr ""
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr ""
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, fuzzy, no-c-format
 msgid "Focus point for scanning."
 msgstr "Løs ut dokoment etter skanning"
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
 "combination of speed and detail."
 msgstr ""
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr ""
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
 "like."
 msgstr ""
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr ""
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, fuzzy, no-c-format
 msgid "Frame to be scanned"
 msgstr "Fra papir"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, no-c-format
 msgid "Focus-mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, fuzzy, no-c-format
 msgid "Auto or manual focus"
 msgstr "Automatisk utløsning"
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, fuzzy, no-c-format
 msgid "Focus-point"
 msgstr "Fokuseringposisjon"
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, fuzzy, no-c-format
 msgid "Focus point"
 msgstr "Fokuseringposisjon"
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr ""
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr ""
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr ""
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr "Farge RAW"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr "Farge RGB"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr "Farge RGB TEKST"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr ""
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr ""
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr "Fargemønster"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr ""
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr ""
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr ""
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
 "display it"
 msgstr ""
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr ""
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5011,46 +5707,46 @@ msgid ""
 "option also enables a fixed width of 11 cm."
 msgstr ""
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr ""
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
 "transmitted."
 msgstr ""
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr ""
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr ""
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
 "after 10 scans."
 msgstr ""
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr ""
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr ""
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5061,12 +5757,12 @@ msgid ""
 "square."
 msgstr ""
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr ""
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5074,54 +5770,54 @@ msgid ""
 "uses the correct endianness."
 msgstr ""
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr ""
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr ""
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
 msgstr ""
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr ""
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr ""
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr ""
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
 msgstr ""
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr ""
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
@@ -5129,95 +5825,95 @@ msgid ""
 "frontend handles them."
 msgstr ""
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr ""
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr ""
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr ""
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
 "before sane_start()."
 msgstr ""
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr ""
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr ""
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
 "data."
 msgstr ""
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr ""
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
 "frontends to view and modify all the different SANE option types."
 msgstr ""
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr ""
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr ""
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr ""
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr ""
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
 "advanced) capabilities. That's just a normal bool option."
 msgstr ""
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr ""
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
@@ -5225,12 +5921,12 @@ msgid ""
 "frontend but by the user (e.g. by pressing a button at the device)."
 msgstr ""
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr ""
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5238,36 +5934,36 @@ msgid ""
 "by pressing a button at the device) and can't be read by the frontend."
 msgstr ""
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr ""
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
 "That means the option is read-only."
 msgstr ""
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr ""
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
 "(and advanced) capabilities."
 msgstr ""
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr ""
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5275,299 +5971,299 @@ msgid ""
 "backend."
 msgstr ""
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr ""
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr ""
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr ""
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr ""
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
 "is 4, maximum 192, and quant is 2."
 msgstr ""
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr ""
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr ""
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
 "constraints."
 msgstr ""
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr ""
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
 "constraint. Minimum is 4, maximum 192, and quant is 2."
 msgstr ""
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr ""
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
 "list constraint."
 msgstr ""
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr ""
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr ""
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr ""
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr ""
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
 "Minimum is -42.17, maximum 32767.9999, and quant is 2.0."
 msgstr ""
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr ""
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr ""
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr ""
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr ""
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr ""
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr ""
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr ""
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
 "entries..."
 msgstr ""
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr ""
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr ""
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr ""
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, no-c-format
 msgid "Color 36"
 msgstr "Farge 36"
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr "Bruk Bilde Komposisjon"
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr "Tonivå svart og hvitt (strektegningmodus)"
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr ""
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr "Flernivå svart og hvitt (gråskalamodus)"
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr "Flernivå RGB farge (en omgangs farge)"
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr "Se bort fra kalibrering"
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr ""
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr "Ikke kalibrer fokus"
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr "Manuell førfokus"
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr ""
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr ""
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr ""
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr ""
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr ""
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr ""
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr ""
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr ""
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr ""
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr ""
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr ""
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr ""
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, fuzzy, no-c-format
 msgid "Gray offset"
 msgstr "Lampe av"
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, fuzzy, no-c-format
 msgid "Sets gray channel offset"
 msgstr "Kontrast grønnkanal"
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, fuzzy, no-c-format
 msgid "Sets red channel offset"
 msgstr "Kontrast rødkanal"
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, fuzzy, no-c-format
 msgid "Sets green channel offset"
 msgstr "Kontrast grønnkanal"
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, fuzzy, no-c-format
 msgid "Sets blue channel offset"
 msgstr "Kontrast blåkanal"
diff --git a/po/nl.gmo b/po/nl.gmo
new file mode 100644
index 0000000..78ec2e1
--- /dev/null
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index 39c40ff..98c8aef 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,429 +4,421 @@
 # Martin Kho <mkho@xs4all.nl>, 2003, 2009.
 # Bertrik Sikken <bertrik@zonnet.nl>, 2003.
 # Martin Kho <mdlkho@gmail.com>, 2010.
-# Martin Kho <mkho@dds.nl>, 2011, 2012, 2013, 2015.
+# Martin Kho <mkho@dds.nl>, 2011, 2012, 2013, 2015, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends.nl\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-24 23:43+0200\n"
-"PO-Revision-Date: 2015-09-28 15:48+0200\n"
-"Last-Translator: Martin Kho <mkho@dds.nl>\n"
-"Language-Team: American English <sane-devel@lists.alioth.debian.org>\n"
-"Language: nl_NL\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
+"PO-Revision-Date: 2017-05-19 17:02+0100\n"
+"Last-Translator: Martin Kho <mkho@posteo.net>\n"
+"Language-Team: English <kde-i18n-doc@kde.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr "Aantal opties"
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr "Standaard"
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "Kleurverbetering"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "Gevorderd"
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr "Sensoren"
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "Voorbeeldscan"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr "Dwing monochroom voorbeeldscan"
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr "Bitdiepte"
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Scanmodus"
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "Scansnelheid"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr "Scanbron"
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr "Dwing \"backtracking\""
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "Linksboven x"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "Linksboven y"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "Rechtsonder x"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "Rechtsonder y"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Scanresolutie"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "X-resolutie"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Y-resolutie"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr "Pagina breedte"
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, no-c-format
 msgid "Page height"
 msgstr "Pagina hoogte"
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr "Gebruik door de gebruiker gedefinieerde gammatabel"
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr "Beeldintensiteit"
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr "Rode intensiteit"
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr "Groene intensiteit"
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr "Blauwe intensiteit"
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr "Helderheid"
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "Contrast"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr "Korrelgrootte"
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr "Halftoonmodus"
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "Zwartwaarde"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "Witwaarde"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr "Witwaarde voor rood"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
-msgstr ""
-"Witwaarde "
-"voor groen"
+msgstr "Witwaarde voor groen"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr "Witwaarde voor blauw"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "Schaduw"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr "Schaduw voor rood"
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr "Schaduw voor groen"
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr "Schaduw voor blauw"
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr "Lichteffect"
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr "Lichteffect voor rood"
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr "Lichteffect voor groen"
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr "Lichteffect voor blauw"
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr "Tint"
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr "Kleurverzadiging"
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr "Grootte van het halftoonpatroon"
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "Halftoonpatroon"
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr "Combineer X- en Y-resolutie"
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "Negatief"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "Kwaliteit kalibreren"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr "Dubbele optische resolutie"
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr "Combineer RGB"
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr "Drempelwaarde"
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr "Analoge gammacorrectie"
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr "Analoge gammawaarde rood"
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr "Analoge gammawaarde groen"
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr "Analoge gammawaarde blauw"
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr "Combineer analoge gammawaarde"
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr "Lamp opwarmen"
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr "Belichtingstijd kalibreren"
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr "Belichtingstijd kalibreren voor rood"
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr "Belichtingstijd kalibreren voor groen"
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr "Belichtingstijd kalibreren voor blauw"
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr "Belichtingstijd voor het scannen"
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr "Belichtingstijd voor het scannen van rood"
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr "Belichtingstijd voor het scannen van groen"
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr "Belichtingstijd voor het scannen van blauw"
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr "Stel belichtingstijd in"
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr "Lichtwaarde kalibreren"
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr "Lichtwaarde bij het scannen"
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr "Stel lichtwaarde in"
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr "Lamp aan het einde uitschakelen"
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
@@ -434,49 +426,49 @@ msgid ""
 msgstr ""
 "Alleen-lezen optie, die aangeeft hoeveel opties een apparaat ondersteunt."
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "Opties voor bron, modus en resolutie"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr "Opties voor scanoppervlak en origineelgrootte"
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, no-c-format
 msgid "Image modification options"
 msgstr "Opties voor beeldaanpassing"
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, no-c-format
 msgid "Hardware specific options"
 msgstr "Hardware specifieke opties"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr "Scannersensoren en -knoppen"
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr "Verzoek om een scan in voorbeeldkwaliteit."
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
 "scanner this cuts down the number of passes to one and on a one-pass "
 "scanner, it reduces the memory requirements and scan-time of the preview."
 msgstr ""
-"Legt vast dat alle voorbeeldscans in grijswaardemodus worden "
-"uitgevoerd. Bij een Three-Pass-Scanner is daardoor slechts één doorgang "
-"nodig, bij een Single-Pass-Scanner wordt het geheugengebruik en de "
-"scantijd verminderd."
+"Legt vast dat alle voorbeeldscans in grijswaardemodus worden uitgevoerd. "
+"Bij een Three-Pass-Scanner is daardoor slechts één doorgang nodig, bij "
+"een Single-Pass-Scanner wordt het geheugengebruik en de scantijd "
+"verminderd."
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
@@ -485,62 +477,62 @@ msgstr ""
 "Aantal bits per kleurwaarde, typische waarden zijn 1 voor zwart/wit en 8 "
 "voor multibit-scans."
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr "Kiest de scanmodus (b.v. zwart/wit, monochroom of kleur)."
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr "Bepaald de snelheid waarmee wordt gescand."
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr "Selecteert de scanbron (zoals b.v. een documentendoorvoer)."
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr "Regelt dat \"backtracking\" wordt gebruikt."
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "Linksboven x positie van het scanoppervlak."
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "Linksboven y positie van het scanoppervlak."
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "Rechtsonder x positie van het scanoppervlak."
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "Rechtsonder y positie van het scanoppervlak."
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr "Stelt de resolutie in van het gescande beeld."
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr "Stelt de horizontale resolutie in van het gescande beeld."
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr "Stelt de verticale resolutie in van het gescande origineel."
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
@@ -549,19 +541,20 @@ msgstr ""
 "Bepaalt de breedte van het origineel. Nodig om doorvoerscans automatisch "
 "te kunnen centreren."
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, no-c-format
 msgid "Specifies the height of the media."
 msgstr "Bepaalt de hoogte van het origineel."
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
-msgid "Determines whether a builtin or a custom gamma-table should be used."
+msgid ""
+"Determines whether a builtin or a custom gamma-table should be used."
 msgstr ""
 "Bepaalt of de interne of de door de gebruiker gedefinieerde gammatabel "
 "wordt gebruikt."
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -569,35 +562,35 @@ msgid ""
 "gamma table)."
 msgstr ""
 "Gammacorrectietabel. In kleurmodus beïnvloedt deze optie tegelijkertijd "
-"de rode, groene en blauwe kleurcomponenten. (d.w.z. Het is een helderheids-"
-"gammatabel)."
+"de rode, groene en blauwe kleurcomponenten. (d.w.z. Het is een "
+"helderheids-gammatabel)."
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr "Gammacorrectietabel voor de rode component."
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr "Gammacorrectietabel voor de groene component."
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr "Gammacorrectietabel voor de blauwe component."
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr "Regelt de helderheid van het verkregen beeld."
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr "Regelt het contrast van het verkregen beeld."
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
@@ -606,84 +599,89 @@ msgstr ""
 "Bepaalt de \"gekorreldheid\" van het verkregen beeld. Kleine waarden "
 "zorgen voor een scherper beeld."
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr "Bepaalt of een halftoon beeld (dithered) wordt verkregen."
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
-msgstr "Bepaalt welke helderheidswaarde als \"zwart\" moet worden beschouwd."
+msgstr ""
+"Bepaalt welke helderheidswaarde als \"zwart\" moet worden beschouwd."
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr "Bepaalt welke helderheidswaarde als \"wit\" moet worden beschouwd."
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr ""
 "Bepaalt welke rode helderheidswaarde als \"wit\" moet worden beschouwd."
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr ""
 "Bepaalt welke groene helderheidswaarde als \"wit\" moet worden beschouwd."
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr ""
 "Bepaalt welke blauwe helderheidswaarde als \"wit\" moet worden beschouwd."
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr ""
 "Bepaalt welke rode helderheidswaarde als \"zwart\" moet worden beschouwd."
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr ""
-"Bepaalt welke groene helderheidswaarde als \"zwart\" moet worden beschouwd."
+"Bepaalt welke groene helderheidswaarde als \"zwart\" moet worden "
+"beschouwd."
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr ""
-"Bepaalt welke blauwe helderheidswaarde als \"zwart\" moet worden beschouwd."
+"Bepaalt welke blauwe helderheidswaarde als \"zwart\" moet worden "
+"beschouwd."
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr ""
 "Bepaalt welke rode helderheidswaarde als \"verzadigd rood\" moet worden "
 "beschouwd."
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
-msgid "Selects what green radiance level should be considered \"full green\"."
+msgid ""
+"Selects what green radiance level should be considered \"full green\"."
 msgstr ""
-"Bepaalt welke groene helderheidswaarde als \"verzadigd groen\" moet worden "
-"beschouwd."
+"Bepaalt welke groene helderheidswaarde als \"verzadigd groen\" moet "
+"worden beschouwd."
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
-msgid "Selects what blue radiance level should be considered \"full blue\"."
+msgid ""
+"Selects what blue radiance level should be considered \"full blue\"."
 msgstr ""
-"Bepaalt welke blauwe helderheidswaarde als \"verzadigd blauw\" moet worden "
-"beschouwd."
+"Bepaalt welke blauwe helderheidswaarde als \"verzadigd blauw\" moet "
+"worden beschouwd."
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr "Regelt de \"tint\" (blauwwaarde) van het verkregen beeld."
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
@@ -692,12 +690,12 @@ msgstr ""
 "De verzadigingsgraad bepaalt de \"kleuring\" van een met een camera "
 "opgenomen beeld. Hogere waarden zorgen voor een sterkere kleuring."
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr "De bestandsnaam van het te scannen beeld."
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
@@ -706,295 +704,297 @@ msgstr ""
 "Stelt het halftoon patroon (dithering) in dat wordt gebruikt om halftoon "
 "beelden te scannen."
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
 msgstr ""
-"Definieert het halftoon patroon (dithering) waarmee halftoon beelden worden "
-"gescand."
+"Definieert het halftoon patroon (dithering) waarmee halftoon beelden "
+"worden gescand."
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr "Gebruik dezelfde waarden voor X en Y resoluties."
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr "Verwissel zwart en wit (inverteren)."
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr "Voer een kwaliteit wit-kalibratie uit"
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr "Gebruik de lens waarmee de optische resolutie wordt verdubbeld."
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr "Gebruik in RGB-modus voor alle kleuren dezelfde waarden"
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr "Kiest de minimale helderheid waarmee witte punt wordt verkregen"
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr "Analoge gammacorrectie"
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr "Analoge gammacorrectie voor rood"
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr "Analoge gammacorrectie voor groen"
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr "Analoge gammacorrectie voor blauw"
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr "Warm de lamp op alvorens te scannen"
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr "Bepaal de belichtingstijd voor de kalibratie"
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr "Bepaal de belichtingstijd voor de kalibratie van de rode component"
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
-msgstr "Bepaal de belichtingstijd voor de kalibratie van de groene component"
+msgstr ""
+"Bepaal de belichtingstijd voor de kalibratie van de groene component"
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
-msgstr "Bepaal de belichtingstijd voor de kalibratie van de blauwe component"
+msgstr ""
+"Bepaal de belichtingstijd voor de kalibratie van de blauwe component"
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr "Bepaal de belichtingstijd voor de scan"
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr "Bepaal de belichtingstijd voor de scan van de rode component"
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr "Bepaal de belichtingstijd voor de scan van de groene component"
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr "Bepaal de belichtingstijd voor de scan van de blauwe component"
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr "Schakelt de instelling van de belichtingstijd in"
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr "Bepaal de lichthoeveelheid waarmee wordt gekalibreerd"
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr "Bepaal de lichthoeveelheid waarmee wordt gescand"
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr "Schakelt de instelling van de lichthoeveelheid in"
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr "Schakel de lamp uit als het programma wordt verlaten"
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, no-c-format
 msgid "Scan button"
 msgstr "Scan-knop"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, no-c-format
 msgid "Email button"
 msgstr "E-mail-knop"
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, no-c-format
 msgid "Fax button"
 msgstr "Fax-knop"
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, no-c-format
 msgid "Copy button"
 msgstr "Kopieer-knop"
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr "PDF-knop"
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr "Annuleer-knop"
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr "Pagina geladen"
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, no-c-format
 msgid "Cover open"
 msgstr "Deksel open"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "Kleur"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr "Kleur lijntekening"
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr "Kleur Halftoon"
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "Grijs"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr "Halftoon"
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "Lijntekening"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr "Succes"
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, no-c-format
 msgid "Operation not supported"
 msgstr "Handeling niet ondersteund"
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr "Handeling was geannuleerd"
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr "Apparaat is bezet"
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr "Ongeldige waarde"
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr "Eind van bestand bereikt"
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, no-c-format
 msgid "Document feeder jammed"
 msgstr "Opstopping in documentendoorvoer"
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, no-c-format
 msgid "Document feeder out of documents"
 msgstr "Documentendoorvoer leeg"
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, no-c-format
 msgid "Scanner cover is open"
 msgstr "Deksel van de scanner is open"
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr "Fout tijdens apparaat I/O"
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr "Geheugen vol"
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr "Toegang tot bron is geweigerd"
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr "Lamp niet klaar, probeer opnieuw"
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr "Scannerwagen geblokkeerd (in transportstand)"
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "Standaardinstellingen"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr "Stel standaardwaarden in om verbeteropties te krijgen."
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "Kalibreren"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr "Voor de volgende scan kalibreren"
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
@@ -1004,12 +1004,12 @@ msgstr ""
 "gekalibreerd. Anders wordt de scanner alleen voor de eerste scan "
 "gekalibreerd."
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr "Voer alleen een schaduwcorrectie uit"
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -1021,1058 +1021,1054 @@ msgstr ""
 "belichtingstijd bepaald door de hardware of het configuratiebestand, "
 "worden gebruikt."
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr "Status van de knop"
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr "Nummer van het te scannen scannerraam"
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr "Kiest het nummer van het te scannen scannerraam"
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, no-c-format
 msgid "Duplex scan"
 msgstr "Dubbelzijdige scan"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
-msgid "Duplex scan provide a scan of the front and back side of the document"
+msgid ""
+"Duplex scan provide a scan of the front and back side of the document"
 msgstr "Dubbelzijdige scan scant beide zijden van een document"
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr "Kalibreer scanner"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr "Dwing te kalibreren voor het scannen"
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr "Grijstrapscan"
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr "Voer een grijstrap-, in plaats van een kleurenscan uit"
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr "Analoog bereik"
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr "Vergroot of verklein het analoge bereik van de CCD-sensor"
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "Gammacorrectie"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr "Kiest de gamma gecorrigeerde overdrachtscurve"
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr "Ongecomprimeerd"
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr "Fraaie kleuren"
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, no-c-format
 msgid "No transparency correction"
 msgstr "Ongecorrigeerde transparantie"
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr "Correctie op basis van filmtype"
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr "Correctie op basis van de transparantieverhouding"
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, no-c-format
 msgid "Negatives"
 msgstr "Negatieven"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, no-c-format
 msgid "Slides"
 msgstr "Dia's"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, no-c-format
 msgid "Normal speed"
 msgstr "Standaard snelheid"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/2 normal speed"
 msgstr "1/2 van de standaard snelheid"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/3 normal speed"
 msgstr "1/3 van de standaard snelheid"
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, no-c-format
 msgid "rounded parameter"
 msgstr "Afgeronde parameter"
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr "onbekend"
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, no-c-format
 msgid "ADF jam"
 msgstr "Opstopping in automatische documentinvoer"
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr "Deksel van automatische documentinvoer open"
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, no-c-format
 msgid "lamp failure"
 msgstr "lampfalen"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr "fout in positionering van scannerkop"
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr "fout bij controle van processor"
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr "fout bij controle van het RAM geheugen"
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr "fout bij controle van het ROM geheugen"
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr "fout bij controle van de hardware"
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, no-c-format
 msgid "transparency unit lamp failure"
 msgstr "lampfalen van de transparanten eenheid"
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
-msgstr "fout in de positionering van de scannerkop in de transparanten eenheid"
+msgstr ""
+"fout in de positionering van de scannerkop in de transparanten eenheid"
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr "fout in de lengte van de parameterlijst"
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr "ongeldige opdrachtcode"
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr "ongeldig veld in CDB"
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr "niet-ondersteunde LUN"
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr "ongeldig veld in de parameterlijst"
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr "fout in volgorde van de opdrachten"
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr "te veel vensters gespecificeerd"
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr "medium niet aanwezig"
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr "ongeldig onderdeel in IDENTIFY boodschap"
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr "optie onjuist"
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr "scanner aan reset / scannerinterface reset"
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr "parameter gewijzigd door een andere initiator"
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr "geen zinvolle, aanvullende informatie"
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr "opnieuw kiezen mislukt"
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr "fout in SCSI pariteit"
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr "Door initiator gesignaleerde foutboodschap ontvangen"
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr "ongeldige boodschap fout"
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr "timeout"
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, no-c-format
 msgid "transparency unit shading error"
 msgstr "fout in de afscherming van de transparantie-eenheid "
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr "lamp niet gestabiliseerd"
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, no-c-format
 msgid "film scanner"
 msgstr "Filmscanner"
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr "Flatbedscanner"
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr "Filmtype"
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr "Selecteert het filmtype, bijvoorbeeld negatieven of dia's"
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, no-c-format
 msgid "Negative film type"
 msgstr "Negatief filmtype"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, no-c-format
 msgid "Selects the negative film type"
 msgstr "Selecteert het negatief filmtype"
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, no-c-format
 msgid "Hardware resolution"
 msgstr "Hardware resolutie"
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "Gebruik alleen hardware resoluties"
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr "Focus"
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, no-c-format
 msgid "Auto focus"
 msgstr "Autofocus"
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, no-c-format
 msgid "Enable/disable auto focus"
 msgstr "Aan/uit schakelen van autofocus"
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr "Eén keer autofocus"
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr "Voer alleen een autofocus uit tussen uitworpen"
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, no-c-format
 msgid "Manual focus position"
 msgstr "Handmatige focuspositie"
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
-msgstr "Stel de optische focus van de scanner handmatig in (standaard: 128)"
+msgstr ""
+"Stel de optische focus van de scanner handmatig in (standaard: 128)"
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr "Scanmarges"
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr "Extra kleuraanpassingen"
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "Spiegel het beeld"
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "Spiegel het beeld horizontaal"
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, no-c-format
 msgid "Auto exposure"
 msgstr "Automatische belichting"
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr "Schakel de automatische belichtingsoptie aan/uit"
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, no-c-format
 msgid "Calibration now"
 msgstr "Kalibreer nu"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Voer kalibratie *NU* uit"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr "Zelftest"
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr "Voer de zelftest van de scanner uit"
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, no-c-format
 msgid "Reset scanner"
 msgstr "Reset scanner"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, no-c-format
 msgid "Reset the scanner"
 msgstr "Reset de scanner"
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr "Gemiddeld gebruik"
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, no-c-format
 msgid "Eject film after each scan"
 msgstr "Werp de film uit na elke scan"
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr "Werp de film automatisch uit de scanner na elke scan"
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr "Werp de film uit voor het programma wordt verlaten"
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
-msgid "Automatically eject the film from the device before exiting the program"
+msgid ""
+"Automatically eject the film from the device before exiting the program"
 msgstr ""
 "Werp de film automatisch uit de scanner voor het programma wordt verlaten"
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr "Werp de film nu uit"
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr "Werp de film *NU* uit"
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, no-c-format
 msgid "Document feeder extras"
 msgstr "Extra's van de documentendoorvoer"
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, no-c-format
 msgid "Flatbed only"
 msgstr "Alleen flatbed"
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr "Schakel automatische documentinvoer uit en gebruik alleen flatbed"
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, no-c-format
 msgid "Transparency unit"
 msgstr "Transparanteneenheid"
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr "Schakel de transparanteneenheid aan/uit (FAU, film adaptereenheid)"
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, no-c-format
 msgid "Negative film"
 msgstr "Negatief filmtype"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, no-c-format
 msgid "Positive or negative film"
 msgstr "Dia of negatief filmtype"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr "Dichtheidscontrole"
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr "Kies de dichtheidscontrolemodus"
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, no-c-format
 msgid "Transparency ratio"
 msgstr "Transparantieverhouding"
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, no-c-format
 msgid "Select film type"
 msgstr "Selecteert filmtype"
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, no-c-format
 msgid "Select the film type"
 msgstr "Selecteert het filmtype"
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "Flatbed"
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, no-c-format
 msgid "ADF Front"
 msgstr "Automatische documentinvoer voorzijde"
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, no-c-format
 msgid "ADF Back"
 msgstr "Automatische documentinvoer achterzijde"
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, no-c-format
 msgid "ADF Duplex"
 msgstr "Automatische documentinvoer dubbelzijdig"
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, no-c-format
 msgid "Card Front"
 msgstr "Kaart voorzijde"
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, no-c-format
 msgid "Card Back"
 msgstr "Kaart achterzijde"
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, no-c-format
 msgid "Card Duplex"
 msgstr "Kaart dubbelzijdig"
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "Rood"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "Groen"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "Blauw"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, no-c-format
 msgid "Enhance Red"
 msgstr "Verbeter rood"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, no-c-format
 msgid "Enhance Green"
 msgstr "Verbeter groen"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, no-c-format
 msgid "Enhance Blue"
 msgstr "Verbeter blauw"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr "Geen"
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr "JPEG"
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr "Softwarematig over te slaan percentage lege pagina's"
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr "Verzoek het stuurprogramma pagina's met weinig dekking te negeren"
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr "enkelzijdig"
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr "Dubbelzijdig"
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr "Filmeenheid"
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr "Automatische documentinvoer"
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "Dia"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "Transparant"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr "Focus op het glas"
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr "Focus 2.5mm boven het glas"
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr "Halftoon A (hard)"
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr "Halftoon B (zacht)"
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr "Halftoon C"
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr "Dither A (4x4 Bayer)"
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr "Dither B (4x4 Spiraalvorm)"
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr "Dither C (4x4 Net Screen)"
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr "Dither D (8x4 Net Screen)"
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr "Tekstverbeteringstechnologie"
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr "Download patroon A"
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr "Download patroon B"
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "Geen correctie"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr "Door gebruiker gedefinieerd"
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr "Matrixprinters"
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr "Thermische printers"
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "Inkjetprinters"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr "CRT-monitoren"
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "Standaardinstelling"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr "Afdrukken op hoge kwaliteit"
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr "Afdrukken op lage kwaliteit"
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr "Afdrukken met hoog contrast"
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr "Door gebruiker gedefinieerd (Gamma=1.0)"
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr "Door gebruiker gedefinieerd (Gamma=1.8)"
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr "CD"
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr "A5 staand"
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr "A5 liggend"
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr "Letter"
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr "A4"
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "Maximaal"
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr "Scanmodus"
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr "Kiest halftoon."
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr "Kleuronderdrukken"
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr "Kiest kleuronderdrukken."
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr "Kiest helderheid."
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr "Scherpte"
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr "Kleurcorrectie"
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr "Stelt de kleurcorrectietabel in voor het gekozen uitvoerapparaat."
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr "Kleurcorrectiecoëfficiënten"
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr "Matrix vermenigvuldiging van RGB"
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr "Verschuift groen naar rood"
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr "Verschuift groen naar blauw"
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr "Verschuift rood naar groen"
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr "Verschuift rood naar blauw"
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr "Verschuift blauw naar groen"
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr "Verschuift blauw naar rood"
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr "Regelt de groenwaarde"
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr "Verhoogt rood op basis van de groenwaarde"
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr "Verhoogt blauw op basis van het groenwaarde"
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr "Verhoogt groen op basis van het roodwaarde"
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr "Regelt de roodwaarde"
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr "Verhoogt blauw op basis van de roodwaarde"
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr "Verhoogt groen op basis van de blauwwaarde"
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr "Verhoogt rood op basis van de blauwwaarde"
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, no-c-format
 msgid "Controls blue level"
 msgstr "Regelt de blauwwaarde"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr "Spiegel het beeld."
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr "Snelle voorbeeldscan"
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr "Automatische verdeling van het scanoppervlak"
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr "Korte oplossingenlijst"
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr "Toon korte lijst met oplossingen"
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr "Vergroten"
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr "Definieert de vergrotingsfactor die de scanner zal gebruiken"
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr "Snelle opmaak"
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr "Optioneel hulpstuk"
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr "Uitwerpen"
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr "Werp het document in de automatische documentinvoer uit"
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr "Automatische uitworp"
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr "Werp het document uit na het scannen"
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr "Automatische documentinvoer Modus"
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr ""
-"Selecteert de Automatische documentinvoer modus (enkelzijdig/dubbelzijdig)"
+"Selecteert de Automatische documentinvoer modus (enkelzijdig/"
+"dubbelzijdig)"
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr "Bak"
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr "Kies de bak om te scannen"
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
@@ -2082,234 +2078,1025 @@ msgstr ""
 "apparaten of de door de gebruiker gedefinieerde tabel die naar de "
 "scanner kan worden gestuurd"
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr "Focus positie"
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
-msgid "Sets the focus position to either the glass or 2.5mm above the glass"
+msgid ""
+"Sets the focus position to either the glass or 2.5mm above the glass"
 msgstr "Stelt de focus in op het glas of 2.5mm daarboven"
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr "Wacht op een druk op de knop"
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
 "pressed to actually start the scan process."
 msgstr ""
-"Begin pas met scannen als eerst het scancommando naar de scanner is gestuurd "
-"en "
-"daarna de knop van de scanner is ingedrukt."
+"Begin pas met scannen als eerst het scancommando naar de scanner is "
+"gestuurd en daarna de knop van de scanner is ingedrukt."
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr "Infrarood"
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr "TPU8x10"
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, no-c-format
 msgid "Positive Slide"
 msgstr "Dia"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, no-c-format
 msgid "Negative Slide"
 msgstr "Negatief"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr "Ingebouwd CCT profiel"
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, no-c-format
 msgid "User defined CCT profile"
 msgstr "Door gebruiker gedefinieerd CCT profiel"
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr "Aan"
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr "Uit"
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr "DTC"
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr "SDTC"
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr "Dither"
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, no-c-format
 msgid "Diffusion"
 msgstr "Verspreiding"
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, no-c-format
 msgid "White"
 msgstr "Wit"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, no-c-format
 msgid "Black"
 msgstr "Zwart"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, no-c-format
 msgid "Continue"
 msgstr "Voortzetten"
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr "Stoppen"
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr "10mm"
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr "15mm"
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr "20mm"
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr "Horizontaal"
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, no-c-format
 msgid "Horizontal bold"
 msgstr "Horizontaal vet"
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, no-c-format
 msgid "Horizontal narrow"
 msgstr "Horizontaal smal"
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr "Verticaal"
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, no-c-format
 msgid "Vertical bold"
 msgstr "Verticaal vet"
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr "Van boven naar beneden"
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr "Van beneden naar boven"
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, no-c-format
 msgid "Front"
 msgstr "Voorzijde"
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr "Achterzijde"
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
-msgstr "Softwarematig over te slaan percentage lege pagina's"
+msgid "Gamma function exponent"
+msgstr "Gammafunctie exponent"
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
 #, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
-msgstr "Verzoek het stuurprogramma pagina's met weinig dekking te negeren"
+msgid "Changes intensity of midtones"
+msgstr "Verandert de intensiteit van de middentonen"
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr "GBF"
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr "Gespiegeld beeld formaat"
+
+#: backend/fujitsu.c:3165
+#, no-c-format
+msgid "Halftone type"
+msgstr "Halftoon type"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr "Regeltype van het halftoon filter"
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr "Regelpatroon van het halftoon filter"
+
+#: backend/fujitsu.c:3209
+#, fuzzy, no-c-format
+msgid "Outline"
+msgstr "Omtrek"
+
+#: backend/fujitsu.c:3210
+#, fuzzy, no-c-format
+msgid "Perform outline extraction"
+msgstr "Voer omtrek extractie uit"
+
+#: backend/fujitsu.c:3221
+#, no-c-format
+msgid "Emphasis"
+msgstr "Nadruk"
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr "Negatief naar geleidelijk of positief naar scherp beeld"
+
+#: backend/fujitsu.c:3240
+#, no-c-format
+msgid "Separation"
+msgstr "Scheiding"
+
+#: backend/fujitsu.c:3241
+#, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr "Schakel automatische scheiding tussen beeld en tekst in"
+
+#: backend/fujitsu.c:3252
+#, no-c-format
+msgid "Mirroring"
+msgstr "Spiegelen"
+
+#: backend/fujitsu.c:3253
+#, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "Spiegel het resulterende beeld horizontaal"
+
+#: backend/fujitsu.c:3270
+#, no-c-format
+msgid "White level follower"
+msgstr "Witwaarde volger"
+
+#: backend/fujitsu.c:3271
+#, no-c-format
+msgid "Control white level follower"
+msgstr "Regel de witwaarde volger"
+
+#: backend/fujitsu.c:3289
+#, no-c-format
+msgid "BP filter"
+msgstr "BP filter"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr "Verbeterd de kwaliteit van hoog resolutie bal-punt pen tekst"
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr "Verzachten"
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr "Schakelt verzachting in om OCR te verbeteren"
+
+#: backend/fujitsu.c:3323
+#, no-c-format
+msgid "Gamma curve"
+msgstr "Gammakromme"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+"Gammakromme, van licht naar donker, maar bovenste twee werken misschien "
+"niet"
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, no-c-format
+msgid "Threshold curve"
+msgstr "Drempel curve"
+
+#: backend/fujitsu.c:3347
+#, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+"Drempel curve, van licht naar donker, maar bovenste twee zijn misschien "
+"niet liniair"
+
+#: backend/fujitsu.c:3369
+#, no-c-format
+msgid "Threshold white"
+msgstr "Drempel wit"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr "Stelt schermpunten in overeenkomstig de drempel voor wit ipv zwart"
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, no-c-format
+msgid "Noise removal"
+msgstr "Ruisverwijdering"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr "Matrix 5x5"
+
+#: backend/fujitsu.c:3404
+#, fuzzy, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr "Verwijder 5 beeldpunten in een vierkant ruis"
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr "Matrix 4x4"
+
+#: backend/fujitsu.c:3421
+#, fuzzy, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr "Verwijder 4 beeldpunten in een vierkant ruis"
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr "Matrix 3x3"
+
+#: backend/fujitsu.c:3438
+#, fuzzy, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr "Verwijder 3 beeldpunten in een vierkant ruis"
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr "Matrix 2x2"
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr "Verwijder 2 beeldpunten in een vierkant ruis"
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr "Variantie"
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr "Stelt SDTC variantie rato in (gevoeligheid), 0 is gelijk aan 127"
+
+#: backend/fujitsu.c:3508
+#, no-c-format
+msgid "Auto width detection"
+msgstr "Automatische breedte herkenning"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr "Scanner herkent paper zijden. Kan de scansnelheid verminderen."
+
+#: backend/fujitsu.c:3526
+#, no-c-format
+msgid "Auto length detection"
+msgstr "Automatische lengte herkenning"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+"Scanner herkent onderzijde van het papier. Kan sommige frontends in de "
+"war brengen."
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr "Compressie"
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+"Schakelt gecomprimeerde gegevens in. Kan je front-end programma laten "
+"crashen."
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr "Compressie argument"
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+"Niveau van JPEG compressie. 1 is klein bestand, 7 is groot bestand. 0 "
+"(standaard) is hetzelfde als 4"
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr "DF actie"
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr "Actie die volgt op dubbele doorvoer fout"
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr "DF scheefheid"
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr "Schakel dubbele doorvoer fout in als gevolg van scheefheid"
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr "DF dikte"
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr "Stelt dubbele doorvoer fout in als gevolg van papierdikte"
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr "DF lengte"
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr "Stelt dubbele doorvoer fout in als gevolg van papierlengte"
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
+msgstr "DF lengte verschil"
+
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr "Verschil in papier lengte om dubbele doorvoer fout te veroorzaken"
+
+#: backend/fujitsu.c:3708
+#, no-c-format
+msgid "DF recovery mode"
+msgstr "DF herstel modus"
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr "Vraag de scanner de doorvoer om te keren bij papier opstopping"
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr "Papier protectie"
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr "Vraag de scanner opstoppingen in de ADF  te voorspellen "
+
+#: backend/fujitsu.c:3748
+#, no-c-format
+msgid "Advanced paper protection"
+msgstr "Geavanceerde papier protectie"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+"Vraag de scanner opstoppingen in de ADF te voorspellen met behulp van "
+"verbeterde sensoren"
+
+#: backend/fujitsu.c:3768
+#, no-c-format
+msgid "Staple detection"
+msgstr "Nietjes detectie"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+"Vraag de scanner opstoppingen in de ADF te detecteren die worden "
+"veroorzaakt door nietjes"
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr "Achtergrond kleur"
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+"Stel de achtergrond kleur van scans in. Kan conflicteren met de "
+"'overscan' optie"
+
+#: backend/fujitsu.c:3809
+#, no-c-format
+msgid "Dropout color"
+msgstr "Uitvalkleur"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+"One-pass scanners gebruiken slechts een kleur bij grijstrap of binair "
+"scannen, bruikbaar voor gekleurd papier of inkt."
+
+#: backend/fujitsu.c:3833
+#, no-c-format
+msgid "Buffer mode"
+msgstr "Buffermodus"
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+"Vraag de scanner pagina's vanuit de ADF zo snel mogelijk in te lezen in "
+"het interne geheugen"
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr "Voorkeuze"
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr "Vraag de scanner de volgende pagina uit de ADF op te halen"
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr "Overscan"
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+"Selecteer een paar mm van de achtergrond aan de bovenkant van de scan, "
+"voordat het papier de ADF ingaat, en vergroot het maximale scan "
+"oppervlak t.o.v. het papierformaat, om de inzameling van de overige "
+"kanten toe te staan. Kan conflicteren met 'bgcolor' optie"
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr "Tijdschakelaar - slaapstand"
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+"Tijd in minuten voordat de interne voeding overschakelt naar slaap modus"
+
+#: backend/fujitsu.c:3911
+#, no-c-format
+msgid "Off timer"
+msgstr "Tijdschakelaar - uitstand"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+"Tijd in minuten voordat de interne voeding de scanner uitschakelt. In "
+"stappen van 15 minuten. Nul betekent nooit uitschakelen"
+
+#: backend/fujitsu.c:3930
+#, no-c-format
+msgid "Duplex offset"
+msgstr "Dubbelzijdige compensatie"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr "Pas voor-/achtercompensatie aan"
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "Groen compensatie"
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:3949
+#, no-c-format
+msgid "Adjust green/red offset"
+msgstr "Pas groen-/roodcompensatie aan"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr "Blauw compensatie"
+
+#: backend/fujitsu.c:3967
+#, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "Pas blauw-/roodcompensatie aan"
+
+#: backend/fujitsu.c:3980
+#, no-c-format
+msgid "Low Memory"
+msgstr "Te weinig geheugen beschikbaar"
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+"Beperk het geheugengebruik door het stuurprogramma in ingebedde "
+"systemen. Zorgt bij sommige duplex scans voor wisselende zijden bij de "
+"aanroep van sane_read. De waarde van de optie 'zijde' kan worden "
+"gebruikt om het juiste beeld vast te stellen. Deze optie dient "
+"uitsluitend te worden gebruikt door aangepaste front-end software."
+
+#: backend/fujitsu.c:3996
+#, no-c-format
+msgid "Duplex side"
+msgstr "Duplex zijde"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+"Vertelt welke zijde (0=voorkant, 1=achterkant) van een duplex scan bij "
+"de volgende aanroep van sane_read wordt geretourneerd."
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr "Hardware rechtzetten en afknippen"
+
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr "Vraag de scanner pagina's digitaal te roteren en af te knippen."
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr "Softwarematige scheefheid correctie"
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr ""
+"Vraag het stuurprogramma scheef getrokken pagina's digitaal te roteren."
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr "Softwarematige ontspikkel omvang"
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
+msgstr ""
+"Maximale diameter van verspreid liggende spikkels, die van het gescande "
+"beeld moeten worden verwijderd."
+
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr "Softwarematig uitsnijden"
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr ""
+"Vraag het stuurprogramma randen van pagina's digitaal te verwijderen."
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr "Stoppen bij annuleren"
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+"Vraag het stuurprogramma de papierdoorvoer te stoppen i.p.v. uit te "
+"werpen tijdens een annulering"
+
+#: backend/fujitsu.c:4095
+#, no-c-format
+msgid "Endorser Options"
+msgstr "Endorser-opties"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr "Stuurt de Endorser eenheid aan"
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr "Endorser"
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr "Schakel Endorser eenheid in"
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr "Endorser delen"
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr "Bepaald maximale Endorser teller waarde"
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr "Endorser waarde"
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr "Initiële Endorser teller waarde"
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr "Endorser stap"
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+"Wijzig Endorser teller waarde met deze hoeveelheid voor elke pagina"
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr "Endorser Y"
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr "Endorser afdruk compensatie vanaf de bovenkant van het papier"
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr "Endorser lettertype"
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr "Endorser afdruk lettertype"
+
+#: backend/fujitsu.c:4253
+#, no-c-format
+msgid "Endorser direction"
+msgstr "Endorser richting"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr "Endorser afdruk richting"
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr "Endorser zijde"
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+"Endorser afdrukzijde, vereist hardware ondersteuning om te worden "
+"gewijzigd"
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr "Endorser tekst"
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+"Endorser alfanumerieke afdrukformaat. %05ud of %08ud zal aan het eind "
+"worden vervangen door de teller waarde."
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr "Bovenrand"
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr "Papier is gedeeltelijk in de ADF getrokken"
+
+#: backend/fujitsu.c:4344
+#, no-c-format
+msgid "A3 paper"
+msgstr "A3 papier"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr "A3 papier gedetecteerd"
+
+#: backend/fujitsu.c:4356
+#, no-c-format
+msgid "B4 paper"
+msgstr "B4 papier"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr "B4 papier gedetecteerd"
+
+#: backend/fujitsu.c:4368
+#, no-c-format
+msgid "A4 paper"
+msgstr "A4 papier"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr "A4 papier gedetecteerd"
+
+#: backend/fujitsu.c:4380
+#, no-c-format
+msgid "B5 paper"
+msgstr "B5 papier"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr "B5 papier gedetecteerd"
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr "OMR of DF"
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr "OMR of dubbele doorvoer gedetecteerd"
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr "Energiebesparende"
+
+#: backend/fujitsu.c:4429
+#, no-c-format
+msgid "Scanner in power saving mode"
+msgstr "Scanner in energiebesparende modus"
+
+#: backend/fujitsu.c:4452
+#, no-c-format
+msgid "Manual feed"
+msgstr "Handmatige doorvoer"
+
+#: backend/fujitsu.c:4453
+#, no-c-format
+msgid "Manual feed selected"
+msgstr "Handmatige doorvoer geselecteerd"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr "Functie"
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr "Functie karakter op het scherm"
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr "Inkt bijna op"
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr "Imprinter inkt is bijna op"
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr "Dubbele doorvoer"
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr "Dubbele doorvoer gedetecteerd"
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr "Foutcode"
+
+#: backend/fujitsu.c:4513
+#, no-c-format
+msgid "Hardware error code"
+msgstr "Hardware foutcode"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr "Scheefheidshoek"
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr "Vereist zwarte achtergrond voor het scannen"
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr "Resterende hoeveelheid inkt"
+
+#: backend/fujitsu.c:4537
+#, no-c-format
+msgid "Imprinter ink level"
+msgstr "Imprinter inkt niveau"
+
+#: backend/fujitsu.c:4548
+#, no-c-format
+msgid "Density"
+msgstr "Dichtheid"
+
+#: backend/fujitsu.c:4549
+#, no-c-format
+msgid "Density dial"
+msgstr "Dichtheid schaal"
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, no-c-format
+msgid "Duplex switch"
+msgstr "Duplex schakelaar"
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr "Vraag backend randen van pagina's digitaal te verwijderen"
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
-msgstr "Vraag het stuurprogramma pagina's met weinig dekking te verwijderen"
+msgstr ""
+"Vraag het stuurprogramma pagina's met weinig dekking te verwijderen"
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr "Softwarematige rotatie tegen de klok in"
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 "Vraag stuurprogramma een 90 graden gedraaid beeld te herkennen en "
 "corrigeren"
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, no-c-format
 msgid "Extras"
 msgstr "Extra's"
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, no-c-format
-msgid "Threshold curve"
-msgstr "Drempel curve"
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr "Dynamische drempel curve, van licht naar donker, normaal 50-65"
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr "Dynamische lijntekening uitschakelen"
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
@@ -2318,12 +3105,12 @@ msgstr ""
 "Schakel, om een lijntekening te genereren het gebruik van een software "
 "aanpassend algoritme uit en vertrouw in plaats daarvan op de hardware."
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, no-c-format
 msgid "Disable interpolation"
 msgstr "Schakel interpolatie uit"
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
@@ -2333,49 +3120,49 @@ msgstr ""
 "resolutie kleiner is dan de verticale resolutie, wordt de horizontale "
 "interpolatie uitgeschakeld."
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, no-c-format
 msgid "Color filter"
 msgstr "Kleurenfilter"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 "Wanneer grijs of lijntekening wordt gebruikt, selecteert deze optie de "
 "huidige actieve kleur."
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, no-c-format
 msgid "Calibration file"
 msgstr "Kalibratiebestand"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Specificeer het te gebruiken kalibratiebestand"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Vervaltijd van de kalibratie cache"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
-"Tijd (in minuten) voordat een gecachete kalibratie verloopt. Een waarde van 0 "
-"betekent dat geen cache wordt gebruikt. Een negatieve waarde betekent dat "
-"de cache nooit verloopt."
+"Tijd (in minuten) voordat een gecachete kalibratie verloopt. Een waarde "
+"van 0 betekent dat geen cache wordt gebruikt. Een negatieve waarde "
+"betekent dat de cache nooit verloopt."
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, no-c-format
 msgid "Lamp off time"
 msgstr "Lamp-uit tijd"
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
@@ -2384,105 +3171,103 @@ msgstr ""
 "De lamp wordt uitgeschakeld na de opgegeven tijd (in minuten). Een "
 "waarde van 0 betekent, dat de lamp niet wordt uitgeschakeld."
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, no-c-format
 msgid "Lamp off during scan"
 msgstr "Lamp uit tijdens het scannen"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr "De lamp wordt uitgeschakeld tijdens het scannen"
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, no-c-format
 msgid "File button"
 msgstr "Bestand-knop"
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr "OCR-knop"
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, no-c-format
 msgid "Power button"
 msgstr "Aan/Uit-knop"
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, no-c-format
 msgid "Extra button"
 msgstr "Extra-knop"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, no-c-format
 msgid "Need calibration"
 msgstr "Kalibratie nodig"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr "De scanner moet worden gekalibreerd voor de huidige instellingen"
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, no-c-format
 msgid "Buttons"
 msgstr "Knoppen"
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr "Kalibreren"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "Begin kalibreerproces met een speciale transparant"
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, no-c-format
 msgid "Clear calibration"
 msgstr "Reset kalibratie"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, no-c-format
 msgid "Clear calibration cache"
 msgstr "Reset kalibratiecache"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr "Transparantenhulpstuk"
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr "Kleur in grijsmodus"
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 "Selecteert de scankleur die in de grijsmodus wordt gebruikt (Standaard: "
 "groen)"
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr "Foutzoekopties"
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "Automatisch opwarmen"
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -2491,12 +3276,12 @@ msgstr ""
 "Warm op totdat de helderheid van de lamp constant is in plaats van de "
 "'verplichte' 60 seconde opwarmtijd aan te houden."
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "Volledige scan"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
@@ -2505,12 +3290,12 @@ msgstr ""
 "Scan het volledige scanbereik inclusief de kalibereerstrook. Pas op! "
 "Kies niet een te grote hoogte. Alleen voor testdoeleinden."
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Grove kalibratie"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2522,12 +3307,12 @@ msgstr ""
 "worden ingesteld. Deze optie staat standaard aan. Alleen voor "
 "testdoeleinden."
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "Grove kalibratie alleen voor de eerste scan"
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2539,12 +3324,12 @@ msgstr ""
 "van het beeld per scan verschilt, schakel deze optie dan uit. Alleen "
 "voor testdoeleinden."
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, no-c-format
 msgid "Backtrack lines"
 msgstr "\"Backtrack\" lijnen"
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2557,85 +3342,85 @@ msgstr ""
 "data kan verwerken. Lage waarden zorgen voor snellere scans, maar "
 "vergroten het risico van gemiste scanlijnen."
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Gammawaarde"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr "Stelt de gammawaarde voor alle kanalen in."
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, no-c-format
 msgid "Geometry Group"
 msgstr "Geometrie groep"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, no-c-format
 msgid "Scan Mode Group"
 msgstr "Scanmodus groep"
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr "Dia"
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, no-c-format
 msgid "Scanner model"
 msgstr "Scanner model"
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr ""
-"Biedt men de mogelijkheid de werking van het apparaat te testen met andere "
-"ondersteunde modellen."
+"Biedt men de mogelijkheid de werking van het apparaat te testen met "
+"andere ondersteunde modellen."
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr "Kleuren van het beeld worden geïnverteerd"
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, no-c-format
 msgid "Disable gamma correction"
 msgstr "Schakel gammacorrectie uit"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "Gammacorrectie wordt uitgeschakeld"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, no-c-format
 msgid "Disable white shading correction"
 msgstr "Schakel witte schaduw correctie uit"
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr "Witte schaduw correctie wordt uitgeschakeld"
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr "Sla opwarmprocedure over"
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr "Opwarmprocedure wordt uitgeschakeld"
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr "Forceer ware diepte"
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2647,12 +3432,12 @@ msgstr ""
 "geconverteerd naar de gekozen diepte. Deze optie schakelt diepte "
 "emulatie uit."
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, no-c-format
 msgid "Emulate Grayscale"
 msgstr "Emuleer grijstrap"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2663,12 +3448,12 @@ msgstr ""
 "door de software geconverteerd naar grijswaardes. Dit kan de "
 "beeldkwaliteit in sommige gevallen verbeteren."
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr "Bewaar foutzoekbeelden"
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
@@ -2677,358 +3462,352 @@ msgstr ""
 "Indien ingeschakeld, worden enkele beelden die deel uitmaken van het "
 "scanproces bewaard, zodat ze kunnen worden geanalyseerd."
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, no-c-format
 msgid "Reset chipset"
 msgstr "Reset chipset"
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr "Reset chipset gegevens"
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, no-c-format
 msgid "Information"
 msgstr "Informatie"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, no-c-format
 msgid "Chipset name"
 msgstr "Naam van de chipset"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr "Toont de naam van de chipset gebruikt in het apparaat."
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr "Chipset ID"
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, no-c-format
 msgid "Shows the chipset ID"
 msgstr "Toont de chipset ID"
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, no-c-format
 msgid "Scan counter"
 msgstr "Scannerteller"
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr "Toont het aantal scans dat de scanner heeft gemaakt"
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, no-c-format
 msgid "Update information"
 msgstr "Werk de informatie bij"
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr "Werkt de informatie over het apparaat bij"
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr "Deze optie geeft de scannerknoppen op het apparaat weer"
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr "Beeld"
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr "Overig"
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, no-c-format
 msgid "offset X"
 msgstr "compensatie X"
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr "X positie in de scanner van het scanoppervlak."
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, no-c-format
 msgid "offset Y"
 msgstr "compensatie Y"
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr "Y positie in de scanner van het scanoppervlak."
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr "Lamp status"
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr "Schakelt de lamp aan of uit."
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr "Kalibreert voor de zwart-/witwaarde"
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr "Automatische documentinvoer"
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, no-c-format
 msgid "TMA Slides"
 msgstr "TMA dia's"
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, no-c-format
 msgid "TMA Negatives"
 msgstr "TMA Negatieven"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, no-c-format
 msgid "Color (48 bits)"
 msgstr "Kleur (48 bits)"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, no-c-format
 msgid "Extend lamp timeout"
 msgstr "Verleng lamp timeout"
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr "Verlengt de lamp timeout (van 15 minuten tot 1 uur)"
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr "Wacht op een druk op de knop"
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, no-c-format
 msgid "Waits for button before scanning"
 msgstr "Wacht op een druk op de knop alvorens te scannen"
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, no-c-format
 msgid "Advanced Options"
 msgstr "Geavanceerde opties"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr "Grof"
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr "Fijn"
 
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr "Bayer"
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr "Door de gebruiker gedefinieerd"
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "Automatisch"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr "NTSC RGB"
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr "XPA RGB"
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr "Doorgang"
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "NTSC Grijs"
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr "XPA Grijs"
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "Langzaam"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr "Normaal"
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "Snel"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr "Extra snel"
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr "2-beeldpunt"
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr "4-beeldpunt"
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr "8-beeldpunt"
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr "Afdruk"
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, no-c-format
 msgid "Film-strip"
 msgstr "Filmstrook"
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr "XPA"
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr "Voorwaardelijk"
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, no-c-format
 msgid "Experiment"
 msgstr "Experiment"
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, no-c-format
 msgid "Sharpening"
 msgstr "Scherper maken"
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr "Stel scherpte waarde in."
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr "Automatische drempelwaarde"
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr ""
 "Maak automatische bepaling mogelijk van de drempelwaarde voor "
 "lijntekening scans."
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr "Gelijkmatig"
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr "Kies halftoon filter."
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr "Verwijder origineel na de scan"
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, no-c-format
 msgid "Unloads the media after a scan."
 msgstr "Verwijdert het origineel na de scan."
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, no-c-format
 msgid "Change document"
 msgstr "Wijzig origineel"
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr "Wijzig Origineel."
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr "Verwijder"
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr "Verwijder Origineel."
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, no-c-format
 msgid "Start calibration process."
 msgstr "Begin het kalibreer proces"
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, no-c-format
 msgid "Media"
 msgstr "Origineel"
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr "Stel origineel type in."
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr "Belichtingstijd"
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -3036,581 +3815,572 @@ msgid ""
 "negative film. For dark (underexposed) images you can increase this "
 "value."
 msgstr ""
-"Een langere belichtingstijd laat de scanner meer licht verzamelen. Advies is "
-"om "
-"175% voor papieren originelen, 150% voor dia's en \"Negatief\" voor "
-"negatieven te "
-"gebruiken. Voor donkere (onderbelichte) beelden kun je deze waarde verhogen."
+"Een langere belichtingstijd laat de scanner meer licht verzamelen. "
+"Advies is om 175% voor papieren originelen, 150% voor dia's en \"Negatief"
+"\" voor negatieven te gebruiken. Voor donkere (onderbelichte) beelden "
+"kun je deze waarde verhogen."
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, no-c-format
 msgid "Color Matrix"
 msgstr "Kleurmatrix"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, no-c-format
 msgid "Set the scanners color matrix."
 msgstr "Stel de kleurmatrix in van de scanner"
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr "Door de gebruiker gedefinieerde kleurmatrix"
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, no-c-format
 msgid "Mono Color Matrix"
 msgstr "Mono Kleurmatrix"
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr "Door de gebruiker gedefinieerd kleurmatrix voor grijstint scans"
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, no-c-format
 msgid "Mirror horizontal"
 msgstr "Horizontaal spiegelen"
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, no-c-format
 msgid "Mirror image horizontally."
 msgstr "Beeld horizontaal spiegelen"
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, no-c-format
 msgid "Mirror vertical"
 msgstr "Verticaal spiegelen"
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, no-c-format
 msgid "Mirror image vertically."
 msgstr "Beeld verticaal spiegelen"
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, no-c-format
 msgid "Update options"
 msgstr "Opties bijwerken"
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, no-c-format
 msgid "Update options."
 msgstr "Opties bijwerken."
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr "8-bit resultaat"
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr "Gebruik intern meer dan acht bits, maar geef slechts acht bits."
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr "Voorpaneel knop wacht"
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr "Wacht met scannen totdat knop op voorpaneel is ingedrukt."
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr "Schakel de lamp uit"
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr "Schakel de scannerlamp uit."
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "Papierformaat"
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr "Automatische kleurscheiding"
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, no-c-format
 msgid "Landscape"
 msgstr "Liggend"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr "Geïnverteerd beeld"
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr "Groot formaat papier modus"
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, no-c-format
 msgid "Length control mode"
 msgstr "Lengte-controlemodus"
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, no-c-format
 msgid "Manual feed mode"
 msgstr "Handmatige doorvoermodus"
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, no-c-format
 msgid "Manual feed timeout"
 msgstr "Handmatige doorvoer timeout"
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr "Dubbele doorvoer herkenning"
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr "Schakel dubbelzijdig (duplex) scannen in"
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
-msgstr "Feitelijke formaat van het papier in de Automatische documentinvoer"
+msgstr ""
+"Feitelijke formaat van het papier in de Automatische documentinvoer"
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr "z/w"
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, no-c-format
 msgid "halftone"
 msgstr "halftoon"
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr "grijs"
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, no-c-format
 msgid "color"
 msgstr "kleur"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr "adf"
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr "fb"
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr "enkel"
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, no-c-format
 msgid "continuous"
 msgstr "continu"
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, no-c-format
 msgid "off"
 msgstr "uit"
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr "wacht_doc"
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr "wacht_toets"
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr "gebruiker_gedefinieerd"
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr "visitekaart"
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr "Controleer"
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr "A5"
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr "A6"
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr "B5"
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr "B6"
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr "Legal"
 
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, no-c-format
 msgid "bayer_64"
 msgstr "bayer 64"
 
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, no-c-format
 msgid "bayer_16"
 msgstr "bayer 16"
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, no-c-format
 msgid "halftone_32"
 msgstr "halftoon 32"
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, no-c-format
 msgid "halftone_64"
 msgstr "halftoon 64"
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, no-c-format
 msgid "diffusion"
 msgstr "verspreiding"
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, no-c-format
 msgid "normal"
 msgstr "normaal"
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, no-c-format
 msgid "light"
 msgstr "licht"
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr "donker"
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, no-c-format
 msgid "From scanner"
 msgstr "Vanuit de scanner"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr "Vanaf papier"
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, no-c-format
 msgid "default"
 msgstr "standaardinstelling"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, no-c-format
 msgid "smooth"
 msgstr "gelijkmatig"
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr "geen"
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, no-c-format
 msgid "low"
 msgstr "laag"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, no-c-format
 msgid "medium"
 msgstr "gemiddeld"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr "hoog"
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr "crt"
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr "lineair"
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, no-c-format
 msgid "red"
 msgstr "rood"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, no-c-format
 msgid "green"
 msgstr "groen"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr "blauw"
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, no-c-format
 msgid "Sets the scan source"
 msgstr "Stelt de scanbron in"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr "Doorvoermodus"
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr "Stelt de doorvoermodus in"
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr "Groot formaat papier modus in/uit schakelen"
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr "Formaat gestuurde modus in/uit schakelen"
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "Stelt de handmatige doorvoermodus in"
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr "Stelt de handmatige doorvoer timeout in seconden in"
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr "Dubbele doorvoer herkenning in/uit schakelen"
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr "aangepast aan de pagina"
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr "Aangepast aan de pagina"
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr "Scanner verkleint het beeld zodat deze op de gescande pagina past"
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr "Stelt de papier positie in: waar voor liggend, onwaar voor staand"
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr "Automatische drempelwaarde"
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
 "reduction and image emphasis"
 msgstr ""
-"Stelt automatisch helderheid, contrast, witwaarde, gamma, ruisonderdrukking "
-"en "
-"beeldverbetering in"
+"Stelt automatisch helderheid, contrast, witwaarde, gamma, "
+"ruisonderdrukking en beeldverbetering in"
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "Ruisonderdrukking"
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr "Verminder de ruis van afzonderlijke punten"
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr "Beeldverbetering"
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr "Stelt beeldverbetering in"
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, no-c-format
 msgid "Lamp color"
 msgstr "Lamp kleur"
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr "Schakelt de lamp kleur in (kleur uitval)"
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr "Geïnverteerd beeld in Z/W of halftoon modus"
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "Spiegel beeld (links/rechts verwisselen)"
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr "jpeg compressie"
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr "JPEG beeld compressie met Q parameter, '0' - geen compressie"
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr "Roteer beeld met de klok mee"
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
-msgstr "Vraag het stuurprogramma pagina's met een vaste hoeveelheid te roteren"
-
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr "Softwarematige scheefheid correctie"
+msgstr ""
+"Vraag het stuurprogramma pagina's met een vaste hoeveelheid te roteren"
 
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
-msgstr "Vraag het stuurprogramma scheef getrokken pagina's digitaal te roteren"
-
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr "Softwarematige ontspikkel omvang"
+msgstr ""
+"Vraag het stuurprogramma scheef getrokken pagina's digitaal te roteren"
 
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 "Maximale omvang van verspreid liggende spikkels, die van het gescande "
 "beeld moeten worden verwijderd"
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr "Softwarematig automatisch uitsnijden"
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
-msgstr "Vraag het stuurprogramma randen van pagina's digitaal te verwijderen "
+msgstr ""
+"Vraag het stuurprogramma randen van pagina's digitaal te verwijderen "
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
@@ -3620,64 +4390,64 @@ msgstr ""
 "kortste lengte van het gebruikte papier of de feitelijke lengte van het "
 "document."
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "Gammacorrectie"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr "wacht_doc_spring_op"
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr "A3"
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr "Dubbel briefpapier 11x17 inc."
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr "B4"
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, no-c-format
 msgid "High sensivity"
 msgstr "Hoge gevoeligheid"
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, no-c-format
 msgid "Low sensivity"
 msgstr "Lage gevoeligheid"
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, no-c-format
 msgid "err_diffusion"
 msgstr "err_verspreiding"
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, no-c-format
 msgid "No detection"
 msgstr "Geen herkenning"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, no-c-format
 msgid "Normal mode"
 msgstr "Normale modus"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, no-c-format
 msgid "Enhanced mode"
 msgstr "Verbetermodus"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
@@ -3687,452 +4457,451 @@ msgstr ""
 "hij het formaat van het  papier heeft gedeeld door de lengte, die is "
 "ingesteld bij de optie Document Formaat"
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr "Gevoeligheid van de dubbele doorvoer verklikker"
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr "Stel de gevoeligheid van de dubbele doorvoer verklikker in"
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr "Stop niet na de dubbele doorvoer verklikker"
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr "Negeer linker dubbele doorvoor voeler"
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr "Negeer middelste dubbele doorvoer voeler"
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr "Negeer rechter dubbele doorvoer voeler"
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, no-c-format
 msgid "Automatic threshold mode"
 msgstr "Automatische drempelwaarde modus"
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr "Stelt de automatische drempelwaarde in"
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr "Inverteer beeld in Z/W modus"
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr "JPEG compressie"
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr "JPEG compressie (je programma moet in staat zijn te decomprimeren)"
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr "Herken aan elkaar geniet document"
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr "kleurwaarde van rood"
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, no-c-format
 msgid "Set chroma of red"
 msgstr "Stel kleurwaarde van rood in"
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, no-c-format
 msgid "chroma of blue"
 msgstr "kleurwaarde van blauw"
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, no-c-format
 msgid "Set chroma of blue"
 msgstr "Stel kleurwaarde van blauw in"
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr "Scheefheid correctie"
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr "Stop de scanner als het papier is scheefgetrokken"
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr "De scanner wordt gestopt als het papier is scheefgetrokken"
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr "Snij het effectieve beeldoppervlak uit"
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
-msgstr "De scanner herkent automatisch het beeldoppervlak en snijdt die uit"
+msgstr ""
+"De scanner herkent automatisch het beeldoppervlak en snijdt die uit"
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr "Het is rechts en links omkering"
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr "Ruimte toevoegen aan de bovenzijde"
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr "Ruimte toevoegen aan de onderzijde"
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr "Ruitvormig"
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr "8x8 Grof Aandikken"
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr "8x8 Fijn Aandikken"
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr "8x8 Bayer"
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr "8x8 Verticale Lijn"
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr "Bereik"
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr "Bereikinstellingen van de kleurkanalen"
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, no-c-format
 msgid "Gray gain"
 msgstr "Grijsbereik"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr "Stelt het bereik in van het grijze kanaal"
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, no-c-format
 msgid "Red gain"
 msgstr "Roodbereik"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr "Stelt het bereik in van het rode kanaal"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, no-c-format
 msgid "Green gain"
 msgstr "Groenbereik"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr "Stelt het bereik in van het groene kanaal"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, no-c-format
 msgid "Blue gain"
 msgstr "Blauwbereik"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr "Stelt het bereik in van het blauwe kanaal"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr "Bayer Dither 16"
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr "Bayer Dither 64"
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr "Halftoon punt 32"
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr "Halftoon punt 64"
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr "Foutenverspreiding"
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr "Mode 1"
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr "Mode 2"
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr "Mode 3"
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr "Vanaf witte punt"
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr "Gelijkmatig"
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr "Laag"
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr "Gemiddeld"
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr "Hoog"
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr "CRT"
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "Eén pagina"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "Alle pagina's"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr "Doorvoerscanner"
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr "4 bit grijstrap"
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr "8 bit grijstrap"
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr "Schaduw, middentoon, lichteffecten, belichtingstijd"
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr "Extra opties"
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr "Kleurbalans"
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr "Geen \"backtracking\""
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr "Wanneer aangevinkt, voert de scanner geen \"backtracking\" uit"
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr "Schakel lamp van de flatbed aan/uit"
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr "Schakelt de lamp van de flatbedscanner aan/uit"
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr "Kalibratie door de \"backend\""
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
-msgid "If checked the color calibration before a scan is done by the backend"
+msgid ""
+"If checked the color calibration before a scan is done by the backend"
 msgstr ""
-"Wanneer aangevinkt, wordt de kleur kalibratie voor een scan uitgevoerd door "
-"de \"backend\""
+"Wanneer aangevinkt, wordt de kleur kalibratie voor een scan uitgevoerd "
+"door de \"backend\""
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr "Gebruik het \"lightlid-35mm\" hulpstuk"
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr "Deze optie schakelt de lamp van de flatbed uit tijdens het scannen"
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "Hoge kwaliteit scan"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr "Hoogste kwaliteit, maar met een lagere snelheid"
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "Hoge snelheid"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr "Hoogste snelheid, maar met een lagere kwaliteit"
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr "Automatische aanpassing van de drempelwaarde"
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
 "for the threshold."
 msgstr ""
-"Indien aangevinkt, probeert de \"backend\" een optimale waarde te bepalen "
-"voor de drempelwaarde."
+"Indien aangevinkt, probeert de \"backend\" een optimale waarde te "
+"bepalen voor de drempelwaarde."
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr "Kiest de gammacorrectiemodus"
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr "Gecombineerde gamma"
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr "Gebruik dezelfde gammawaarden voor alle kleurkanalen."
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr "Gammagetalwaarde"
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr "Kiest een getalwaarde voor de gammacorrectie"
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr "Gammagetalwaarde voor rood"
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr "Kiest een getalswaarde voor gammacorrectie (rode kanaal)"
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr "Gammagetalwaarde voor groen"
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr "Kiest een getalwaarde voor gammacorrectie (groene kanaal)"
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr "Gammagetalwaarde voor blauw"
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr "Kiest een getalwaarde voor gammacorrectie (blauwe kanaal)"
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr "Kanaal"
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
@@ -4140,334 +4909,338 @@ msgstr ""
 "Kiest de kleurengroep, \"Master\" betekent dat alle kleuren worden "
 "beïnvloed."
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr "Middentoon"
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr "Kiest welke helderheidswaarde als 50% grijs moet worden beschouwd."
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr "Middentoon voor rood"
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr "Kiest welke helderheidswaarde als 50% rood moet worden beschouwd."
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr "Middentoon voor groen"
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr "Kiest welke helderheidswaarde als 50% groen moet worden beschouwd."
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr "Middentoon voor blauw"
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr "Kiest welke helderheidswaarde als 50% blauw moet worden beschouwd."
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr "Roodbalans"
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr ""
-"Kleurbalansfactor voor rood: Een waarde van 100% betekent geen kleurcorrectie."
+"Kleurbalansfactor voor rood: Een waarde van 100% betekent geen "
+"kleurcorrectie."
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr "Groenbalans"
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr ""
 "Kleurbalansfactor voor groen: Een waarde van 100% betekent geen "
 "kleurcorrectie."
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr "Blauwbalans"
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr ""
 "Kleurbalansfactor voor blauw: Een waarde van 100% betekent geen "
 "kleurcorrectie."
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr "Standaardkleurbalans"
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr ""
 "Stelt de kleurbalanswaarden in op de waarden zoals opgegeven door de "
 "fabrikant."
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "Langzaamste"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "Langzamer"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "Sneller"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "Snelste"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr "8x8 grof"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr "8x8 normaal"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr "8x8 fijn"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr "8x8 zeer fijn"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr "6x6 normaal"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr "5x5 grof"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr "5x5 fijn"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr "4x4 grof"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr "4x4 normaal"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr "4x4 fijn"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr "3x3 normaal"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr "2x2 normaal"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr "8x8 door de gebruiker gedefinieerd"
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr "6x6 door de gebruiker gedefinieerd"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr "5x5 door de gebruiker gedefinieerd"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr "4x4 door de gebruiker gedefinieerd"
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr "3x3 door de gebruiker gedefinieerd"
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr "2x2 door de gebruiker gedefinieerd"
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr "Snelle grijsmodus"
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr "Scan in snelle grijsmodus (lage beeldkwaliteit)."
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
 "This may be a non-color mode or a low resolution mode."
 msgstr ""
 "Vraag de snelste (lage kwaliteit) modus te gebruiken voor alle "
-"voorbeeldscans. "
-"Dit kan een niet-kleur of lage resolutie modus zijn."
+"voorbeeldscans. Dit kan een niet-kleur of lage resolutie modus zijn."
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr "Lamp uit tijd (minuten)"
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr "Stel de tijd (in minuten) in waarna de lamp wordt uitgeschakeld."
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, no-c-format
 msgid "Turn lamp off"
 msgstr "Schakel de lamp uit"
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr "Schakelt de lamp direct uit"
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr "Helderheid van het rode kanaal"
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr "Bepaalt de helderheid van het rode kanaal van het verkregen beeld."
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr "Helderheid van het groene kanaal"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
-msgstr "Bepaalt de helderheid van het groene kanaal van het verkregen beeld."
+msgstr ""
+"Bepaalt de helderheid van het groene kanaal van het verkregen beeld."
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr "Helderheid van het blauwe kanaal"
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
-msgstr "Bepaalt de helderheid van het blauwe kanaal van het verkregen beeld."
+msgstr ""
+"Bepaalt de helderheid van het blauwe kanaal van het verkregen beeld."
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "Contrast van het rode kanaal"
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr "Bepaalt het contrast van het rode kanaal van het verkregen beeld."
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "Contrast van het groene kanaal"
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
-msgstr "Bepaalt het contrast van het groene kanaal van het verkregen beeld."
+msgstr ""
+"Bepaalt het contrast van het groene kanaal van het verkregen beeld."
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "Contrast van het blauwe kanaal"
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
-msgstr "Bepaalt het contrast van het blauwe kanaal van het verkregen beeld."
+msgstr ""
+"Bepaalt het contrast van het blauwe kanaal van het verkregen beeld."
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr "Kleur48"
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr "Kleur24"
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr "Grijs16"
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr "Grijs8"
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr "Reflecterend"
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, no-c-format
 msgid "Positive"
 msgstr "Diapositief"
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -4476,42 +5249,42 @@ msgstr ""
 "Warm op totdat de helderheid van de lamp constant is in plaats van de "
 "'verplichte' 40 seconde opwarmtijd aan te houden."
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, no-c-format
 msgid "Negative color"
 msgstr "Kleurennegatief"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, no-c-format
 msgid "Negative gray"
 msgstr "Grijsnegatief"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, no-c-format
 msgid "48 bits color"
 msgstr "48 bits kleur"
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr "16 bits grijs"
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
 "mode and resolution. Resets mode and resolution to auto values."
 msgstr ""
-"Kiest de scanbron (zoals b.v. documentendoorvoer). Stel de bron in voor de "
-"modus en resolutie. "
-"Zet modus en resolutie terug naar automatische waarden."
+"Kiest de scanbron (zoals b.v. documentendoorvoer). Stel de bron in voor "
+"de modus en resolutie. Zet modus en resolutie terug naar automatische "
+"waarden."
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr "Knop-gestuurde scan"
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4522,263 +5295,257 @@ msgstr ""
 "gaan, druk op de \"SCAN\" knop (voor MP150) of \"COLOR\" knop (voor "
 "andere modellen). Om te annuleren, druk op de \"GRAY\" knop."
 
-#: ../backend/pixma_sane_options.c:143
-#, no-c-format
-msgid "Gamma function exponent"
-msgstr "Gammafunctie exponent"
-
-#: ../backend/pixma_sane_options.c:144
-#, no-c-format
-msgid "Changes intensity of midtones"
-msgstr "Verandert de intensiteit van de middentonen"
-
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:232
 #, no-c-format
 msgid "Update button state"
 msgstr "Werk de status van de knop bij"
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:244
 #, no-c-format
 msgid "Button 1"
 msgstr "Knop 1"
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:258
 #, no-c-format
 msgid "Button 2"
 msgstr "Knop 2"
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr "Soort te scannen origineel"
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr "Soort bewerking van het resultaat"
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr "ADF wachttijd"
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+"Wanneer ingesteld, zoekt de scanner gedurende de wachttijd in seconden "
+"naar een nieuw document dat in de automatisch document doorvoer is "
+"gelegd."
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr "Transparantie"
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr "Apparaatinstellingen"
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr "Lampschakelaar"
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr "Schakel de lamp(en) handmatig aan/uit."
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "Lamp uit tijdens donker kalibreren"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr "Schakel altijd de lamp uit tijdens donker kalibreren."
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, no-c-format
 msgid "Calibration data cache"
 msgstr "Kalibratie gegevenscache"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr "Schakelt kalibratiecache in/uit"
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, no-c-format
 msgid "Performs calibration"
 msgstr "Voert kalibratie uit"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr "Snellere sensor beweging"
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr "Schakelt snellere sensor beweging in/uit"
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, no-c-format
 msgid "Warmup-time"
 msgstr "Opwarmtijd"
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, no-c-format
 msgid "Warmup-time in seconds."
 msgstr "Opwarmtijd in seconden."
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, no-c-format
 msgid "Lampoff-time"
 msgstr "Lamp uit tijd"
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr "Lamp uit tijd in seconden."
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, no-c-format
 msgid "Analog frontend"
 msgstr "Analoge \"frontend\""
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr "Roodbereik waarde van de AFE"
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr "Rood compensatie"
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr "Rood compensatie van de AFE"
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr "Groenbereik waarde van de AFE"
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr "Groen compensatie"
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr "Groen compensatie van de AFE"
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr "Blauwbereik waarde van de AFE"
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr "Blauw compensatie"
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr "Blauw compensatie van de AFE"
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, no-c-format
 msgid "Red lamp off"
 msgstr "Rode lamp uit"
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr "Bepaalt de rode lamp uit parameter"
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, no-c-format
 msgid "Green lamp off"
 msgstr "Groene lamp uit"
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr "Bepaalt de groene lamp uit parameter"
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, no-c-format
 msgid "Blue lamp off"
 msgstr "Blauwe lamp uit"
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr "Bepaalt de blauwe lamp uit parameter"
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr "Deze optie geeft de status weer van de scannerknoppen."
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr "Kleur36"
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr "Ditherpatroon 1"
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr "Ditherpatroon 2"
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr "Toevalspatroon"
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr "Keuze van de bron"
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr "Beeldverbetering"
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr "Grijs maken"
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr "Scan het beeld in grijstinten."
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr "Three-Pass Simulation"
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
 "kicks, it returns green, then blue, then red."
 msgstr ""
 "Simuleer een Three-Pass Scanner door drie afzonderlijke afbeeldingen te "
-"retourneren. Bij "
-"voorkeur is de volgorde groen, dan blauw en tenslotte rood."
+"retourneren. Bij voorkeur is de volgorde groen, dan blauw en tenslotte "
+"rood."
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr "Handscanner simulatie"
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4790,49 +5557,50 @@ msgstr ""
 "terug. Met deze optie kan worden vastgesteld, of een \"frontend\" "
 "hiermee juist kan omgaan."
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
-msgid "Set default values for enhancement controls (brightness & contrast)."
+msgid ""
+"Set default values for enhancement controls (brightness & contrast)."
 msgstr ""
 "Stel de kleurverbeteringsinstellingen (helderheid en contrast) in op "
 "standaardwaarden."
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr "Alleen-lezen testoptie"
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr "Eens kijken of \"frontends\" hiermee om kunnen gaan."
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr "Gammatabellen"
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr "Statusbericht simulatie"
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr "Statusbericht niet opdringen"
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr "Dwing de \"backend\" niet een statusbericht terug te geven."
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr "Geef SANE_STATUS_EOF terug"
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
@@ -4841,12 +5609,12 @@ msgstr ""
 "Dwing de \"backend\", na een aanroep van sane_read() het statusbericht "
 "SANE_STATUS_EOF terug te geven."
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr "Geef SANE_STATUS_JAMMED terug"
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
@@ -4855,12 +5623,12 @@ msgstr ""
 "Dwing de \"backend\", na een aanroep van sane_read() het statusbericht "
 "SANE_STATUS_JAMMED terug te geven."
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr "Geef SANE_STATUS_NO_DOCS terug"
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
@@ -4869,12 +5637,12 @@ msgstr ""
 "Dwing de \"backend\", na een aanroep van sane_read() het statusbericht "
 "SANE_STATUS_NO_DOCS terug te geven."
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr "Geef SANE_STATUS_COVER_OPEN terug"
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
@@ -4883,12 +5651,12 @@ msgstr ""
 "Dwing de \"backend\", na een aanroep van sane_read() het statusbericht "
 "SANE_STATUS_COVER_OPEN terug te geven."
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr "Geef SANE_STATUS_IO_ERROR terug"
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
@@ -4897,12 +5665,12 @@ msgstr ""
 "Dwing de \"backend\", na een aanroep van sane_read() het statusbericht "
 "SANE_STATUS_IO_ERROR terug te geven."
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr "Geef SANE_STATUS_NO_MEM terug"
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
@@ -4911,99 +5679,96 @@ msgstr ""
 "Dwing de \"backend\", na een aanroep van sane_read() het statusbericht "
 "SANE_STATUS_NO_MEM terug te geven."
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr "Geef SANE_STATUS_ACCESS_DENIED terug"
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
 "after sane_read() has been called."
 msgstr ""
-"Dwing de \"backend\", na een aanroep van sane_read() het "
-"statusbericht SANE_STATUS_ACCESS_DENIED terug te geven."
+"Dwing de \"backend\", na een aanroep van sane_read() het statusbericht "
+"SANE_STATUS_ACCESS_DENIED terug te geven."
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr "Deze optie geeft de status weer van een scannerknop."
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr "Lamp aan"
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr "Schakel scannerlamp aan"
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr "Lamp uit"
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr "Schakel de scannerlamp uit"
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, no-c-format
 msgid "Lamp timeout"
 msgstr "Lamp timeout"
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr "Tijd (in minuten) totdat de lamp wordt uitgeschakeld na een scan"
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr "Drempelwaarde voor lijntekening modus"
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr "Documentinvoer"
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr "6x4 (inch)"
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr "8x10 (inch)"
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr "8.5x11 (inch)"
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr "Halftoon niet ondersteund"
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr "DispersedDot8x8"
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr "DispersedDot16x16"
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -5020,138 +5785,138 @@ msgstr ""
 "het scanprogramma niet meer reageert op invoer van de gebruiker en kan "
 "het gehele systeem onbruikbaar worden."
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr "Het te scannen raamnummer van de filmhouder"
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr "Gebruik handmatige of automatische keuze voor scherpstelpositie"
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, no-c-format
 msgid "Focus point for scanning."
 msgstr "Scherpstelpositie voor het scannen"
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr "Voorbeeldmodus"
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
 "combination of speed and detail."
 msgstr ""
-"Kies de scanmodus voor voorbeeldscans. Grijstrap voorbeeldscans "
-"geven meestal de beste combinatie van snelheid en detail."
+"Kies de scanmodus voor voorbeeldscans. Grijstrap voorbeeldscans geven "
+"meestal de beste combinatie van snelheid en detail."
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr "Voorgedefinieerde instellingen"
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
 "like."
 msgstr "Biedt standaard scanoppervlaktes voor foto's, afdrukken enzovoort."
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr "Scannerraam"
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, no-c-format
 msgid "Frame to be scanned"
 msgstr "Het te scannen scannerraam"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, no-c-format
 msgid "Focus-mode"
 msgstr "Scherpstelmodus"
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, no-c-format
 msgid "Auto or manual focus"
 msgstr "Automatische of handmatige scherpstelling"
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, no-c-format
 msgid "Focus-point"
 msgstr "Scherpstelpositie"
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, no-c-format
 msgid "Focus point"
 msgstr "Scherpstel positie"
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr "Kleurlijnen per leesopdracht"
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr "Grijstraplijnen per leesopdracht"
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr "webcam"
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr "Kleur RAW"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr "Kleur RGB"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr "Kleur RGB TEKST"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr "Verzadigd zwart"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr "Verzadigd wit"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr "Kleurpatroon"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr "Raster"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr "Eerste ingang"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr "Tweede ingang"
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
@@ -5160,12 +5925,12 @@ msgstr ""
 "Dit is de erg lange derde ingang. Misschien weet de \"frontend\" hoe "
 "deze kan worden getoond"
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr "Handscanner-simulatie"
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5178,12 +5943,12 @@ msgstr ""
 "van -1 terug. Met deze optie is te testen of de \"frontend\" daarmee "
 "juist kan omgaan. Deze optie stelt ook een vaste breedte van 11 cm in."
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr "Three-Pass simulatie"
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
@@ -5192,36 +5957,36 @@ msgstr ""
 "Simuleer een Three-Pass-Scanner. In kleurmodus worden drie afbeeldingen "
 "overgedragen."
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr "Bepaal de volgorde van de afbeeldingen"
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr "Bepaal de volgorde van de afbeeldingen in Three-Pass kleurenmodus."
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
 "after 10 scans."
 msgstr ""
-"Als de automatische documentinvoer is gekozen, zal de invoer"
-"na 10 scans 'leeg' zijn."
+"Als de automatische documentinvoer is gekozen, zal de invoerna 10 scans "
+"'leeg' zijn."
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr "Extra opties"
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr "Kies het testbeeld"
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5238,12 +6003,12 @@ msgstr ""
 "modus.\n"
 "Raster: tekent een zwart/wit raster ter grootte van 10 mm²."
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr "Inverteer \"endianness\""
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5255,46 +6020,47 @@ msgstr ""
 "testen, bijvoorbeeld of de \"frontend\" de juiste \"endianness\" "
 "gebruikt."
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr "Leesbegrenzing"
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 "Begrens de hoeveelheid gegevens die bij elke aanroep van sane_read() "
 "wordt overgedragen."
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr "Grootte van de leesbegrenzing"
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
-msgid "The (maximum) amount of data transferred with each call to sane_read()."
+msgid ""
+"The (maximum) amount of data transferred with each call to sane_read()."
 msgstr ""
-"De (maximale) hoeveelheid gegevens die bij elke aanroep van "
-"sane_read() wordt overgedragen."
+"De (maximale) hoeveelheid gegevens die bij elke aanroep van sane_read() "
+"wordt overgedragen."
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr "Leesvertraging"
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr "Vertraag de gegevensoverdracht door de databus."
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr "Duur van de leesvertraging"
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
@@ -5302,64 +6068,64 @@ msgstr ""
 "Hoe lang wordt gewacht nadat de gegevensverzameling door de databus is "
 "overgebracht."
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr "Resultaat van sane_read"
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
 "handling for scanning. All other status codes are for testing how the "
 "frontend handles them."
 msgstr ""
-"Kies het resultaat van sane_read(). \"Default\" is de normale "
-"instelling voor het scannen. Alle andere resultaten zijn bedoeld om vast "
-"te stellen hoe \"frontends\" hiermee omgaan."
+"Kies het resultaat van sane_read(). \"Default\" is de normale instelling "
+"voor het scannen. Alle andere resultaten zijn bedoeld om vast te stellen "
+"hoe \"frontends\" hiermee omgaan."
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr "Verlies van pixels per lijn"
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr "Het aantal pixels dat aan het einde van elke lijn verloren gaat."
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr "Onduidelijke parameters"
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
 "before sane_start()."
 msgstr ""
-"Geef onduidelijke lijnen en bytes per lijn terug als sane_parameters() voor "
-"sane_start() wordt aangeroepen."
+"Geef onduidelijke lijnen en bytes per lijn terug als sane_parameters() "
+"voor sane_start() wordt aangeroepen."
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr "Gebruik niet-blokkerende IO"
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 "Gebruik niet-blokkerende IO voor sane_read() als de \"frontend\" dat "
 "ondersteunt."
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr "Biedt \"kies-bestandsbeschrijving\" aan"
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
@@ -5368,12 +6134,12 @@ msgstr ""
 "Biedt een \"kies-bestandsbeschrijving\" aan, om te kunnen achterhalen of "
 "sane_read() gegevens zal teruggeven."
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr "Testopties inschakelen"
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
@@ -5383,59 +6149,59 @@ msgstr ""
 "hoeverre \"frontends\" de verschillende SANE-optietypes laten zien en "
 "kunnen veranderen."
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr "Druk opties af"
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr "Druk een lijst met alle opties af."
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr "Bool-testopties"
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr "(1/6) Bool \"soft select\" \"soft detect\""
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
 "advanced) capabilities. That's just a normal bool option."
 msgstr ""
-"(1/6) Dit is een bool-testoptie, met \"soft select\" en \"soft detect\" "
-"(en \"advanced\") mogelijkheden. Dit is slechts een normale bool-"
+"(1/6) Dit is een bool-testoptie, met \"soft select\" en \"soft detect"
+"\" (en \"advanced\") mogelijkheden. Dit is slechts een normale bool-"
 "optie."
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr "(2/6) Bool \"hard select\" \"soft detect\""
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
 "advanced) capabilities. That means the option can't be set by the "
 "frontend but by the user (e.g. by pressing a button at the device)."
 msgstr ""
-"(2/6) Dit is een bool-testoptie, met \"hard select\" en \"soft detect\" "
-"(en \"advanced\") mogelijkheden. Dit betekent dat de \"frontend\" de "
+"(2/6) Dit is een bool-testoptie, met \"hard select\" en \"soft detect"
+"\" (en \"advanced\") mogelijkheden. Dit betekent dat de \"frontend\" de "
 "optie niet kan instellen, maar de gebruiker dat moet doen (b.v. door op "
 "een knop van het apparaat te drukken)."
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr "(3/6) Bool \"hard select\""
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5448,12 +6214,12 @@ msgstr ""
 "apparaat in te drukken). Bovendien kan de \"frontend\" de instelling "
 "niet lezen."
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr "(4/6) Bool \"soft detect\""
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
@@ -5462,12 +6228,12 @@ msgstr ""
 "(4/6) Dit is een bool-testoptie, met \"soft detect\" (en \"advanced\") "
 "mogelijkheden. Dit betekent dat het een alleen-lezen optie is."
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr "(5/6) Bool \"soft select\" \"soft detect\" geemuleerd"
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
@@ -5476,12 +6242,12 @@ msgstr ""
 "(5/6) Dit is een bool-testoptie, met \"soft select\", \"soft detect\", "
 "en \"emulated\" (en \"advanced\") mogelijkheden."
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr "(6/6) Bool \"soft select\" \"soft detect\" auto"
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5492,27 +6258,27 @@ msgstr ""
 "en \"automatic\" (en \"advanced\") mogelijkheden. Deze optie kan de "
 "backend automatisch instellen."
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr "Int-testopties"
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr "(1/6) Int"
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr "(1/6) Int-testoptie zonder eenheid en beperkingen."
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr "(2/6) Int bereikbeperking"
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
@@ -5521,24 +6287,24 @@ msgstr ""
 "(2/6) Int-testoptie met de eenheid \"Pixel\" en een beperkt bereik. Het "
 "minimum is 4, het maximum 192, en de stapgrootte is 2."
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr "(3/6) Int beperkte woordenlijst"
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 "(3/6) Int-testoptie met de eenheid \"bits\" en een woordenlijst-"
 "beperking."
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr "(4/6) Int rij"
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
@@ -5546,12 +6312,12 @@ msgid ""
 msgstr ""
 "(4/6) Int-testoptie met de eenheid \"mm\" en een rij zonder beperkingen."
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr "(5/6) Int rij bereikbeperking"
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
@@ -5561,12 +6327,12 @@ msgstr ""
 "bereikbeperking. Het minimum is 4, het maximum 192, en de stapgrootte is "
 "2."
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr "(6/6) Int rij beperkte woordenlijst"
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
@@ -5575,27 +6341,27 @@ msgstr ""
 "(6/6) Int-testoptie met de eenheid \"procent\" en een rij met een "
 "woordenlijstbeperking."
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr "Vaste testopties"
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr "(1/3) Vast"
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr "(1/3) Vaste testoptie zonder eenheid en zonder beperking."
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr "(2/3) Vaste bereikbeperking"
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
@@ -5605,47 +6371,48 @@ msgstr ""
 "bereik. Het minimum is -42.17, het maximum 32767.9999 en de stapgrootte "
 "is 2.0."
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr "(3/3) Vaste beperkte woordenlijst"
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
-msgstr "(3/3) Vaste-testoptie zonder eenheid en met een beperkte woordenlijst."
+msgstr ""
+"(3/3) Vaste-testoptie zonder eenheid en met een beperkte woordenlijst."
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr "String-testopties"
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr "(1/3) String"
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr "(1/3) String-testoptie zonder beperkingen."
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr "(2/3) String beperkte \"string list\""
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr "(2/3) String-testoptie met een beperkte \"string list\"."
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr "(3/3) String beperkte lange \"string list\""
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
@@ -5654,156 +6421,160 @@ msgstr ""
 "(3/3) String-testoptie met een beperkte \"string list\". Bevat enkele "
 "andere ingangen..."
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr "Knoppen testoptie"
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr "(1/1) Knop"
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr "(1/1) Knoppen-testoptie. Levert enige tekst op..."
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, no-c-format
 msgid "Color 36"
 msgstr "Kleur 36"
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr "Gebruik beeldcompositie"
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr "2-niveau zwart/wit (lijntekening modus)"
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr "Halftoon zwart/wit (halftoon modus)"
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr "Multi-niveau zwart/wit (grijstrap modus)"
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr "Multi-niveau RGB kleur (één-doorgang-kleur)"
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr "Negeer kalibratie"
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr "Voorfocusering uitschakelen"
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr "Focusering niet kalibreren"
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr "Handmatige voorfocusering"
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr "Zet focuspositie vast"
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr "Kalibratie van de lens op het document"
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr "Kalibreer focus van de lens op het document"
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr "Houder focus positie 0mm"
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr "Gebruik 0mm houder focus positie in plaats van 0.6mm"
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr "Kalibreermodus"
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr "Bepaal kalibreermodus"
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr "Schakelt de lamp aan/uit"
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr "UTA aan"
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr "Schakelt UTA aan/uit"
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr "Compensatie"
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr "Compensatieinstellingen van de kleurkanalen"
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, no-c-format
 msgid "Gray offset"
 msgstr "Grijscompensatie"
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr "Stelt de compensatie in van het grijze kanaal"
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr "Stelt de compensatie in van het rode kanaal"
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr "Stelt de compensatie in van het groene kanaal"
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr "Stelt de compensatie in van het blauwe kanaal"
 
+#, fuzzy
+#~ msgid "IPC mode"
+#~ msgstr "Voorbeeldmodus"
+
 #~ msgid "problem not analyzed (unknown SCSI class)"
 #~ msgstr "probleem niet geanalyseerd (onbekende SCSI klasse)"
 
diff --git a/po/pl.gmo b/po/pl.gmo
new file mode 100644
index 0000000..6abea3d
--- /dev/null
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index bbd8bfb..872e709 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends 1.0.21\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
 "PO-Revision-Date: 2010-11-06 19:33+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -15,448 +15,442 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr "Liczba opcji"
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr "Standardowe"
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "Krawędzie obszaru skanowania"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "Ulepszanie"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr "Czujniki"
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "PodglÄ…d"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr "Wymuszaj podgląd czarnobiały"
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr "Głębokość bitowa"
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Tryb skanowania"
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "Prędkość skanowania"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr "Źródło skanowania"
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr "Wymuszaj nawracanie"
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "Lewa"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "Górna"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "Prawa"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "Dolna"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Rozdzielczość skanowania"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "Rozdzielczość X"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Rozdzielczość Y"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr "Szerokość strony"
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, no-c-format
 msgid "Page height"
 msgstr "Wysokość strony"
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr "Użyj tablicę kolorów użytkownika"
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr "Gęstość obrazka"
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr "Natężenie czerwieni"
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr "Natężenie zieleni"
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr "Natężenie błękitu"
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr "Jasność"
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr "Wielkość ziarna"
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr "Tworzenie półtonów"
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "Poziom czerni"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "Poziom bieli"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr "Poziom bieli dla czerwonego"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
 msgstr "Poziom bieli dla zielonego"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr "Poziom bieli dla niebieskiego"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "Cień"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr "Cień dla czerwonego"
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr "Cień dla zielonego"
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr "Cień dla niebieskiego"
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr "Światło"
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr "Światło dla czerwonego"
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr "Światło dla zielonego"
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr "Światło dla niebieskiego"
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr "Odcień"
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr "Nasycenie"
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "Nazwa pliku"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr "Rozmiar wzoru półcienia"
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "Wzór półcienia"
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr "Zrównaj rozdzielczość w osi X i Y"
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "Negatyw"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "Kalibracja jakości"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr "Podwójna rozdzielczość optyczna"
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr "Zepnij RGB"
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr "Próg"
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr "Analogowa korekcja gamma"
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr "Analogowa gamma czerwieni"
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr "Analogowa gamma zieleni"
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr "Analogowa gamma błękitu"
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr "Zepnij analogowÄ… gammÄ™"
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr "Rozgrzej lampÄ™"
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr "Kal. czasu ekspozycji"
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr "dla czerwieni"
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr "dla zieleni"
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr "dla błękitu"
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr "Czas ekspozycji"
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr "Czas ekspozycji dla czerwonego"
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr "Czas ekspozycji dla zielonego"
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr "Czas ekspozycji dla niebieskiego"
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr "Ustawia czas ekspozycji"
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr "Kal. gęstości lampy"
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr "Skan gęstości lampy"
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr "Ustaw gęstość lampy"
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr "Wyłącz lampę przy wyjściu"
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
 "supports."
 msgstr "Opcja tylko do odczytu, mówiąca ile opcji wspiera dane urządzenie."
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "Opecje źródła, trybu i rozdzielczości"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr "Opcje obszaru skanowania i rozmiaru obiektu"
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, no-c-format
 msgid "Image modification options"
 msgstr "Opcje modyfikacji obrazu"
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, no-c-format
 msgid "Hardware specific options"
 msgstr "Opcje specyficzne dla sprzętu"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr "Czujniki i przyciski skanera"
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr "Zażądaj skanu w jakości podglądu."
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -468,7 +462,7 @@ msgstr ""
 "przebiegów do jednego a na jednoprzebiegowym zmniejsza zapotrzebowanie "
 "na pamięć i czas pobierania podglądu."
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
@@ -477,63 +471,63 @@ msgstr ""
 "Ilość bitów na próbkę; typowe wartości to 1 dla trybu kreski i 8 dla "
 "skanów kolorowych i w skali szarości."
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr ""
 "Ustawia tryb skanowania, np. tryb kreski, skala szarości lub kolorowy"
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr "Określa prędkość przy której postępuje skanowanie."
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr "Wybierz źródło skanowania (np. podajnik)."
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr "Steruje wymuszaniem nawracania"
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "Lewa krawędź skanowanego obszaru (górny lewy x)."
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "Górna krawędź skanowanego obszaru (górny lewy y)."
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "Prawa krawędź skanowanego obszaru (dolny prawy x)."
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "Dolna krawędź skanowanego obszaru (dolny prawy y)."
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr "Ustawia rozdzielczość skanowanego obrazka."
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr "Ustawia poziomą rozdzielczość skanowanego obrazka."
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr "Ustawia pionową rozdzielczość skanowanego obrazka."
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
@@ -542,19 +536,19 @@ msgstr ""
 "Określa szerokość obiektu. Wymagane do automatycznego centrowania "
 "skanowania."
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, no-c-format
 msgid "Specifies the height of the media."
 msgstr "Określa wysokość obiektu."
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid ""
 "Determines whether a builtin or a custom gamma-table should be used."
 msgstr ""
 "Określa czy powinna być użyta wbudowana tabela gamma czy użytkownika"
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -564,32 +558,32 @@ msgstr ""
 "Tabela korekcji gamma. W trybie kolorowym ta opcja równomiernie wpływa "
 "na wszystkie kanały jednocześnie (staje się tabelą intensywności)."
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr "Tabela korekcji gamma dla pasma czerwieni"
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr "Tabela korekcji gamma dla pasma zieleni"
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr "Tabela korekcji gamma dla pasma błękitu"
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr "Ustawia jasność uzyskanego obrazka."
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr "Ustawia kontrast uzyskanego obrazka."
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
@@ -598,69 +592,69 @@ msgstr ""
 "Ustawia \"ziarnistość\" uzyskanego obrazka. Mniejsze wartości dadzą "
 "ostrzejsze obrazki."
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr "Ustawia czy uzyskany obrazek powinien być stonowany (ditherowany)."
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr "Decyduje o tym jaki poziom jasności ma być uznawany za \"czarny\"."
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr "Decyduje o tym jaki poziom jasności ma być uznawany za \"biały\"."
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr ""
 "Decyduje o tym jaki poziom jasności czerwieni ma być uznawany za \"biały"
 "\"."
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr ""
 "Decyduje o tym jaki poziom jasności zieleni ma być uznawany za \"biały\"."
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr ""
 "Decyduje o tym jaki poziom jasności błękitu ma być uznawany za \"biały\"."
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr ""
 "Decyduje o tym jaki poziom jasności czerwieni ma być uznawany za \"czarny"
 "\"."
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr ""
 "Decyduje o tym jaki poziom jasności zieleni ma być uznawany za \"czarny"
 "\"."
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr ""
 "Decyduje o tym jaki poziom jasności błękitu ma być uznawany za \"czarny"
 "\"."
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr ""
 "Decyduje o tym jaki poziom jasności czerwonego ma być uznawany jako "
 "czysty czerwony."
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid ""
 "Selects what green radiance level should be considered \"full green\"."
@@ -668,7 +662,7 @@ msgstr ""
 "Decyduje o tym jaki poziom jasności niebieskiego ma być uznawany jako "
 "czysty niebieski."
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid ""
 "Selects what blue radiance level should be considered \"full blue\"."
@@ -676,12 +670,12 @@ msgstr ""
 "Decyduje o tym jaki poziom jasności zielonego ma być uznawany jako "
 "czysty zielony."
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr "Ustawia \"odcień\" (poziom błękitu) otrzymanego obrazja"
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
@@ -690,12 +684,12 @@ msgstr ""
 "Poziom nasycenia ustawia ilość \"wykwitu\" który ukazuje się, kiedy "
 "pobieramy obraz z kamery. Większe wartości powodują większy wykwit."
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr "Nazwa pliku, który ma zostać załadowany."
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
@@ -704,7 +698,7 @@ msgstr ""
 "Ustawia rozmiar wzorca tonowania (ditheringu) używanego podczas "
 "skanowania tonowanych obrazków."
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
@@ -712,289 +706,289 @@ msgstr ""
 "Definiuje wzorzec tonowania (ditheringu) dla skanowania tonowanych "
 "obrazków."
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr ""
 "Użyj tych samych wartości dla rozdzielczości w osi X i Y (poziomie i "
 "pionie)"
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr "Zamień czarny z białym"
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr "Przeprowadź jakościową kalibrację białego"
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr "Użyj soczewek które podwajają rozdzielczość optyczną"
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr "W trybie RGB użyj tych samych wartości dla każdego koloru"
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr "Wybierz minimalną jasność by uzyskać biały punkt"
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr "Analogowa korekcja gamma"
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr "Analogowa korekcja gamma dla czerwieni"
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr "Analogowa korekcja gamma dla zieleni"
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr "Analogowa korekcja gamma dla niebieskiego"
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr "Rozgrzej lampÄ™ przed skanowaniem"
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr "Ustawia czas ekspozycji dla kalibracji"
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr "Ustawia czas ekspozycji dla kalibracji czerwonego"
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr "Ustawia czas ekspozycji dla kalibracji zielonego"
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr "Ustawia czas ekspozycji dla kalibracji niebieskiego"
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr "Ustawia czas ekspozycji dla skanowania"
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr "Ustawia czas ekspozycji dla skanowania czerwonego"
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr "Ustawia czas ekspozycji dla skanowania zielonego"
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr "Ustawia czas ekspozycji dla skanowania niebieskiego"
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr "Włącz wybór czasu ekspozycji"
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr "Ustaw gęstość lampy do kalibracji"
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr "Ustaw gęstość lampy do skanowania"
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr "Włącz wybór gęstości lampy"
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr "Wyłącz lampę przy wyjściu z programu"
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, no-c-format
 msgid "Scan button"
 msgstr "Przycisk skanowania"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, no-c-format
 msgid "Email button"
 msgstr "Przycisk E-maila"
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, no-c-format
 msgid "Fax button"
 msgstr "Przycisk faksu"
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, no-c-format
 msgid "Copy button"
 msgstr "Przycisk kopiowania"
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr "Przycisk PDF"
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr "Przycisk anulowania"
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr "Strona włożona"
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, no-c-format
 msgid "Cover open"
 msgstr "Pokrywa otwarta"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "Kolor"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr "Kolorowy tryb kreski"
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr "Kolorowy tryb półcieni"
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "Skala szarości"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr "Półtony"
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "Tryb kreski"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr "Sukces"
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, no-c-format
 msgid "Operation not supported"
 msgstr "Operacja nieobsługiwana"
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr "Operacja anulowana"
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr "Urządzenie zajęte"
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr "Błędny argument"
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr "Osiągnięto koniec pliku"
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, no-c-format
 msgid "Document feeder jammed"
 msgstr "Zakleszczenie podajnika dokumentów"
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, no-c-format
 msgid "Document feeder out of documents"
 msgstr "Koniec dokumentów w podajniku"
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, no-c-format
 msgid "Scanner cover is open"
 msgstr "Pokrywa skanera jest otwarta"
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr "BÅ‚Ä…d podczas operacji we/wy"
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr "Brak pamięci"
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr "Brak dostępu do zasobu"
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr "Lampa nie gotowa, proszę spróbować powtórnie"
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr "Mechanizm skanera zablokowany w celu transportu"
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "Wartości domyślne"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr "Ustaw domyślne wartości ustawień ulepszania"
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "Kalibracja"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr "Kalibruj przed następnym skanowaniem"
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
@@ -1004,12 +998,12 @@ msgstr ""
 "skanowaniem. W innym przypadku kalibracja zostanie wykonana przed "
 "pierwszym przebiegiem"
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr "Przeprowadź tylko korektę cieniowania"
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -1020,27 +1014,27 @@ msgstr ""
 "kalibracji. Domyślne są używane wartości dla wzmocnienia offsetu i czasu "
 "ekspozycji wbudowane lub z pliku konfiguracyjnego"
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr "Stan przycisku"
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr "Numer ramki do skanowania"
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr "Wybiera numer ramki do skanowania"
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, no-c-format
 msgid "Duplex scan"
 msgstr "Skanowanie dwustronne"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid ""
 "Duplex scan provide a scan of the front and back side of the document"
@@ -1048,1035 +1042,1026 @@ msgstr ""
 "Skanowanie dwustronne pozwala na skanowanie przedniej i tylnej strony "
 "dokumentu"
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr "Kalibruj Skaner"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr "WymuÅ› kalibracjÄ™ przed skanowaniem"
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr "Skanowanie w odcieniach szarości"
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr "Skanuj raczej w odcieniach szarości niż w kolorze"
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr "Wzmocnienie analogowe"
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr "Zwiększ lub zmniejsz wzmocnienie analogowe matrycy CCD"
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "Korekcja Gamma"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr "Wybiera poprawioną krzywą przejścia"
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr "Surowy"
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr "Dobry kolor"
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, no-c-format
 msgid "No transparency correction"
 msgstr "Brak korekcji dla klisz"
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr "Korekcja zgodna z rodzajem filmu"
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr "Korekcja zgodna ze współczynnikiem przezroczystości"
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, no-c-format
 msgid "Negatives"
 msgstr "Negatywy"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, no-c-format
 msgid "Slides"
 msgstr "Slajdy"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, no-c-format
 msgid "Normal speed"
 msgstr "Zwykła prędkość"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/2 normal speed"
 msgstr "1/2 zwykłej prędkości"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/3 normal speed"
 msgstr "1/3 zwykłej prędkości"
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, no-c-format
 msgid "rounded parameter"
 msgstr "parametr zaokrÄ…glony"
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr "nieznany"
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, no-c-format
 msgid "ADF jam"
 msgstr "zakleszczenie ADF"
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr "pokrywa ADF otwarta"
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, no-c-format
 msgid "lamp failure"
 msgstr "awaria lampy"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr "błąd pozycjonowania głowicy skanera"
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr "błąd kontroli CPU"
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr "błąd kontroli RAM"
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr "błąd kontroli ROM"
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr "błąd kontroli sprzętu"
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, no-c-format
 msgid "transparency unit lamp failure"
 msgstr "awaria lampy do skanowania przezroczy"
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr "błąd pozycjonowania głowicy do skanowania przezroczy"
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr "błąd długości listy parametrów"
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr "błędny kod operacji"
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr "błędne pole w CDB"
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr "nieobsługiwany LUN"
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr "błędne pole w liście parametrów"
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr "błąd sekwencji poleceń"
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr "podano zbyt dużo okien"
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr "brak nośnika"
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr "błędny komunikat bitowy IDENTIFY"
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr "opcja nie podłączona"
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr "reset po włączeniu zasilania / reset szyny"
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr "parametr zmieniony przez inny inicjator"
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr "brak dodatkowej informacji o stanie"
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr "niepowodzenie ponownego wyboru"
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr "błąd parzystości SCSI"
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr "otrzymano komunikat błędu wykryty przez inicjator"
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr "błędny komunikat"
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr "błąd przekroczenia czasu"
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, no-c-format
 msgid "transparency unit shading error"
 msgstr "błąd cieniowania modułu do skanowania przezroczy"
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr "lampa nie ustabilizowana"
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, no-c-format
 msgid "film scanner"
 msgstr "skaner filmów"
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr "skaner płaski"
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr "Rodzaj filmu"
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr "Wybór rodzaju filmu, np. negatywów lub slajdów"
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, no-c-format
 msgid "Negative film type"
 msgstr "Rodzaj negatywu"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, no-c-format
 msgid "Selects the negative film type"
 msgstr "Wybór rodzaju negatywu"
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, no-c-format
 msgid "Hardware resolution"
 msgstr "Rozdzielczość sprzętowa"
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "Użycie tylko rozdzielczości sprzętowych"
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr "Ostrość"
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, no-c-format
 msgid "Auto focus"
 msgstr "Ostrość automatyczna"
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, no-c-format
 msgid "Enable/disable auto focus"
 msgstr "Włączenie/wyłączenie automatycznego ustawiania ostrości"
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr "Jednokrotny autofocus"
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr "Automatyczne ustawianie ostrości tylko po wymianie nośnika"
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, no-c-format
 msgid "Manual focus position"
 msgstr "Ręczne ustawianie ostrości"
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr "Ręczne ustawianie pozycji ostrości optyki (domyślnie: 128)."
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr "Marginesy skanowania"
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr "Dodatkowe ustawienia kolorów"
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "Odbicie lustrzane obrazka"
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "Poziome odbicie lustrzane obrazu"
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, no-c-format
 msgid "Auto exposure"
 msgstr "Ekspozycja automatyczna"
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr "Włączenie/wyłączenie automatycznego wyboru ekspozycji"
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, no-c-format
 msgid "Calibration now"
 msgstr "Kalibruj teraz"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Uruchomienie kalibracji *teraz*"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr "Autodiagnostyka"
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr "Wykonanie autodiagnostyki skanera"
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, no-c-format
 msgid "Reset scanner"
 msgstr "Reset skanera"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, no-c-format
 msgid "Reset the scanner"
 msgstr "Zresetowanie skanera"
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr "Obsługa medium"
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, no-c-format
 msgid "Eject film after each scan"
 msgstr "Wysuń film po zeskanowaniu"
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr "Automatyczne wysuwanie filmu z urządzenia po każdym skanowaniu"
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr "Wysuń film przed zakończeniem"
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr ""
 "Automatyczne wysuwanie filmu z urządzenia przed zakończeniem programu"
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr "Wysuń film teraz"
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr "Wysunięcie filmu *teraz*"
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, no-c-format
 msgid "Document feeder extras"
 msgstr "Dodatkowy podajnik dokumentów"
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, no-c-format
 msgid "Flatbed only"
 msgstr "Tylko płyta"
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr ""
 "Wyłączenie automatycznego podajnika dokumentów, używanie tylko płyty"
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, no-c-format
 msgid "Transparency unit"
 msgstr "Moduł do skanowania przezroczy"
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr "Włączenie/wyłączenie modułu do skanowania przezroczy (FAU)"
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, no-c-format
 msgid "Negative film"
 msgstr "Negatyw"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, no-c-format
 msgid "Positive or negative film"
 msgstr "Pozytyw lub negatyw"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr "Kontrola gęstości"
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr "Ustawienie trybu kontroli gęstości"
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, no-c-format
 msgid "Transparency ratio"
 msgstr "Współczynnik przezroczystości"
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, no-c-format
 msgid "Select film type"
 msgstr "Rodzaj filmu"
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, no-c-format
 msgid "Select the film type"
 msgstr "Wybór rodzaju filmu"
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "PÅ‚yta"
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, no-c-format
 msgid "ADF Front"
 msgstr "ADF przód"
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, no-c-format
 msgid "ADF Back"
 msgstr "ADF tył"
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, no-c-format
 msgid "ADF Duplex"
 msgstr "ADF dwustronny"
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, fuzzy, no-c-format
 msgid "Card Front"
 msgstr "Przód"
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, fuzzy, no-c-format
 msgid "Card Back"
 msgstr "Tył"
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, fuzzy, no-c-format
 msgid "Card Duplex"
 msgstr "Dwustronny"
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "Czerwony"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "Zielony"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "Niebieski"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, no-c-format
 msgid "Enhance Red"
 msgstr "Rozszerzenie czerwieni"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, no-c-format
 msgid "Enhance Green"
 msgstr "Rozszerzenie zieleni"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, no-c-format
 msgid "Enhance Blue"
 msgstr "Rozszerzenie błękitu"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr "Brak"
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr "JPEG"
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr ""
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr ""
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr "Jednostronny"
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr "Dwustronny"
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr "Moduł do skanowania przezroczy"
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr "Automatyczny podajnik dokumentów"
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "Pozytyw"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "Negatyw"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr "Ostrość na szybie"
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr "Ostrość 2.5mm powyżej szyby"
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr "Półton A (Twardy)"
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr "Półton B (Miękki)"
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr "Półton C (Siatka)"
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr "Ziarnistość A (4x4 Bayera)"
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr "Ziarnistość B (4x4 Spiralna)"
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr "Ziarnistość C (4x4 Siatka)"
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr "Ziarnistość D (8x4 Siatka)"
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr "Technologia Uwydatniania Tekstu"
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr "Pobierz wzór A"
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr "Pobierz wzór B"
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "Brak korekcji"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr "Zdefiniowane przez użytkownika"
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr "Drukarki igłowe"
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr "Drukarki termiczne"
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "Drukarki atramentowe"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr "Monitory CRT"
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "Domyślny"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr "Druk wysokiej gęstości"
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr "Druk niskiej gęstości"
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr "Druk o wysokim kontraście"
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr "Zdefiniowane przez użytkownika (Gamma=1.0)"
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr "Zdefiniowane przez użytkownika (Gamma=1.8)"
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr "CD"
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr "A5 portret"
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr "A5 krajobraz"
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr "List"
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr "A4"
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "Maksimum"
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr "Tryb skanowania"
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr "Wybór półcieni"
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr "Dropout"
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr "Wybiera dropout"
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr "Wybiera jasność"
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr "Ostrość"
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr "Korekcja koloru"
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr ""
 "Ustawia tablicę korekcji koloru dla wybranego urządzenia wyjściowego."
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr "Współczynnik korekcji koloru"
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr "Macierz mnożenia RGB"
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr "Przesuń zieleń do czerwieni"
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr "Przesuń zieleń do błękitu"
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr "Przesuń czerwień do zieleni"
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr "Przesuń czerwień do błękitu"
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr "Przesuń błękit do zieleni"
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr "Przesuń błękit do czerwieni"
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr "Nadzoruje poziom zieleni"
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr "Dodaje do czerwieni bazujÄ…c na poziomie zieleni"
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr "Dodaje do błękitu bazując na poziomie zieleni"
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr "Dodaje do zieleni bazujÄ…c na poziomie czerwieni"
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr "Nadzoruje poziom czerwieni"
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr "Dodaje do błękitu bazując na poziomie czerwieni"
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr "Dodaje do zieleni bazując na poziomie błękitu"
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr "Dodaje do czerwieni bazując na poziomie błękitu"
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, no-c-format
 msgid "Controls blue level"
 msgstr "Nadzoruje poziom błękitu"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr "Utwórz odbicie lustrzane obrazka"
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr "Szybki podglÄ…d"
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr "Automatyczny podział obszaru"
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr "Krótka lista rozdzielczości"
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr "Wyświetl krótką listę rozdzielczości"
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr "Powiększenie"
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr "Definiuje współczynnik powiększenia dla skanera"
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr "Szybkie formatowanie"
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr "Wyposażenie opcjonalne"
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr "Wysuń"
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr "Wysuń arkusz z ADF"
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr "Wysuwanie automatyczne"
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr "Wysuń dokument po zeskanowaniu"
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr "Tryb ADF"
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr "Wybiera tryb ADF (jedno/dwustronny)"
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr "Wnęka"
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr "Wybierz wnękę do skanowania"
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
@@ -2085,23 +2070,23 @@ msgstr ""
 "Wybiera wartość korekcji gamma z listy zdefiniowanych urządzeń lub "
 "tabeli użytkownika, która może być załadowana do skanera"
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr "Pozycja skupienia (ostrości)"
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
 msgstr "Ustawia skupienie (ostrość) na szybę lub 2.5mm powyżej szyby"
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr "Czekaj na Przycisk"
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
@@ -2110,207 +2095,952 @@ msgstr ""
 "Po wysłaniu komendy skanowania, czekaj aż przycisk na skanerze jest "
 "naciśnięty, aby naprawdę rozpocząć skanowanie"
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr "Podczerwień"
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, no-c-format
 msgid "Positive Slide"
 msgstr "Pozytyw"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, no-c-format
 msgid "Negative Slide"
 msgstr "Negatyw"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr "Wbudowany profil CCT"
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, no-c-format
 msgid "User defined CCT profile"
 msgstr "Profil CCT zdefiniowany przez użytkownika"
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr "WÅ‚Ä…czony"
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr "Wyłącz"
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr "DTC"
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr "SDTC"
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr "Ditheruj"
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, no-c-format
 msgid "Diffusion"
 msgstr "Dyfuzja"
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, no-c-format
 msgid "White"
 msgstr "Biel"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, no-c-format
 msgid "Black"
 msgstr "Czerń"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, no-c-format
 msgid "Continue"
 msgstr "Kontynuacja"
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr "Stop"
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr "10mm"
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr "15mm"
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr "20mm"
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr "Poziomy"
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, no-c-format
 msgid "Horizontal bold"
 msgstr "Poziomy pogrubiony"
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, no-c-format
 msgid "Horizontal narrow"
 msgstr "Poziomy cienki"
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr "Pionowy"
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, no-c-format
 msgid "Vertical bold"
 msgstr "Pionowy pogrubiony"
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr "Od góry do dołu"
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr "Od dołu do góry"
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, no-c-format
 msgid "Front"
 msgstr "Przód"
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr "Tył"
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
+msgid "Gamma function exponent"
 msgstr ""
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
 #, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
+msgid "Changes intensity of midtones"
+msgstr ""
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr ""
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr ""
+
+#: backend/fujitsu.c:3165
+#, fuzzy, no-c-format
+msgid "Halftone type"
+msgstr "Półtony"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr ""
+
+#: backend/fujitsu.c:3210
+#, fuzzy, no-c-format
+msgid "Perform outline extraction"
+msgstr "Wykonuje kalibracjÄ™"
+
+#: backend/fujitsu.c:3221
+#, fuzzy, no-c-format
+msgid "Emphasis"
+msgstr "Emfaza obrazka"
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr ""
+
+#: backend/fujitsu.c:3240
+#, fuzzy, no-c-format
+msgid "Separation"
+msgstr "Nasycenie"
+
+#: backend/fujitsu.c:3241
+#, fuzzy, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr "Włącz automatyczne rozpoznawanie progu dla skanów w trybie kreski."
+
+#: backend/fujitsu.c:3252
+#, fuzzy, no-c-format
+msgid "Mirroring"
+msgstr "Odbicie lustrzane obrazka"
+
+#: backend/fujitsu.c:3253
+#, fuzzy, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "Poziome, lustrzane odbicie obrazka."
+
+#: backend/fujitsu.c:3270
+#, fuzzy, no-c-format
+msgid "White level follower"
+msgstr "Poziom bieli dla niebieskiego"
+
+#: backend/fujitsu.c:3271
+#, fuzzy, no-c-format
+msgid "Control white level follower"
+msgstr "Nadzoruje poziom czerwieni"
+
+#: backend/fujitsu.c:3289
+#, fuzzy, no-c-format
+msgid "BP filter"
+msgstr "Filtr kolorów"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr ""
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr "Wygładzanie"
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr ""
+
+#: backend/fujitsu.c:3323
+#, fuzzy, no-c-format
+msgid "Gamma curve"
+msgstr "Wartość gamma"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, no-c-format
+msgid "Threshold curve"
+msgstr "Krzywa progowa"
+
+#: backend/fujitsu.c:3347
+#, fuzzy, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr "Dynamiczna krzywa progowa, od ciemnego do jasnego, zwykle 50-65"
+
+#: backend/fujitsu.c:3369
+#, fuzzy, no-c-format
+msgid "Threshold white"
+msgstr "Próg"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr ""
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, fuzzy, no-c-format
+msgid "Noise removal"
+msgstr "Redukcja szumów"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr ""
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr ""
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr ""
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr ""
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr ""
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr ""
+
+#: backend/fujitsu.c:3508
+#, fuzzy, no-c-format
+msgid "Auto width detection"
+msgstr "Brak korekcji"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr ""
+
+#: backend/fujitsu.c:3526
+#, fuzzy, no-c-format
+msgid "Auto length detection"
+msgstr "Brak korekcji"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr ""
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr ""
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr ""
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr ""
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr ""
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr ""
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr ""
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
 msgstr ""
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3708
+#, fuzzy, no-c-format
+msgid "DF recovery mode"
+msgstr "pokrywa ADF otwarta"
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr ""
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3748
+#, fuzzy, no-c-format
+msgid "Advanced paper protection"
+msgstr "Opcje zaawansowane"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+
+#: backend/fujitsu.c:3768
+#, fuzzy, no-c-format
+msgid "Staple detection"
+msgstr "Brak korekcji"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr ""
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+
+#: backend/fujitsu.c:3809
+#, fuzzy, no-c-format
+msgid "Dropout color"
+msgstr "Dropout"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+
+#: backend/fujitsu.c:3833
+#, fuzzy, no-c-format
+msgid "Buffer mode"
+msgstr "tryb podajnika"
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr ""
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr ""
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr ""
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+
+#: backend/fujitsu.c:3911
+#, fuzzy, no-c-format
+msgid "Off timer"
+msgstr "Czas wyłączania lampy"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+
+#: backend/fujitsu.c:3930
+#, fuzzy, no-c-format
+msgid "Duplex offset"
+msgstr "Offset błękitu"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr ""
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "Offset zieleni"
+
+#: backend/fujitsu.c:3949
+#, fuzzy, no-c-format
+msgid "Adjust green/red offset"
+msgstr "Offset zieleni"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr "Offset błękitu"
+
+#: backend/fujitsu.c:3967
+#, fuzzy, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "Ustawienie offsetu kanału błękitu"
+
+#: backend/fujitsu.c:3980
+#, fuzzy, no-c-format
+msgid "Low Memory"
+msgstr "Brak pamięci"
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+
+#: backend/fujitsu.c:3996
+#, fuzzy, no-c-format
+msgid "Duplex side"
+msgstr "Skanowanie dwustronne"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr ""
+
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr ""
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr ""
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
+msgstr ""
+
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr ""
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+
+#: backend/fujitsu.c:4095
+#, fuzzy, no-c-format
+msgid "Endorser Options"
+msgstr "Opcje zaawansowane"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr ""
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr ""
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr ""
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr ""
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr ""
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr ""
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr ""
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr ""
+
+#: backend/fujitsu.c:4253
+#, fuzzy, no-c-format
+msgid "Endorser direction"
+msgstr "Redukcja szumów"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr ""
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr ""
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr ""
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr ""
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr ""
+
+#: backend/fujitsu.c:4344
+#, fuzzy, no-c-format
+msgid "A3 paper"
+msgstr "Od papieru"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4356
+#, fuzzy, no-c-format
+msgid "B4 paper"
+msgstr "Od papieru"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4368
+#, fuzzy, no-c-format
+msgid "A4 paper"
+msgstr "Od papieru"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4380
+#, fuzzy, no-c-format
+msgid "B5 paper"
+msgstr "Od papieru"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr ""
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr ""
+
+#: backend/fujitsu.c:4429
+#, fuzzy, no-c-format
+msgid "Scanner in power saving mode"
+msgstr "Pokrywa skanera jest otwarta"
+
+#: backend/fujitsu.c:4452
+#, fuzzy, no-c-format
+msgid "Manual feed"
+msgstr "Ręczne wstępne ustawianie ostrości"
+
+#: backend/fujitsu.c:4453
+#, fuzzy, no-c-format
+msgid "Manual feed selected"
+msgstr "Ręczne wstępne ustawianie ostrości"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr ""
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr ""
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr ""
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr ""
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr ""
+
+#: backend/fujitsu.c:4513
+#, fuzzy, no-c-format
+msgid "Hardware error code"
+msgstr "błąd kontroli sprzętu"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr ""
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr ""
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr ""
+
+#: backend/fujitsu.c:4537
+#, fuzzy, no-c-format
+msgid "Imprinter ink level"
+msgstr "Poziom bieli"
+
+#: backend/fujitsu.c:4548
+#, fuzzy, no-c-format
+msgid "Density"
+msgstr "Kontrola gęstości"
+
+#: backend/fujitsu.c:4549
+#, fuzzy, no-c-format
+msgid "Density dial"
+msgstr "Kontrola gęstości"
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, fuzzy, no-c-format
+msgid "Duplex switch"
+msgstr "Skanowanie dwustronne"
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, no-c-format
 msgid "Extras"
 msgstr "Dodatki"
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, no-c-format
-msgid "Threshold curve"
-msgstr "Krzywa progowa"
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr "Dynamiczna krzywa progowa, od ciemnego do jasnego, zwykle 50-65"
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr "Wyłączenie dynamicznego trybu kreski"
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, fuzzy, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
@@ -2319,12 +3049,12 @@ msgstr ""
 "Wyłączenie użycia algorytmu adaptacyjnego do generowania linii zamiast "
 "polegania na trybie sprzętowym"
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, no-c-format
 msgid "Disable interpolation"
 msgstr "Wyłącz interpolację"
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
@@ -2334,44 +3064,44 @@ msgstr ""
 "mniejsza niż rozdzielczość pionowa, ta opcja wyłącza interpolację "
 "poziomÄ…."
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "Filtr kolorów"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr "W trybie szarości lub kreski ta opcja wybiera używany kolor."
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "Kalibracja"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Zdefiniuj tryb kalibracji"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Pamięć podręczna danych kalibracji"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, no-c-format
 msgid "Lamp off time"
 msgstr "Czas wyłączania lampy"
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
@@ -2380,105 +3110,103 @@ msgstr ""
 "Lampa zostanie wyłączona po podanym czasie (w minutach). Wartość 0 "
 "oznacza, że lampa nie będzie wyłączana."
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, fuzzy, no-c-format
 msgid "Lamp off during scan"
 msgstr "Wyłącz lampę podczas kalibracji ciemności"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, fuzzy, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr "Liczba minut do wyłączenia lampy po skanowaniu"
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, no-c-format
 msgid "File button"
 msgstr "Przycisk pliku"
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr "Przycisk OCR"
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, no-c-format
 msgid "Power button"
 msgstr "Przycisk zasilania"
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "Przycisk E-maila"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, no-c-format
 msgid "Need calibration"
 msgstr "Wymaga kalibracji"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr "Skaner wymaga kalibracji dla obecnych ustawień"
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, no-c-format
 msgid "Buttons"
 msgstr "Przyciski"
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr "Kalibracja"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "Rozpocznij kalibrację przy użyciu specjalnej kartki"
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, no-c-format
 msgid "Clear calibration"
 msgstr "Wyczyść kalibrację"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, no-c-format
 msgid "Clear calibration cache"
 msgstr "Wyczyść pamięć podręczną kalibracji"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr "Moduł do skanowania negatywów"
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr "Kolor trybu odcieni szarości"
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 "Wybiera który kolor skanowania jest używany w trybie odcieni szarości "
 "(domyślnie: zielony)."
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr "Opcje odpluskwiania"
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "Automatyczne rozgrzewanie"
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -2487,12 +3215,12 @@ msgstr ""
 "Rozgrzewaj dopóki jasność lampy będzie stała, zamiast przyjmować stały "
 "czas 60 sekund."
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "Pełny ekran"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
@@ -2501,12 +3229,12 @@ msgstr ""
 "Skanuj cały dostępny obszar, łącznie z paskiem kalibracyjnym. Bądź "
 "ostrożny. Nie wybieraj pełnej wysokości. Opcja tylko do celów testowych"
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Kalibracja ziarnistości"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2518,12 +3246,12 @@ msgstr ""
 "parametrów analogowych. Ta opcja jest odblokowana domyślnie. Opcja tylko "
 "do testów."
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "Kalibracja ziarnistości tylko dla pierwszego skanu"
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2535,12 +3263,12 @@ msgstr ""
 "jasność obrazka jest różna za każdym skanem, wyłącz tę opcję. Opcja "
 "tylko dla testów."
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, no-c-format
 msgid "Backtrack lines"
 msgstr "Wymuszaj nawracanie"
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2553,85 +3281,85 @@ msgstr ""
 "Niskie wartości mogą powodować szybsze skanowanie lecz zwiększają ryzyko "
 "pominięcia niektórych linii."
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Wartość gamma"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr "Ustawia wartość gamma dla wszystkich kanałów"
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, no-c-format
 msgid "Geometry Group"
 msgstr "Grupa geometrii"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, no-c-format
 msgid "Scan Mode Group"
 msgstr "Grupa trybu skanowania"
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr "Slajd"
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, no-c-format
 msgid "Scanner model"
 msgstr "Model skanera"
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, fuzzy, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr ""
 "Umożliwia sprawdzenie zachowania urządzenia z innymi obsługiwanymi "
 "modelami"
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr "Kolory obrazu będą odwrócone"
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, no-c-format
 msgid "Disable gamma correction"
 msgstr "Wyłącz korekcję gamma"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "Korekcja gamma będzie wyłączona"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, no-c-format
 msgid "Disable white shading correction"
 msgstr "Wyłącz korekcję cieniowania bieli"
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr "Korekcja cieniowania bieli będzie wyłączona"
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr "Pomiń proces rozgrzewania"
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr "Proces rozgrzewania będzie pominięty"
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr "Wymuś prawdziwą głębię"
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2642,12 +3370,12 @@ msgstr ""
 "z 16-bitową głębią w celu poprawy jakości obrazu, a następnie "
 "konwertowane do wybranej głębi. Ta opcja zapobiega emulacji głębi."
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, no-c-format
 msgid "Emulate Grayscale"
 msgstr "Emulacja skali szarości"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2658,12 +3386,12 @@ msgstr ""
 "następnie konwertowany programowo do skali szarości. Może to poprawić "
 "jakość obrazu w pewnych przypadkach."
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr "Zapisuj obrazy diagnostyczne"
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
@@ -2672,356 +3400,350 @@ msgstr ""
 "Jeśli jest włączona, obrazy uczestniczące w dostrajaniu skanera są "
 "zapisywane w celu analizy."
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, no-c-format
 msgid "Reset chipset"
 msgstr "Reset układów"
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr "Zresetowanie danych układów"
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, no-c-format
 msgid "Information"
 msgstr "Informacje"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, no-c-format
 msgid "Chipset name"
 msgstr "Nazwa układów"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr "Pokazuje nazwy układów (chipsetu) użytych w urządzeniu."
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr "ID chipsetu"
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, no-c-format
 msgid "Shows the chipset ID"
 msgstr "Pokazuje ID chipsetu"
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, no-c-format
 msgid "Scan counter"
 msgstr "Licznik skanowań"
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr "Pokazuje liczbę wykonanych skanowań"
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, no-c-format
 msgid "Update information"
 msgstr "Aktualizuj informacje"
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr "Uaktualnia informacje o urzÄ…dzeniu"
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr "Opcja ta odzwierciedla stan przycisku przedniego panelu skanera"
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr "Obraz"
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr "Różne"
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, no-c-format
 msgid "offset X"
 msgstr "przesunięcie X"
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr "Wewnętrzne sprzętowe położenie poziome (X) obszaru skanowania."
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, no-c-format
 msgid "offset Y"
 msgstr "przesunięcie Y"
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr "Wewnętrzne sprzętowe położenie pionowe (Y) obszaru skanowania."
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr "Status lampy"
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr "Włącza lub wyłącza lampę."
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr "Kalibruje poziom dla czerni i bieli."
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr "ADF"
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, no-c-format
 msgid "TMA Slides"
 msgstr "TMA - slajdy"
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, no-c-format
 msgid "TMA Negatives"
 msgstr "TMA - negatywy"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, no-c-format
 msgid "Color (48 bits)"
 msgstr "Kolor (48 bitów)"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, no-c-format
 msgid "Extend lamp timeout"
 msgstr "Powiększ czas wyłączenia lampy"
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr "Powiększa czas wyłączenia lampy (z 15 minut do 1 godziny)"
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr "Czekaj na przycisk"
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, no-c-format
 msgid "Waits for button before scanning"
 msgstr "Oczekiwanie na naciśnięcie przycisku przed skanowaniem"
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, no-c-format
 msgid "Advanced Options"
 msgstr "Opcje zaawansowane"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr "Ziarnistość"
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr "Dokładny"
 
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr "Bayera"
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr "Użytkownika"
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "Automatyczny"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr "NTSC RGB"
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr "XPA RGB"
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr "Åšrodkowoprzepustowy"
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "Skala szarości NTSC"
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr "Skala szarości XPA"
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "Powolny"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr "Zwykły"
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "Szybki"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr "Bardzo szybki"
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr "2-pikselowy"
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr "4-pikselowy"
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr "8-pikselowy"
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr "Drukuj"
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, no-c-format
 msgid "Film-strip"
 msgstr "Pasek filmu"
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr "XPA"
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr "Warunkowy"
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, no-c-format
 msgid "Experiment"
 msgstr "Eksperyment"
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, no-c-format
 msgid "Sharpening"
 msgstr "Wyostrzanie"
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr "Ustaw wartość wyostrzania."
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr "Automatyczne progowanie"
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr "Włącz automatyczne rozpoznawanie progu dla skanów w trybie kreski."
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr "Wygładzanie"
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr "Wybierz filtr wygładzający."
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr "Wysuń nośnik po skanowaniu"
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, no-c-format
 msgid "Unloads the media after a scan."
 msgstr "Wysuwa nośnik po skanowaniu."
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, no-c-format
 msgid "Change document"
 msgstr "Zmień dokument"
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr "Zmień Dokument."
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr "Wysuń"
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr "Wysuń Dokument."
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, no-c-format
 msgid "Start calibration process."
 msgstr "Rozpocznij proces kalibracji."
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, no-c-format
 msgid "Media"
 msgstr "Nośnik"
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr "Ustaw rodzaj nośnika."
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr "Czas ekspozycji"
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -3034,462 +3756,461 @@ msgstr ""
 "\" dla filmu negatywowego. Dla ciemnych (nie doświetlonych) obrazków "
 "możesz zwiększyć tę wartość."
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, no-c-format
 msgid "Color Matrix"
 msgstr "Matryca kolorów"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, no-c-format
 msgid "Set the scanners color matrix."
 msgstr "Ustaw matrycę kolorów skanera."
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr "Matryca kolorów użytkownika"
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, no-c-format
 msgid "Mono Color Matrix"
 msgstr "Monochromatyczna matryca kolorów"
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr "Matryca kolorów użytkownika dla skanów w skali szarości."
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, no-c-format
 msgid "Mirror horizontal"
 msgstr "Odbicie poziome"
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, no-c-format
 msgid "Mirror image horizontally."
 msgstr "Poziome, lustrzane odbicie obrazka."
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, no-c-format
 msgid "Mirror vertical"
 msgstr "Odbij pionowo."
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, no-c-format
 msgid "Mirror image vertically."
 msgstr "Pionowe, lustrzane odbicie obrazka."
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, no-c-format
 msgid "Update options"
 msgstr "Aktualizuj opcje"
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, no-c-format
 msgid "Update options."
 msgstr "Aktualizuj opcje."
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr "8-bitowe wyjście"
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr ""
 "Użyj wewnętrznie głębi większej niż osiem bitów, lecz na wyjściu daj "
 "równe osiem."
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr "Oczekiwanie na przycisk panelu"
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr "Czekaj ze skanowaniem na naciśnięcie przycisku na przednim panelu."
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr "Wyłącz lampę"
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr "Wyłącz lampę skanera."
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "Rozmiar papieru"
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr "Automatyczna separacja"
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, fuzzy, no-c-format
 msgid "Landscape"
 msgstr "A5 krajobraz"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr ""
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, fuzzy, no-c-format
 msgid "Length control mode"
 msgstr "Ustawienie trybu kontroli gęstości"
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, fuzzy, no-c-format
 msgid "Manual feed mode"
 msgstr "Ręczne wstępne ustawianie ostrości"
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, fuzzy, no-c-format
 msgid "Manual feed timeout"
 msgstr "Ręczne wstępne ustawianie ostrości"
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr "WÅ‚Ä…cz skanowanie dwustronne"
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr "Fizyczny rozmiar papieru w ADF"
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, fuzzy, no-c-format
 msgid "halftone"
 msgstr "Półtony"
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, fuzzy, no-c-format
 msgid "color"
 msgstr "Kolor"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, fuzzy, no-c-format
 msgid "continuous"
 msgstr "Kontynuacja"
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, fuzzy, no-c-format
 msgid "off"
 msgstr "Wyłącz"
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, fuzzy, no-c-format
 msgid "bayer_64"
 msgstr "Bayera"
 
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, fuzzy, no-c-format
 msgid "bayer_16"
 msgstr "Bayera"
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, fuzzy, no-c-format
 msgid "halftone_32"
 msgstr "Półtony"
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, fuzzy, no-c-format
 msgid "halftone_64"
 msgstr "Półtony"
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, fuzzy, no-c-format
 msgid "diffusion"
 msgstr "Dyfuzja"
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, fuzzy, no-c-format
 msgid "normal"
 msgstr "Zwykły"
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, fuzzy, no-c-format
 msgid "light"
 msgstr "Światło"
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, fuzzy, no-c-format
 msgid "From scanner"
 msgstr "skaner filmów"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr "Od papieru"
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, fuzzy, no-c-format
 msgid "default"
 msgstr "Domyślny"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, fuzzy, no-c-format
 msgid "smooth"
 msgstr "Wygładzanie"
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, fuzzy, no-c-format
 msgid "low"
 msgstr "Powolny"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, fuzzy, no-c-format
 msgid "medium"
 msgstr "Åšredni"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, fuzzy, no-c-format
 msgid "red"
 msgstr "Czerwony"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, fuzzy, no-c-format
 msgid "green"
 msgstr "Zielony"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, fuzzy, no-c-format
 msgid "Sets the scan source"
 msgstr "Źródło skanowania"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr "tryb podajnika"
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr "Ustawia tryb podajnika"
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, fuzzy, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr "Włączenie/wyłączenie automatycznego ustawiania ostrości"
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, fuzzy, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr "Ustawienie trybu kontroli gęstości"
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, fuzzy, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "Ustawia tryb podajnika"
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, fuzzy, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr "Ustawia tryb podajnika"
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr "Automatyczne progowanie"
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
@@ -3498,559 +4219,546 @@ msgstr ""
 "Automatycznie ustawia jasność, kontrast, poziom bieli, gammę, redukcję "
 "szumów i emfazę obrazka"
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "Redukcja szumów"
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr "Zmniejsz szum izolowanych punktów"
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr "Emfaza obrazka"
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr "Ustawia emfazÄ™ obrazka"
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, fuzzy, no-c-format
 msgid "Lamp color"
 msgstr "WÅ‚Ä…cz lampÄ™"
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, fuzzy, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr "Włącza lub wyłącza lampę."
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, fuzzy, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "Pionowe, lustrzane odbicie obrazka."
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
 "length of actual paper or logical document length."
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "Korekcja gamma"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, fuzzy, no-c-format
 msgid "High sensivity"
 msgstr "Druk wysokiej gęstości"
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, fuzzy, no-c-format
 msgid "Low sensivity"
 msgstr "Druk niskiej gęstości"
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, fuzzy, no-c-format
 msgid "err_diffusion"
 msgstr "Dyfuzja"
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, fuzzy, no-c-format
 msgid "No detection"
 msgstr "Brak korekcji"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, fuzzy, no-c-format
 msgid "Normal mode"
 msgstr "Zwykły"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, fuzzy, no-c-format
 msgid "Enhanced mode"
 msgstr "Ulepszanie"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
 "divides long paper by the length which is set in Document Size option."
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, fuzzy, no-c-format
 msgid "Automatic threshold mode"
 msgstr "Automatyczne progowanie"
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, fuzzy, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr "Automatyczne progowanie"
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, fuzzy, no-c-format
 msgid "Set chroma of red"
 msgstr "Ustaw kolejność ramek"
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, fuzzy, no-c-format
 msgid "chroma of blue"
 msgstr "Cień dla niebieskiego"
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, fuzzy, no-c-format
 msgid "Set chroma of blue"
 msgstr "Przesuń czerwień do błękitu"
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr "Diamentowy"
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr "Pogrubianie ziarniste 8x8"
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr "Pogrubianie dokładne 8x8"
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr "Pogrubianie Bayera 8x8"
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr "Linie pionowe 8x8"
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr "Wzmocnienie"
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr "Ustawienia wzmocnienia kanałów kolorów"
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, no-c-format
 msgid "Gray gain"
 msgstr "Wzmocnienie szarości"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr "Ustawia wzmocnienie kanału szarości"
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, no-c-format
 msgid "Red gain"
 msgstr "Wzmocnienie czerwieni"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr "Ustawia wzmocnienie kanału czerwieni"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, no-c-format
 msgid "Green gain"
 msgstr "Wzmocnienie zieleni"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr "Ustawia wzmocnienie kanału zieleni"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, no-c-format
 msgid "Blue gain"
 msgstr "Wzmocnienie błękitu"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr "Ustawia wzmocnienie kanału błękitu"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr "Ditherowanie Bayera 16"
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr "Ditherowanie Bayera 64"
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr "Półtonu Punkt 32"
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr "Półton Punkt 64"
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr "\"Przenikanie błędów\""
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr "Tryb 1"
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr "Tryb 2"
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr "Tryb 3"
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr "Od białego elementu"
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr "Wygładzanie"
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr "Niski"
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr "Åšredni"
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr "Wysoki"
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr "CRT"
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "Jedna strona"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "Wszystkie strony"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr "skaner arkuszy"
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr "Skala szarości w 4-bitach"
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr "Skala szarości w 8-bitach"
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr "Cienie, półtony, światła, czas ekspozycji"
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr "Opcje dodatkowe"
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr "Balans kolorów"
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr "Nie wykonuj nawracania"
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr "Jeśli zaznaczone, skaner nie wykonuje nawracania głowicy"
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr "Włącz / wyłącz lampę główną skanera"
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr "Włącza bądź wyłącza lampę główną skanera"
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr "Kalibracja wykonywana przez sterownik"
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid ""
 "If checked the color calibration before a scan is done by the backend"
 msgstr ""
 "Jeśli zaznaczone, sterownik wykonuje kalibrację kolorów przed skanowaniem"
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr "Używaj przystawki lightlid-35mm"
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr ""
 "Ta opcja wyłącza lampę główną skanera podczas używania przystawki do "
 "materiałów przezroczystych"
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "Skan dobrej jakości"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr "Najwyższa jakość, ale mała prędkość"
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "Szybki skan"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr "Największa szybkość, ale gorsza jakość"
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr "Automatyczne dostosowanie progu"
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
@@ -4059,283 +4767,283 @@ msgstr ""
 "Jeżeli zaznaczone, sterownik automatycznie próbuje znaleźć optymalną "
 "wartość dla progu."
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr "Ustawia sposób korekcji gamma."
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr "Identyczna gamma dla wszystkich kanałów"
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr "Użyj takiej samej wartości dla wszystkich kolorów"
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr "Liniowa gamma"
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr "Ustawia wartość dla liniowej korekcji gamma."
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr "Liniowa gamma, czerwony"
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr "Ustawia wartość liniowej korekcji gamma dla czerwonego kanału"
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr "Liniowa gamma, zielony"
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr "Ustawia wartość liniowej korekcji gamma dla zielonego kanału"
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr "Liniowa gamma, niebieski"
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr "Ustawia wartość liniowej korekcji gamma dla niebieskiego kanału"
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr "Kanał"
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
 msgstr "Wybiera zakres kolorów, \"Główny\" ma wpływ na wszystkie kolory."
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr "Półcień"
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr ""
 "Decyduje o tym jaki poziom jasności ma być uznawany za \"50% szarego\""
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr "Półcień dla czerwonego"
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr ""
 "Decyduje o tym jaki poziom jasności ma być uznawany za \"50% czerwonego\""
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr "Półcień dla zielonego"
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr ""
 "Decyduje o tym jaki poziom jasności ma być uznawany za \"50% zielonego\""
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr "Półcień dla niebieskiego"
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr ""
 "Decyduje o tym jaki poziom jasności ma być uznawany za \"50% niebieskiego"
 "\""
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr "Balans czerwonego"
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr ""
 "Współczynnik balansu dla czerwonego. Wartość 100% oznacza brak korekcji."
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr "Balans zielonego"
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr ""
 "Współczynnik balansu dla zielonego. Wartość 100% oznacza brak korekcji."
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr "Balans niebieskiego"
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr ""
 "Współczynnik balansu dla niebieskiego. Wartość 100% oznacza brak "
 "korekcji."
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr "Balans firmware-owy"
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr ""
 "Ustawia balans kolorów na wartości podane przez oprogramowania skanera"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "Najwolniejszy"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "Wolniejszy"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "Szybszy"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "Najszybszy"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr "8x8 chropowaty"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr "8x8 zwykły"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr "8x8 dobry"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr "8x8 bardzo dobry"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr "6x6 zwykły"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr "5x5 chropowaty"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr "5x5 dobry"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr "4x4 chropowaty"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr "4x4 zwykły"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr "4x4 dobry"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr "3x3 zwykły"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr "2x2 zwykły"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr "8x8 ustawiany"
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr "6x6 ustawiany"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr "5x5 ustawiany"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr "4x4 ustawiany"
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr "3x3 ustawiany"
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr "2x2 ustawiany"
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr "Szybki tryb szarości"
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr "Skanuj w szybkim trybie odcieni szarości (niższa jakość)."
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
@@ -4345,117 +5053,117 @@ msgstr ""
 "(niskiej jakości). To może być tryb niekolorowy lub niskiej "
 "rozdzielczości."
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr "Czas wyłączenia lampy (w minutach)"
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr "Czas (w minutach), po którym lampa jest wyłączana."
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, no-c-format
 msgid "Turn lamp off"
 msgstr "Wyłącz lampę"
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr "Wyłącza lampę natychmiast."
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr "Jasność czerwieni"
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr "Steruje jasnością kanału czerwieni."
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr "Jasność zieleni"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr "Steruje jasnością kanału zieleni."
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr "Jasność błękitu"
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr "Steruje jasnością kanału błękitu."
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "Kontrast kanału czerwieni"
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr "Steruje kontrastem kanału czerwieni."
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "Kontrast kanału zieleni"
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr "Steruje kontrastem kanału zieleni."
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "Kontrast kanału "
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr "Steruje kontrastem kanału błękitu."
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr "Kolor 48"
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr "Kolor 24"
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr "Skala szarości 16"
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr "Skala szarości 8"
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr "Odbijający światło"
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, no-c-format
 msgid "Positive"
 msgstr "Pozytyw"
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -4464,39 +5172,39 @@ msgstr ""
 "Rozgrzewaj dopóki jasność lampy będzie stała, zamiast przyjmować stały "
 "czas 40 sekund."
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, fuzzy, no-c-format
 msgid "Negative color"
 msgstr "Negatyw"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, fuzzy, no-c-format
 msgid "Negative gray"
 msgstr "Negatyw"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, fuzzy, no-c-format
 msgid "48 bits color"
 msgstr "Dobry kolor"
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
 "mode and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr "Skanowanie sterowane przyciskiem"
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4508,248 +5216,239 @@ msgstr ""
 "\"COLOR\" (dla innych modeli). Aby anulować, należy nacisnąć przycisk "
 "\"GRAY\"."
 
-#: ../backend/pixma_sane_options.c:143
-#, no-c-format
-msgid "Gamma function exponent"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:144
-#, no-c-format
-msgid "Changes intensity of midtones"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:232
 #, no-c-format
 msgid "Update button state"
 msgstr "Uaktualnij stan przycisku"
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:244
 #, no-c-format
 msgid "Button 1"
 msgstr "Przycisk 1"
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:258
 #, no-c-format
 msgid "Button 2"
 msgstr "Przycisk 2"
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr ""
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr ""
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr "Materiały fotograficzne"
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr "Ustawienia urzÄ…dzenia"
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr "Przełącznik lampy"
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr "Ręczne włączanie lamp(y)."
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "Wyłącz lampę podczas kalibracji ciemności"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr "Wyłączanie lampy zawsze podczas kalibracji ciemności."
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, no-c-format
 msgid "Calibration data cache"
 msgstr "Pamięć podręczna danych kalibracji"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr "Włącza lub wyłącza pamięć podręczną danych kalibracji."
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, no-c-format
 msgid "Performs calibration"
 msgstr "Wykonuje kalibracjÄ™"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr "Przyspieszenie czujnika"
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr "Włącza lub wyłącza przyspieszanie ruchu czujnika."
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, no-c-format
 msgid "Warmup-time"
 msgstr "Czas rozgrzewania"
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, no-c-format
 msgid "Warmup-time in seconds."
 msgstr "Czas rozgrzewania w sekundach"
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, no-c-format
 msgid "Lampoff-time"
 msgstr "Czas wyłączenia lampy"
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr "Czas wyłączenia lampy w sekundach."
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, no-c-format
 msgid "Analog frontend"
 msgstr "Frontend analogowy"
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr "Wartość AFE wzmocnienia czerwieni"
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr "Offset czerwieni"
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr "Wartość AFE offsetu czerwieni"
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr "Wartość AFE wzmocnienia zieleni"
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr "Offset zieleni"
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr "Wartość AFE offsetu "
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr "Wartość AFE wzmocnienia błękitu"
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr "Offset błękitu"
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr "Wartość AFE offsetu zieleni"
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, no-c-format
 msgid "Red lamp off"
 msgstr "Wyłącz czerwoną lampę"
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr "Definiuje parametr wyłączenia czerwonej lampy"
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, no-c-format
 msgid "Green lamp off"
 msgstr "Wyłącz zieloną lampę"
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr "Definiuje parametr wyłączenia zielonej lampy"
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, no-c-format
 msgid "Blue lamp off"
 msgstr "Wyłącz niebieską lampę"
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr "Definiuje parametr wyłączenia niebieskiej lampy"
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr "Opcja ta odzwierciedla stan przycisków skanera."
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr "Kolor 36"
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr "Mapa Ditheringu 1"
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr "Mapa Ditheringu 2"
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr "Porozrzucaj"
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr "Wybór źródła"
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr "Ulepszanie obrazu"
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr "Wyszarz"
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr "Załaduj obrazek jako szarości"
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr "Symulacja trójprzebiegowa"
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
@@ -4758,12 +5457,12 @@ msgstr ""
 "Symuluje skaner trójprzebiegowy zwracając trzy oddzielne ramki: zieloną, "
 "potem niebieską a na końcu czerwoną."
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr "Symulacja skanera ręcznego"
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4774,7 +5473,7 @@ msgstr ""
 "obrazka. Zamiast tego zwracają wysokość -1. Ustawienie tej opcji pozwala "
 "sprawdzić czy frontend obsługuje to poprawnie."
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid ""
 "Set default values for enhancement controls (brightness & contrast)."
@@ -4782,42 +5481,42 @@ msgstr ""
 "Przywróć domyślne wartości dla ustawień ulepszania (jasności i "
 "kontrastu)."
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr "Tylko do odczytu (opcja testowa)"
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr "Sprawdzam czy frontendy interpretujÄ… to poprawnie"
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr "Tablice gamma"
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr "Symulacja kodu statusu"
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr "Nie wymuszaj kodu statusu"
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr "Nie wymuszaj na frontendzie zwracania kodu statusu."
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr "Zwróć SANE_STATUS_EOF"
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
@@ -4826,12 +5525,12 @@ msgstr ""
 "Zmuś sterownik by zwrócił kod SANE_STATUS_EOF po tym jak została "
 "wywołana funkcja sane_read()."
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr "Zwróć SANE_STATUS_JAMMED"
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
@@ -4840,12 +5539,12 @@ msgstr ""
 "Zmuś sterownik by zwrócił kod SANE_STATUS_JAMMED po tym jak została "
 "wywołana funkcja sane_read()."
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr "Zwróć SANE_STATUS_NO_DOCS"
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
@@ -4854,12 +5553,12 @@ msgstr ""
 "Zmuś sterownik by zwrócił kod SANE_STATUS_NO_DOCS po tym jak została "
 "wywołana funkcja sane_read()."
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr "Zwróć SANE_STATUS_COVER_OPEN"
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
@@ -4868,12 +5567,12 @@ msgstr ""
 "Zmuś sterownik by zwrócił kod SANE_STATUS_COVER_OPEN po tym jak została "
 "wywołana funkcja sane_read()."
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr "Zwróć SANE_STATUS_IO_ERROR"
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
@@ -4882,12 +5581,12 @@ msgstr ""
 "Zmuś sterownik by zwrócił kod SANE_STATUS_IO_ERROR po tym jak została "
 "wywołana funkcja sane_read()."
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr "Zwróć SANE_STATUS_NO_MEM"
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
@@ -4896,12 +5595,12 @@ msgstr ""
 "Zmuś sterownik by zwrócił kod  po tym jak została wywołana funkcja "
 "sane_read()."
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr "Zwróć SANE_STATUS_ACCESS_DENIED"
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
@@ -4910,85 +5609,82 @@ msgstr ""
 "Zmuś sterownik by zwrócił kod SANE_STATUS_ACCESS_DENIED po tym jak "
 "została wywołana funkcja sane_read()."
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr "Opcja ta odzwierciedla stan przycisku skanera."
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr "WÅ‚Ä…cz lampÄ™"
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr "WÅ‚Ä…cza lampÄ™ skanera"
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr "Wyłącz lampę"
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr "Wyłącza lampę skanera"
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, no-c-format
 msgid "Lamp timeout"
 msgstr "Czas wyłączenia lampy"
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr "Liczba minut do wyłączenia lampy po skanowaniu"
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr "Wartość progowa dla trybu kreski"
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr "podajnik dokumentów"
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr "6x4 (cale)"
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr "8x10 (cale)"
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr "8.5x11 (cale)"
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr "Półcienie nie wspierane"
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr "RozproszonaKropka8x8"
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr "RozproszonaKropka16x16"
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -5004,27 +5700,27 @@ msgstr ""
 "połowie pracy; jeżeli za wysoko, graficzne frontendy mogą przestać "
 "odpowiadać."
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr ""
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr ""
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, fuzzy, no-c-format
 msgid "Focus point for scanning."
 msgstr "Wysuń dokument po zeskanowaniu"
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr "Tryb podglÄ…du"
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
@@ -5033,12 +5729,12 @@ msgstr ""
 "Wybierz tryb dla podglądów. Podglądy w skali szarości zwykle dają "
 "najlepszą kombinację szybkości i detali."
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr "Ustawienia zdefiniowane"
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
@@ -5046,97 +5742,97 @@ msgid ""
 msgstr ""
 "Udostępnia standardowe obszary skanowania dla fotografii, druków itp."
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr ""
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, fuzzy, no-c-format
 msgid "Frame to be scanned"
 msgstr "skaner płaski"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, fuzzy, no-c-format
 msgid "Focus-mode"
 msgstr "Ostrość"
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, fuzzy, no-c-format
 msgid "Auto or manual focus"
 msgstr "Ostrość automatyczna"
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, fuzzy, no-c-format
 msgid "Focus-point"
 msgstr "Pozycja skupienia (ostrości)"
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, fuzzy, no-c-format
 msgid "Focus point"
 msgstr "Pozycja skupienia (ostrości)"
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr "Liczba kolorów na odczyt"
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr "Liczba linii w skali szarości na odczyt"
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr "kamera internetowa"
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr "Kolor RAW"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr "Kolor RGB"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr "Kolor RGB TEKST"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr "Całkowicie czarny"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr "Całkowicie biały"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr "Wzorzec kolorów"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr "Siatka"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr "Pierwsza pozycja"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr "Druga pozycja"
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
@@ -5145,12 +5841,12 @@ msgstr ""
 "To jest bardzo długa trzecia pozycja. Być może frontend ma jakiś pomysł "
 "jak ją wyświetlić"
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr "Symulacja skanera ręcznego"
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5163,12 +5859,12 @@ msgstr ""
 "sprawdzić czy frontend obsługuje to poprawnie. Ta opcja również włącza "
 "szerokość ustaloną 11 cm."
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr "Symulacja skanera trójprzebiegowego"
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
@@ -5177,17 +5873,17 @@ msgstr ""
 "Symuluje skaner trójprzebiegowy. W trybie kolorowym przesyłane są trzy "
 "ramki."
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr "Ustaw kolejność ramek"
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr "Ustaw kolejność ramek w kolorowym trybie trójprzebiegowym"
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
@@ -5196,17 +5892,17 @@ msgstr ""
 "Jeśli wybrano automatyczny podajnij dokumentów (ADF), podajnik będzie "
 "'pusty' po 10 skanach."
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr "Opcje Specjalne"
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr "Wybierz obraz testowy"
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5222,12 +5918,12 @@ msgstr ""
 "Wzorzec kolorów: rysuje różne kolorowe wzory testowe, zależne od trybu.\n"
 "Siatka: rysuje czarno-białą siatkę o rozmiarach 10x10mm na kwadrat."
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr "Odwróć kolejność bajtów"
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5238,24 +5934,24 @@ msgstr ""
 "opcja może być używana do testowania 16-bitowych trybów frontendów, np. "
 "czy frontend używa odpowiedniej kolejności."
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr "Granica odczytu"
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 "Ogranicza ilość danych przesyłanych przy każdym wywołaniu funkcji "
 "sane_read()."
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr "Rozmiar limitu odczytu"
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
@@ -5263,33 +5959,33 @@ msgstr ""
 "(maksymalna) ilość danych transmitowanych z każdym wywołaniem "
 "sane_read()."
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr "Opóźnienie odczytu"
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr "Opóźnia transfer danych do potoku."
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr "Okres opóźnienia odczytu"
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
 msgstr "Jak długo czekać po transmisji każdego bufora danych przez potok."
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr "Wartość powrotna sane_read"
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
@@ -5300,22 +5996,22 @@ msgstr ""
 "skanowanie. Wszystkie inne kody statusu służą do testowania jak traktuje "
 "je frontend."
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr "Utrata pikseli na liniÄ™"
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr "Liczba pikseli które są tracone przy końcu każdej linii."
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr "Parametry rozmyte"
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
@@ -5324,24 +6020,24 @@ msgstr ""
 "Zwraca rozmyte linie i bajty na linię gdy wywoływany jest "
 "sane_parameters() przed sane_start()."
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr "Używaj nie blokującego IO"
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 "Użyj nie blokującego IO dla sane_read jeżeli jest to wspierane przez "
 "frontend."
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr "Proponuj deskryptor pliku \"select\""
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
@@ -5350,12 +6046,12 @@ msgstr ""
 "Proponuj deskryptor pliku \"select\" jeżeli sane_read() będzie zwracaj "
 "dane."
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr "Udostępnij opcje testowe"
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
@@ -5364,27 +6060,27 @@ msgstr ""
 "Udostępnia różne opcje testowe. Służy do testowania możliwości "
 "frontendów do przeglądania i modyfikowania różnych typów opcji SANE."
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr "Opcje drukowania"
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr "Drukuj listÄ™ wszystkich opcji."
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr "Opcje testowe (typu logicznego)"
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr "(1/6) logiczny miękki wybór miękkie wykrywanie"
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
@@ -5393,12 +6089,12 @@ msgstr ""
 "(1/6) logiczna opcja testowa, która umożliwia miękki wybór i miękkie "
 "(oraz zaawansowane) wykrywanie możliwości. Jest to zwykła opcja logiczna."
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr "(2/6) Logiczny twardy wybór miękkie wykrywanie"
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
@@ -5410,12 +6106,12 @@ msgstr ""
 "może być ustawiona przez frontend, tylko przez użytkownika (np. przez "
 "przyciśnięcie przycisku na urządzeniu)."
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr "(3/6) Logiczny twardy wybór"
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5427,12 +6123,12 @@ msgstr ""
 "użytkownika (np. przez przyciśnięcie przycisku na urządzeniu) i nie może "
 "być odczytywana przez frontend"
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr "(4/6) Logiczne miękkie wykrywanie"
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
@@ -5442,12 +6138,12 @@ msgstr ""
 "(również zaawansowanych) możliwości. Oznacza to, że jest tylko do "
 "odczytu."
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr "(5/6) Emulowany logiczny miękki wybór miękkie wykrywanie"
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
@@ -5456,12 +6152,12 @@ msgstr ""
 "(5/6) Logiczna opcja testowa, która umożliwia miękki wybór, miękkie "
 "wykrywanie i emulowanie (również zaawansowanych) możliwości"
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr "(6/6) Logiczny miękki wybór miękkie wykrywanie automatyczne"
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5472,53 +6168,53 @@ msgstr ""
 "wykrywanie i automatyczne (oraz zaawansowane) możliwości. Ta opcja może "
 "być automatycznie ustawiania przez sterownik."
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr "Opcje testowe typu całkowitego (int)"
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr "(1/6) Typ całkowity (int)"
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr ""
 "(1/6) Opcja testowa typu całkowitego bez narzuconych jednostek i "
 "ograniczeń"
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr "(2/6) Typ całkowity o ograniczonym zasięgu"
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
 "is 4, maximum 192, and quant is 2."
 msgstr "(2/6) Opcja testowa typu całkowitego "
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr "(/6) Typ całkowity"
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 "(3/6) Opcja testowa typu całkowitego posiadająca bity jednostek oraz "
 "ograniczona słownikiem"
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr "(4/6) Macierz typu całkowitego"
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
@@ -5527,12 +6223,12 @@ msgstr ""
 "(4/6) Opcja testowa typu całkowitego z jednostką w mm, używająca "
 "macierzy nieograniczonej"
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr "(5/6) Macierz typu całkowitego z ograniczonym zasięgiem"
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
@@ -5542,12 +6238,12 @@ msgstr ""
 "tablicy z ograniczeniem zasięgu. Minimum to 4, maksimum 192, a kwant to "
 "2."
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr "(6/6) Macierz typu całkowitego ograniczona słownikiem"
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
@@ -5556,28 +6252,28 @@ msgstr ""
 "(6/6) Opcja testowa typu całkowitego z jednostką w procentach, używająca "
 "tablicy ograniczonej słownikiem"
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr "Opcje testowe stałoprzecinkowe"
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr "(1/3) Typ stałoprzecinkowy"
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr ""
 "(1/3) Opcja testowa stałoprzecinkowa bez jednostek i bez ograniczeń"
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr "(2/3) Typ stałoprzecinkowy o ograniczonym zasięgu"
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
@@ -5587,49 +6283,49 @@ msgstr ""
 "ograniczonym zasięgiem. Minimum to -42.17, maksimum 32767.9999 a kwant "
 "to 2.0."
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr "(3/3) Typ stałoprzecinkowy ograniczony słownikiem"
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 "(3/3) Opcja testowa stałoprzecinkowa bez jednostek, ograniczona "
 "słownikiem"
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr "Opcje testowe typu ciÄ…g znakowy"
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr "(1/3) CiÄ…g znakowy"
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr "(1/3) Opcja testowa typu ciąg znakowy bez narzuconych ograniczeń"
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr "(2/3) CiÄ…g znakowy ograniczony listÄ…"
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr "(2/3) Opcja testowa typu ciÄ…g znakowy ograniczona listÄ…"
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr "(3/3) Ciąg znakowy ograniczony długą listą"
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
@@ -5638,155 +6334,159 @@ msgstr ""
 "(/3) Opcja testowa typu ciÄ…g znakowy ograniczony listÄ…. Zawiera trochÄ™ "
 "więcej pozycji..."
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr "Opcje testowe przycisków"
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr "(1/1) Przycisk"
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr "(1/1) Opcja testowa przycisku. Wyświetla trochę tekstu..."
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, no-c-format
 msgid "Color 36"
 msgstr "Kolor 36"
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr "Użyj Składania Obrazków"
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr "Dwupoziomowa czerń i biel (tryb kreski)"
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr "Ditherowana/półcieniowa czerń i biel (tryb półtonów)"
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr "Wielopoziomowa czerń i biel (tryb szarości)"
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr "Wielopoziomowy kolor RGB (kolor jednoprzebiegowy)"
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr "Ignoruj kalibracjÄ™"
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr "Zablokuj wstępne ustawianie ostrości"
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr "Nie kalibruj ostrości"
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr "Ręczne wstępne ustawianie ostrości"
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr "Popraw pozycjÄ™ skupienia"
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr "Kalibracja soczewek w pozycji dokumentu"
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr "Kaibruj skupienie soczewek w pozycji dokumentu"
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr "Pozycja skupienia uchwytu 0mm"
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr "Użyj pozycji skupienia uchwytu 0mm zamiast 0.6mm"
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr "Tryb kalibracji"
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr "Zdefiniuj tryb kalibracji"
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr "Ustawia lapę jako włączoną lub wyłączoną"
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr "WÅ‚Ä…cz UTA"
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr "Ustawia UTA jako włączone lub wyłączone"
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr "Offset"
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr "Ustawienia offsetu kanałów koloru"
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, no-c-format
 msgid "Gray offset"
 msgstr "Przesunięcie (offset) skali szarości"
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr "Ustawienie offsetu kanału szarości"
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr "Ustawienie offsetu kanału czerwieni"
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr "Ustawienie offsetu kanału zieleni"
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr "Ustawienie offsetu kanału błękitu"
 
+#, fuzzy
+#~ msgid "IPC mode"
+#~ msgstr "Tryb podglÄ…du"
+
 #~ msgid "problem not analyzed (unknown SCSI class)"
 #~ msgstr "problem nie przeanalizowany (nieznana klasa SCSI)"
diff --git a/po/pt.gmo b/po/pt.gmo
new file mode 100644
index 0000000..0a0b9fe
--- /dev/null
+++ b/po/pt.gmo
diff --git a/po/pt.po b/po/pt.po
index b6ca1ca..b4cf46d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,458 +4,452 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends 1.0.10\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
 "PO-Revision-Date: 2007-05-08 13:31+0200\n"
 "Last-Translator: Pedro Morais <morais@inocam.com>\n"
 "Language-Team: pt <morais@inocam.com>\n"
-"Language: \n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr "Número de opções"
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr ""
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "Geometria"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "Melhorias"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr ""
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr ""
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "Previsão"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr ""
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr ""
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Modo de digitalização"
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "Velocidade de digitalização"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr "Origem da digitalização"
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr ""
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "Superior-esquerda x"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "Superior-esquerda y"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "Inferior-direita x"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "Inferior-direita y"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Resolução digitalização"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "X-Resolução"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Y-Resolução"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr "Largura página"
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, no-c-format
 msgid "Page height"
 msgstr "Altura página"
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr "Usar tabela customizada gamma"
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr "Intensidade da imagem"
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr "Intensidade do vermelho"
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr "Intensidade do verde"
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr "Intensidade do azul"
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr "Brilho"
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr "Tamanho do grão"
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr "Simulação de cinza"
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "Nível de preto"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "Nível de branco"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr "Nível de branco para vermelho"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
 msgstr "Nível de branco para verde"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr "Nível de branco para azul"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "Sombra"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr "Sombra para vermelho"
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr "Sombra para verde"
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr "Sombra para azul"
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr "Clarear"
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr ""
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr ""
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr "Natural-Hue"
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr "Saturação"
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr "Tamanho padrão ponto - simulação cinza"
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "Simulação cinza padrão"
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr "Vincular resoluções X e Y"
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "Negativo"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "Calibração de qualidade"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr "Resolução ótica dupla"
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr "Vincular RGB"
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr "Valor do pixel-Threshold"
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr "Correção analógica do gama"
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr "Gama analógico vermelho"
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr "Gama analógico verde"
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr "Gama analógico azul"
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr "Vincular gama analógico"
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr "Aquecimento da lâmpada"
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr "Tempo de exposição Cal."
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr "Tempo de exposição Cal. para Vermelho"
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr "Tempo de exposição Cal. para Verde"
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr "Tempo de exposição Cal. para azul"
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr "Tempo de exposição digitalização"
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr "Tempo de exposição digitalização para Vermelho"
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr "Tempo de exposição digitalização para Verde"
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr "Tempo de exposição digitalização para Azul"
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr "Definir tempo de exposição"
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr "Densidade lâmpada Cal."
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr "Densidade luz de digitalização"
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr "Definir densidade da luz"
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr "Desligar lâmpada na saída"
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
 "supports."
 msgstr ""
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "Opções de Fonte, Modo e Resolução"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr "Opções de digitalização de área e mídia"
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, fuzzy, no-c-format
 msgid "Image modification options"
 msgstr "Opções para alteração de imagens"
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, no-c-format
 msgid "Hardware specific options"
 msgstr "Opções específicas de hardware"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr "ensores e botôes do scanner"
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr "Solicitar pré-visualização com qualidade da digitalização"
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -463,88 +457,88 @@ msgid ""
 "scanner, it reduces the memory requirements and scan-time of the preview."
 msgstr ""
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
 "for multibit scans."
 msgstr ""
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr "Selecionar Modo de digitalização ex. monocromático, colorido, ..."
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr "Determina em qual velocidade digitaliza"
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr "Seleciona fonte para digitalização (ex. ADF)"
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr "ontrola se o backtracking é forçado"
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "Posição de área de digitalização Superior-esquerda x"
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "Posição de área de digitalização Superior-esquerda y "
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "Posição de área de digitalização Inferior-direita x"
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "Posição de área de digitalização Inferior-direita y"
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr "efine resolução de saída"
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr "Define resolução horizontal de saída "
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr "Define resolução horizontal de saída"
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
 "sheet-fed scans."
 msgstr ""
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, no-c-format
 msgid "Specifies the height of the media."
 msgstr "Especifica a altura da mídia"
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid ""
 "Determines whether a builtin or a custom gamma-table should be used."
 msgstr ""
 "Determine se um builtin ou tabela customizada gama deve ser utilizada"
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -552,425 +546,425 @@ msgid ""
 "gamma table)."
 msgstr ""
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr "Tabela correção Gama para banda vermelha"
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr "Tabela correção Gama para banda verde"
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr "Tabela correção Gama para banda azul"
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr "Controla o brilho da imagem adquirida."
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr "Controla o contraste da imagem adquirida."
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
 "in sharper images."
 msgstr ""
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr ""
 "Defina se a imagem inserida deve ser simulada em cinza (halftone-"
 "dithered)"
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid ""
 "Selects what green radiance level should be considered \"full green\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid ""
 "Selects what blue radiance level should be considered \"full blue\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
 "when acquiring an image with a camera. Larger values cause more blooming."
 msgstr ""
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr ""
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
 "halftoned images."
 msgstr ""
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
 msgstr ""
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr ""
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr ""
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr "Usar lentes que duplicam a resolução ótica"
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr "Em modo RGB usar os mesmos valores para cada cor"
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr "Selecionar brilho mínimo para obter ponto branco"
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr "Correção analógica gama"
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr "Correção analógica gama para Vermelho"
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr "Correção analógica gama para Verde"
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr "Correção analógica gama para Azul"
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr "Aquecer lâmpada antes de digitalizar"
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr "Definir tempo de exposição para calibração"
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr "Definir tempo de exposição para calibração do vermelho"
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr "Definir tempo de exposição para calibração do verde"
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr "Definir tempo de exposição para calibração do azul"
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr "Definir tempo de exposição para digitalização"
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr "Definir tempo de exposição para digitalização do vermelho"
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr ""
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr ""
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr ""
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr ""
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr ""
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr ""
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, fuzzy, no-c-format
 msgid "Scan button"
 msgstr "Origem da digitalização"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, no-c-format
 msgid "Email button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, no-c-format
 msgid "Fax button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, no-c-format
 msgid "Copy button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr ""
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, fuzzy, no-c-format
 msgid "Cover open"
 msgstr "Linhas em cor"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "Cor"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr "Linhas em cor"
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr ""
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "Cinzento"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr ""
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "Linhas"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, no-c-format
 msgid "Operation not supported"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, no-c-format
 msgid "Document feeder jammed"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, no-c-format
 msgid "Document feeder out of documents"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, no-c-format
 msgid "Scanner cover is open"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "Predefinições"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "Calibração"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
 "Otherwise, calibration is performed only before the first start."
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -978,1451 +972,2186 @@ msgid ""
 "or from the configuration file, are used."
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr "Estado do botão"
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr ""
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr ""
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, fuzzy, no-c-format
 msgid "Duplex scan"
 msgstr "Digitalização completa"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid ""
 "Duplex scan provide a scan of the front and back side of the document"
 msgstr ""
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, fuzzy, no-c-format
 msgid "Calibrate Scanner"
 msgstr "Calibração"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, fuzzy, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr "Calibração rudimentar apenas na primeira digitalização"
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr ""
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr ""
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr "Ganho analógico"
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr ""
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "Correcção do gamma"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr ""
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr ""
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr ""
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, fuzzy, no-c-format
 msgid "No transparency correction"
 msgstr "Correcção do gamma"
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr ""
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr ""
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, fuzzy, no-c-format
 msgid "Negatives"
 msgstr "Negativo"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, fuzzy, no-c-format
 msgid "Slides"
 msgstr "Mais lento"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, fuzzy, no-c-format
 msgid "Normal speed"
 msgstr "Normal"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/2 normal speed"
 msgstr ""
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/3 normal speed"
 msgstr ""
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, no-c-format
 msgid "rounded parameter"
 msgstr ""
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr ""
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, no-c-format
 msgid "ADF jam"
 msgstr ""
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr ""
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, fuzzy, no-c-format
 msgid "lamp failure"
 msgstr "Valor de 'gamma'"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr ""
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr ""
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr ""
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr ""
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr ""
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, fuzzy, no-c-format
 msgid "transparency unit lamp failure"
 msgstr "Unidade de Transparências"
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr ""
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr ""
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr ""
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr ""
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr ""
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr ""
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr ""
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr ""
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr ""
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr ""
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr ""
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr ""
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr ""
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr ""
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr ""
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr ""
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr ""
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr ""
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr ""
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, fuzzy, no-c-format
 msgid "transparency unit shading error"
 msgstr "Unidade de Transparências"
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr ""
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, no-c-format
 msgid "film scanner"
 msgstr ""
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr ""
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr ""
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr ""
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, fuzzy, no-c-format
 msgid "Negative film type"
 msgstr "Filme Negativo"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, no-c-format
 msgid "Selects the negative film type"
 msgstr ""
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, no-c-format
 msgid "Hardware resolution"
 msgstr ""
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, no-c-format
 msgid "Use only hardware resolutions"
 msgstr ""
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr ""
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, no-c-format
 msgid "Auto focus"
 msgstr ""
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, no-c-format
 msgid "Enable/disable auto focus"
 msgstr ""
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr ""
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr ""
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, no-c-format
 msgid "Manual focus position"
 msgstr ""
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr ""
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr ""
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr ""
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr ""
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, no-c-format
 msgid "Mirror the image horizontally"
 msgstr ""
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, no-c-format
 msgid "Auto exposure"
 msgstr ""
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr ""
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, fuzzy, no-c-format
 msgid "Calibration now"
 msgstr "Calibração"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, fuzzy, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Definine o modo de calibração"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr ""
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr ""
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, fuzzy, no-c-format
 msgid "Reset scanner"
 msgstr "Digitalização rápida"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, no-c-format
 msgid "Reset the scanner"
 msgstr ""
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr ""
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, no-c-format
 msgid "Eject film after each scan"
 msgstr ""
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr ""
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr ""
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr ""
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr ""
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr ""
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, no-c-format
 msgid "Document feeder extras"
 msgstr ""
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, fuzzy, no-c-format
 msgid "Flatbed only"
 msgstr "Flachbett"
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr ""
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, fuzzy, no-c-format
 msgid "Transparency unit"
 msgstr "Unidade de Transparências"
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr ""
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, fuzzy, no-c-format
 msgid "Negative film"
 msgstr "Filme Negativo"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, fuzzy, no-c-format
 msgid "Positive or negative film"
 msgstr "Filme Positivo"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr ""
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr ""
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, fuzzy, no-c-format
 msgid "Transparency ratio"
 msgstr "Unidade de Transparências"
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, no-c-format
 msgid "Select film type"
 msgstr ""
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, no-c-format
 msgid "Select the film type"
 msgstr ""
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "Flachbett"
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, no-c-format
 msgid "ADF Front"
 msgstr ""
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, no-c-format
 msgid "ADF Back"
 msgstr ""
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, no-c-format
 msgid "ADF Duplex"
 msgstr ""
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, no-c-format
 msgid "Card Front"
 msgstr ""
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, no-c-format
 msgid "Card Back"
 msgstr ""
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, no-c-format
 msgid "Card Duplex"
 msgstr ""
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "Vermelho"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "Verde"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "Azul"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, fuzzy, no-c-format
 msgid "Enhance Red"
 msgstr "Melhorias"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, fuzzy, no-c-format
 msgid "Enhance Green"
 msgstr "Melhorias"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, fuzzy, no-c-format
 msgid "Enhance Blue"
 msgstr "Melhorias"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr ""
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr "Desconsiderar porcentagem branco"
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, fuzzy, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr ""
+"Solicita ao driver para eliminar páginas com baixo número de pixels "
+"escuros"
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr ""
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr ""
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr "Unidade de Transparências"
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr ""
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "Filme Positivo"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "Filme Negativo"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr ""
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr ""
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr ""
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr ""
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr ""
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr ""
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr ""
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr ""
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr ""
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr ""
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr ""
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr ""
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "Sem Correcção"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr "Definido pelo utilizador"
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr "Impressoras de agulhas"
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr "Impressoras térmicas"
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "Impressoras de jacto de tinta"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr "Monitores CRT"
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "Predefinição"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr ""
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr ""
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr ""
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr ""
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr ""
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr "CD"
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr ""
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr ""
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr "Letter"
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr "A4"
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "Máximo"
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr "Modo de Digitalização"
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr ""
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr ""
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr ""
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr ""
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr ""
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr ""
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr ""
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr ""
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr ""
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr ""
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr ""
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr "Deslocar vermelho para o verde"
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr ""
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr ""
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr ""
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr ""
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr ""
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr ""
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr ""
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr ""
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr ""
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr ""
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr ""
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, fuzzy, no-c-format
 msgid "Controls blue level"
 msgstr "Contraste do canal azul"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr ""
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr ""
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr ""
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr ""
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr ""
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr ""
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr ""
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr ""
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr ""
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr ""
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr ""
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr ""
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr ""
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr ""
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr ""
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr ""
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr ""
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
 "the user defined table, which can be downloaded to the scanner"
 msgstr ""
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr ""
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
 msgstr ""
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr ""
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
 "pressed to actually start the scan process."
 msgstr ""
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr ""
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, fuzzy, no-c-format
 msgid "Positive Slide"
 msgstr "Filme Positivo"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, fuzzy, no-c-format
 msgid "Negative Slide"
 msgstr "Filme Negativo"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr ""
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, fuzzy, no-c-format
 msgid "User defined CCT profile"
 msgstr "Definido pelo utilizador"
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr ""
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr ""
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr ""
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, no-c-format
 msgid "Diffusion"
 msgstr ""
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, fuzzy, no-c-format
 msgid "White"
 msgstr "Nível de branco"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, fuzzy, no-c-format
 msgid "Black"
 msgstr "Nível de preto"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, no-c-format
 msgid "Continue"
 msgstr ""
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr ""
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr ""
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, no-c-format
 msgid "Horizontal bold"
 msgstr ""
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, no-c-format
 msgid "Horizontal narrow"
 msgstr ""
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr ""
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, no-c-format
 msgid "Vertical bold"
 msgstr ""
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr ""
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr ""
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, no-c-format
 msgid "Front"
 msgstr ""
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr ""
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
-msgstr "Desconsiderar porcentagem branco"
+msgid "Gamma function exponent"
+msgstr ""
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
+#, no-c-format
+msgid "Changes intensity of midtones"
+msgstr ""
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr ""
+
+#: backend/fujitsu.c:3148
 #, fuzzy, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
+msgid "Reverse image format"
+msgstr "Inverte imagem"
+
+#: backend/fujitsu.c:3165
+#, fuzzy, no-c-format
+msgid "Halftone type"
+msgstr "Simulação cinza padrão"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr ""
+
+#: backend/fujitsu.c:3210
+#, fuzzy, no-c-format
+msgid "Perform outline extraction"
+msgstr "Calibração rudimentar"
+
+#: backend/fujitsu.c:3221
+#, no-c-format
+msgid "Emphasis"
+msgstr ""
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr ""
+
+#: backend/fujitsu.c:3240
+#, fuzzy, no-c-format
+msgid "Separation"
+msgstr "Saturação"
+
+#: backend/fujitsu.c:3241
+#, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr ""
+
+#: backend/fujitsu.c:3252
+#, no-c-format
+msgid "Mirroring"
+msgstr ""
+
+#: backend/fujitsu.c:3253
+#, no-c-format
+msgid "Reflect output image horizontally"
+msgstr ""
+
+#: backend/fujitsu.c:3270
+#, fuzzy, no-c-format
+msgid "White level follower"
+msgstr "Nível de branco para azul"
+
+#: backend/fujitsu.c:3271
+#, fuzzy, no-c-format
+msgid "Control white level follower"
+msgstr "Contraste do canal azul"
+
+#: backend/fujitsu.c:3289
+#, fuzzy, no-c-format
+msgid "BP filter"
+msgstr "Linhas em cor"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr ""
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr ""
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr ""
+
+#: backend/fujitsu.c:3323
+#, fuzzy, no-c-format
+msgid "Gamma curve"
+msgstr "Valor de 'gamma'"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, fuzzy, no-c-format
+msgid "Threshold curve"
+msgstr "Limiar de aquecimento"
+
+#: backend/fujitsu.c:3347
+#, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+
+#: backend/fujitsu.c:3369
+#, fuzzy, no-c-format
+msgid "Threshold white"
+msgstr "Valor do pixel-Threshold"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr ""
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, no-c-format
+msgid "Noise removal"
+msgstr ""
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr ""
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr ""
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr ""
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr ""
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr ""
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
 msgstr ""
-"Solicita ao driver para eliminar páginas com baixo número de pixels "
-"escuros"
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:3508
+#, fuzzy, no-c-format
+msgid "Auto width detection"
+msgstr "Sem Correcção"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr ""
+
+#: backend/fujitsu.c:3526
+#, fuzzy, no-c-format
+msgid "Auto length detection"
+msgstr "Sem Correcção"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+
+#: backend/fujitsu.c:3553
+#, fuzzy, no-c-format
+msgid "Compression"
+msgstr "Compressão JPEG"
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr ""
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr ""
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr ""
+
+#: backend/fujitsu.c:3623
+#, fuzzy, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr "Liga / Desliga Modo de detecção de alimentação"
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3642
+#, fuzzy, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr "Liga / Desliga Modo de detecção de alimentação"
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr ""
+
+#: backend/fujitsu.c:3661
+#, fuzzy, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr "Liga / Desliga Modo de detecção de alimentação"
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
+msgstr ""
+
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3708
+#, no-c-format
+msgid "DF recovery mode"
+msgstr ""
+
+#: backend/fujitsu.c:3709
+#, fuzzy, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr "Solicita ao driver para remover digitalmente bordas das páginas"
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3748
+#, fuzzy, no-c-format
+msgid "Advanced paper protection"
+msgstr "Imprimir opções"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+
+#: backend/fujitsu.c:3768
+#, fuzzy, no-c-format
+msgid "Staple detection"
+msgstr "Sem Correcção"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr ""
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+
+#: backend/fujitsu.c:3809
+#, fuzzy, no-c-format
+msgid "Dropout color"
+msgstr "Cor da lâmpada"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+
+#: backend/fujitsu.c:3833
+#, no-c-format
+msgid "Buffer mode"
+msgstr ""
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr ""
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr ""
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr ""
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+
+#: backend/fujitsu.c:3911
+#, fuzzy, no-c-format
+msgid "Off timer"
+msgstr "Lâmpada acesa"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+
+#: backend/fujitsu.c:3930
+#, fuzzy, no-c-format
+msgid "Duplex offset"
+msgstr "Deslocamento do azul"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr ""
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "Deslocamento do verde"
+
+#: backend/fujitsu.c:3949
+#, fuzzy, no-c-format
+msgid "Adjust green/red offset"
+msgstr "Deslocamento do verde"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr "Deslocamento do azul"
+
+#: backend/fujitsu.c:3967
+#, fuzzy, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "Deslocamento do canal azul"
+
+#: backend/fujitsu.c:3980
+#, no-c-format
+msgid "Low Memory"
+msgstr ""
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+
+#: backend/fujitsu.c:3996
+#, fuzzy, no-c-format
+msgid "Duplex side"
+msgstr "Digitalização completa"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr ""
+
+#: backend/fujitsu.c:4009
+#, fuzzy, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr "Solicita ao driver para rotacionar digitalmente páginas inclinadas"
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr "Alinhamento - Deskew"
+
+#: backend/fujitsu.c:4021
+#, fuzzy, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr "Solicita ao driver para rotacionar digitalmente páginas inclinadas"
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr "Diâmetro despeckle"
+
+#: backend/fujitsu.c:4034
+#, fuzzy, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
+msgstr ""
+"Diâmetro máximo de pontos isolados a serem removidos da digitalização"
+
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, fuzzy, no-c-format
 msgid "Software crop"
 msgstr "Crop automático"
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, fuzzy, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr "Solicita ao driver para remover digitalmente bordas das páginas"
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr ""
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+
+#: backend/fujitsu.c:4095
+#, fuzzy, no-c-format
+msgid "Endorser Options"
+msgstr "Imprimir opções"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr ""
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr ""
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr ""
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr ""
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr ""
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr ""
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr ""
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr ""
+
+#: backend/fujitsu.c:4253
+#, fuzzy, no-c-format
+msgid "Endorser direction"
+msgstr "Calibração rudimentar"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr ""
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr ""
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr ""
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr ""
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr ""
+
+#: backend/fujitsu.c:4344
+#, no-c-format
+msgid "A3 paper"
+msgstr ""
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4356
+#, no-c-format
+msgid "B4 paper"
+msgstr ""
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4368
+#, no-c-format
+msgid "A4 paper"
+msgstr ""
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4380
+#, no-c-format
+msgid "B5 paper"
+msgstr ""
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr ""
+
+#: backend/fujitsu.c:4405
+#, fuzzy, no-c-format
+msgid "OMR or double feed detected"
+msgstr "Detecção de dupla alimentação"
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr ""
+
+#: backend/fujitsu.c:4429
+#, no-c-format
+msgid "Scanner in power saving mode"
+msgstr ""
+
+#: backend/fujitsu.c:4452
+#, fuzzy, no-c-format
+msgid "Manual feed"
+msgstr "Modo de Alimentação manual"
+
+#: backend/fujitsu.c:4453
+#, fuzzy, no-c-format
+msgid "Manual feed selected"
+msgstr "Modo de Alimentação manual"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr ""
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr ""
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr ""
+
+#: backend/fujitsu.c:4500
+#, fuzzy, no-c-format
+msgid "Double feed"
+msgstr "Detecção de dupla alimentação"
+
+#: backend/fujitsu.c:4501
+#, fuzzy, no-c-format
+msgid "Double feed detected"
+msgstr "Detecção de dupla alimentação"
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr ""
+
+#: backend/fujitsu.c:4513
+#, no-c-format
+msgid "Hardware error code"
+msgstr ""
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr ""
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr ""
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr ""
+
+#: backend/fujitsu.c:4537
+#, fuzzy, no-c-format
+msgid "Imprinter ink level"
+msgstr "Nível de branco"
+
+#: backend/fujitsu.c:4548
+#, fuzzy, no-c-format
+msgid "Density"
+msgstr "Intensidade do vermelho"
+
+#: backend/fujitsu.c:4549
+#, no-c-format
+msgid "Density dial"
+msgstr ""
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, fuzzy, no-c-format
+msgid "Duplex switch"
+msgstr "Digitalização completa"
+
+#: backend/genesys.c:5761
 #, fuzzy, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr "Solicita ao driver para remover digitalmente bordas das páginas"
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 "Solicita ao driver para eliminar páginas com baixo número de pixels "
 "escuros"
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, fuzzy, no-c-format
 msgid "Software derotate"
 msgstr "Alinhamento - Deskew"
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, fuzzy, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr "Solicita ao driver para remover digitalmente bordas das páginas"
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, no-c-format
 msgid "Extras"
 msgstr ""
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, fuzzy, no-c-format
-msgid "Threshold curve"
-msgstr "Limiar de aquecimento"
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr ""
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
 "instead on hardware lineart."
 msgstr ""
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, no-c-format
 msgid "Disable interpolation"
 msgstr ""
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
 "than the vertical resolution this disables horizontal interpolation."
 msgstr ""
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "Linhas em cor"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "Calibração"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Definine o modo de calibração"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Modo de calibração"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, fuzzy, no-c-format
 msgid "Lamp off time"
 msgstr "Lâmpada acesa"
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
 "of 0 means, that the lamp won't be turned off."
 msgstr ""
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, fuzzy, no-c-format
 msgid "Lamp off during scan"
 msgstr "Calibração rudimentar"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr ""
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, no-c-format
 msgid "File button"
 msgstr ""
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr ""
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, no-c-format
 msgid "Power button"
 msgstr ""
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "Origem da digitalização"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, fuzzy, no-c-format
 msgid "Need calibration"
 msgstr "Calibração rudimentar"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, fuzzy, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr "Calibração rudimentar apenas na primeira digitalização"
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, fuzzy, no-c-format
 msgid "Buttons"
 msgstr "Estado do botão"
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, fuzzy, no-c-format
 msgid "Calibrate"
 msgstr "Calibração"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, fuzzy, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "Calibração rudimentar"
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, fuzzy, no-c-format
 msgid "Clear calibration"
 msgstr "Calibração rudimentar"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, fuzzy, no-c-format
 msgid "Clear calibration cache"
 msgstr "Modo de calibração"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr "Adaptador de Transparências"
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr ""
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr "Opções de Depuração"
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "Aquecimento automático"
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -2431,12 +3160,12 @@ msgstr ""
 "Aquecer até o brilho da lâmpada ser constante em ver de insistir em 60 "
 "segundos de tempo de aquecimento."
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "Digitalização completa"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
@@ -2445,12 +3174,12 @@ msgstr ""
 "Digitalizar toda a área de digitalização, incluindo a faixa de "
 "calibração. Cuidado: não seleccione toda a altura. Apenas para testes."
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Calibração rudimentar"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2461,12 +3190,12 @@ msgstr ""
 "estiver desactivada são fornecidas opções para configurar manualmente "
 "este parâmetro. Apenas para testes."
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "Calibração rudimentar apenas na primeira digitalização"
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2478,12 +3207,12 @@ msgstr ""
 "briho da imagem é diferente em cada digitalização, desactive esta opção. "
 "Apenas para testes."
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, no-c-format
 msgid "Backtrack lines"
 msgstr ""
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2492,83 +3221,83 @@ msgid ""
 "omitting lines."
 msgstr ""
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Valor de 'gamma'"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr "Define o valor de 'gamma' em todos os canais."
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, fuzzy, no-c-format
 msgid "Geometry Group"
 msgstr "Geometria"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, fuzzy, no-c-format
 msgid "Scan Mode Group"
 msgstr "Modo de Digitalização"
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, fuzzy, no-c-format
 msgid "Scanner model"
 msgstr "Modo de digitalização"
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, fuzzy, no-c-format
 msgid "Disable gamma correction"
 msgstr "Correcção do gamma"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, fuzzy, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "Correcção do gamma"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, no-c-format
 msgid "Disable white shading correction"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2576,12 +3305,12 @@ msgid ""
 "avoids depth emulation."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, fuzzy, no-c-format
 msgid "Emulate Grayscale"
 msgstr "Cinzento"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2589,368 +3318,362 @@ msgid ""
 "circumstances."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
 "analyze them."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, fuzzy, no-c-format
 msgid "Reset chipset"
 msgstr "Digitalização rápida"
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, fuzzy, no-c-format
 msgid "Information"
 msgstr "Ignorar a calibração"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, fuzzy, no-c-format
 msgid "Chipset name"
 msgstr "Nome do ficheiro"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Unknown"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, fuzzy, no-c-format
 msgid "Shows the chipset ID"
 msgstr "Digitalização rápida"
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, fuzzy, no-c-format
 msgid "Scan counter"
 msgstr "Origem da digitalização"
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, fuzzy, no-c-format
 msgid "Update information"
 msgstr "Imprimir opções"
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, fuzzy, no-c-format
 msgid "offset X"
 msgstr "Deslocamento"
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr ""
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, fuzzy, no-c-format
 msgid "offset Y"
 msgstr "Deslocamento"
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr ""
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr ""
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr ""
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr ""
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, fuzzy, no-c-format
 msgid "TMA Slides"
 msgstr "Mais lento"
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, fuzzy, no-c-format
 msgid "TMA Negatives"
 msgstr "Negativo"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, fuzzy, no-c-format
 msgid "Color (48 bits)"
 msgstr "Cor 48"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, fuzzy, no-c-format
 msgid "Extend lamp timeout"
 msgstr "Lâmpada acesa"
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr ""
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr ""
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, no-c-format
 msgid "Waits for button before scanning"
 msgstr ""
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, fuzzy, no-c-format
 msgid "Advanced Options"
 msgstr "Imprimir opções"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr ""
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, fuzzy, no-c-format
 msgid "Fine"
 msgstr "Nome do ficheiro"
 
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr ""
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr ""
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "Automático"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr ""
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr ""
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr ""
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "NTSC cinzento"
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr "XPA cinzento"
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "Lento"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "Rápido"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr ""
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr ""
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr ""
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr ""
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr ""
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, no-c-format
 msgid "Film-strip"
 msgstr ""
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr ""
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr ""
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, no-c-format
 msgid "Experiment"
 msgstr ""
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, no-c-format
 msgid "Sharpening"
 msgstr ""
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr ""
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr "Limiar de aquecimento"
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr ""
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr ""
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr ""
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr ""
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, no-c-format
 msgid "Unloads the media after a scan."
 msgstr ""
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, fuzzy, no-c-format
 msgid "Change document"
 msgstr "Melhorias"
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr ""
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr ""
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr ""
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, fuzzy, no-c-format
 msgid "Start calibration process."
 msgstr "Calibração rudimentar"
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, no-c-format
 msgid "Media"
 msgstr ""
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr ""
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr ""
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -2959,1408 +3682,1394 @@ msgid ""
 "value."
 msgstr ""
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, fuzzy, no-c-format
 msgid "Color Matrix"
 msgstr "Linhas em cor"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, fuzzy, no-c-format
 msgid "Set the scanners color matrix."
 msgstr "Contraste do canal vermelho."
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr ""
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, fuzzy, no-c-format
 msgid "Mono Color Matrix"
 msgstr "Linhas em cor"
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr ""
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, no-c-format
 msgid "Mirror horizontal"
 msgstr ""
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, no-c-format
 msgid "Mirror image horizontally."
 msgstr ""
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, no-c-format
 msgid "Mirror vertical"
 msgstr ""
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, no-c-format
 msgid "Mirror image vertically."
 msgstr ""
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, fuzzy, no-c-format
 msgid "Update options"
 msgstr "Imprimir opções"
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, fuzzy, no-c-format
 msgid "Update options."
 msgstr "Imprimir opções"
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr ""
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr ""
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr ""
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr ""
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr ""
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr ""
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr ""
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr "Separação automática"
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, no-c-format
 msgid "Landscape"
 msgstr "Paisagem"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr "Inverte imagem"
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr "Modo de Papel Longo"
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, no-c-format
 msgid "Length control mode"
 msgstr "Modo de Controle do Comprimento"
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, no-c-format
 msgid "Manual feed mode"
 msgstr "Modo de Alimentação manual"
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, no-c-format
 msgid "Manual feed timeout"
 msgstr "Tempo de desligamento da alimentação manual"
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr "Detecção de dupla alimentação"
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr ""
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr "PB"
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, no-c-format
 msgid "halftone"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, fuzzy, no-c-format
 msgid "gray"
 msgstr "Cinzento"
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, fuzzy, no-c-format
 msgid "color"
 msgstr "Cor"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, fuzzy, no-c-format
 msgid "single"
 msgstr "simples"
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, no-c-format
 msgid "continuous"
 msgstr "contínuo"
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, no-c-format
 msgid "off"
 msgstr "desliga"
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr "Aguarde_doc"
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr "Aguarde-Chave"
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, fuzzy, no-c-format
 msgid "user_def"
 msgstr "Definido pelo utilizador"
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr "Cartão de visita"
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr "Verificar"
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, no-c-format
 msgid "bayer_64"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, no-c-format
 msgid "bayer_16"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, no-c-format
 msgid "halftone_32"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, no-c-format
 msgid "halftone_64"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, no-c-format
 msgid "diffusion"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, fuzzy, no-c-format
 msgid "normal"
 msgstr "Normal"
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, no-c-format
 msgid "light"
 msgstr "claro"
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr "escuro"
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, fuzzy, no-c-format
 msgid "From scanner"
 msgstr "Digitalização rápida"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, fuzzy, no-c-format
 msgid "default"
 msgstr "Predefinição"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, no-c-format
 msgid "smooth"
 msgstr "Suave"
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr "Nenhuma"
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, fuzzy, no-c-format
 msgid "low"
 msgstr "Lento"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, no-c-format
 msgid "medium"
 msgstr "Média"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr "Alta"
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, fuzzy, no-c-format
 msgid "linier"
 msgstr "Linhas"
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, fuzzy, no-c-format
 msgid "red"
 msgstr "Vermelho"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, fuzzy, no-c-format
 msgid "green"
 msgstr "Verde"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, fuzzy, no-c-format
 msgid "blue"
 msgstr "Azul"
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, fuzzy, no-c-format
 msgid "Sets the scan source"
 msgstr "Origem da digitalização"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr "Liga / Desliga Modo Papel Longo"
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr "Liga / Desliga Modo Controle do Comprimento"
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "Define modo de alimentação manual"
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr "Define desligamento de alimentação manual em segundos"
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr "Liga / Desliga Modo de detecção de alimentação"
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr "Adequar à página"
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr "Adequar à página"
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr "Scanner diminui imagem para adequar à pagina digitalizada"
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 "Define posição do papel: Verdadeiro para Paisagem, Falso para Retrato"
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr "Limiar de aquecimento"
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
 "reduction and image emphasis"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, fuzzy, no-c-format
 msgid "Lamp color"
 msgstr "Cor da lâmpada"
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr "Define cor da lâmpada (Color dropout)"
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr "Inverte imagem nos modos P/B ou simulação de cinza"
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "Imagem espelhada"
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr "Compressão JPEG"
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr "Compressão da imagem JPEG com parâmetro Q, '0' - sem compressão"
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, fuzzy, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr "Solicita ao driver para rotacionar digitalmente páginas inclinadas"
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr "Alinhamento - Deskew"
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr "Solicita ao driver para rotacionar digitalmente páginas inclinadas"
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr "Diâmetro despeckle"
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 "Diâmetro máximo de pontos isolados a serem removidos da digitalização"
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr "Crop automático"
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr "Solicita ao driver para remover digitalmente bordas das páginas"
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
 "length of actual paper or logical document length."
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "Correcção do gamma"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, fuzzy, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr "Aguarde_doc"
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, no-c-format
 msgid "High sensivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, no-c-format
 msgid "Low sensivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, no-c-format
 msgid "err_diffusion"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, fuzzy, no-c-format
 msgid "No detection"
 msgstr "Sem Correcção"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, fuzzy, no-c-format
 msgid "Normal mode"
 msgstr "Normal"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, fuzzy, no-c-format
 msgid "Enhanced mode"
 msgstr "Melhorias"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
 "divides long paper by the length which is set in Document Size option."
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, fuzzy, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr "Detecção de dupla alimentação"
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, fuzzy, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr "Detecção de dupla alimentação"
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, fuzzy, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr "Detecção de dupla alimentação"
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, fuzzy, no-c-format
 msgid "Automatic threshold mode"
 msgstr "Limiar de aquecimento"
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, fuzzy, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr "Limiar de aquecimento"
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, fuzzy, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr "Inverte imagem nos modos P/B ou simulação de cinza"
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, fuzzy, no-c-format
 msgid "JPEG compression"
 msgstr "Compressão JPEG"
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, no-c-format
 msgid "Set chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, fuzzy, no-c-format
 msgid "chroma of blue"
 msgstr "Sombra para azul"
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, fuzzy, no-c-format
 msgid "Set chroma of blue"
 msgstr "Sombra para azul"
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr "Diamante"
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr ""
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr ""
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr ""
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr ""
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr "Ganho"
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr ""
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, no-c-format
 msgid "Gray gain"
 msgstr "Ganho do cinzento"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr "Ganho do canal cinzento"
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, no-c-format
 msgid "Red gain"
 msgstr "Ganho do vermelho"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr "Ganho do canal vermelho"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, no-c-format
 msgid "Green gain"
 msgstr "Ganho do verde"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr "Ganho do canal verde"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, no-c-format
 msgid "Blue gain"
 msgstr "Ganho do azul"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr "Ganho do canal azul"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr ""
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr ""
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr ""
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr ""
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr ""
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr "Modo 1"
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr "Modo 2"
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr "Modo 3"
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr ""
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr ""
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr ""
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr ""
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr ""
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr "CRT"
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "Uma página"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "Todas as páginas"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr ""
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr ""
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr ""
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr ""
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr ""
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr ""
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr ""
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr ""
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr ""
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr ""
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr ""
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid ""
 "If checked the color calibration before a scan is done by the backend"
 msgstr ""
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr ""
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr "Esta opção desligar a lâmpada durante a digitalização"
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "Digitalização de qualidade"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr ""
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "Digitalização rápida"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr ""
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr ""
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
 "for the threshold."
 msgstr ""
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr ""
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr ""
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr ""
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr ""
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr ""
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr ""
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr ""
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr ""
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr ""
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr ""
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr ""
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr ""
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
 msgstr ""
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr ""
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr ""
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr ""
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr ""
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr ""
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr ""
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr ""
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr ""
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr ""
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr ""
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr ""
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr ""
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr ""
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr ""
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr ""
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr ""
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "Mais lento"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "Lento"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "Rápido"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "Mais rápido"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr ""
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr ""
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr ""
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr ""
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr ""
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr ""
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr ""
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr ""
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr ""
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr ""
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr ""
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr ""
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr ""
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr ""
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr ""
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr ""
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr ""
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr ""
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr ""
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr ""
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
 "This may be a non-color mode or a low resolution mode."
 msgstr ""
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr ""
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr ""
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, no-c-format
 msgid "Turn lamp off"
 msgstr ""
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr ""
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr "Brilho do vermelho"
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, fuzzy, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr "Deslocamento (brilho) do canal vermelho."
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr "Brilho do verde"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, fuzzy, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr "Deslocamento (brilho) do canal vermelho."
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr "Brilho do azul"
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, fuzzy, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr "Deslocamento (brilho) do canal azul."
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "Contraste do canal vermelho"
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, fuzzy, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr "Ganho (contraste) do canal vermelho."
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "Contraste do canal verde"
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "Contraste do canal azul"
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, fuzzy, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr "Ganho (contraste) do canal azul."
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr "Cor 48"
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr "Cor 24"
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr "Cinzento 16"
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr "Cinzento 8"
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, fuzzy, no-c-format
 msgid "Positive"
 msgstr "Filme Positivo"
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -4369,39 +5078,39 @@ msgstr ""
 "Aquecer até o brilho da lâmpada ser constante em ver de insistir em 40 "
 "segundos de tempo de aquecimento."
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, fuzzy, no-c-format
 msgid "Negative color"
 msgstr "Filme Negativo"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, fuzzy, no-c-format
 msgid "Negative gray"
 msgstr "Negativo"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, no-c-format
 msgid "48 bits color"
 msgstr ""
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
 "mode and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4409,260 +5118,251 @@ msgid ""
 "cancel, press \"GRAY\" button."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:143
-#, no-c-format
-msgid "Gamma function exponent"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:144
-#, no-c-format
-msgid "Changes intensity of midtones"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:232
 #, fuzzy, no-c-format
 msgid "Update button state"
 msgstr "Estado do botão"
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:244
 #, fuzzy, no-c-format
 msgid "Button 1"
 msgstr "Estado do botão"
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:258
 #, fuzzy, no-c-format
 msgid "Button 2"
 msgstr "Estado do botão"
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr ""
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr ""
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr "Transparência"
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr ""
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr ""
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr ""
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, fuzzy, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "Calibração rudimentar"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr ""
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, fuzzy, no-c-format
 msgid "Calibration data cache"
 msgstr "Modo de calibração"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr ""
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, fuzzy, no-c-format
 msgid "Performs calibration"
 msgstr "Calibração rudimentar"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr ""
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr ""
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, no-c-format
 msgid "Warmup-time"
 msgstr ""
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, no-c-format
 msgid "Warmup-time in seconds."
 msgstr ""
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, no-c-format
 msgid "Lampoff-time"
 msgstr ""
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr ""
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, fuzzy, no-c-format
 msgid "Analog frontend"
 msgstr "Ganho analógico"
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr "Deslocamento do vermelho"
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr "Deslocamento do verde"
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr "Deslocamento do azul"
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, no-c-format
 msgid "Red lamp off"
 msgstr ""
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, no-c-format
 msgid "Green lamp off"
 msgstr ""
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, no-c-format
 msgid "Blue lamp off"
 msgstr ""
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr ""
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr "Cor 36"
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr ""
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr ""
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr ""
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr ""
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr "Melhorias de Imagem"
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr "Acinzentar"
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr ""
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr ""
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
 "kicks, it returns green, then blue, then red."
 msgstr ""
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr ""
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4670,205 +5370,202 @@ msgid ""
 "option allows one to test whether a frontend can handle this correctly."
 msgstr ""
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid ""
 "Set default values for enhancement controls (brightness & contrast)."
 msgstr ""
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr ""
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr ""
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr ""
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr ""
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr ""
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr ""
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr ""
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr ""
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr ""
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr ""
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr ""
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr ""
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr ""
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
 "after sane_read() has been called."
 msgstr ""
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr ""
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr "Lâmpada acesa"
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr ""
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr ""
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr ""
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, fuzzy, no-c-format
 msgid "Lamp timeout"
 msgstr "Lâmpada acesa"
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr ""
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr ""
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr "6x4 (pol)"
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr "8x10 (pol)"
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr "8.5x11 (pol)"
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr ""
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr ""
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr ""
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -4878,148 +5575,148 @@ msgid ""
 "frontends may stop responding to X events and your system could bog down."
 msgstr ""
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr ""
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr ""
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, fuzzy, no-c-format
 msgid "Focus point for scanning."
 msgstr "Aquecer lâmpada antes de digitalizar"
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
 "combination of speed and detail."
 msgstr ""
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr ""
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
 "like."
 msgstr ""
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr ""
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, fuzzy, no-c-format
 msgid "Frame to be scanned"
 msgstr "Digitalização rápida"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, no-c-format
 msgid "Focus-mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, no-c-format
 msgid "Auto or manual focus"
 msgstr ""
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, no-c-format
 msgid "Focus-point"
 msgstr ""
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, no-c-format
 msgid "Focus point"
 msgstr ""
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr ""
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr ""
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr ""
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr "Cor RAW"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr "Cor RGB"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr "Cor RGB TEXT"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr ""
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr ""
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, fuzzy, no-c-format
 msgid "Color pattern"
 msgstr "Linhas em cor"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr "Grelha"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr "Primeira entrada"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr "Segunda entrada"
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
 "display it"
 msgstr ""
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr ""
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5028,46 +5725,46 @@ msgid ""
 "option also enables a fixed width of 11 cm."
 msgstr ""
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr ""
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
 "transmitted."
 msgstr ""
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr ""
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr ""
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
 "after 10 scans."
 msgstr ""
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr "Opções Especiais"
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr ""
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5078,12 +5775,12 @@ msgid ""
 "square."
 msgstr ""
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr ""
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5091,54 +5788,54 @@ msgid ""
 "uses the correct endianness."
 msgstr ""
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr ""
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr ""
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
 msgstr ""
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr ""
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr ""
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr ""
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
 msgstr ""
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr ""
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
@@ -5146,95 +5843,95 @@ msgid ""
 "frontend handles them."
 msgstr ""
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr ""
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr ""
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr ""
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
 "before sane_start()."
 msgstr ""
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr ""
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr ""
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
 "data."
 msgstr ""
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr ""
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
 "frontends to view and modify all the different SANE option types."
 msgstr ""
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr "Imprimir opções"
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr "Imprime uma lista de todas as opções."
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr ""
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr ""
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
 "advanced) capabilities. That's just a normal bool option."
 msgstr ""
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr ""
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
@@ -5242,12 +5939,12 @@ msgid ""
 "frontend but by the user (e.g. by pressing a button at the device)."
 msgstr ""
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr ""
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5255,36 +5952,36 @@ msgid ""
 "by pressing a button at the device) and can't be read by the frontend."
 msgstr ""
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr ""
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
 "That means the option is read-only."
 msgstr ""
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr ""
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
 "(and advanced) capabilities."
 msgstr ""
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr ""
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5292,299 +5989,299 @@ msgid ""
 "backend."
 msgstr ""
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr ""
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr ""
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr ""
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr ""
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
 "is 4, maximum 192, and quant is 2."
 msgstr ""
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr ""
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr ""
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
 "constraints."
 msgstr ""
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr ""
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
 "constraint. Minimum is 4, maximum 192, and quant is 2."
 msgstr ""
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr ""
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
 "list constraint."
 msgstr ""
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr ""
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr ""
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr ""
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr ""
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
 "Minimum is -42.17, maximum 32767.9999, and quant is 2.0."
 msgstr ""
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr ""
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr ""
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr ""
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr ""
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr ""
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr ""
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr ""
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
 "entries..."
 msgstr ""
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr ""
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr ""
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr ""
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, no-c-format
 msgid "Color 36"
 msgstr "Cor 36"
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr ""
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr ""
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr ""
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr ""
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr ""
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr "Ignorar a calibração"
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr ""
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr ""
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr ""
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr ""
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr ""
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr ""
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr ""
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr ""
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr "Modo de calibração"
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr "Definine o modo de calibração"
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr ""
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr ""
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr ""
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr "Deslocamento"
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr ""
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, no-c-format
 msgid "Gray offset"
 msgstr "Deslocamento do cinzento"
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr "Deslocamento do canal cinzento"
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr "Deslocamento do canal vermelho"
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr "Deslocamento do canal verde"
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr "Deslocamento do canal azul"
diff --git a/po/quot.sed b/po/quot.sed
new file mode 100644
index 0000000..0122c46
--- /dev/null
+++ b/po/quot.sed
@@ -0,0 +1,6 @@
+s/"\([^"]*\)"/“\1�/g
+s/`\([^`']*\)'/‘\1’/g
+s/ '\([^`']*\)' / ‘\1’ /g
+s/ '\([^`']*\)'$/ ‘\1’/g
+s/^'\([^`']*\)' /‘\1’ /g
+s/“�/""/g
diff --git a/po/remove-potcdate.sin b/po/remove-potcdate.sin
new file mode 100644
index 0000000..2436c49
--- /dev/null
+++ b/po/remove-potcdate.sin
@@ -0,0 +1,19 @@
+# Sed script that remove the POT-Creation-Date line in the header entry
+# from a POT file.
+#
+# The distinction between the first and the following occurrences of the
+# pattern is achieved by looking at the hold space.
+/^"POT-Creation-Date: .*"$/{
+x
+# Test if the hold space is empty.
+s/P/P/
+ta
+# Yes it was empty. First occurrence. Remove the line.
+g
+d
+bb
+:a
+# The hold space was nonempty. Following occurrences. Do nothing.
+x
+:b
+}
diff --git a/po/ru.gmo b/po/ru.gmo
new file mode 100644
index 0000000..3b34813
--- /dev/null
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index 7e83aee..2b8335a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,12 +7,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
 "PO-Revision-Date: 2007-12-17 23:05+0100\n"
 "Last-Translator: \n"
 "Language-Team:  <ru@li.org>\n"
-"Language: \n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,411 +20,405 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr "Количе�тво параметров"
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr ""
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "Ра�положение"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "Повышение"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr ""
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "Предварительный про�мотр"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr "Принудительный одноцветный предварительный про�мотр"
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr "Бит на цвет"
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Режим �канировани�"
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "Скоро�ть �канировани�"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr "И�точник �канировани�"
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr "Принудительно откатывать��"
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "Лева� верхн�� координата X"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "Лева� верхн�� координата Y"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "Права� нижн�� координата X"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "Права� нижн�� координата Y"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Разрешение �канировани�"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "Разрешение по X"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Разрешение по Y"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr ""
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, fuzzy, no-c-format
 msgid "Page height"
 msgstr "Под�ветка"
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr "И�пользовать не�тандартную гамму"
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr "Интен�ивно�ть изображени�"
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr "Интен�ивно�ть кра�ного"
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr "Интен�ивно�ть зелёного"
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr "Интен�ивно�ть �инего"
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr "Ярко�ть"
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "Контра�тно�ть"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr ""
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr "Полутона"
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "Уровень чёрного"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "Уровень белого"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr "Уровень белого дл� кра�ного"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
 msgstr "Уровень белого дл� зелёного"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr "Уровень белого дл� �инего"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "Затенённо�ть"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr "Затенённо�ть дл� кра�ного"
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr "Затенённо�ть дл� зелёного"
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr "Затенённо�ть дл� �инего"
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr "Под�ветка"
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr "Под�ветка дл� кра�ного"
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr "Под�ветка дл� зелёного"
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr "Под�ветка дл� �инего"
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr "Тон"
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr "�а�ыщенно�ть"
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "�азвание файла"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr "Размер чёрно-белого шаблона"
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "Чёрно-белый шаблон"
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr "Согла�овывать разрешение по X и по Y"
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "�егатив"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "Калибровка каче�тва"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr "Удваивать оптиче�кое разрешение"
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr "Св�зывать RGB"
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr "Порог"
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr "�налогова� коррекци� гаммы"
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr "�налогова� гамма кра�ного"
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr "�налогова� гамма зелёного"
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr "�налогова� гамма �инего"
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr "Св�зывать аналоговые гаммы"
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr "Прогрев лампы"
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr "Калибровать врем� выдержки"
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr "Калибровать врем� выдержки дл� кра�ного"
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr "Калибровать врем� выдержки дл� зелёного"
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr "Калибровать врем� выдержки дл� �инего"
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr "Сканировать врем� выдержки"
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr "Сканировать врем� выдержки дл� кра�ного"
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr "Сканировать врем� выдержки дл� зелёного"
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr "Сканировать врем� выдержки дл� �инего"
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr "У�тановить врем� выдержки"
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr "Калибровать плотно�ть лампы"
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr "Сканировать плотно�ть лампы"
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr "У�тановить плотно�ть лампы"
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr "Выключить лампу при выходе"
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
@@ -433,37 +427,37 @@ msgstr ""
 "Параметр только дл� чтени�, указывающий как много параметров указанное "
 "у�трой�тво поддерживает."
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, fuzzy, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "Короткий �пи�ок разрешений"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr ""
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, fuzzy, no-c-format
 msgid "Image modification options"
 msgstr "Количе�тво параметров"
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, fuzzy, no-c-format
 msgid "Hardware specific options"
 msgstr "Разрешение �канировани�"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr ""
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr "Запро�ить �канирование каче�тва как у предварительного про�мотра"
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -475,7 +469,7 @@ msgstr ""
 "одного, а на однопроходных �канерах �ократит требовани� к пам�ти и врем� "
 "предварительного �канировани�."
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
@@ -484,78 +478,78 @@ msgstr ""
 "Количе�тво бит на цвет, обычным значением �вл�ет�� 1 дл� штрихового и 8 "
 "дл� полутонового режима �канировани�."
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr ""
 "Выберите режим �канировани� (например, штриховой, чёрно-белый или "
 "цветной)."
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr "Определ�ет �коро�ть, � которой производит�� �канирование."
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr ""
 "Выберите и�точник �канирование (такой как у�трой�тво автоматиче�кой "
 "подачи документов)"
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr "Определ�ет, будет ли �овершать�� принудительный откат."
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "Координата X левого верхнего угла обла�ти �канировани�."
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "Координата Y левого верхнего угла обла�ти �канировани�."
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "Координата X правого нижнего угла обла�ти �канировани�."
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "Координата Y правого нижнего угла обла�ти �канировани�."
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr "У�танавливает разрешение �канируемого изображени�."
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr "У�танавливает горизонтальное разрешение �канируемого изображени�."
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr "У�танавливает вертикальное разрешение �канируемого изображени�."
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
 "sheet-fed scans."
 msgstr ""
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, fuzzy, no-c-format
 msgid "Specifies the height of the media."
 msgstr "У�танавливает разрешение �канируемого изображени�."
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid ""
 "Determines whether a builtin or a custom gamma-table should be used."
@@ -563,7 +557,7 @@ msgstr ""
 "Определ�ет, будет ли и�пользовать�� в�троенна� или не�тандартна� таблица "
 "гамма-коррекции."
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -574,108 +568,108 @@ msgstr ""
 "одинаково на кра�ный, зелёный и �иний каналы (то е�ть �то интен�ивно�ть "
 "коррекции гаммы)."
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr "Таблица коррекции гаммы дл� кра�ной компоненты."
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr "Таблица коррекции гаммы дл� зелёной компоненты."
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr "Таблица коррекции гаммы дл� �иней компоненты."
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr "Управление �рко�тью полученного изображени�."
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr "Управление контра�тно�тью полученного изображени�."
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
 "in sharper images."
 msgstr ""
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr ""
 "Определ�ет, должно ли полученное изображение быть превращено в "
 "полутоновое (размытием)."
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr ""
 "Определ�ет, какой уровень излучени� должен быть ра��мотрен как \"чёрный"
 "\"."
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr ""
 "Определ�ет, какой уровень излучени� должен быть ра��мотрен как \"белый\"."
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr ""
 "Определ�ет, какой кра�ный уровень излучени� должен быть ра��мотрен как "
 "\"белый\"."
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr ""
 "Определ�ет, какой зелёный уровень излучени� должен быть ра��мотрен как "
 "\"белый\"."
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr ""
 "Определ�ет, какой �иний уровень излучени� должен быть ра��мотрен как "
 "\"белый\"."
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr ""
 "Определ�ет, какой кра�ный уровень излучени� должен быть ра��мотрен как "
 "\"чёрный\"."
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr ""
 "Определ�ет, какой зелёный уровень излучени� должен быть ра��мотрен как "
 "\"чёрный\"."
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr ""
 "Определ�ет, какой �иний уровень излучени� должен быть ра��мотрен как "
 "\"чёрный\"."
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr ""
 "Определ�ет, какой кра�ный уровень излучени� должен быть ра��мотрен как "
 "\"полный кра�ный\"."
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid ""
 "Selects what green radiance level should be considered \"full green\"."
@@ -683,7 +677,7 @@ msgstr ""
 "Определ�ет, какой зелёный уровень излучени� должен быть ра��мотрен как "
 "\"полный зелёный\"."
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid ""
 "Selects what blue radiance level should be considered \"full blue\"."
@@ -691,12 +685,12 @@ msgstr ""
 "Определ�ет, какой �иний уровень излучени� должен быть ра��мотрен как "
 "\"полный �иний\"."
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr "Управл�ет \"тоном\" (уровнем �инего) полученного изображени�."
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
@@ -706,12 +700,12 @@ msgstr ""
 "получает�� при получении изображени� � камеры. Большие значени� вызывают "
 "больше blooming."
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr "�азвание файла изображени�, которое должно быть загружено."
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
@@ -720,7 +714,7 @@ msgstr ""
 "У�танавливает размер полутонового (dithering) шаблона, и�пользуемого при "
 "�канировании полутоновых изображений."
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
@@ -728,289 +722,289 @@ msgstr ""
 "У�танавливает полутоновый (dithering) шаблон, и�пользуемый при "
 "�канировании полутоновых изображений."
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr ""
 "И�пользовать одинаковые значени� дл� разрешений по горизонтали и "
 "вертикали."
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr "Помен�ть ме�тами чёрный и белый"
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr "Выполнить каче�твенную калибровку белого"
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr "И�пользовать lens, которое удваивает оптиче�кое разрешение"
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr "В режиме RGB и�пользовать одинаковые значени� дл� каждого цвета"
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr "Выберите минимальную �рко�ть дл� получени� белой точки"
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr "�налогова� коррекци� гаммы"
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr "�налогова� коррекци� гаммы дл� кра�ного"
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr "�налогова� коррекци� гаммы дл� зелёного"
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr "�налогова� коррекци� гаммы дл� �инего"
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr "Прогревать лампу перед �канированием"
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr "У�тановить врем� выдержки дл� калибровки"
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr "У�тановить врем� выдержки дл� калибровки кра�ного"
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr "У�тановить врем� выдержки дл� калибровки зелёного"
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr "У�тановить врем� выдержки дл� калибровки �инего"
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr "У�тановить врем� выдержки дл� �канировани�"
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr "У�тановить врем� выдержки дл� �канировани� кра�ного"
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr "У�тановить врем� выдержки дл� �канировани� зелёного"
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr "У�тановить врем� выдержки дл� �канировани� �инего"
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr "Включить выбор времени выдержки"
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr "Определить плотно�ть лампы дл� калибровки"
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr "Определить плотно�ть лампы дл� �канировани�"
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr "Включить выбор плотно�ти лампы"
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr "Выключить лампу при выходе из программы"
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, fuzzy, no-c-format
 msgid "Scan button"
 msgstr "Разрешение �канировани�"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, fuzzy, no-c-format
 msgid "Email button"
 msgstr "Ожидать нажати� кнопки"
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, fuzzy, no-c-format
 msgid "Fax button"
 msgstr "Ожидать нажати� кнопки"
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, fuzzy, no-c-format
 msgid "Copy button"
 msgstr "Ожидать нажати� кнопки"
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr ""
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, fuzzy, no-c-format
 msgid "Cover open"
 msgstr "Цветовой шаблон"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "Цветной"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr "Цветное штриховое"
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr "Цветное полутоновое"
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "Чёрно-белый"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr "Полутоновый (ра�тр)"
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "Штриховой"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, fuzzy, no-c-format
 msgid "Operation not supported"
 msgstr "Полутоновое �канирование не поддерживает��"
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, fuzzy, no-c-format
 msgid "Document feeder jammed"
 msgstr "Податчик ли�тов"
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, fuzzy, no-c-format
 msgid "Document feeder out of documents"
 msgstr "Податчик ли�тов"
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, no-c-format
 msgid "Scanner cover is open"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "По умолчанию"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr "У�танавливает значени� по умолчанию дл� управлени� повышением."
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "Калибровка"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr "Калибровать перед �ледующим �канированием"
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
@@ -1020,12 +1014,12 @@ msgstr ""
 "�канированием. В противном �лучае, калибровка будет выполнена только "
 "перед первым �канированием."
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr "Выполн�ть только коррекцию оттенка"
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -1036,27 +1030,27 @@ msgstr ""
 "оттенков. Дл� у�илени�, �мещени� и времени выдержки и�пользуют�� либо "
 "в�троенные значени� по умолчанию, либо из конфигурационного файла."
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr "Со�то�ние кнопки"
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr "Количе�тво кадров дл� �канировани�"
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr "Выберите количе�тво кадров дл� �канировани�"
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, no-c-format
 msgid "Duplex scan"
 msgstr "Двух�тороннее �канирование"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid ""
 "Duplex scan provide a scan of the front and back side of the document"
@@ -1064,1036 +1058,1027 @@ msgstr ""
 "Двух�тороннее �канирование позвол�ет получить изображение лицевой и "
 "обратной �тороны документа"
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr "Калибровать �канер"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr "Выполн�ть калибровку �канера перед �канированием"
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr "Чёрно-белое �канирование"
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr "Выполн�ть чёрно-белое �канирование вме�то цветного"
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr "�налоговое у�иление"
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr "Увеличить или уменьшить аналоговое у�иление матрицы CCD"
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "Коррекци� гаммы"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr "Выберите кривую гамма-коррекции"
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr ""
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr ""
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, fuzzy, no-c-format
 msgid "No transparency correction"
 msgstr "Коррекци� цветов"
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr ""
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr ""
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, fuzzy, no-c-format
 msgid "Negatives"
 msgstr "�егатив"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, fuzzy, no-c-format
 msgid "Slides"
 msgstr "Слайд"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "�втоматиче�ки"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, fuzzy, no-c-format
 msgid "Normal speed"
 msgstr "�ормально"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, fuzzy, no-c-format
 msgid "1/2 normal speed"
 msgstr "2x2 нормальное"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, fuzzy, no-c-format
 msgid "1/3 normal speed"
 msgstr "3x3 нормальное"
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, fuzzy, no-c-format
 msgid "rounded parameter"
 msgstr "�ечёткие параметры"
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr ""
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, fuzzy, no-c-format
 msgid "ADF jam"
 msgstr "�ПД"
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr ""
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, fuzzy, no-c-format
 msgid "lamp failure"
 msgstr "Значение гаммы"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr ""
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr ""
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr ""
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr ""
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr ""
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, fuzzy, no-c-format
 msgid "transparency unit lamp failure"
 msgstr "Модуль дл� �лайдов"
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr ""
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr ""
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr ""
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr ""
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr ""
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr ""
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr ""
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr ""
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr ""
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr ""
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr ""
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr ""
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr ""
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr ""
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr ""
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr ""
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr ""
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr ""
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr ""
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, fuzzy, no-c-format
 msgid "transparency unit shading error"
 msgstr "Модуль дл� �лайдов"
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr ""
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, fuzzy, no-c-format
 msgid "film scanner"
 msgstr "планшетный �канер"
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr "планшетный �канер"
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr "Тип плёнки"
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr ""
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, fuzzy, no-c-format
 msgid "Negative film type"
 msgstr "�егатив"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, fuzzy, no-c-format
 msgid "Selects the negative film type"
 msgstr "Выберите те�товое изображение"
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, fuzzy, no-c-format
 msgid "Hardware resolution"
 msgstr "Разрешение �канировани�"
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, fuzzy, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "Показывать короткий �пи�ок разрешений"
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr ""
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, fuzzy, no-c-format
 msgid "Auto focus"
 msgstr "�втоизвлечение"
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, fuzzy, no-c-format
 msgid "Enable/disable auto focus"
 msgstr "Выключить предварительный фоку�"
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr ""
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr ""
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, fuzzy, no-c-format
 msgid "Manual focus position"
 msgstr "Зафик�ировать позицию фоку�а"
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr ""
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr ""
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr ""
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "Зеркальное изображение"
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, fuzzy, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "Отображает изображение по горизонтали."
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, fuzzy, no-c-format
 msgid "Auto exposure"
 msgstr "У�тановить врем� выдержки"
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, fuzzy, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr "Включить выбор времени выдержки"
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, fuzzy, no-c-format
 msgid "Calibration now"
 msgstr "Калибровка"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, fuzzy, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Задать режим калибровки"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr ""
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr ""
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, fuzzy, no-c-format
 msgid "Reset scanner"
 msgstr "ли�товой �канер"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, fuzzy, no-c-format
 msgid "Reset the scanner"
 msgstr "ли�товой �канер"
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr ""
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, fuzzy, no-c-format
 msgid "Eject film after each scan"
 msgstr "Извлечь документ по�ле �канировани�"
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr ""
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr ""
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr ""
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr ""
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr ""
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, fuzzy, no-c-format
 msgid "Document feeder extras"
 msgstr "Податчик ли�тов"
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, fuzzy, no-c-format
 msgid "Flatbed only"
 msgstr "Планшетный"
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr ""
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, fuzzy, no-c-format
 msgid "Transparency unit"
 msgstr "Модуль дл� �лайдов"
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr ""
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, fuzzy, no-c-format
 msgid "Negative film"
 msgstr "�егатив"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, fuzzy, no-c-format
 msgid "Positive or negative film"
 msgstr "Позитив"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr ""
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr ""
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, fuzzy, no-c-format
 msgid "Transparency ratio"
 msgstr "Модуль дл� �лайдов"
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, fuzzy, no-c-format
 msgid "Select film type"
 msgstr "Тип плёнки"
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, fuzzy, no-c-format
 msgid "Select the film type"
 msgstr "Выбирает полутона."
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "Планшетный"
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, no-c-format
 msgid "ADF Front"
 msgstr ""
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, fuzzy, no-c-format
 msgid "ADF Back"
 msgstr "�ПД"
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, fuzzy, no-c-format
 msgid "ADF Duplex"
 msgstr "Двух�торонний"
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, fuzzy, no-c-format
 msgid "Card Front"
 msgstr "Ра�печатка"
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, no-c-format
 msgid "Card Back"
 msgstr ""
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, fuzzy, no-c-format
 msgid "Card Duplex"
 msgstr "Двух�торонний"
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "Кра�ный"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "Зелёный"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "Синий"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, fuzzy, no-c-format
 msgid "Enhance Red"
 msgstr "Повышение"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, fuzzy, no-c-format
 msgid "Enhance Green"
 msgstr "Повышение"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, fuzzy, no-c-format
 msgid "Enhance Blue"
 msgstr "Повышение"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr "�ичего"
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr ""
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr ""
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr "Одно�торонний"
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr "Двух�торонний"
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr "Модуль дл� �лайдов"
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr "�втоматиче�кий податчик документов"
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "Позитив"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "�егатив"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr "Фоку� на �текле"
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr "Фоку� 2.5мм над �теклом"
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr "Чёрно-белый A (Резкие тона)"
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr "Чёрно-белый B (М�гкие тона)"
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr "Чёрно-белый C (Net Screen)"
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr ""
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr ""
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr ""
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr ""
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr "Технологи� улучшени� тек�та"
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr "Загрузить шаблон A"
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr "Загрузить шаблон B"
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "Без коррекции"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr "Определ�емое пользователем"
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr "Матричные принтеры"
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr "Термиче�кие принтеры"
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "Струйные принтеры"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr "Мониторы � ЭЛТ"
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr "Печать вы�окой плотно�ти"
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr "Печать вы�окой плотно�ти"
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr "Печать вы�окой контра�тно�ти"
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr "Определённое пользователем (Gamma=1.0)"
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr "Определённое пользователем (Gamma=1.8)"
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr "CD"
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr "A5 портрет"
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr "A5 ландшафт"
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr "Letter"
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr "A4"
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "Мак�"
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr "Режим �канировани�"
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr "Выбирает полутона."
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr ""
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr ""
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr "Выбирает �рко�ть."
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr "Резко�ть"
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr "Коррекци� цветов"
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr ""
 "У�танавливает таблицу коррекции цветов дл� выбранного выходного "
 "у�трой�тва."
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr "Ко�ффициенты цветовой коррекции"
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr "Матричный множитель RGB"
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr "Сдвиг зелёного к кра�ному"
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr "Сдвиг зелёного к �инему"
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr "Сдвиг кра�ного к зелёному"
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr "Сдвиг кра�ного к �инему"
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr "Сдвиг �инего к зелёному"
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr "Сдвиг �инего к кра�ному"
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr "Управл�ет уровнем зелёного"
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr "Добавл�ет к кра�ному, о�нованному на уровне зелёного"
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr "Добавл�ет к �инему, о�нованному на уровне зелёного"
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr "Добавл�ет к зелёному, о�нованному на уровне кра�ного"
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr "Управл�ет уровнем кра�ного"
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr "Добавл�ет к �инему, о�нованному на уровне кра�ного"
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr "Добавл�ет к зелёному, о�нованному на уровне �инего"
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr "Добавл�ет к кра�ному, о�нованному на уровне �инего"
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, no-c-format
 msgid "Controls blue level"
 msgstr "Управл�ет уровнем �инего"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr "Сделать изображение зеркальным."
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr "Бы�трый предварительный про�мотр"
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr "�втоматиче�ки раздел�ть на обла�ти"
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr "Короткий �пи�ок разрешений"
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr "Показывать короткий �пи�ок разрешений"
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr "Ма�штаб"
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr ""
 "Определ�ет ко�ффициент ма�штабировани�, который будет и�пользовать�� "
 "�канером"
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr "Бы�трый формат"
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr "Дополнительное оборудование"
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr "Извлечь"
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr "В�тавить бумагу в у�трой�тво подачи документов"
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr "�втоизвлечение"
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr "Извлечь документ по�ле �канировани�"
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr "Режим автоподачи"
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr "Выбирает режим автоподачи (одно�торонний/двух�торонний)"
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr "От�ек"
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr "Выбрать от�ек, который �канировать"
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
@@ -2102,12 +2087,12 @@ msgstr ""
 "Выбирает значение гамма-коррекции из �пи�ка предопределённых или "
 "на�троенных пользователем, которое может быть загружено в �канер"
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr "Ра�положение фоку�а"
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
@@ -2115,12 +2100,12 @@ msgstr ""
 "У�танавливает ра�положение фоку�а либо на �текле, либо на 2.5мм выше "
 "�текла"
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr "Ожидать нажати� кнопки"
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
@@ -2129,263 +2114,1010 @@ msgstr ""
 "По�ле подачи команды \"�канировать\", будет ожидать пока не будет нажата "
 "кнопка на �канере, чтобы дей�твительно начать проце�� �канировани�."
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr ""
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, fuzzy, no-c-format
 msgid "Positive Slide"
 msgstr "Позитив"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, fuzzy, no-c-format
 msgid "Negative Slide"
 msgstr "�егатив"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr ""
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, fuzzy, no-c-format
 msgid "User defined CCT profile"
 msgstr "Определ�емое пользователем"
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr "Вкл"
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr "Выкл"
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr "Размытие"
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, fuzzy, no-c-format
 msgid "Diffusion"
 msgstr "Диффузи� ошибок"
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, fuzzy, no-c-format
 msgid "White"
 msgstr "Уровень белого"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, fuzzy, no-c-format
 msgid "Black"
 msgstr "Уровень чёрного"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, fuzzy, no-c-format
 msgid "Continue"
 msgstr "У�ловно"
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr ""
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr "Горизонтально"
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, fuzzy, no-c-format
 msgid "Horizontal bold"
 msgstr "Горизонтально"
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, fuzzy, no-c-format
 msgid "Horizontal narrow"
 msgstr "Горизонтально"
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr "Вертикальное"
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, fuzzy, no-c-format
 msgid "Vertical bold"
 msgstr "Вертикальное"
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr ""
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr ""
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, fuzzy, no-c-format
 msgid "Front"
 msgstr "Ра�печатка"
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr ""
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
+msgid "Gamma function exponent"
 msgstr ""
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
 #, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
+msgid "Changes intensity of midtones"
+msgstr ""
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr ""
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr ""
+
+#: backend/fujitsu.c:3165
+#, fuzzy, no-c-format
+msgid "Halftone type"
+msgstr "Полутоновый (ра�тр)"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr ""
+
+#: backend/fujitsu.c:3210
+#, fuzzy, no-c-format
+msgid "Perform outline extraction"
+msgstr "Груба� калибровка"
+
+#: backend/fujitsu.c:3221
+#, fuzzy, no-c-format
+msgid "Emphasis"
+msgstr "Выразительно�ть изображени�"
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr ""
+
+#: backend/fujitsu.c:3240
+#, fuzzy, no-c-format
+msgid "Separation"
+msgstr "�а�ыщенно�ть"
+
+#: backend/fujitsu.c:3241
+#, fuzzy, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr ""
+"Включает автоматиче�кое определение порога при �канировании штриховых "
+"изображений."
+
+#: backend/fujitsu.c:3252
+#, fuzzy, no-c-format
+msgid "Mirroring"
+msgstr "Зеркальное изображение"
+
+#: backend/fujitsu.c:3253
+#, fuzzy, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "Отображает изображение по горизонтали."
+
+#: backend/fujitsu.c:3270
+#, fuzzy, no-c-format
+msgid "White level follower"
+msgstr "Уровень белого дл� �инего"
+
+#: backend/fujitsu.c:3271
+#, fuzzy, no-c-format
+msgid "Control white level follower"
+msgstr "Управл�ет уровнем кра�ного"
+
+#: backend/fujitsu.c:3289
+#, fuzzy, no-c-format
+msgid "BP filter"
+msgstr "Цветное штриховое"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr ""
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr "Сглаживание"
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr ""
+
+#: backend/fujitsu.c:3323
+#, fuzzy, no-c-format
+msgid "Gamma curve"
+msgstr "Значение гаммы"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, fuzzy, no-c-format
+msgid "Threshold curve"
+msgstr "Порог"
+
+#: backend/fujitsu.c:3347
+#, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+
+#: backend/fujitsu.c:3369
+#, fuzzy, no-c-format
+msgid "Threshold white"
+msgstr "Порог"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr ""
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, fuzzy, no-c-format
+msgid "Noise removal"
+msgstr "Уменьшение шумов"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr ""
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr ""
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr ""
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr ""
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr ""
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr ""
+
+#: backend/fujitsu.c:3508
+#, fuzzy, no-c-format
+msgid "Auto width detection"
+msgstr "Без коррекции"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr ""
+
+#: backend/fujitsu.c:3526
+#, fuzzy, no-c-format
+msgid "Auto length detection"
+msgstr "Без коррекции"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr ""
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr ""
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr ""
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr ""
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr ""
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr ""
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr ""
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
+msgstr ""
+
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3708
+#, fuzzy, no-c-format
+msgid "DF recovery mode"
+msgstr "Режим подачи"
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr ""
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3748
+#, fuzzy, no-c-format
+msgid "Advanced paper protection"
+msgstr "Дополнительные параметры"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+
+#: backend/fujitsu.c:3768
+#, fuzzy, no-c-format
+msgid "Staple detection"
+msgstr "Без коррекции"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr ""
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+
+#: backend/fujitsu.c:3809
+#, fuzzy, no-c-format
+msgid "Dropout color"
+msgstr "Включить лампу"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+
+#: backend/fujitsu.c:3833
+#, fuzzy, no-c-format
+msgid "Buffer mode"
+msgstr "Режим подачи"
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr ""
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr ""
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr ""
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+
+#: backend/fujitsu.c:3911
+#, fuzzy, no-c-format
+msgid "Off timer"
+msgstr "Врем� выключени� лампы"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+
+#: backend/fujitsu.c:3930
+#, fuzzy, no-c-format
+msgid "Duplex offset"
+msgstr "Смещение �инего"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr ""
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "Смещение зелёного"
+
+#: backend/fujitsu.c:3949
+#, fuzzy, no-c-format
+msgid "Adjust green/red offset"
+msgstr "Смещение зелёного"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr "Смещение �инего"
+
+#: backend/fujitsu.c:3967
+#, fuzzy, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "У�танавливает �мещение канала �инего"
+
+#: backend/fujitsu.c:3980
+#, no-c-format
+msgid "Low Memory"
+msgstr ""
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+
+#: backend/fujitsu.c:3996
+#, fuzzy, no-c-format
+msgid "Duplex side"
+msgstr "Двух�тороннее �канирование"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr ""
+
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr ""
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr ""
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
 msgstr ""
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr ""
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+
+#: backend/fujitsu.c:4095
+#, fuzzy, no-c-format
+msgid "Endorser Options"
+msgstr "Дополнительные параметры"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr ""
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr ""
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr ""
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr ""
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr ""
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr ""
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr ""
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr ""
+
+#: backend/fujitsu.c:4253
+#, fuzzy, no-c-format
+msgid "Endorser direction"
+msgstr "Уменьшение шумов"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr ""
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr ""
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr ""
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr ""
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr ""
+
+#: backend/fujitsu.c:4344
+#, fuzzy, no-c-format
+msgid "A3 paper"
+msgstr "От бумаги"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4356
+#, fuzzy, no-c-format
+msgid "B4 paper"
+msgstr "От бумаги"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4368
+#, fuzzy, no-c-format
+msgid "A4 paper"
+msgstr "От бумаги"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4380
+#, fuzzy, no-c-format
+msgid "B5 paper"
+msgstr "От бумаги"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr ""
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr ""
+
+#: backend/fujitsu.c:4429
+#, no-c-format
+msgid "Scanner in power saving mode"
+msgstr ""
+
+#: backend/fujitsu.c:4452
+#, fuzzy, no-c-format
+msgid "Manual feed"
+msgstr "Ручна� предварительна� фоку�ировка"
+
+#: backend/fujitsu.c:4453
+#, fuzzy, no-c-format
+msgid "Manual feed selected"
+msgstr "Ручна� предварительна� фоку�ировка"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr ""
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr ""
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr ""
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr ""
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr ""
+
+#: backend/fujitsu.c:4513
+#, fuzzy, no-c-format
+msgid "Hardware error code"
+msgstr "Разрешение �канировани�"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr ""
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr ""
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr ""
+
+#: backend/fujitsu.c:4537
+#, fuzzy, no-c-format
+msgid "Imprinter ink level"
+msgstr "Уровень белого"
+
+#: backend/fujitsu.c:4548
+#, fuzzy, no-c-format
+msgid "Density"
+msgstr "Интен�ивно�ть кра�ного"
+
+#: backend/fujitsu.c:4549
+#, no-c-format
+msgid "Density dial"
+msgstr ""
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, fuzzy, no-c-format
+msgid "Duplex switch"
+msgstr "Двух�тороннее �канирование"
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, no-c-format
 msgid "Extras"
 msgstr "Дополнительно"
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, fuzzy, no-c-format
-msgid "Threshold curve"
-msgstr "Порог"
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr ""
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
 "instead on hardware lineart."
 msgstr ""
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, fuzzy, no-c-format
 msgid "Disable interpolation"
 msgstr "Выключить от�леживание"
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
 "than the vertical resolution this disables horizontal interpolation."
 msgstr ""
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "Цветное штриховое"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "Калибровка"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Задать режим калибровки"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "К�ширование калибровочных данных"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, no-c-format
 msgid "Lamp off time"
 msgstr "Врем� выключени� лампы"
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
@@ -2394,105 +3126,103 @@ msgstr ""
 "Лампа будет выключена через указанное врем� (в минутах). Значение 0 "
 "означает, что лампа выключать�� не будет."
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, fuzzy, no-c-format
 msgid "Lamp off during scan"
 msgstr "Груба� калибровка"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr ""
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, fuzzy, no-c-format
 msgid "File button"
 msgstr "Ожидать нажати� кнопки"
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr ""
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, fuzzy, no-c-format
 msgid "Power button"
 msgstr "Ожидать нажати� кнопки"
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "Ожидать нажати� кнопки"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, fuzzy, no-c-format
 msgid "Need calibration"
 msgstr "Груба� калибровка"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, fuzzy, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr "Выполн�ть калибровку �канера перед �канированием"
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, no-c-format
 msgid "Buttons"
 msgstr "Кнопки"
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr "Калибровка"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, fuzzy, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "�ачать проце�� калибровки."
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, fuzzy, no-c-format
 msgid "Clear calibration"
 msgstr "Груба� калибровка"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, fuzzy, no-c-format
 msgid "Clear calibration cache"
 msgstr "К�ширование калибровочных данных"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr "Слайд-модуль"
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr "Цвет полутонового режима"
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 "Выбирает, какой цвет будет и�пользовать�� при �канировании в полутоновом "
 "режиме (по умолчанию - зелёный)."
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr "Параметры отладки"
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "�втоматиче�кий прогрев"
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -2501,12 +3231,12 @@ msgstr ""
 "Разогревать пока �рко�ть лампы не �танет по�то�нной, вме�то про�того 60-"
 "ти�екундного ожидани� разогрева."
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "Полное �канирование"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
@@ -2516,12 +3246,12 @@ msgstr ""
 "поло�у. Будьте о�торожны. �е выбирайте полную вы�оту. Только дл� "
 "те�тировани�."
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Груба� калибровка"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2533,12 +3263,12 @@ msgstr ""
 "аналоговой на�тройки. Параметр включен по умолчанию. Только дл� "
 "те�тировани�."
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "Груба� калибровка только дл� первого �канировани�"
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2550,12 +3280,12 @@ msgstr ""
 "Е�ли �рко�ть изображени� отличает�� при каждом �канировании, выключите "
 "�тот параметр. Только дл� те�тировани�."
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, no-c-format
 msgid "Backtrack lines"
 msgstr "Линии отката"
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2568,83 +3298,83 @@ msgstr ""
 "бы�трее, чем компьютер может принимать данные. �изкое значение приводит "
 "к более бы�трому �канированию, но увеличивает веро�тно�ть пропу�ка линий."
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Значение гаммы"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr "У�танавливает значение гаммы в�ех каналов."
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, fuzzy, no-c-format
 msgid "Geometry Group"
 msgstr "Ра�положение"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, fuzzy, no-c-format
 msgid "Scan Mode Group"
 msgstr "Режим �канировани�"
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr "Слайд"
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, fuzzy, no-c-format
 msgid "Scanner model"
 msgstr "Режим �канировани�"
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, fuzzy, no-c-format
 msgid "Disable gamma correction"
 msgstr "�налогова� коррекци� гаммы"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, fuzzy, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "Коррекци� гаммы"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, fuzzy, no-c-format
 msgid "Disable white shading correction"
 msgstr "Выполн�ть только коррекцию оттенка"
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2652,12 +3382,12 @@ msgid ""
 "avoids depth emulation."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, fuzzy, no-c-format
 msgid "Emulate Grayscale"
 msgstr "Чёрно-белый"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2665,370 +3395,364 @@ msgid ""
 "circumstances."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
 "analyze them."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, fuzzy, no-c-format
 msgid "Reset chipset"
 msgstr "ли�товой �канер"
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, fuzzy, no-c-format
 msgid "Information"
 msgstr "Игнорировать калибровку"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, fuzzy, no-c-format
 msgid "Chipset name"
 msgstr "�азвание файла"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Unknown"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, fuzzy, no-c-format
 msgid "Shows the chipset ID"
 msgstr "ли�товой �канер"
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, fuzzy, no-c-format
 msgid "Scan counter"
 msgstr "И�точник �канировани�"
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, fuzzy, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr "Выберите количе�тво кадров дл� �канировани�"
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, fuzzy, no-c-format
 msgid "Update information"
 msgstr "Обновить параметры"
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, fuzzy, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr "Этот параметр отражает �о�то�ние кнопок �канера."
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr "Изображение"
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr "Различное"
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, fuzzy, no-c-format
 msgid "offset X"
 msgstr "Смещение"
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, fuzzy, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr "Координата X левого верхнего угла обла�ти �канировани�."
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, fuzzy, no-c-format
 msgid "offset Y"
 msgstr "Смещение"
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, fuzzy, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr "Координата X левого верхнего угла обла�ти �канировани�."
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr "Со�то�ние лампы"
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr "Включить/выключить лампу."
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr "Калибрует дл� чёрного и белого уровн�."
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr "�ПД"
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, fuzzy, no-c-format
 msgid "TMA Slides"
 msgstr "Слайд"
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, fuzzy, no-c-format
 msgid "TMA Negatives"
 msgstr "�егатив"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, fuzzy, no-c-format
 msgid "Color (48 bits)"
 msgstr "Цветной 48"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, fuzzy, no-c-format
 msgid "Extend lamp timeout"
 msgstr "Врем� выключени� лампы"
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr ""
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr "Ожидать нажати� кнопки"
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, fuzzy, no-c-format
 msgid "Waits for button before scanning"
 msgstr "Прогревать лампу перед �канированием"
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, no-c-format
 msgid "Advanced Options"
 msgstr "Дополнительные параметры"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr "Грубое"
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr "Точное"
 
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr ""
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr "Пользователь�кое"
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "�втоматиче�ки"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr "NTSC RGB"
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr "XPA RGB"
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr "Пропу�кать �квозь"
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "Чёрно-белое NTSC"
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr "Чёрно-белое XPA"
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "Медленно"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr "�ормально"
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "Бы�тро"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr "Очень бы�тро"
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr "Двухточечное"
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr "Четырёхточечное"
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr "Во�ьмиточечное"
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr "Ра�печатка"
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, no-c-format
 msgid "Film-strip"
 msgstr "Плёнка"
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr ""
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr "У�ловно"
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, no-c-format
 msgid "Experiment"
 msgstr "Эк�перимент"
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, no-c-format
 msgid "Sharpening"
 msgstr "Зао�трени�"
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr "У�танавливает величину зао�трени�."
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr "�втоматиче�кий порог"
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr ""
 "Включает автоматиче�кое определение порога при �канировании штриховых "
 "изображений."
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr "Сглаживание"
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr "Выберите фильтр дл� �глаживани�."
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr "Выгружать но�итель по�ле �канировани�"
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, no-c-format
 msgid "Unloads the media after a scan."
 msgstr "Выгружает но�итель по�ле �канировани�."
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, no-c-format
 msgid "Change document"
 msgstr "Сменить документ"
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr "Изменить документ."
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr "Выгрузить"
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr "Выгрузить документ."
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, no-c-format
 msgid "Start calibration process."
 msgstr "�ачать проце�� калибровки."
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, no-c-format
 msgid "Media"
 msgstr "�о�итель"
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr "У�тановить тип но�ител�."
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr "Врем� выдержки"
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -3041,461 +3765,460 @@ msgstr ""
 "�лайдов и \"�егатив\" дл� негативов. Дл� тёмных (недо�к�понированных) "
 "изображений вы можете увеличить �то значение."
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, no-c-format
 msgid "Color Matrix"
 msgstr "Цветова� матрица"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, no-c-format
 msgid "Set the scanners color matrix."
 msgstr "У�танавливает цветовую матрицу �канера."
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr "Пользователь�ка� цветова� матрица"
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, no-c-format
 msgid "Mono Color Matrix"
 msgstr "Однотонна� цветова� матрица"
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr "Пользователь�ка� цветова� матрица дл� чёрно-белых изображений."
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, no-c-format
 msgid "Mirror horizontal"
 msgstr "Отобразить горизонтально"
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, no-c-format
 msgid "Mirror image horizontally."
 msgstr "Отображает изображение по горизонтали."
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, no-c-format
 msgid "Mirror vertical"
 msgstr "Отобразить вертикально"
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, no-c-format
 msgid "Mirror image vertically."
 msgstr "Отображает изображение по вертикали."
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, no-c-format
 msgid "Update options"
 msgstr "Обновить параметры"
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, no-c-format
 msgid "Update options."
 msgstr "Обновл�ет параметры."
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr "Во�ьмибитный вывод"
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr ""
 "Внутри и�пользовать разр�дно�ть более 8 бит, но выводить только 8 бит."
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr "Ожидать кнопки на лицевой панели"
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr "Ждать нажати� кнопки на передней панели дл� начала �канировани�."
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr "Выключить лампу"
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr "Выключает лампу �канера."
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "Размер бумаги"
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr "�втоматиче�кое разделение"
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, fuzzy, no-c-format
 msgid "Landscape"
 msgstr "A5 ландшафт"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr ""
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, no-c-format
 msgid "Length control mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, fuzzy, no-c-format
 msgid "Manual feed mode"
 msgstr "Ручна� предварительна� фоку�ировка"
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, fuzzy, no-c-format
 msgid "Manual feed timeout"
 msgstr "Ручна� предварительна� фоку�ировка"
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr "Включить дву�тороннее �канирование"
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr "Физиче�кий размер бумаги в у�трой�тве автоподачи"
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, fuzzy, no-c-format
 msgid "halftone"
 msgstr "Полутоновый (ра�тр)"
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, fuzzy, no-c-format
 msgid "color"
 msgstr "Цветной"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, fuzzy, no-c-format
 msgid "continuous"
 msgstr "У�ловно"
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, fuzzy, no-c-format
 msgid "off"
 msgstr "Выкл"
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, no-c-format
 msgid "bayer_64"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, no-c-format
 msgid "bayer_16"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, fuzzy, no-c-format
 msgid "halftone_32"
 msgstr "Полутоновый (ра�тр)"
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, fuzzy, no-c-format
 msgid "halftone_64"
 msgstr "Полутоновый (ра�тр)"
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, fuzzy, no-c-format
 msgid "diffusion"
 msgstr "Диффузи� ошибок"
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, fuzzy, no-c-format
 msgid "normal"
 msgstr "�ормально"
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, fuzzy, no-c-format
 msgid "light"
 msgstr "Под�ветка"
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, fuzzy, no-c-format
 msgid "From scanner"
 msgstr "планшетный �канер"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr "От бумаги"
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, fuzzy, no-c-format
 msgid "default"
 msgstr "По умолчанию"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, fuzzy, no-c-format
 msgid "smooth"
 msgstr "Сглаживать"
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, fuzzy, no-c-format
 msgid "low"
 msgstr "Медленно"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, fuzzy, no-c-format
 msgid "medium"
 msgstr "�ормальный"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, fuzzy, no-c-format
 msgid "red"
 msgstr "Кра�ный"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, fuzzy, no-c-format
 msgid "green"
 msgstr "Зелёный"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, fuzzy, no-c-format
 msgid "Sets the scan source"
 msgstr "И�точник �канировани�"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr "Режим подачи"
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr "У�танавливает режим подачи"
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, fuzzy, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr "Выключить предварительный фоку�"
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, fuzzy, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr "Выключить предварительный фоку�"
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, fuzzy, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "У�танавливает режим подачи"
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, fuzzy, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr "У�танавливает режим подачи"
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr "�втоматиче�кий порог"
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
@@ -3504,558 +4227,545 @@ msgstr ""
 "�втоматиче�ки у�танавливает �рко�ть, контра�тно�ть, уровень белого, "
 "гамму, уменьшение шума и выразительно�ть изображени�"
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "Уменьшение шумов"
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr "Уменьшает количе�тво отдельных �лучайных точек"
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr "Выразительно�ть изображени�"
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr "У�танавливает выразительно�ть изображени�"
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr "Гамма"
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, fuzzy, no-c-format
 msgid "Lamp color"
 msgstr "Включить лампу"
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, fuzzy, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr "Включить/выключить лампу."
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, fuzzy, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "Отображает изображение по вертикали."
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
 "length of actual paper or logical document length."
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "Коррекци� гаммы"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, fuzzy, no-c-format
 msgid "High sensivity"
 msgstr "Печать вы�окой плотно�ти"
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, fuzzy, no-c-format
 msgid "Low sensivity"
 msgstr "Печать вы�окой плотно�ти"
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, fuzzy, no-c-format
 msgid "err_diffusion"
 msgstr "Диффузи� ошибок"
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, fuzzy, no-c-format
 msgid "No detection"
 msgstr "Без коррекции"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, fuzzy, no-c-format
 msgid "Normal mode"
 msgstr "�ормально"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, fuzzy, no-c-format
 msgid "Enhanced mode"
 msgstr "Повышение"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
 "divides long paper by the length which is set in Document Size option."
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, fuzzy, no-c-format
 msgid "Automatic threshold mode"
 msgstr "�втоматиче�кий порог"
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, fuzzy, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr "�втоматиче�кий порог"
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, fuzzy, no-c-format
 msgid "Set chroma of red"
 msgstr "У�тановить пор�док кадров"
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, fuzzy, no-c-format
 msgid "chroma of blue"
 msgstr "Затенённо�ть дл� �инего"
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, fuzzy, no-c-format
 msgid "Set chroma of blue"
 msgstr "Сдвиг кра�ного к �инему"
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr ""
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr ""
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr ""
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr ""
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr "8x8 вертикальна� лини�"
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr "У�иление"
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr "�а�тройки у�илени� цветовых каналов"
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, no-c-format
 msgid "Gray gain"
 msgstr "У�иление �ерого"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr "У�танавливает у�иление �ерого канала"
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, no-c-format
 msgid "Red gain"
 msgstr "У�иление кра�ного"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr "У�танавливает у�иление кра�ного канала"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, no-c-format
 msgid "Green gain"
 msgstr "У�иление зелёного"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr "У�танавливает у�иление зелёного канала"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, no-c-format
 msgid "Blue gain"
 msgstr "У�иление �инего"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr "У�танавливает у�иление �инего канала"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr ""
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr ""
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr "Полутоновый пункт 32"
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr "Полутоновый пункт 64"
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr "Диффузи� ошибок"
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr "Режим 1"
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr "Режим 2"
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr "Режим 3"
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr "От белой палочки"
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr "Сглаживать"
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr "�изкий"
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr "�ормальный"
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr "Вы�окий"
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr "ЭЛТ"
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "Одна �траница"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "В�е �траницы"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr "ли�товой �канер"
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr "Оттенки �ерого 4 бита"
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr "Оттенки �ерого 8 бит"
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr "Затенённо�ть, полутон, под�ветка, врем� выдержки"
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr "Специальные параметры"
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr "Цветовой балан�"
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr "Выключить от�леживание"
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr "Е�ли отмечено, �канер не выполн�ет от�леживание"
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr "Переключить лампу планшетного �канера"
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr "Переключает лампу планшетного �канера"
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr "Калибровка производит�� движком"
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid ""
 "If checked the color calibration before a scan is done by the backend"
 msgstr ""
 "Е�ли отмечено, калибровка цвета перед �канированием выполн�ет�� движком"
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr "И�пользовать 35мм адаптер lightlid"
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr ""
 "Этот параметр выключает лампу планшетного �канера во врем� �канировани�"
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "Каче�твенное �канирование"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr "�аивы�шее каче�тво, но медленна� �коро�ть"
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "Бы�трое �канирование"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr "�аивы�ша� �коро�ть, но низкое каче�тво"
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr "�втоматиче�кое на�траивание порога"
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
@@ -4064,67 +4774,67 @@ msgstr ""
 "Е�ли отмечено, движок автоматиче�ки попробует определить оптимальное "
 "значение порога."
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr "Выберите режим коррекции гаммы."
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr "Св�зывать гаммы"
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr "И�пользовать те же �амые значени� гаммы дл� в�ех цветовых каналов."
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr "Скал�рна� гамма"
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr "Выбирает значение дл� коррекции �кал�рной гаммы."
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr "Скал�рна� гамма кра�ного"
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr "Выбирает значение дл� коррекции �кал�рной гаммы (канал кра�ного)"
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr "Скал�рна� гамма зелёного"
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr "Выбирает значение дл� коррекции �кал�рной гаммы (канал зелёного)"
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr "Скал�рна� гамма �инего"
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr "Выбирает значение дл� коррекции �кал�рной гаммы (канал �инего)"
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr "Канал"
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
@@ -4132,223 +4842,223 @@ msgstr ""
 "Выбирает �в�зь цветов, \"О�новной\" означает, что будут подвержены в�е "
 "цвета."
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr "Полутон"
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr ""
 "Определ�ет, какой уровень излучени� должен быть ра��мотрен как \"50 % "
 "�ерого\"."
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr "Полутон дл� кра�ного"
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr ""
 "Определ�ет, какой уровень излучени� должен быть ра��мотрен как \"50 % "
 "кра�ного\"."
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr "Полутон дл� зелёного"
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr ""
 "Определ�ет, какой уровень излучени� должен быть ра��мотрен как \"50 % "
 "зелёного\"."
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr "Полутон дл� �инего"
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr ""
 "Определ�ет, какой уровень излучени� должен быть ра��мотрен как \"50 % "
 "�инего\"."
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr "Балан� кра�ного"
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr ""
 "Ко�ффициент дл� кра�ного цвета. Значение 100% означает от�ут�твие "
 "коррекции."
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr "Балан� зелёного"
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr ""
 "Ко�ффициент дл� зелёного цвета. Значение 100% означает от�ут�твие "
 "коррекции."
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr "Балан� �инего"
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr ""
 "Ко�ффициент дл� �инего цвета. Значение 100% означает от�ут�твие "
 "коррекции."
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr "Балан�, у�тановленный на заводе"
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr ""
 "У�танавливает значени� цветового балан�а в и�ходные значени�, "
 "у�тановленные на заводе."
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "Сама� медленна�"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "Медленна�"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "Бы�тра�"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "Сама� бы�тра�"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr "8x8 грубое"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr "8x8 нормальное"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr "8x8 хорошее"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr "8x8 очень хорошее"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr "6x6 нормальное"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr "5x5 грубое"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr "5x5 хорошее"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr "4x4 грубое"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr "4x4 нормальное"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr "4x4 хорошее"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr "3x3 нормальное"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr "2x2 нормальное"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr "8x8 выборочно"
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr "6x6 выборочно"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr "5x5 выборочно"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr "4x4 выборочно"
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr "3x3 выборочно"
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr "2x2 выборочно"
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr "Бы�трый чёрно-белый режим"
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr "Сканировать в бы�тром чёрно-белом режиме (наихудшее каче�тво)."
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
@@ -4358,117 +5068,117 @@ msgstr ""
 "(низкокаче�твенном) режиме. Это может быть чёрно-белый режим или режим � "
 "низким разрешением."
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr "Врем� выключени� лампы (в минутах)"
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr "Указывает врем� (в минутах), по�ле которого лампа будет выключена."
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, no-c-format
 msgid "Turn lamp off"
 msgstr "Выключить лампу �канера"
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr "Выключает лампу незамедлительно."
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr "Ярко�ть кра�ного"
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr "Управл�ет �рко�тью кра�ного канала полученного изображени�."
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr "Ярко�ть зелёного"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr "Управл�ет �рко�тью зелёного канала полученного изображени�."
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr "Ярко�ть �инего"
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr "Управл�ет �рко�тью �инего канала полученного изображени�."
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "Контра�тно�ть кра�ного канала"
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr "Управл�ет контра�тно�тью кра�ного канала полученного изображени�."
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "Контра�тно�ть зелёного канала"
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr "Управл�ет контра�тно�тью зелёного канала полученного изображени�."
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "Контра�тно�ть �инего канала"
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr "Управл�ет контра�тно�тью �инего канала полученного изображени�."
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr "Цветной 48"
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr "Цветной 24"
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr "Чёрно-белый 16"
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr "Чёрно-белый 8"
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, fuzzy, no-c-format
 msgid "Positive"
 msgstr "Позитив"
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -4477,39 +5187,39 @@ msgstr ""
 "Разогревать пока �рко�ть лампы не �танет по�то�нной, вме�то про�того 40-"
 "ти�екундного ожидани� разогрева."
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, fuzzy, no-c-format
 msgid "Negative color"
 msgstr "�егатив"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, fuzzy, no-c-format
 msgid "Negative gray"
 msgstr "�егатив"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, no-c-format
 msgid "48 bits color"
 msgstr ""
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
 "mode and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4517,248 +5227,239 @@ msgid ""
 "cancel, press \"GRAY\" button."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:143
-#, no-c-format
-msgid "Gamma function exponent"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:144
-#, no-c-format
-msgid "Changes intensity of midtones"
-msgstr ""
-
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:232
 #, fuzzy, no-c-format
 msgid "Update button state"
 msgstr "Со�то�ние кнопки"
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:244
 #, fuzzy, no-c-format
 msgid "Button 1"
 msgstr "Кнопки"
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:258
 #, fuzzy, no-c-format
 msgid "Button 2"
 msgstr "Кнопки"
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr ""
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr ""
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr "Прозрачный"
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr "�а�тройки у�трой�тва"
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr "Выключатель лампы"
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr "Вручную управл�ет лампой."
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, fuzzy, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "Груба� калибровка"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr ""
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, no-c-format
 msgid "Calibration data cache"
 msgstr "К�ширование калибровочных данных"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr "Включает или выключает к�ширование данных о калибровке."
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, fuzzy, no-c-format
 msgid "Performs calibration"
 msgstr "Груба� калибровка"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr ""
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr ""
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, no-c-format
 msgid "Warmup-time"
 msgstr "Врем� прогрева лампы"
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, no-c-format
 msgid "Warmup-time in seconds."
 msgstr "Врем� прогрева лампы в �екундах."
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, no-c-format
 msgid "Lampoff-time"
 msgstr "Врем� выключени� лампы"
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr "Врем� выключени� лампы в �екундах."
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, no-c-format
 msgid "Analog frontend"
 msgstr ""
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr "Смещение кра�ного"
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr "Смещение зелёного"
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr "Смещение �инего"
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, no-c-format
 msgid "Red lamp off"
 msgstr "Выключение кра�ной лампы"
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr "Определ�ет параметры выключени� кра�ной лампы"
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, no-c-format
 msgid "Green lamp off"
 msgstr "Выключение зелёной лампы"
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr "Определ�ет параметры выключени� зелёной лампы"
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, no-c-format
 msgid "Blue lamp off"
 msgstr "Выключение �иней лампы"
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr "Определ�ет параметры выключени� �иней лампы"
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr "Этот параметр отражает �о�то�ние кнопок �канера."
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr "Цветное 36"
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr ""
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr ""
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr "Случайный"
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr "И�точник �канировани�"
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr "Выразительно�ть изображени�"
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr "Сделать чёрно-белым"
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr "Загрузить изображение как чёрно-белое"
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr "Имитаци� трёхпроходного режима"
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
@@ -4767,12 +5468,12 @@ msgstr ""
 "Имитирует трёхпроходной �кнер возвращениём трёх различных кадров. То "
 "е�ть возвращает �начала зелёный, потом �иний, потом кра�ный."
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr "Имитаци� ручного �канера"
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4784,7 +5485,7 @@ msgstr ""
 "параметра позволит проверить будет ли фронтенд корректно обрабатывать "
 "�ту �итуацию."
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid ""
 "Set default values for enhancement controls (brightness & contrast)."
@@ -4792,199 +5493,196 @@ msgstr ""
 "У�танавливает значени� по умолчанию дл� управлени� повышением (�рко�тью "
 "и контра�тно�тью)."
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr "Те�товый параметр только дл� чтени�"
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr ""
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr "Таблица гаммы"
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr "Имитаци� кода �о�то�ни�"
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr "�е получать код �о�то�ни�"
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr "�е принуждать драйвер возвращать код �о�то�ни�."
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr ""
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr ""
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr ""
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr ""
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr ""
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr ""
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr ""
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
 "after sane_read() has been called."
 msgstr ""
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, fuzzy, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr "Этот параметр отражает �о�то�ние кнопок �канера."
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr "Включить лампу"
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr "Включить лампу �канера"
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr "Выключить лампу"
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr "Выключить лампу �канера"
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, fuzzy, no-c-format
 msgid "Lamp timeout"
 msgstr "Врем� выключени� лампы"
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr ""
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr "Податчик ли�тов"
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr "6x4 (дюймов)"
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr "8x10 (дюймов)"
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr "8.5x11 (дюймов)"
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr "Полутоновое �канирование не поддерживает��"
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr "Точка размыти� 8x8"
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr "Точка размыти� 16x16"
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -5001,27 +5699,27 @@ msgstr ""
 "оболочка может пере�тать принимать �обыти� от �и�темы X Window и не "
 "будет реагировать на ваши команды до окончани� �канировани�."
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr ""
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr ""
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, fuzzy, no-c-format
 msgid "Focus point for scanning."
 msgstr "Извлечь документ по�ле �канировани�"
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr "Режим предварительного про�мотра"
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
@@ -5031,12 +5729,12 @@ msgstr ""
 "предварительный про�мотр обычно даёт лучшее �очетание �коро�ти и "
 "детализации."
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr "Заранее на�троенные параметры"
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
@@ -5045,97 +5743,97 @@ msgstr ""
 "Предо�тавл�ют �тандартные обла�ти �канировани� дл� фотографий, "
 "ра�печатанных �траниц и прочего."
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr ""
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, fuzzy, no-c-format
 msgid "Frame to be scanned"
 msgstr "планшетный �канер"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, no-c-format
 msgid "Focus-mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, fuzzy, no-c-format
 msgid "Auto or manual focus"
 msgstr "�втоизвлечение"
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, fuzzy, no-c-format
 msgid "Focus-point"
 msgstr "Ра�положение фоку�а"
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, fuzzy, no-c-format
 msgid "Focus point"
 msgstr "Ра�положение фоку�а"
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr "Цветных �трок за запро� на чтение"
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr "Чёрно-белых �трок за запро� на чтение"
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr ""
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr "Цветной RAW"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr "Цветной RGB"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr "Цветной RGB TEXT"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr "Сплошной чёрный"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr "Сплошной белый"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr "Цветовой шаблон"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr "Сетка"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr "Перва� запи�ь"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr "Втора� запи�ь"
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
@@ -5143,12 +5841,12 @@ msgid ""
 msgstr ""
 "Это очень длинна� треть� запи�ь. Может быть фронтенд �может показать её."
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr "Имитаци� ручного �канера"
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5162,12 +5860,12 @@ msgstr ""
 "обрабатывать �то корректно. Этот параметр также включает фик�ированную "
 "ширину 11 �м."
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr "Имитаци� трёхпроходного режима"
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
@@ -5176,34 +5874,34 @@ msgstr ""
 "Имитаци� трёхпроходного �канера. В цветном режиме будет передано три "
 "кадра."
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr "У�тановить пор�док кадров"
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr "У�танавливает пор�док кадров в трёхпроходном цветном режиме."
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
 "after 10 scans."
 msgstr ""
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr "Специальные параметры"
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr "Выберите те�товое изображение"
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5220,12 +5918,12 @@ msgstr ""
 "зави�имо�ти от режима.\n"
 "Сетка: ри�ует чёрно-белую �етку � размером каждого квадрата 10 на 10 мм."
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr "Инвертировать пор�док байт"
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5233,23 +5931,23 @@ msgid ""
 "uses the correct endianness."
 msgstr ""
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr "Предел чтени�"
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 "Ограничить количе�тво данных, передаваемых при каждом вызове sane_read()."
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr "Размер предела чтени�"
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
@@ -5257,34 +5955,34 @@ msgstr ""
 "Мак�имальное количе�тво данных, передаваемых при каждом вызове "
 "sane_read()."
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr "Задержка при чтении"
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr "Задержка передачи данных в канал."
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr "Длительно�ть задержки при чтении"
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
 msgstr ""
 "Как долго ожидать по�ле передачи каждого буфера данных через канал."
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr "Возвращаемое значение sane_read"
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
@@ -5292,58 +5990,58 @@ msgid ""
 "frontend handles them."
 msgstr ""
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr "Потери точек на линию"
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr "Количе�тво точек, которые потер�ны в конце каждой линии."
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr "�ечёткие параметры"
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
 "before sane_start()."
 msgstr ""
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr "И�пользовать неблокирующий ввод-вывод"
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 "И�пользовать неблокируемый ввод-вывод дл� sane_read(), е�ли таковой "
 "поддерживает�� графиче�кой оболочкой."
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr ""
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
 "data."
 msgstr ""
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr "Включить те�товые параметры"
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
@@ -5353,39 +6051,39 @@ msgstr ""
 "�по�обно�ти графиче�ких оболочек про�матривать и измен�ть различные типы "
 "параметров SANE."
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr "�апечатать параметры"
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr "�апечатать �пи�ок в�ех параметров."
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr "Двочные те�товые параметры"
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr ""
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
 "advanced) capabilities. That's just a normal bool option."
 msgstr ""
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr ""
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
@@ -5393,12 +6091,12 @@ msgid ""
 "frontend but by the user (e.g. by pressing a button at the device)."
 msgstr ""
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr ""
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5406,36 +6104,36 @@ msgid ""
 "by pressing a button at the device) and can't be read by the frontend."
 msgstr ""
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr ""
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
 "That means the option is read-only."
 msgstr ""
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr ""
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
 "(and advanced) capabilities."
 msgstr ""
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr ""
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5443,303 +6141,307 @@ msgid ""
 "backend."
 msgstr ""
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr "Целочи�ленные те�товые параметры"
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr ""
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr ""
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr ""
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
 "is 4, maximum 192, and quant is 2."
 msgstr ""
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr ""
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr ""
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
 "constraints."
 msgstr ""
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr ""
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
 "constraint. Minimum is 4, maximum 192, and quant is 2."
 msgstr ""
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr ""
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
 "list constraint."
 msgstr ""
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr "Дробночи�ленные те�товые параметры"
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr ""
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr ""
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr ""
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
 "Minimum is -42.17, maximum 32767.9999, and quant is 2.0."
 msgstr ""
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr ""
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr "Те�товые параметры дл� �трок"
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr ""
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr ""
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr ""
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr ""
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr ""
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
 "entries..."
 msgstr ""
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr "Те�товые параметры дл� кнопок"
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr "(1/1) Кнопка"
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr ""
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, no-c-format
 msgid "Color 36"
 msgstr "Цветное 36"
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr "И�пользовать компоновку изображений"
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr "Только чёрный и только белый (штриховой режим)"
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr "Полутоновый чёрно-белый (полутоновый режим)"
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr "Многоуровневый чёрно-белый (режим оттенков �ерого)"
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr "Многоуровневые цвета RGB (однопроходной цвет)"
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr "Игнорировать калибровку"
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr "Выключить предварительный фоку�"
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr "�е калибровать фоку�"
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr "Ручна� предварительна� фоку�ировка"
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr "Зафик�ировать позицию фоку�а"
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr ""
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr ""
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr "Держать позицию фоку�а на 0мм"
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr "И�пользовать фоку� 0мм вме�то 0.6мм"
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr "Режим калибровки"
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr "Задать режим калибровки"
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr "Включить/выключить лампу"
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr "включить UTA"
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr "Включить/выключить UTA"
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr "Смещение"
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr "�а�тройки �мещени� цветовых каналов"
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, no-c-format
 msgid "Gray offset"
 msgstr "Смещение �ерого"
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr "У�танавливает �мещение канала �ерого"
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr "У�танавливает �мещение канала кра�ного"
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr "У�танавливает �мещение канала зелёного"
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr "У�танавливает �мещение канала �инего"
 
+#, fuzzy
+#~ msgid "IPC mode"
+#~ msgstr "Режим предварительного про�мотра"
+
 #~ msgid "Grayscale"
 #~ msgstr "Чёрно-белый"
 
diff --git a/po/sane-backends.pot b/po/sane-backends.pot
index 76ae8f8..85fa955 100644
--- a/po/sane-backends.pot
+++ b/po/sane-backends.pot
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) YEAR The SANE developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
+"Project-Id-Version: sane-backends 1.0.27\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,444 +17,439 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr ""
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr ""
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291 ../backend/genesys.c:5615
-#: ../backend/gt68xx.c:703 ../backend/hp3500.c:1003
-#: ../backend/hp-option.c:3297 ../backend/kvs1025_opt.c:640
-#: ../backend/kvs20xx_opt.c:284 ../backend/kvs40xx_opt.c:505
-#: ../backend/leo.c:823 ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305 backend/mustek_usb2.c:465
+#: backend/pixma_sane_options.c:160 backend/plustek.c:808
+#: backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095 backend/teco2.c:1914
+#: backend/teco3.c:920 backend/test.c:647 backend/u12.c:546
+#: backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr ""
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675 ../backend/gt68xx.c:672
-#: ../backend/hp-option.c:2953 ../backend/kvs1025_opt.c:704
-#: ../backend/leo.c:871 ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854 ../backend/plustek_pp.c:793
-#: ../backend/sceptre.c:750 ../backend/snapscan-options.c:617
-#: ../backend/stv680.c:1067 ../backend/teco1.c:1143 ../backend/teco2.c:1962
-#: ../backend/teco3.c:968 ../backend/u12.c:592 ../backend/umax.c:5226
-#: ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353 backend/mustek_usb2.c:431
+#: backend/niash.c:754 backend/plustek.c:854 backend/plustek_pp.c:793
+#: backend/sceptre.c:750 backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr ""
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597 backend/rts8891.c:2831
+#: backend/snapscan-options.c:923 backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr ""
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr ""
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr ""
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr ""
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr ""
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145 ../backend/leo.c:781
-#: ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr ""
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr ""
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr ""
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr ""
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr ""
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr ""
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr ""
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr ""
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr ""
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr ""
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr ""
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr ""
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, no-c-format
 msgid "Page height"
 msgstr ""
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr ""
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr ""
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr ""
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr ""
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr ""
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr ""
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr ""
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr ""
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr ""
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr ""
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr ""
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr ""
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
 msgstr ""
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr ""
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr ""
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr ""
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr ""
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr ""
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr ""
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr ""
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr ""
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr ""
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr ""
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr ""
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205 ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121 backend/plustek.c:236
+#: backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr ""
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr ""
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr ""
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr ""
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr ""
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr ""
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr ""
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr ""
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr ""
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr ""
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr ""
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr ""
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr ""
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr ""
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr ""
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr ""
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr ""
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr ""
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr ""
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr ""
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices supports."
 msgstr ""
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, no-c-format
 msgid "Source, mode and resolution options"
 msgstr ""
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr ""
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, no-c-format
 msgid "Image modification options"
 msgstr ""
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, no-c-format
 msgid "Hardware specific options"
 msgstr ""
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr ""
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr ""
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -462,86 +457,86 @@ msgid ""
 "scanner, it reduces the memory requirements and scan-time of the preview."
 msgstr ""
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 for "
 "multibit scans."
 msgstr ""
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr ""
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr ""
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr ""
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr ""
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr ""
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr ""
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr ""
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr ""
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of sheet-"
 "fed scans."
 msgstr ""
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, no-c-format
 msgid "Specifies the height of the media."
 msgstr ""
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid "Determines whether a builtin or a custom gamma-table should be used."
 msgstr ""
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the red, "
@@ -549,421 +544,421 @@ msgid ""
 "table)."
 msgstr ""
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr ""
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr ""
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr ""
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result in "
 "sharper images."
 msgstr ""
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr ""
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"full green\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"full blue\"."
 msgstr ""
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr ""
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs when "
 "acquiring an image with a camera. Larger values cause more blooming."
 msgstr ""
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr ""
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
 "halftoned images."
 msgstr ""
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
 msgstr ""
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr ""
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr ""
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr ""
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr ""
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr ""
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr ""
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr ""
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr ""
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr ""
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr ""
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr ""
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr ""
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr ""
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr ""
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr ""
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr ""
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr ""
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr ""
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr ""
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, no-c-format
 msgid "Scan button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, no-c-format
 msgid "Email button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, no-c-format
 msgid "Fax button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, no-c-format
 msgid "Copy button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr ""
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr ""
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, no-c-format
 msgid "Cover open"
 msgstr ""
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr ""
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr ""
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr ""
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr ""
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr ""
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, no-c-format
 msgid "Operation not supported"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, no-c-format
 msgid "Document feeder jammed"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, no-c-format
 msgid "Document feeder out of documents"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, no-c-format
 msgid "Scanner cover is open"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr ""
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. Otherwise, "
 "calibration is performed only before the first start."
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. The "
@@ -971,1456 +966,2194 @@ msgid ""
 "the configuration file, are used."
 msgstr ""
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr ""
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr ""
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr ""
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, no-c-format
 msgid "Duplex scan"
 msgstr ""
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid "Duplex scan provide a scan of the front and back side of the document"
 msgstr ""
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr ""
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr ""
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr ""
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr ""
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr ""
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr ""
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr ""
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr ""
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr ""
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr ""
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, no-c-format
 msgid "No transparency correction"
 msgstr ""
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr ""
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr ""
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, no-c-format
 msgid "Negatives"
 msgstr ""
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, no-c-format
 msgid "Slides"
 msgstr ""
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr ""
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, no-c-format
 msgid "Normal speed"
 msgstr ""
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/2 normal speed"
 msgstr ""
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/3 normal speed"
 msgstr ""
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, no-c-format
 msgid "rounded parameter"
 msgstr ""
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr ""
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, no-c-format
 msgid "ADF jam"
 msgstr ""
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr ""
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, no-c-format
 msgid "lamp failure"
 msgstr ""
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr ""
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr ""
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr ""
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr ""
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr ""
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, no-c-format
 msgid "transparency unit lamp failure"
 msgstr ""
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr ""
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr ""
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr ""
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr ""
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr ""
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr ""
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr ""
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr ""
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr ""
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr ""
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr ""
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr ""
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr ""
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr ""
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr ""
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr ""
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr ""
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr ""
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr ""
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, no-c-format
 msgid "transparency unit shading error"
 msgstr ""
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr ""
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, no-c-format
 msgid "film scanner"
 msgstr ""
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr ""
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386 ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr ""
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr ""
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, no-c-format
 msgid "Negative film type"
 msgstr ""
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, no-c-format
 msgid "Selects the negative film type"
 msgstr ""
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, no-c-format
 msgid "Hardware resolution"
 msgstr ""
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, no-c-format
 msgid "Use only hardware resolutions"
 msgstr ""
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr ""
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, no-c-format
 msgid "Auto focus"
 msgstr ""
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, no-c-format
 msgid "Enable/disable auto focus"
 msgstr ""
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr ""
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr ""
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, no-c-format
 msgid "Manual focus position"
 msgstr ""
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr ""
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr ""
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr ""
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205 ../backend/epson2.c:1255
-#: ../backend/kvs1025.h:55 ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr ""
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, no-c-format
 msgid "Mirror the image horizontally"
 msgstr ""
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, no-c-format
 msgid "Auto exposure"
 msgstr ""
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr ""
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, no-c-format
 msgid "Calibration now"
 msgstr ""
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, no-c-format
 msgid "Execute calibration *now*"
 msgstr ""
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr ""
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr ""
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, no-c-format
 msgid "Reset scanner"
 msgstr ""
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, no-c-format
 msgid "Reset the scanner"
 msgstr ""
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr ""
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, no-c-format
 msgid "Eject film after each scan"
 msgstr ""
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr ""
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr ""
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid "Automatically eject the film from the device before exiting the program"
 msgstr ""
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr ""
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr ""
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, no-c-format
 msgid "Document feeder extras"
 msgstr ""
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, no-c-format
 msgid "Flatbed only"
 msgstr ""
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr ""
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, no-c-format
 msgid "Transparency unit"
 msgstr ""
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr ""
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, no-c-format
 msgid "Negative film"
 msgstr ""
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, no-c-format
 msgid "Positive or negative film"
 msgstr ""
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr ""
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr ""
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, no-c-format
 msgid "Transparency ratio"
 msgstr ""
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, no-c-format
 msgid "Select film type"
 msgstr ""
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, no-c-format
 msgid "Select the film type"
 msgstr ""
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227 ../backend/epson.c:501
-#: ../backend/epson2.c:115 ../backend/fujitsu.c:649 ../backend/gt68xx.c:148
-#: ../backend/hp3900_sane.c:418 ../backend/hp3900_sane.c:427
-#: ../backend/hp3900_sane.c:1017 ../backend/hp5590.c:82
-#: ../backend/ma1509.c:108 ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901 backend/pixma_sane_options.c:92
+#: backend/snapscan-options.c:86 backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr ""
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228 ../backend/fujitsu.c:650
-#: ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, no-c-format
 msgid "ADF Front"
 msgstr ""
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229 ../backend/fujitsu.c:651
-#: ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, no-c-format
 msgid "ADF Back"
 msgstr ""
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230 ../backend/fujitsu.c:652
-#: ../backend/hp5590.c:84 ../backend/kodak.c:137 ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, no-c-format
 msgid "ADF Duplex"
 msgstr ""
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, no-c-format
 msgid "Card Front"
 msgstr ""
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, no-c-format
 msgid "Card Back"
 msgstr ""
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, no-c-format
 msgid "Card Duplex"
 msgstr ""
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599 ../backend/epson.c:3096
-#: ../backend/epson2.c:201 ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr ""
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600 ../backend/epson.c:3092
-#: ../backend/epson2.c:202 ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr ""
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601 ../backend/epson.c:3100
-#: ../backend/epson2.c:203 ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr ""
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, no-c-format
 msgid "Enhance Red"
 msgstr ""
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, no-c-format
 msgid "Enhance Green"
 msgstr ""
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, no-c-format
 msgid "Enhance Blue"
 msgstr ""
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675 ../backend/genesys.c:99
-#: ../backend/leo.c:109 ../backend/matsushita.c:138
-#: ../backend/matsushita.c:159 ../backend/matsushita.c:191
-#: ../backend/matsushita.c:213 ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr ""
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108 ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr ""
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr ""
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr ""
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353 backend/magicolor.c:175
+#: backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr ""
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr ""
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118 ../backend/magicolor.c:182
-#: ../backend/mustek.c:160 ../backend/pixma.c:896 ../backend/test.c:192
-#: ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr ""
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr ""
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr ""
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr ""
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr ""
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr ""
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr ""
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr ""
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr ""
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr ""
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr ""
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr ""
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr ""
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr ""
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr ""
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr ""
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr ""
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr ""
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr ""
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr ""
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr ""
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr ""
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr ""
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr ""
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr ""
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr ""
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr ""
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr ""
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr ""
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr ""
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr ""
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr ""
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr ""
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977 ../backend/genesys.c:5532
-#: ../backend/gt68xx.c:458 ../backend/hp-option.c:2914
-#: ../backend/kvs1025_opt.c:522 ../backend/kvs20xx_opt.c:170
-#: ../backend/kvs40xx_opt.c:319 ../backend/ma1509.c:501
-#: ../backend/matsushita.c:1084 ../backend/microtek2.h:598
-#: ../backend/mustek.c:4205 ../backend/mustek_usb.c:260
-#: ../backend/mustek_usb2.c:344 ../backend/niash.c:734
-#: ../backend/plustek.c:721 ../backend/plustek_pp.c:658
-#: ../backend/sceptre.c:673 ../backend/snapscan-options.c:354
-#: ../backend/stv680.c:1030 ../backend/teco2.c:1886 ../backend/test.c:306
-#: ../backend/u12.c:473 ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320 backend/ma1509.c:501
+#: backend/matsushita.c:1084 backend/microtek2.h:598 backend/mustek.c:4203
+#: backend/mustek_usb.c:260 backend/mustek_usb2.c:344 backend/niash.c:734
+#: backend/plustek.c:721 backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030 backend/teco2.c:1886
+#: backend/test.c:306 backend/u12.c:473 backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr ""
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr ""
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr ""
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr ""
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr ""
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr ""
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175 ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr ""
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr ""
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr ""
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr ""
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr ""
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr ""
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr ""
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr ""
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr ""
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr ""
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr ""
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr ""
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr ""
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr ""
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr ""
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr ""
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr ""
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr ""
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, no-c-format
 msgid "Controls blue level"
 msgstr ""
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr ""
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr ""
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr ""
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr ""
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr ""
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr ""
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr ""
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr ""
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr ""
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr ""
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr ""
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr ""
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr ""
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr ""
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr ""
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr ""
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr ""
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or the "
 "user defined table, which can be downloaded to the scanner"
 msgstr ""
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr ""
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid "Sets the focus position to either the glass or 2.5mm above the glass"
 msgstr ""
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr ""
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
 "pressed to actually start the scan process."
 msgstr ""
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr ""
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, no-c-format
 msgid "Positive Slide"
 msgstr ""
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, no-c-format
 msgid "Negative Slide"
 msgstr ""
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr ""
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, no-c-format
 msgid "User defined CCT profile"
 msgstr ""
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr ""
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr ""
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr ""
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152 ../backend/teco1.c:1153
-#: ../backend/teco2.c:1971 ../backend/teco2.c:1972 ../backend/teco3.c:977
-#: ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr ""
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, no-c-format
 msgid "Diffusion"
 msgstr ""
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, no-c-format
 msgid "White"
 msgstr ""
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, no-c-format
 msgid "Black"
 msgstr ""
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, no-c-format
 msgid "Continue"
 msgstr ""
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr ""
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr ""
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr ""
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, no-c-format
 msgid "Horizontal bold"
 msgstr ""
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, no-c-format
 msgid "Horizontal narrow"
 msgstr ""
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr ""
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, no-c-format
 msgid "Vertical bold"
 msgstr ""
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr ""
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr ""
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, no-c-format
 msgid "Front"
 msgstr ""
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr ""
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
+msgid "Gamma function exponent"
 msgstr ""
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
 #, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
+msgid "Changes intensity of midtones"
+msgstr ""
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr ""
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr ""
+
+#: backend/fujitsu.c:3165
+#, no-c-format
+msgid "Halftone type"
+msgstr ""
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr ""
+
+#: backend/fujitsu.c:3210
+#, no-c-format
+msgid "Perform outline extraction"
+msgstr ""
+
+#: backend/fujitsu.c:3221
+#, no-c-format
+msgid "Emphasis"
+msgstr ""
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr ""
+
+#: backend/fujitsu.c:3240
+#, no-c-format
+msgid "Separation"
+msgstr ""
+
+#: backend/fujitsu.c:3241
+#, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr ""
+
+#: backend/fujitsu.c:3252
+#, no-c-format
+msgid "Mirroring"
+msgstr ""
+
+#: backend/fujitsu.c:3253
+#, no-c-format
+msgid "Reflect output image horizontally"
+msgstr ""
+
+#: backend/fujitsu.c:3270
+#, no-c-format
+msgid "White level follower"
+msgstr ""
+
+#: backend/fujitsu.c:3271
+#, no-c-format
+msgid "Control white level follower"
+msgstr ""
+
+#: backend/fujitsu.c:3289
+#, no-c-format
+msgid "BP filter"
+msgstr ""
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr ""
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr ""
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr ""
+
+#: backend/fujitsu.c:3323
+#, no-c-format
+msgid "Gamma curve"
+msgstr ""
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, no-c-format
+msgid "Threshold curve"
+msgstr ""
+
+#: backend/fujitsu.c:3347
+#, no-c-format
+msgid "Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+
+#: backend/fujitsu.c:3369
+#, no-c-format
+msgid "Threshold white"
+msgstr ""
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr ""
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, no-c-format
+msgid "Noise removal"
+msgstr ""
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr ""
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr ""
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr ""
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr ""
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr ""
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr ""
+
+#: backend/fujitsu.c:3508
+#, no-c-format
+msgid "Auto width detection"
+msgstr ""
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr ""
+
+#: backend/fujitsu.c:3526
+#, no-c-format
+msgid "Auto length detection"
+msgstr ""
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr ""
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr ""
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) is "
+"same as 4"
+msgstr ""
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr ""
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr ""
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr ""
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr ""
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr ""
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
+msgstr ""
+
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3708
+#, no-c-format
+msgid "DF recovery mode"
+msgstr ""
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr ""
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3748
+#, no-c-format
+msgid "Advanced paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+
+#: backend/fujitsu.c:3768
+#, no-c-format
+msgid "Staple detection"
+msgstr ""
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr ""
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid "Set color of background for scans. May conflict with overscan option"
+msgstr ""
+
+#: backend/fujitsu.c:3809
+#, no-c-format
+msgid "Dropout color"
+msgstr ""
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, useful "
+"for colored paper or ink"
+msgstr ""
+
+#: backend/fujitsu.c:3833
+#, no-c-format
+msgid "Buffer mode"
+msgstr ""
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr ""
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr ""
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters ADF, "
+"and increase maximum scan area beyond paper size, to allow collection on "
+"remaining sides. May conflict with bgcolor option"
+msgstr ""
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr ""
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid "Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+
+#: backend/fujitsu.c:3911
+#, no-c-format
+msgid "Off timer"
+msgstr ""
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner off. "
+"Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+
+#: backend/fujitsu.c:3930
+#, no-c-format
+msgid "Duplex offset"
+msgstr ""
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr ""
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr ""
+
+#: backend/fujitsu.c:3949
+#, no-c-format
+msgid "Adjust green/red offset"
+msgstr ""
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr ""
+
+#: backend/fujitsu.c:3967
+#, no-c-format
+msgid "Adjust blue/red offset"
 msgstr ""
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:3980
+#, no-c-format
+msgid "Low Memory"
+msgstr ""
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some duplex "
+"transfers to alternate sides on each call to sane_read. Value of option "
+"'side' can be used to determine correct image. This option should only be "
+"used with custom front-end software."
+msgstr ""
+
+#: backend/fujitsu.c:3996
+#, no-c-format
+msgid "Duplex side"
+msgstr ""
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr ""
+
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr ""
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr ""
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
+msgstr ""
+
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr ""
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr ""
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid "Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+
+#: backend/fujitsu.c:4095
+#, no-c-format
+msgid "Endorser Options"
+msgstr ""
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr ""
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr ""
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr ""
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr ""
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr ""
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr ""
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr ""
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr ""
+
+#: backend/fujitsu.c:4253
+#, no-c-format
+msgid "Endorser direction"
+msgstr ""
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr ""
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr ""
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr ""
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr ""
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr ""
+
+#: backend/fujitsu.c:4344
+#, no-c-format
+msgid "A3 paper"
+msgstr ""
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4356
+#, no-c-format
+msgid "B4 paper"
+msgstr ""
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4368
+#, no-c-format
+msgid "A4 paper"
+msgstr ""
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4380
+#, no-c-format
+msgid "B5 paper"
+msgstr ""
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr ""
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr ""
+
+#: backend/fujitsu.c:4429
+#, no-c-format
+msgid "Scanner in power saving mode"
+msgstr ""
+
+#: backend/fujitsu.c:4452
+#, no-c-format
+msgid "Manual feed"
+msgstr ""
+
+#: backend/fujitsu.c:4453
+#, no-c-format
+msgid "Manual feed selected"
+msgstr ""
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr ""
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr ""
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr ""
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr ""
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr ""
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr ""
+
+#: backend/fujitsu.c:4513
+#, no-c-format
+msgid "Hardware error code"
+msgstr ""
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr ""
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr ""
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr ""
+
+#: backend/fujitsu.c:4537
+#, no-c-format
+msgid "Imprinter ink level"
+msgstr ""
+
+#: backend/fujitsu.c:4548
+#, no-c-format
+msgid "Density"
+msgstr ""
+
+#: backend/fujitsu.c:4549
+#, no-c-format
+msgid "Density dial"
+msgstr ""
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, no-c-format
+msgid "Duplex switch"
+msgstr ""
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, no-c-format
 msgid "Extras"
 msgstr ""
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, no-c-format
-msgid "Threshold curve"
-msgstr ""
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr ""
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
 "instead on hardware lineart."
 msgstr ""
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, no-c-format
 msgid "Disable interpolation"
 msgstr ""
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller than "
 "the vertical resolution this disables horizontal interpolation."
 msgstr ""
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, no-c-format
 msgid "Color filter"
 msgstr ""
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, no-c-format
 msgid "Calibration file"
 msgstr ""
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, no-c-format
 msgid "Specify the calibration file to use"
 msgstr ""
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, no-c-format
 msgid "Calibration cache expiration time"
 msgstr ""
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 means "
 "cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, no-c-format
 msgid "Lamp off time"
 msgstr ""
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value of 0 "
 "means, that the lamp won't be turned off."
 msgstr ""
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, no-c-format
 msgid "Lamp off during scan"
 msgstr ""
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr ""
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, no-c-format
 msgid "File button"
 msgstr ""
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr ""
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, no-c-format
 msgid "Power button"
 msgstr ""
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, no-c-format
 msgid "Extra button"
 msgstr ""
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, no-c-format
 msgid "Need calibration"
 msgstr ""
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr ""
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787 ../backend/gt68xx.c:788
-#: ../backend/pixma_sane_options.c:224 ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, no-c-format
 msgid "Buttons"
 msgstr ""
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr ""
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, no-c-format
 msgid "Start calibration using special sheet"
 msgstr ""
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, no-c-format
 msgid "Clear calibration"
 msgstr ""
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, no-c-format
 msgid "Clear calibration cache"
 msgstr ""
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr ""
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr ""
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392 backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr ""
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr ""
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on 60 "
 "seconds warm-up time."
 msgstr ""
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr ""
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
 "Don't select the full height. For testing only."
 msgstr ""
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr ""
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2428,12 +3161,12 @@ msgid ""
 "provided. This option is enabled by default. For testing only."
 msgstr ""
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr ""
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most scanners "
@@ -2441,12 +3174,12 @@ msgid ""
 "scan, disable this option. For testing only."
 msgstr ""
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, no-c-format
 msgid "Backtrack lines"
 msgstr ""
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. That "
@@ -2454,83 +3187,83 @@ msgid ""
 "data. Low values cause faster scans but increase the risk of omitting lines."
 msgstr ""
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr ""
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr ""
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, no-c-format
 msgid "Geometry Group"
 msgstr ""
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, no-c-format
 msgid "Scan Mode Group"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, no-c-format
 msgid "Scanner model"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, no-c-format
 msgid "Disable gamma correction"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, no-c-format
 msgid "Disable white shading correction"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve image "
@@ -2538,380 +3271,373 @@ msgid ""
 "emulation."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, no-c-format
 msgid "Emulate Grayscale"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
 "grayscale by software. This may improve image quality in some circumstances."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to analyze "
 "them."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, no-c-format
 msgid "Reset chipset"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, no-c-format
 msgid "Information"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, no-c-format
 msgid "Chipset name"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Unknown"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, no-c-format
 msgid "Shows the chipset ID"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, no-c-format
 msgid "Scan counter"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, no-c-format
 msgid "Update information"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr ""
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, no-c-format
 msgid "offset X"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr ""
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, no-c-format
 msgid "offset Y"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr ""
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr ""
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr ""
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr ""
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr ""
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, no-c-format
 msgid "TMA Slides"
 msgstr ""
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, no-c-format
 msgid "TMA Negatives"
 msgstr ""
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, no-c-format
 msgid "Color (48 bits)"
 msgstr ""
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, no-c-format
 msgid "Extend lamp timeout"
 msgstr ""
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr ""
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr ""
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, no-c-format
 msgid "Waits for button before scanning"
 msgstr ""
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, no-c-format
 msgid "Advanced Options"
 msgstr ""
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr ""
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr ""
 
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr ""
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr ""
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143 backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr ""
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr ""
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr ""
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr ""
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr ""
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr ""
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr ""
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252 backend/kvs40xx_opt.c:230
+#: backend/matsushita.c:244 backend/mustek.c:149 backend/plustek.c:234
+#: backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr ""
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr ""
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr ""
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr ""
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr ""
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr ""
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr ""
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, no-c-format
 msgid "Film-strip"
 msgstr ""
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr ""
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr ""
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, no-c-format
 msgid "Experiment"
 msgstr ""
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, no-c-format
 msgid "Sharpening"
 msgstr ""
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr ""
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr ""
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr ""
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr ""
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr ""
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr ""
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, no-c-format
 msgid "Unloads the media after a scan."
 msgstr ""
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, no-c-format
 msgid "Change document"
 msgstr ""
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr ""
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr ""
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr ""
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, no-c-format
 msgid "Start calibration process."
 msgstr ""
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, no-c-format
 msgid "Media"
 msgstr ""
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr ""
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr ""
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested use is "
@@ -2919,1441 +3645,1418 @@ msgid ""
 "For dark (underexposed) images you can increase this value."
 msgstr ""
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, no-c-format
 msgid "Color Matrix"
 msgstr ""
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, no-c-format
 msgid "Set the scanners color matrix."
 msgstr ""
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr ""
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, no-c-format
 msgid "Mono Color Matrix"
 msgstr ""
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr ""
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, no-c-format
 msgid "Mirror horizontal"
 msgstr ""
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, no-c-format
 msgid "Mirror image horizontally."
 msgstr ""
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, no-c-format
 msgid "Mirror vertical"
 msgstr ""
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, no-c-format
 msgid "Mirror image vertically."
 msgstr ""
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, no-c-format
 msgid "Update options"
 msgstr ""
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, no-c-format
 msgid "Update options."
 msgstr ""
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr ""
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr ""
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr ""
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr ""
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr ""
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr ""
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295 backend/kvs40xx_opt.c:516
+#: backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr ""
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67 ../backend/matsushita.h:220
-#: ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr ""
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307 backend/kvs40xx_opt.c:531
 #, no-c-format
 msgid "Landscape"
 msgstr ""
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr ""
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230 backend/kvs40xx_opt.c:393
 #, no-c-format
 msgid "Length control mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242 backend/kvs40xx_opt.c:416
 #, no-c-format
 msgid "Manual feed mode"
 msgstr ""
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254 backend/kvs40xx_opt.c:428
 #, no-c-format
 msgid "Manual feed timeout"
 msgstr ""
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267 backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205 backend/kvs40xx_opt.c:354
+#: backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr ""
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296 backend/kvs40xx_opt.c:517
+#: backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, no-c-format
 msgid "halftone"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, no-c-format
 msgid "color"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50 backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55 backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, no-c-format
 msgid "continuous"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62 backend/kvs40xx_opt.c:115
 #, no-c-format
 msgid "off"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63 backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64 backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70 backend/kvs40xx_opt.c:124
+#: backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71 backend/kvs40xx_opt.c:125
+#: backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, no-c-format
 msgid "bayer_64"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, no-c-format
 msgid "bayer_16"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, no-c-format
 msgid "halftone_32"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, no-c-format
 msgid "halftone_64"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, no-c-format
 msgid "diffusion"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, no-c-format
 msgid "normal"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, no-c-format
 msgid "light"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, no-c-format
 msgid "From scanner"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, no-c-format
 msgid "default"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, no-c-format
 msgid "smooth"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, no-c-format
 msgid "low"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, no-c-format
 msgid "medium"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, no-c-format
 msgid "red"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, no-c-format
 msgid "green"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, no-c-format
 msgid "Sets the scan source"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, no-c-format
 msgid "Sets the manual feed mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise reduction "
 "and image emphasis"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, no-c-format
 msgid "Lamp color"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr ""
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
 "length of actual paper or logical document length."
 msgstr ""
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669 backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, no-c-format
 msgid "High sensivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, no-c-format
 msgid "Low sensivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, no-c-format
 msgid "err_diffusion"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, no-c-format
 msgid "No detection"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, no-c-format
 msgid "Normal mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, no-c-format
 msgid "Enhanced mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it divides "
 "long paper by the length which is set in Document Size option."
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, no-c-format
 msgid "Automatic threshold mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, no-c-format
 msgid "Set chroma of red"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, no-c-format
 msgid "chroma of blue"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, no-c-format
 msgid "Set chroma of blue"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr ""
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr ""
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr ""
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr ""
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr ""
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr ""
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr ""
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr ""
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, no-c-format
 msgid "Gray gain"
 msgstr ""
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr ""
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001 ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, no-c-format
 msgid "Red gain"
 msgstr ""
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr ""
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017 ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, no-c-format
 msgid "Green gain"
 msgstr ""
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr ""
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033 ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, no-c-format
 msgid "Blue gain"
 msgstr ""
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr ""
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr ""
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr ""
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr ""
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr ""
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr ""
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr ""
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr ""
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr ""
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr ""
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr ""
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr ""
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230 backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr ""
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr ""
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr ""
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr ""
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr ""
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr ""
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr ""
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr ""
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr ""
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr ""
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr ""
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr ""
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr ""
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr ""
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr ""
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr ""
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid "If checked the color calibration before a scan is done by the backend"
 msgstr ""
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr ""
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr ""
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr ""
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr ""
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr ""
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr ""
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr ""
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value for "
 "the threshold."
 msgstr ""
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr ""
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr ""
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr ""
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr ""
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr ""
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr ""
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr ""
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr ""
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr ""
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr ""
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr ""
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr ""
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
 msgstr ""
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr ""
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr ""
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr ""
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr ""
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr ""
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr ""
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr ""
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr ""
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr ""
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr ""
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr ""
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr ""
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr ""
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr ""
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr ""
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr ""
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr ""
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr ""
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr ""
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr ""
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr ""
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr ""
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr ""
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr ""
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr ""
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr ""
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr ""
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr ""
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr ""
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr ""
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr ""
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr ""
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr ""
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr ""
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr ""
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr ""
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr ""
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr ""
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr ""
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr ""
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. This "
 "may be a non-color mode or a low resolution mode."
 msgstr ""
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr ""
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr ""
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, no-c-format
 msgid "Turn lamp off"
 msgstr ""
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr ""
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr ""
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr ""
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr ""
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr ""
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr ""
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr ""
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr ""
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, no-c-format
 msgid "Positive"
 msgstr ""
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on 40 "
 "seconds warm-up time."
 msgstr ""
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, no-c-format
 msgid "Negative color"
 msgstr ""
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, no-c-format
 msgid "Negative gray"
 msgstr ""
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, no-c-format
 msgid "48 bits color"
 msgstr ""
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before mode "
 "and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4361,259 +5064,251 @@ msgid ""
 "cancel, press \"GRAY\" button."
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:143
+#: backend/pixma_sane_options.c:232
 #, no-c-format
-msgid "Gamma function exponent"
+msgid "Update button state"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:144
+#: backend/pixma_sane_options.c:244
 #, no-c-format
-msgid "Changes intensity of midtones"
+msgid "Button 1"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:258
 #, no-c-format
-msgid "Update button state"
+msgid "Button 2"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:272
 #, no-c-format
-msgid "Button 1"
+msgid "Type of original to scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:286
 #, no-c-format
-msgid "Button 2"
+msgid "Target operation type"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:348
 #, no-c-format
-msgid "Type of original to scan"
+msgid "ADF Waiting Time"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:349
 #, no-c-format
-msgid "Target operation type"
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
 msgstr ""
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204 ../backend/u12.c:156
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr ""
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr ""
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr ""
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr ""
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr ""
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr ""
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, no-c-format
 msgid "Calibration data cache"
 msgstr ""
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr ""
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, no-c-format
 msgid "Performs calibration"
 msgstr ""
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr ""
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr ""
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, no-c-format
 msgid "Warmup-time"
 msgstr ""
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, no-c-format
 msgid "Warmup-time in seconds."
 msgstr ""
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, no-c-format
 msgid "Lampoff-time"
 msgstr ""
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr ""
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, no-c-format
 msgid "Analog frontend"
 msgstr ""
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr ""
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr ""
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr ""
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr ""
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, no-c-format
 msgid "Red lamp off"
 msgstr ""
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, no-c-format
 msgid "Green lamp off"
 msgstr ""
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, no-c-format
 msgid "Blue lamp off"
 msgstr ""
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr ""
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr ""
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr ""
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr ""
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr ""
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr ""
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr ""
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr ""
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr ""
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr ""
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr ""
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For kicks, it "
 "returns green, then blue, then red."
 msgstr ""
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr ""
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image height a "
@@ -4621,201 +5316,201 @@ msgid ""
 "one to test whether a frontend can handle this correctly."
 msgstr ""
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid "Set default values for enhancement controls (brightness & contrast)."
 msgstr ""
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr ""
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr ""
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr ""
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr ""
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr ""
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr ""
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr ""
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr ""
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr ""
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr ""
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr ""
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr ""
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr ""
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED after "
 "sane_read() has been called."
 msgstr ""
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr ""
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795 ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr ""
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr ""
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248 ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr ""
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249 ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr ""
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, no-c-format
 msgid "Lamp timeout"
 msgstr ""
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr ""
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr ""
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr ""
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr ""
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr ""
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr ""
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr ""
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr ""
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -4825,147 +5520,147 @@ msgid ""
 "responding to X events and your system could bog down."
 msgstr ""
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr ""
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr ""
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, no-c-format
 msgid "Focus point for scanning."
 msgstr ""
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
 "combination of speed and detail."
 msgstr ""
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr ""
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the like."
 msgstr ""
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr ""
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, no-c-format
 msgid "Frame to be scanned"
 msgstr ""
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, no-c-format
 msgid "Focus-mode"
 msgstr ""
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, no-c-format
 msgid "Auto or manual focus"
 msgstr ""
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, no-c-format
 msgid "Focus-point"
 msgstr ""
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, no-c-format
 msgid "Focus point"
 msgstr ""
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr ""
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr ""
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr ""
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr ""
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr ""
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr ""
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr ""
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr ""
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr ""
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr ""
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr ""
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr ""
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
 "display it"
 msgstr ""
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr ""
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -4974,45 +5669,45 @@ msgid ""
 "enables a fixed width of 11 cm."
 msgstr ""
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr ""
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are transmitted."
 msgstr ""
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr ""
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr ""
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' after "
 "10 scans."
 msgstr ""
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr ""
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr ""
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5022,12 +5717,12 @@ msgid ""
 "Grid: draws a black/white grid with a width and height of 10 mm per square."
 msgstr ""
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr ""
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option can "
@@ -5035,53 +5730,53 @@ msgid ""
 "correct endianness."
 msgstr ""
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr ""
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr ""
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid "The (maximum) amount of data transferred with each call to sane_read()."
 msgstr ""
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr ""
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr ""
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr ""
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
 msgstr ""
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr ""
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal handling "
@@ -5089,94 +5784,94 @@ msgid ""
 "handles them."
 msgstr ""
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr ""
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr ""
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr ""
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
 "before sane_start()."
 msgstr ""
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr ""
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr ""
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return data."
 msgstr ""
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr ""
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of frontends to "
 "view and modify all the different SANE option types."
 msgstr ""
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr ""
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr ""
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr ""
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr ""
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and advanced) "
 "capabilities. That's just a normal bool option."
 msgstr ""
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr ""
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and advanced) "
@@ -5184,12 +5879,12 @@ msgid ""
 "user (e.g. by pressing a button at the device)."
 msgstr ""
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr ""
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5197,334 +5892,334 @@ msgid ""
 "pressing a button at the device) and can't be read by the frontend."
 msgstr ""
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr ""
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
 "That means the option is read-only."
 msgstr ""
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr ""
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated (and "
 "advanced) capabilities."
 msgstr ""
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr ""
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic (and "
 "advanced) capabilities. This option can be automatically set by the backend."
 msgstr ""
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr ""
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr ""
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr ""
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr ""
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum is "
 "4, maximum 192, and quant is 2."
 msgstr ""
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr ""
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr ""
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without constraints."
 msgstr ""
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr ""
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
 "constraint. Minimum is 4, maximum 192, and quant is 2."
 msgstr ""
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr ""
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word list "
 "constraint."
 msgstr ""
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr ""
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr ""
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr ""
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr ""
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
 "Minimum is -42.17, maximum 32767.9999, and quant is 2.0."
 msgstr ""
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr ""
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr ""
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr ""
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr ""
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr ""
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr ""
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr ""
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
 "entries..."
 msgstr ""
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr ""
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr ""
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr ""
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, no-c-format
 msgid "Color 36"
 msgstr ""
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr ""
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr ""
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr ""
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr ""
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr ""
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr ""
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr ""
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr ""
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr ""
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr ""
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr ""
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr ""
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr ""
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr ""
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr ""
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr ""
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr ""
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr ""
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr ""
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr ""
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr ""
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, no-c-format
 msgid "Gray offset"
 msgstr ""
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr ""
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr ""
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr ""
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr ""
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
new file mode 100644
index 0000000..5ed20b8
--- /dev/null
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 0924c4c..a83524c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends 1.0.18\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
 "PO-Revision-Date: 2012-10-22 11:17+0200\n"
 "Last-Translator: Mattias Ellert <mattias.ellert@fysast.uu.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -20,411 +20,405 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr "Antal inställningsvärden"
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr "Standard"
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "Geometri"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "Förbättring"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr "Sensorer"
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "Förhandsgranskning"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr "Använd monokrom förhandsgranskning"
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr "Bitdjup"
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Bildläsarläge"
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "Inläsningshastighet"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr "Bildläsarkälla"
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr "Använd bakspårning"
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "Vänster"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "Övre"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "Höger"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "Nedre"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Upplösning"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "X-upplösning"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Y-upplösning"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr "Sidans bredd"
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, no-c-format
 msgid "Page height"
 msgstr "Sidans höjd"
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr "Använd användardefinierad gammatabell"
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr "Bildintensitet"
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr "Röd intensitet"
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr "Grön intensitet"
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr "Blå intensitet"
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr "Ljusstyrka"
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr "Kornstorlek"
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr "Rastrering"
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "Svartnivå"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "Vitnivå"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr "Vitninå för rött"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
 msgstr "Vitnivå för grönt"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr "Vitnivå för blått"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "Skugga"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr "Skugga för rött"
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr "Skugga för grönt"
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr "Skugga för blått"
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr "Belysning"
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr "Belysning för rött"
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr "Belysning för grönt"
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr "Belysning för blått"
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr "Nyans"
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr "Mättnad"
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "Filnamn"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr "Rastermönstersstorlek"
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "Rastermönster"
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr "Koppla X- och Y-upplösning"
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "Negativ"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "Kvalitetskalibrering"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr "Dubbel optisk upplösning"
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr "Koppla RGB"
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr "Tröskelvärde"
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr "Analog gammakorrigering"
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr "Analogt gamma rött"
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr "Analogt gamma grönt"
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr "Analogt gamma blått"
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr "Koppla analogt gamma"
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr "Värm upp lampa"
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr "Kalibreringsexponeringstid"
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr "Kalibreringsexponeringstid för rött"
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr "Kalibreringsexponeringstid för grönt"
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr "Kalibreringsexponeringstid för blått"
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr "Inläsningsexponeringstid"
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr "Inläsningsexponeringstid för rött"
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr "Inläsningsexponeringstid för grönt"
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr "Inläsningsexponeringstid för blått"
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr "Ställ in exponeringstid"
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr "Kalibreringslampdensitet"
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr "Inläsningslampdensitet"
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr "Ställ in lampdensitet"
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr "Lampa av vid avslut"
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
@@ -433,37 +427,37 @@ msgstr ""
 "Skrivskyddat värde som anger hur många parametrar en specifik enhet "
 "stödjer."
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "Bildkälla, bildläsarläge och upplösningsinsällningar"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr "Inläsningsområdes- och orginalstorleksinställningar"
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, no-c-format
 msgid "Image modification options"
 msgstr "Bildförändringsinställningar"
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, no-c-format
 msgid "Hardware specific options"
 msgstr "Hårdvaruspecifika inställningar"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr "Bildläsarsensorer och -knappar"
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr "Begär en inläsning i förhandsgranskningskvalitet."
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -475,7 +469,7 @@ msgstr ""
 "enpassläsare så reduceras både minnesåtgång och inläsningstid för en "
 "förhandsgranskning."
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
@@ -484,62 +478,62 @@ msgstr ""
 "Antal bitar per sampel, typiska värden är 1 för \"streckteckningar\" och "
 "8 för flerbitinläsningar."
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr "Väljer inläsningsläge (t.ex. streckteckning, monokrom eller färg)."
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr "Bestämmer hastigheten med vilken inläsningen sker."
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr "Väljer inläsningskälla (som t.ex. en dokumentmatare)."
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr "Bestämmer ifall bakspårning används."
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "Vänster kant av inläsningsytan."
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "Övre kant av inläsningsytan."
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "Höger kant av inläsningsytan."
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "Nedre kant av inläsningsytan."
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr "Ställer in upplösningen på den inlästa bilden."
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr "Ställer in den horisontella upplösningen på den inlästa bilden."
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr "Ställer in den vertikala upplösningen på den inlästa bilden."
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
@@ -548,12 +542,12 @@ msgstr ""
 "Anger bredden på orginalet. Nödvändigt för automatisk centrering av "
 "arkmatade inläsningar."
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, no-c-format
 msgid "Specifies the height of the media."
 msgstr "Anger höjden på orginalet."
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid ""
 "Determines whether a builtin or a custom gamma-table should be used."
@@ -561,7 +555,7 @@ msgstr ""
 "Bestämmer ifall en inbyggd eller användardefinierad gammatabell skall "
 "användas."
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -571,32 +565,32 @@ msgstr ""
 "Gammakorrigeringstabell. I färgläge påverkar denna inställning de röda, "
 "gröna och blå kanalerna samtidigt (dvs det är en intensitetsgammatabell)."
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr "Gammakorrigeringstabell för den röda kanalen."
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr "Gammakorrigeringstabell för den gröna kanalen."
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr "Gammakorrigeringstabell för den blå kanalen."
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr "Bestämmer ljusstyrkan för den inlästa bilden."
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr "Bestämmer kontrasten för den inlästa bilden."
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
@@ -605,77 +599,77 @@ msgstr ""
 "Väljer \"kornigheten\" för den inlästa bilden. Mindre värden ger "
 "skarpare bilder."
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr "Väljer ifall den inlästa bilden skall rasteras (gittras)."
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr "Väljer vilken strålglansnivå som skall tolkas som \"svart\"."
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr "Väljer vilken strålglansnivå som skall tolkas som \"vit\"."
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr "Väljer vilken röd strålglansnivå som skall tolkas som \"vit\"."
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr "Väljer vilken grön strålglansnivå som skall tolkas som \"vit\"."
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr "Väljer vilken blå strålglansnivå som skall tolkas som \"vit\"."
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr "Väljer vilken röd strålglansnivå som skall tolkas som \"svart\"."
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr "Väljer vilken grön strålglansnivå som skall tolkas som \"svart\"."
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr "Väljer vilken blå strålglansnivå som skall tolkas som \"svart\"."
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr ""
 "Väljer vilken röd strålglansnivå som skall tolkas som \"helt röd\"."
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid ""
 "Selects what green radiance level should be considered \"full green\"."
 msgstr ""
 "Väljer vilken grön strålglansnivå som skall tolkas som \"helt grön\"."
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid ""
 "Selects what blue radiance level should be considered \"full blue\"."
 msgstr ""
 "Väljer vilken blå strålglansnivå som skall tolkas som \"helt blå\"."
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr "Bestämmer \"nyansen\" (blånivån) på den inhämtade bilden."
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
@@ -684,12 +678,12 @@ msgstr ""
 "Mättnadsnivån bestämmer mängden \"blomning\" som förekommer när man "
 "läser in en bild med kamera. Större värden ger mer blomning."
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr "Filnamnet på bilden som skall läsas."
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
@@ -698,293 +692,293 @@ msgstr ""
 "Ställer in storleken på rastermönstret (gittret) som används vid "
 "inläsning av rastrerade bilder."
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
 msgstr "Anger rastermönster (gitter) för inläsning av rastrerade bilder."
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr "Använd samma värde för både X- och Y-upplösning"
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr "Kasta om svart och vit"
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr "Utför en kvalitetsvitkalibrering"
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr "Använd lins som dubblar den optiska upplösningen"
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr "Använd samma värden för varje färg i RGB-läge"
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr "Välj minsta ljusstyrkan för att få en vitpunkt"
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr "Analog gammakorrigering"
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr "Analog gammakorrigering för rött"
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr "Analog gammakorrigering för grönt"
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr "Analog gammakorrigering för blått"
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr "Värm upp lampan innan inläsning"
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr "Ange exponeringstid för kalibrering"
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr "Ange exponeringstid för röd kalibrering"
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr "Ange exponeringstid för grön kalibrering"
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr "Ange exponeringstid för blå kalibrering"
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr "Ange exponeringstid för inläsning"
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr "Ange exponeringstid för röd inläsning"
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr "Ange exponeringstid för grön inläsning"
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr "Ange exponeringstid för blå inläsning"
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr "Möjliggör val av exponeringstid"
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr "Ange lampdensitet för kalibrering"
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr "Ange lampdensitet för inläsning"
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr "Möjliggör val av lampdensitet"
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr "Slå av lampan när programmet avslutas"
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, no-c-format
 msgid "Scan button"
 msgstr "Inläsningsknapp"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, no-c-format
 msgid "Email button"
 msgstr "E-postknapp"
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, no-c-format
 msgid "Fax button"
 msgstr "Faxknapp"
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, no-c-format
 msgid "Copy button"
 msgstr "Kopieringsknapp"
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr "PDF-knapp"
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr "Avbrytknapp"
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr "Sida laddad"
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, no-c-format
 msgid "Cover open"
 msgstr "Locket öppet"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "Färg"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr "Färgstreckteckning"
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr "Färgraster"
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "Grå"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr "Raster"
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "Streckteckning"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr "OK"
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, no-c-format
 msgid "Operation not supported"
 msgstr "Kommandot ej understött"
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr "Kommandot avbröts"
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr "Enheten upptagen"
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr "Ogiltigt argument"
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr "Filslut nått"
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, no-c-format
 msgid "Document feeder jammed"
 msgstr "Stopp i dokumentmataren"
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, no-c-format
 msgid "Document feeder out of documents"
 msgstr "Slut på dokument i dokumentmataren"
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, no-c-format
 msgid "Scanner cover is open"
 msgstr "Bildläsarens lock är öppet"
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr "Fel under enhets-I/O"
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr "Tillträde till resursen har förvägrats"
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr "Lampan ej klar, vanligen försök igen"
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr "Bildläsaren låst för transport"
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "Standardvärden"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr "Använd standardvärden för förbättringsinställningar."
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "Kalibrering"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr "Kalibrera före nästa inläsning"
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
@@ -993,12 +987,12 @@ msgstr ""
 "Om denna inställning är vald kommer enheten att kalibreras före nästa "
 "inläsning. Annars utförs kalibrering endast före första inläsningen."
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr "Utför endast skuggkorrigering"
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -1009,1062 +1003,1053 @@ msgstr ""
 "kalibrering. Standardvärden för förstärkning, offset och exponeringstid, "
 "endera inbyggda eller från konfigureringsfilen, kommer att användas."
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr "Knappläge"
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr "Bildruta att läsa in"
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr "Väljer numret på den bildruta som ska läsas in"
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, no-c-format
 msgid "Duplex scan"
 msgstr "Dubbelsidig inläsning"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid ""
 "Duplex scan provide a scan of the front and back side of the document"
 msgstr "Dubbelsidig inläsning läser in dokumentets framsida och baksida"
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr "Kalibrera bildläsaren"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr "Utför bildläsarkalibrering före inläsning"
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr "Gråskaleinläsning"
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr "Gör en gråskaleinläsning i stället för en färginläsning"
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr "Analog förstärkning"
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr "Öka eller minska CCD-sensorns analoga förstärkning"
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "Gammakorrigering"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr "Väljer gammakorrigerad överföringskurva"
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr "RÃ¥"
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr "Fin färg"
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, no-c-format
 msgid "No transparency correction"
 msgstr "Ingen genomlysningskorrigering"
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr "Korrigering beroende på filmtyp"
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr "Korrigering beroende på genomlysningskvot"
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, no-c-format
 msgid "Negatives"
 msgstr "Negativ"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, no-c-format
 msgid "Slides"
 msgstr "Diapositiv"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, no-c-format
 msgid "Normal speed"
 msgstr "Normal hastighet"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/2 normal speed"
 msgstr "1/2 av normal hastighet"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/3 normal speed"
 msgstr "1/3 av normal hastighet"
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, no-c-format
 msgid "rounded parameter"
 msgstr "avrundad parameter"
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr "okänd"
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, no-c-format
 msgid "ADF jam"
 msgstr "stopp i den automatiska dokumentmataren"
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr "automatiska dokumentmatarens lock är öppet"
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, no-c-format
 msgid "lamp failure"
 msgstr "lampfel"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr "inläsningshuvudspositioneringsfel"
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr "CPU-kontrollfel"
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr "RAM-kontrollfel"
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr "ROM-kontrollfel"
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr "hårdvarukontrollfel"
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, no-c-format
 msgid "transparency unit lamp failure"
 msgstr "genomlysningsenhetslampfel"
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr "genomlysningsenhetsinläsningshuvudspositioneringsfel"
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr "parameterlistlängdsfel"
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr "ogiltig kommandooperationskod"
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr "ogiltigt fält i CDB"
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr "ostött LUN"
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr "ogiltigt fält i parameterlista"
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr "kommandosekvensfel"
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr "för många fönster specificerade"
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr "media icke närvarande"
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr "ogiltigt bit-IDENTIFY-meddelande"
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr "inställning inte anslut"
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr "påslagningsåterställning / bussenhetsåterställning"
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr "parameter ändrad av en annan initiator"
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr "ingen ytterligare sense-information"
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr "Ã¥tervalsfel"
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr "SCSI-paritetsfel"
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr "intitator upptäckte mottaget felmeddelande"
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr "ogiltigt meddelande-fel"
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr "timeoutfel"
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, no-c-format
 msgid "transparency unit shading error"
 msgstr "genomlysningsenhetsskuggningsfel"
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr "lampa ej stabiliserad"
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, no-c-format
 msgid "film scanner"
 msgstr "filmbildläsare"
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr "flatbäddsbildläsare"
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr "Filmtyp"
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr "Väljer filmtyp, t.ex. negativ eller diapositiv"
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, no-c-format
 msgid "Negative film type"
 msgstr "Negativfilmtyp"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, no-c-format
 msgid "Selects the negative film type"
 msgstr "Väljer negativfilmtyp"
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, no-c-format
 msgid "Hardware resolution"
 msgstr "Hårdvaruupplösning"
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "Använd endast hårdvaruupplösningar"
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr "Fokus"
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, no-c-format
 msgid "Auto focus"
 msgstr "Autofokus"
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, no-c-format
 msgid "Enable/disable auto focus"
 msgstr "Aktivera/avaktivera autofokus"
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr "Autofokusera endast en gång"
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr "Autofokusera endast en gång mellan utmatningar"
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, no-c-format
 msgid "Manual focus position"
 msgstr "Manuell fokuseringspunkt"
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr ""
 "Ställ in det optiska systemets fokuseringspunkt för hand (förval: 128)."
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr "Inläsningsmarginaler"
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr "Extra färgjusteringar"
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "Spegla bild"
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "Spegla bilden vågrätt"
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, no-c-format
 msgid "Auto exposure"
 msgstr "Automatisk exponeringstid"
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr "Aktivera/avaktivera automatisk exponeringstid"
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, no-c-format
 msgid "Calibration now"
 msgstr "Kalibrera nu"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Genomför kalibrering *nu*"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr "Självdiagnos"
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr "Genomför bildläsarsjälvdiagnos"
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, no-c-format
 msgid "Reset scanner"
 msgstr "Återställ bildläsare"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, no-c-format
 msgid "Reset the scanner"
 msgstr "Återställ bildläsaren"
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr "Mediahantering"
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, no-c-format
 msgid "Eject film after each scan"
 msgstr "Mata ut film efter varje inläsning"
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr "Mata ut filmen från enheten efter varje inläsning automatiskt"
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr "Mata ut filmen före avslut"
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr "Mata ut filmen från enheten automatiskt före programmet avslutas"
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr "Mata ut filmen nu"
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr "Mata ut filmen *nu*"
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, no-c-format
 msgid "Document feeder extras"
 msgstr "Dokumentmatarinställningar"
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, no-c-format
 msgid "Flatbed only"
 msgstr "Endast flatbädd"
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr ""
 "Stäng av den automatiska dokumentmataren och använd endast flatbädden"
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, no-c-format
 msgid "Transparency unit"
 msgstr "Genomlysningsenhet"
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr "Slå på/av genomlysningsenheten (filmadapterenheten)"
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, no-c-format
 msgid "Negative film"
 msgstr "Negativ film"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, no-c-format
 msgid "Positive or negative film"
 msgstr "Positiv eller negativ film"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr "Densitetsinställning"
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr "Ställer in densitetsinställningsläge"
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, no-c-format
 msgid "Transparency ratio"
 msgstr "Genomlysningskvot"
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, no-c-format
 msgid "Select film type"
 msgstr "Välj filmtyp"
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, no-c-format
 msgid "Select the film type"
 msgstr "Välj filmtyp"
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "Flatbädd"
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, no-c-format
 msgid "ADF Front"
 msgstr "Automatisk dokumentmatare framsida"
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, no-c-format
 msgid "ADF Back"
 msgstr "Automatisk dokumentmatare baksida"
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, no-c-format
 msgid "ADF Duplex"
 msgstr "Automatisk dokumentmatare dubbelsidigt"
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, fuzzy, no-c-format
 msgid "Card Front"
 msgstr "Framsida"
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, fuzzy, no-c-format
 msgid "Card Back"
 msgstr "Baksida"
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, fuzzy, no-c-format
 msgid "Card Duplex"
 msgstr "Dubbelsidigt"
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "Röd"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "Grön"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "Blå"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, no-c-format
 msgid "Enhance Red"
 msgstr "Framhäv rött"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, no-c-format
 msgid "Enhance Green"
 msgstr "Framhäv grönt"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, no-c-format
 msgid "Enhance Blue"
 msgstr "Framhäv blått"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr "Inget"
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr "JPEG"
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr "Procentsats för hoppa över blanka sidor"
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, fuzzy, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr "Begär att drivrutinen hoppar över sidor med få mörka pixlar"
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr "Enkelsidigt"
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr "Dubbelsidigt"
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr "Genomlysningsenhet"
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr "Automatisk dokumentmatare"
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "Positiv film"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "Negativ film"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr "Fokusera på glaset"
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr "Fokusera 2,5 mm ovanför glaset"
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr "Raster A (hårt)"
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr "Raster B (mjukt)"
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr "Raster C (nätskärm)"
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr "Gitter A (4x4 Bayer)"
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr "Gitter B (4x4 spiral)"
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr "Gitter C (4x4 nätskärm)"
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr "Gitter D (8x4 nätskärm)"
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr "Textförbättringsteknik"
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr "Nedladdat mönster A"
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr "Nedladdat mönster B"
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "Ingen korrigering"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr "Användardefinierat"
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr "Matrisskrivare"
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr "Termoskrivare"
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "Bläckstråleskrivare"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr "Bildskärmar (CRT)"
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "Standard"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr "Utskrift med hög densitet"
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr "Utskrift med låg densitet"
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr "Utskrift med hög kontrast"
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr "Användardefinierat (gamma=1,0)"
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr "Användardefinierat (gamma=1,8)"
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr "CD"
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr "A5 stående"
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr "A5 liggande"
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr "US-Letter"
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr "A4"
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "Max"
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr "Bildläsarläge"
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr "Väljer raster."
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr "Blindfärg"
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr "Väljer blindfärg."
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr "Väljer ljusstyrka."
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr "Skärpa"
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr "Färgkorrigering"
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr "Ställer in färgkorrigeringstabellen för den valda utdataenheten."
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr "Färgkorrigeringskoefficienter"
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr "Matrismultiplikation av RGB"
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr "Skifta grön till röd"
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr "Skifta grön till blå"
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr "Skifta röd till grön"
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr "Skifta röd till blå"
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr "Skifta blå till grön"
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr "Skifta blå till röd"
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr "Bestämmer grönnivån"
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr "Lägger till till rött beroende på grönnivån"
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr "Lägger till till blått beroende på grönnivån"
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr "Lägger till till grönt beroende på rödnivån"
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr "Bestämmer rödnivån"
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr "Lägger till till blått beroende på rödnivån"
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr "Lägger till till grönt beroende på blånivån"
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr "Lägger till till rött beroende på blånivån"
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, no-c-format
 msgid "Controls blue level"
 msgstr "Bestämmer blånivån"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr "Spegla bilden."
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr "Snabb förhandsgranskning"
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr "Automatisk ytuppdelning"
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr "Kort lista med upplösningar"
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr "Visa en kort lista med upplösningar"
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr "Anger zoom-faktorn som bildläsaren kommer att använda"
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr "Snabbformatera"
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr "Tillvalsutrustning"
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr "Mata ut"
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr "Mata ut bladet i dokumentmataren"
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr "Mata ut automatiskt"
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr "Mata ut dokument efter inläsning"
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
 msgstr "Dokumentmatarläge"
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr ""
 "Väljer läge för den automatiska dokumentmataren (enkelsidigt/"
 "dubbelsidigt)"
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr "Fack"
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr "Välj fack att läsa in från"
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
@@ -2073,12 +2058,12 @@ msgstr ""
 "Väljer gammakorrigeringsvärdet från en lista av fördefinierade enheter "
 "eller en användardefinierad tabell som kan laddas ner till bildläsaren"
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr "Fokuseringspunkt"
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
@@ -2086,12 +2071,12 @@ msgstr ""
 "Ställer in fokuseringspunkten antingen på glaset eller 2,5 mm ovanför "
 "glaset"
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr "Vänta på knapp"
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
@@ -2100,208 +2085,956 @@ msgstr ""
 "Efter att ha skickat inläsningskommandot, vänta tills knappen på läsaren "
 "trycks in för att starta inläsningen."
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr "Infraröd"
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr "TPU 8x10"
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, no-c-format
 msgid "Positive Slide"
 msgstr "Diapositiv"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, no-c-format
 msgid "Negative Slide"
 msgstr "Dianegativ"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr "Inbyggd CCT-profil"
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, no-c-format
 msgid "User defined CCT profile"
 msgstr "Användardefinierad CCT-profil"
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr "PÃ¥"
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr "Av"
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr "DTC"
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr "SDTC"
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr "Gitter"
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, no-c-format
 msgid "Diffusion"
 msgstr "Diffusion"
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, no-c-format
 msgid "White"
 msgstr "Vit"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, no-c-format
 msgid "Black"
 msgstr "Svart"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, no-c-format
 msgid "Continue"
 msgstr "Fortsätt"
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr "Avsluta"
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr "10 mm"
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr "15 mm"
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr "20 mm"
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr "Vågrätt"
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, no-c-format
 msgid "Horizontal bold"
 msgstr "Vågrätt fetstil"
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, no-c-format
 msgid "Horizontal narrow"
 msgstr "Vågrätt smal"
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr "Lodrätt"
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, no-c-format
 msgid "Vertical bold"
 msgstr "Lodrätt fetstil"
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr "Uppifrån och ner"
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr "Nerifrån och upp"
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, no-c-format
 msgid "Front"
 msgstr "Framsida"
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr "Baksida"
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
-msgstr "Procentsats för hoppa över blanka sidor"
+msgid "Gamma function exponent"
+msgstr "Gammafunktionsexponent"
+
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
+#, no-c-format
+msgid "Changes intensity of midtones"
+msgstr "Ändrar intensitet hos mellantoner"
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr ""
+
+#: backend/fujitsu.c:3148
 #, fuzzy, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
-msgstr "Begär att drivrutinen hoppar över sidor med få mörka pixlar"
+msgid "Reverse image format"
+msgstr "Inverterad bild"
+
+#: backend/fujitsu.c:3165
+#, fuzzy, no-c-format
+msgid "Halftone type"
+msgstr "Raster"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr ""
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr ""
+
+#: backend/fujitsu.c:3210
+#, fuzzy, no-c-format
+msgid "Perform outline extraction"
+msgstr "Utför kalibrering"
+
+#: backend/fujitsu.c:3221
+#, fuzzy, no-c-format
+msgid "Emphasis"
+msgstr "Bildton"
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
+msgstr ""
+
+#: backend/fujitsu.c:3240
+#, fuzzy, no-c-format
+msgid "Separation"
+msgstr "Mättnad"
+
+#: backend/fujitsu.c:3241
+#, fuzzy, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr ""
+"Möjliggör automatisk bestämning av tröskelvärde för "
+"streckteckningsinläsningar."
+
+#: backend/fujitsu.c:3252
+#, fuzzy, no-c-format
+msgid "Mirroring"
+msgstr "Spegla bild"
+
+#: backend/fujitsu.c:3253
+#, fuzzy, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "Spegla bilden vågrätt."
+
+#: backend/fujitsu.c:3270
+#, fuzzy, no-c-format
+msgid "White level follower"
+msgstr "Vitnivå för blått"
+
+#: backend/fujitsu.c:3271
+#, fuzzy, no-c-format
+msgid "Control white level follower"
+msgstr "Bestämmer rödnivån"
+
+#: backend/fujitsu.c:3289
+#, fuzzy, no-c-format
+msgid "BP filter"
+msgstr "Färgfilter"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr ""
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr "Utjämning"
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr ""
+
+#: backend/fujitsu.c:3323
+#, fuzzy, no-c-format
+msgid "Gamma curve"
+msgstr "Gammavärde"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, no-c-format
+msgid "Threshold curve"
+msgstr "Tröskelkurva"
+
+#: backend/fujitsu.c:3347
+#, fuzzy, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr "Dynamisk tröskelkurva, från ljust till mörkt, vanligen 50-65"
+
+#: backend/fujitsu.c:3369
+#, fuzzy, no-c-format
+msgid "Threshold white"
+msgstr "Tröskelvärde"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr ""
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, fuzzy, no-c-format
+msgid "Noise removal"
+msgstr "Brusreducering"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr ""
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr ""
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr ""
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr ""
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr ""
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr ""
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr ""
+
+#: backend/fujitsu.c:3508
+#, fuzzy, no-c-format
+msgid "Auto width detection"
+msgstr "Ingen detektering"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr ""
+
+#: backend/fujitsu.c:3526
+#, fuzzy, no-c-format
+msgid "Auto length detection"
+msgstr "Ingen detektering"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+
+#: backend/fujitsu.c:3553
+#, fuzzy, no-c-format
+msgid "Compression"
+msgstr "jpeg-komprimmering"
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr ""
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr ""
+
+#: backend/fujitsu.c:3606
+#, fuzzy, no-c-format
+msgid "Action following double feed error"
+msgstr "Ignorera högra dubbelmatningssensorn"
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr ""
+
+#: backend/fujitsu.c:3623
+#, fuzzy, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr "Aktivera/avaktivera dubbelmatningsdetekteing"
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr ""
+
+#: backend/fujitsu.c:3642
+#, fuzzy, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr "Aktivera/avaktivera dubbelmatningsdetekteing"
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr ""
+
+#: backend/fujitsu.c:3661
+#, fuzzy, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr "Aktivera/avaktivera dubbelmatningsdetekteing"
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
+msgstr ""
+
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+
+#: backend/fujitsu.c:3708
+#, fuzzy, no-c-format
+msgid "DF recovery mode"
+msgstr "automatiska dokumentmatarens lock är öppet"
+
+#: backend/fujitsu.c:3709
+#, fuzzy, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr "Begär att drivrutinen tar bort ramar från sidor auomatiskt"
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr ""
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3748
+#, fuzzy, no-c-format
+msgid "Advanced paper protection"
+msgstr "Avancerade inställningar"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+
+#: backend/fujitsu.c:3768
+#, fuzzy, no-c-format
+msgid "Staple detection"
+msgstr "Ingen detektering"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr ""
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+
+#: backend/fujitsu.c:3809
+#, fuzzy, no-c-format
+msgid "Dropout color"
+msgstr "Blindfärg"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+
+#: backend/fujitsu.c:3833
+#, fuzzy, no-c-format
+msgid "Buffer mode"
+msgstr "Dokumentmatarläge"
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr ""
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr ""
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr ""
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr ""
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+
+#: backend/fujitsu.c:3911
+#, fuzzy, no-c-format
+msgid "Off timer"
+msgstr "Lampavstängningstid"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+
+#: backend/fujitsu.c:3930
+#, fuzzy, no-c-format
+msgid "Duplex offset"
+msgstr "Blå offset"
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr ""
+
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "Grön offset"
+
+#: backend/fujitsu.c:3949
+#, fuzzy, no-c-format
+msgid "Adjust green/red offset"
+msgstr "Grön offset"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr "Blå offset"
+
+#: backend/fujitsu.c:3967
+#, fuzzy, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "Ställer in den blå kanalens offset"
+
+#: backend/fujitsu.c:3980
+#, fuzzy, no-c-format
+msgid "Low Memory"
+msgstr "Slut på minne"
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+
+#: backend/fujitsu.c:3996
+#, fuzzy, no-c-format
+msgid "Duplex side"
+msgstr "Dubbelsidig inläsning"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr ""
+
+#: backend/fujitsu.c:4009
+#, fuzzy, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr "Begär att drivrutinen linjerar upp sneda sidor digitalt"
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr "Mjukvaruupplinjering"
+
+#: backend/fujitsu.c:4021
+#, fuzzy, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr "Begär att drivrutinen linjerar upp sneda sidor digitalt"
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr "Mjukvarufläckborttagningsdiameter"
+
+#: backend/fujitsu.c:4034
+#, fuzzy, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
+msgstr ""
+"Maximal diameter för ensamma prickar som tas bort från den inlästa bilden"
+
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr "Mjukvarubeskärning"
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, fuzzy, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr "Begär att drivrutinen tar bort ramar från sidor auomatiskt"
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr ""
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+
+#: backend/fujitsu.c:4095
+#, fuzzy, no-c-format
+msgid "Endorser Options"
+msgstr "Avancerade inställningar"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr ""
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr ""
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr ""
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr ""
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr ""
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr ""
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr ""
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr ""
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr ""
+
+#: backend/fujitsu.c:4253
+#, fuzzy, no-c-format
+msgid "Endorser direction"
+msgstr "Brusreducering"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr ""
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr ""
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr ""
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr ""
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr ""
+
+#: backend/fujitsu.c:4344
+#, fuzzy, no-c-format
+msgid "A3 paper"
+msgstr "Från papper"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4356
+#, fuzzy, no-c-format
+msgid "B4 paper"
+msgstr "Från papper"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4368
+#, fuzzy, no-c-format
+msgid "A4 paper"
+msgstr "Från papper"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4380
+#, fuzzy, no-c-format
+msgid "B5 paper"
+msgstr "Från papper"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr ""
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr ""
+
+#: backend/fujitsu.c:4405
+#, fuzzy, no-c-format
+msgid "OMR or double feed detected"
+msgstr "Dubbelmatningsdetektering"
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr ""
+
+#: backend/fujitsu.c:4429
+#, fuzzy, no-c-format
+msgid "Scanner in power saving mode"
+msgstr "Bildläsarens lock är öppet"
+
+#: backend/fujitsu.c:4452
+#, fuzzy, no-c-format
+msgid "Manual feed"
+msgstr "Manuell matning"
+
+#: backend/fujitsu.c:4453
+#, fuzzy, no-c-format
+msgid "Manual feed selected"
+msgstr "Manuell matning"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr ""
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr ""
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr ""
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr ""
+
+#: backend/fujitsu.c:4500
+#, fuzzy, no-c-format
+msgid "Double feed"
+msgstr "Dubbelmatningsdetektering"
+
+#: backend/fujitsu.c:4501
+#, fuzzy, no-c-format
+msgid "Double feed detected"
+msgstr "Dubbelmatningsdetektering"
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr ""
+
+#: backend/fujitsu.c:4513
+#, fuzzy, no-c-format
+msgid "Hardware error code"
+msgstr "hårdvarukontrollfel"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr ""
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr ""
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr ""
+
+#: backend/fujitsu.c:4537
+#, fuzzy, no-c-format
+msgid "Imprinter ink level"
+msgstr "Vitnivå"
+
+#: backend/fujitsu.c:4548
+#, fuzzy, no-c-format
+msgid "Density"
+msgstr "Densitetsinställning"
+
+#: backend/fujitsu.c:4549
+#, fuzzy, no-c-format
+msgid "Density dial"
+msgstr "Densitetsinställning"
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, fuzzy, no-c-format
+msgid "Duplex switch"
+msgstr "Dubbelsidig inläsning"
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr "Begär att drivrutinen tar bort ram från sidor automatiskt"
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr "Begär att drivrutinen hoppar över sidor med få mörka pixlar"
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr "Mjukvaruavrotera"
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 "Begär att drivrutinen detekterar och korrigerar 90 graders bildrotation"
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, no-c-format
 msgid "Extras"
 msgstr "Övrigt"
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, no-c-format
-msgid "Threshold curve"
-msgstr "Tröskelkurva"
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr "Dynamisk tröskelkurva, från ljust till mörkt, vanligen 50-65"
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr "Avaktivera dynamisk streckteckning"
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
@@ -2311,12 +3044,12 @@ msgstr ""
 "streckteckningsinläsningar för att i stället använda hårdvarans "
 "streckteckningsinläsningsläge."
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, no-c-format
 msgid "Disable interpolation"
 msgstr "Stäng av interpolering"
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
@@ -2326,46 +3059,46 @@ msgstr ""
 "mindre än den vertikala upplösningen stänger detta av den horisontella "
 "interpoleringen."
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "Färgfilter"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 "När gråskala eller streckteckning används väljer denna inställning den "
 "använda färgen."
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "Kalibrering"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Definiera kalibreringsläge"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Kalibreringsdatacache"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, no-c-format
 msgid "Lamp off time"
 msgstr "Lampavstängningstid"
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
@@ -2374,104 +3107,102 @@ msgstr ""
 "Lampan kommer att stängas av efter den angivna tiden (i minuter). Värdet "
 "0 betyder att lampan inte kommer att stängas av."
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, no-c-format
 msgid "Lamp off during scan"
 msgstr "Stäng av lampan under inläsning"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr "Lampan kommer att stängas av under inläsningen."
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, no-c-format
 msgid "File button"
 msgstr "Filknapp"
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr "Optisk teckenigenkännings-knapp"
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, no-c-format
 msgid "Power button"
 msgstr "PÃ¥slagningsknapp"
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "E-postknapp"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, no-c-format
 msgid "Need calibration"
 msgstr "Behöver kalibrering"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr "Bildläsaren behöver kalibrering för nuvarande inställningar"
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, no-c-format
 msgid "Buttons"
 msgstr "Knappar"
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr "Kalibrera"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "Påbörja kalibrering med specialark"
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, no-c-format
 msgid "Clear calibration"
 msgstr "Rensa kalibrering"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, no-c-format
 msgid "Clear calibration cache"
 msgstr "Rensa kalibreringsdatacache"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr "Genomlysningsadapter"
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr "Grålägesfärg"
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 "Väljer vilken inläsningsfärg som används i gråläge (förval: grönt)."
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr "Debuggningsinställningar"
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "Automatisk uppvärmning"
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -2480,12 +3211,12 @@ msgstr ""
 "Värm upp tills lampans ljusstyrka är konstant i stället för att "
 "insistera på 60 sekunders uppvärmningstid."
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "Fullständig inläsning"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
@@ -2494,12 +3225,12 @@ msgstr ""
 "Läs in hela inläsningsytan inklusive kalibreringsraden. Var försiktig. "
 "Välj inte för stor höjd. Endast för test."
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Grovkalibrering"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2510,12 +3241,12 @@ msgstr ""
 "inställning inte är vald kan de analoga parametrarna ställas in för "
 "hand. Denna inställning är förvald som standard. Endast för test."
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "Grovkalibrering endast för första inläsningen"
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2526,12 +3257,12 @@ msgstr ""
 "flesta bildläsare och kan spara tid. Välj inte denna inställning om "
 "bildens ljusstyrka är olika för varje inläsning. Endast för test."
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, no-c-format
 msgid "Backtrack lines"
 msgstr "Bakspårningslinjer"
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2544,83 +3275,83 @@ msgstr ""
 "data. Låga värden ger snabbare inläsningar men ökar risken för att "
 "utelämna linjer."
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Gammavärde"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr "Ställer in gammavärdet för alla kanaler."
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, no-c-format
 msgid "Geometry Group"
 msgstr "Geometrigrupp"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, no-c-format
 msgid "Scan Mode Group"
 msgstr "Bildläsarlägesgrupp"
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr "Diapositiv"
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, no-c-format
 msgid "Scanner model"
 msgstr "Bildläsarmodel"
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, fuzzy, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr "Tillåter att testa enhetsbeteende med andra understötta modeller"
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr "Bildens färger kommer att inverteras"
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, no-c-format
 msgid "Disable gamma correction"
 msgstr "Stäng av gammakorrigering"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "Gammakorrigering kommer att stängas av"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, no-c-format
 msgid "Disable white shading correction"
 msgstr "Stäng av vit skuggkorrigering"
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr "Vit skuggkorrigering kommer att stängas av"
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr "Hoppa över uppvärmningsprocessen"
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr "Uppvärmningsprocessen kommer att stängas av"
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr "Använd verkligt bitdjup"
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2631,12 +3362,12 @@ msgstr ""
 "förbättra bildkvaliteten för att sedan konvertera till det valda "
 "bitdjupet. Denna inställning undviker bitdjupsemulering."
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, no-c-format
 msgid "Emulate Grayscale"
 msgstr "Emulera gråskala"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2647,12 +3378,12 @@ msgstr ""
 "konverteras till gråskala av mjukvara. Detta kan förbättra "
 "bildkvaliteten under vissa omständigheter."
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr "Spara debuggningsbilder"
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
@@ -2661,358 +3392,352 @@ msgstr ""
 "Om aktiverad kommer ett antal bilder inblandade i "
 "inläsningsprocesseringen att sparas för analys."
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, no-c-format
 msgid "Reset chipset"
 msgstr "Återställ chipset"
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr "Återställer chipsetdata"
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, no-c-format
 msgid "Information"
 msgstr "Information"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, no-c-format
 msgid "Chipset name"
 msgstr "Chipsetsnamn"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr "Visar chipsetnamn använt i enheten."
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr "Chipset-ID"
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, no-c-format
 msgid "Shows the chipset ID"
 msgstr "Visar chipset-ID"
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, no-c-format
 msgid "Scan counter"
 msgstr "Inläsningsräknare"
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr "Visar antalet inläsningar som gjorts med bildläsaren"
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, no-c-format
 msgid "Update information"
 msgstr "Uppdatera informationen"
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr "Uppdaterar informationen om enheten"
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr "Denna inställing avspeglar en knapp på bildläsarens panel"
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr "Bild"
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, no-c-format
 msgid "offset X"
 msgstr "offset X"
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr "Inläsningsytans hårdvaruinterna X-position."
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, no-c-format
 msgid "offset Y"
 msgstr "offset Y"
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr "Inläsningsytans hårdvaruinterna Y-position."
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr "Lampstatus"
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr "Sätter på eller av lampan."
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr "Kalibrerar för svart- och vitnivå."
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr "Automatisk dokumentmatare"
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, no-c-format
 msgid "TMA Slides"
 msgstr "TMA-positiv"
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, no-c-format
 msgid "TMA Negatives"
 msgstr "TMA-negativ"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, no-c-format
 msgid "Color (48 bits)"
 msgstr "Färg (48 bitar)"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, no-c-format
 msgid "Extend lamp timeout"
 msgstr "Utöka lampavstängningstid"
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr "Utökar lampavstängningstiden (från 15 minuter till 1 timme)"
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr "Vänta på knapp"
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, no-c-format
 msgid "Waits for button before scanning"
 msgstr "Vänta på knapp innan inläsning"
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, no-c-format
 msgid "Advanced Options"
 msgstr "Avancerade inställningar"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr "Grovt"
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr "Fint"
 
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr "Bayer"
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr "Användardefinierat"
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "Automatiskt"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr "NTSC-RGB"
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr "XPA-RGB"
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr "Oförändrat"
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "NTSC-grå"
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr "XPA-grå"
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "LÃ¥ngsam"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "Snabb"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr "Extra snabb"
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr "2 pixlar"
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr "4 pixlar"
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr "8 pixlar"
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr "Fotografi"
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, no-c-format
 msgid "Film-strip"
 msgstr "Filmremsa"
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr "XPA"
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr "Villkorlig"
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, no-c-format
 msgid "Experiment"
 msgstr "Experiment"
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, no-c-format
 msgid "Sharpening"
 msgstr "Skärpa"
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr "Ställer in skärpevärdet."
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr "Automatiskt tröskelvärde"
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr ""
 "Möjliggör automatisk bestämning av tröskelvärde för "
 "streckteckningsinläsningar."
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr "Utjämning"
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr "Välj utjämningsfilter."
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr "Mata ut media efter inläsning"
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, no-c-format
 msgid "Unloads the media after a scan."
 msgstr "Matar ut media efter en inläsning."
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, no-c-format
 msgid "Change document"
 msgstr "Byt dokument"
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr "Byt dokument."
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr "Mata ut"
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr "Mata ut dokument."
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, no-c-format
 msgid "Start calibration process."
 msgstr "Påbörja kalibreringsprocessen."
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, no-c-format
 msgid "Media"
 msgstr "Media"
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr "Välj mediatyp."
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr "Exponeringstid"
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -3025,462 +3750,461 @@ msgstr ""
 "för negativ film. För mörka (underexponerade) bilder kan du öka detta "
 "värde."
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, no-c-format
 msgid "Color Matrix"
 msgstr "Färgmatris"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, no-c-format
 msgid "Set the scanners color matrix."
 msgstr "Ställer in bildläsarens färgmatris."
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr "Användardefinierad färgmatris."
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, no-c-format
 msgid "Mono Color Matrix"
 msgstr "Enfärgsmatris"
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr "Användardefinierad färgmatris för gråskaleinläsningar."
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, no-c-format
 msgid "Mirror horizontal"
 msgstr "Spegla vågrätt"
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, no-c-format
 msgid "Mirror image horizontally."
 msgstr "Spegla bilden vågrätt."
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, no-c-format
 msgid "Mirror vertical"
 msgstr "Spegla lodrätt"
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, no-c-format
 msgid "Mirror image vertically."
 msgstr "Spegla bilden lodrätt."
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, no-c-format
 msgid "Update options"
 msgstr "Uppdatera inställningsvärden"
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, no-c-format
 msgid "Update options."
 msgstr "Uppdatera inställningsvärden."
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr "8 bitars utdata"
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr ""
 "Använd ett bitdjup större än 8 internt, men ge endast 8 bitars utdata."
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr "Invänta knapptryck"
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr ""
 "Vänta med inläsningen tills dess att knappen på frontpanelen trycks in."
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr "Slå av lampan"
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr "Slå av bildläsarlampan."
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "Pappersstorlek"
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr "Automatisk separering"
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, no-c-format
 msgid "Landscape"
 msgstr "Liggande"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr "Inverterad bild"
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr "Läge för långa papper"
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, no-c-format
 msgid "Length control mode"
 msgstr "Längdkontrollsläge"
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, no-c-format
 msgid "Manual feed mode"
 msgstr "Manuell matning"
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, no-c-format
 msgid "Manual feed timeout"
 msgstr "Timeout för manuell matning"
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr "Dubbelmatningsdetektering"
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr "Sätt på dubbelsidig inläsning"
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr "Verklig storlek på papperet i den automatiska dokumentmataren"
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr "s/v"
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, no-c-format
 msgid "halftone"
 msgstr "raster"
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr "gråskala"
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, no-c-format
 msgid "color"
 msgstr "färg"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr "adf"
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr "fb"
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr "ensidigt"
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, no-c-format
 msgid "continuous"
 msgstr "kontinuerligt"
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, no-c-format
 msgid "off"
 msgstr "av"
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr "invänta dokument"
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr "invänta knapptryckning"
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr "användardefinierat"
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr "visitkort"
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr "Check"
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr "A5"
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr "A6"
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr "B5"
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr "B6"
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr "US-Legal"
 
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, no-c-format
 msgid "bayer_64"
 msgstr "Bayer 64"
 
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, no-c-format
 msgid "bayer_16"
 msgstr "Bayer 16"
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, no-c-format
 msgid "halftone_32"
 msgstr "Raster 32"
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, no-c-format
 msgid "halftone_64"
 msgstr "Raster 64"
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, no-c-format
 msgid "diffusion"
 msgstr "diffusion"
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, no-c-format
 msgid "normal"
 msgstr "normal"
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, no-c-format
 msgid "light"
 msgstr "ljus"
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr "mörk"
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, no-c-format
 msgid "From scanner"
 msgstr "Från bildläsare"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr "Från papper"
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, no-c-format
 msgid "default"
 msgstr "standard"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, no-c-format
 msgid "smooth"
 msgstr "jämn"
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr "ingen"
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, no-c-format
 msgid "low"
 msgstr "låg"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, no-c-format
 msgid "medium"
 msgstr "medel"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr "hög"
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr "bildskärm"
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr "linjär"
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, no-c-format
 msgid "red"
 msgstr "röd"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, no-c-format
 msgid "green"
 msgstr "grön"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr "blå"
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, no-c-format
 msgid "Sets the scan source"
 msgstr "Väljer bildläsarkälla"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr "Dokumentmatarläge"
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr "Ställer in dokumentmatarläge"
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr "Aktivera/avaktivera läge för långt papper"
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr "Aktivera/avaktivera läge för längdkontroll"
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "Ställer in manuellt matningsläge"
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr "Ställer in timeout för manuell matning i sekunder"
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr "Aktivera/avaktivera dubbelmatningsdetekteing"
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr "anpassa till sida"
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr "Anpassa till sida"
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr "Bildläsaren krymper sidan för att rymmas på den inlästa sidan"
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr "Ställ in pappersläge: sant för liggande, falskt för stående"
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr "Automatiskt tröskelvärde"
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
@@ -3489,111 +4213,101 @@ msgstr ""
 "Ställer in ljusstyrka, kontrast, vitnivå, gamma, brusreduktion och "
 "bildton automatiskt"
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "Brusreducering"
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr "Minska bruset från isolerade punkter"
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr "Bildton"
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr "Ställer in bildton"
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, no-c-format
 msgid "Lamp color"
 msgstr "Lampfärg"
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr "Ställer in lampfärg (blindfärg)"
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr "Invertera bild i svart-vitt eller rasterläge"
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "Spegla bilden (vänster/höger)"
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr "jpeg-komprimmering"
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr "JPEG-bildkomprimmering med Q-parameter, '0' - ingen komprimmering"
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr "Rotera bilden medurs"
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr "Begär att drivrutinen roterar sidor med ett fixt värde"
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr "Mjukvaruupplinjering"
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr "Begär att drivrutinen linjerar upp sneda sidor digitalt"
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr "Mjukvarufläckborttagningsdiameter"
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 "Maximal diameter för ensamma prickar som tas bort från den inlästa bilden"
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr "Automatisk beskärning i mjukvara"
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr "Begär att drivrutinen tar bort ramar från sidor auomatiskt"
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
@@ -3602,64 +4316,64 @@ msgstr ""
 "I längdkontrolläge läser bildläsaren upp till den kortare av verklig "
 "papperslängd och logisk dokumentlängd."
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "Gammakorrigering"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr "invänta dokument \"hopper\""
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr "A3"
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr "Dubbelt US-Letter 11x17 tum"
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr "B4"
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, no-c-format
 msgid "High sensivity"
 msgstr "Hög känsighet"
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, no-c-format
 msgid "Low sensivity"
 msgstr "Låg känsighet"
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, no-c-format
 msgid "err_diffusion"
 msgstr "Feldiffusion"
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, no-c-format
 msgid "No detection"
 msgstr "Ingen detektering"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, no-c-format
 msgid "Normal mode"
 msgstr "Normalläge"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, no-c-format
 msgid "Enhanced mode"
 msgstr "Förbättringsläge"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
@@ -3669,341 +4383,338 @@ msgstr ""
 "långa papper i delar med en längd som angetts in "
 "dokumentstorleksparametrarna."
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr "Dubbelmatningsdetektionskänslighet"
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr "Ställ in dubbelmatningsdetektionskänsligheten"
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr "Avbryt inte efter dubbelmatningsdetektering"
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr "Ignorera vänstra dubbelmatningssensorn"
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr "Ignorera mellersta dubbelmatningssensorn"
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr "Ignorera högra dubbelmatningssensorn"
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, no-c-format
 msgid "Automatic threshold mode"
 msgstr "Automatiskt tröskelläge"
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr "Väljer automatiskt tröskelläge"
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr "Invertera bilden i svart-vitt läge"
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr "JPEG-komprimmering"
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr "JPEG-komprimmering (din applikation måste kunna dekomprimmera)"
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr "Detektera häftade dokument"
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr "Röd färgmättnad"
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, no-c-format
 msgid "Set chroma of red"
 msgstr "Ställ in färgmättnad för rött"
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, no-c-format
 msgid "chroma of blue"
 msgstr "Blå färgmättnad"
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, no-c-format
 msgid "Set chroma of blue"
 msgstr "Ställ in färgmättnad för blått"
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr "Justering för sned inmatning"
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr "Stoppa bildläsaren när ett papper har inmatats snett"
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr "Stoppa bildläsaren när ett papper har inmatats snett"
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr "Beskär verklig bildarea"
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr "Bildläsaren detecterar automatiskt verklig bildarea och beskär den"
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr "Den kastar om höger och vänster"
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr "Lägg till utrymme ovanför bilden"
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr "Lägg till utrymme nedanför bilden"
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr "Diamant"
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr "8x8 grov förtjockning"
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr "8x8 fin förtjockning"
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr "8x8 Bayer"
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr "8x8 lodrät linje"
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr "Förstärking"
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr "Inställningar för färgkanalernas förstärkning"
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, no-c-format
 msgid "Gray gain"
 msgstr "Grå förstärkning"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr "Ställer in den grå kanalens förstärkning"
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, no-c-format
 msgid "Red gain"
 msgstr "Röd förstärkning"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr "Ställer in den röda kanalens förstärkning"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, no-c-format
 msgid "Green gain"
 msgstr "Grön förstärkning"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr "Ställer in den gröna kanalens förstärkning"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, no-c-format
 msgid "Blue gain"
 msgstr "Blå förstärkning"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr "Ställer in den blå kanalens förstärkning"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr "Bayergitter 16"
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr "Bayergitter 64"
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr "Rasterpunkt 32"
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr "Rasterpunkt 64"
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr "Feldiffusion"
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr "Läge 1"
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr "Läge 2"
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr "Läge 3"
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr "Från kalibreringsraden"
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr "Jämn"
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr "LÃ¥g"
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr "Medel"
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr "Hög"
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr "Bildskärm"
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "En sida"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "Alla sidor"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr "arkmatad bildläsare"
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr "4 bitars gråskala"
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr "8 bitars gråskala"
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr "Skugga, mittvärde, belysning, exponeringstid"
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr "Specialinställningar"
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr "Färgbalans"
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr "Stäng av bakspårning"
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr "Om denna inställning är vald utför bildläsaren ingen bakspårning"
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr "Slå av eller på lampan"
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr "Slår av eller på flatbäddsbildläsarens lampa"
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr "Bakplanskalibrering"
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid ""
 "If checked the color calibration before a scan is done by the backend"
@@ -4011,44 +4722,44 @@ msgstr ""
 "Om denna inställning är vald utförs färgkalibreringen före en inläsning "
 "av bakplanet"
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr "Använd lightlid-35 mm-adaptern"
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr ""
 "Denna inställning slår av lampan på flatbäddsbildläsaren under en "
 "inläsning"
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "Kvalitetsinläsning"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr "Högsta kvalitet men lägre hastighet"
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "Snabbinläsning"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr "Högsta hastighet men lägre kvalitet"
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr "Automatisk inställning av tröskelvärde"
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
@@ -4057,276 +4768,276 @@ msgstr ""
 "Om denna inställning är vald försöker bakplanet automatiskt bestämma ett "
 "optimalt tröskelvärde."
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr "Väljer gammakorrigeringsläge."
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr "Koppla gamma"
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr "Använd samma gammavärde för alla färgkanaler."
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr "Skalärt gamma"
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr "Väljer värde för skalär gammakorrigering."
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr "Skalärt gamma rött"
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr "Väljer värde för skalär gammakorrigering (röd kanal)"
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr "Skalärt gamma grönt"
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr "Väljer värde för skalär gammakorrigering (grön kanal)"
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr "Skalärt gamma blått"
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr "Väljer värde för skalär gammakorrigering (blå kanal)"
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
 msgstr ""
 "Väljer färgkanal, \"Master\" betyder att alla färgkanaler påverkas."
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr "Mittvärde"
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr "Väljer vilken strålglansnivå som skall tolkas som \"50% grå\"."
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr "Mittvärde för rött"
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr "Väljer vilken strålglansnivå som skall tolkas som \"50% röd\"."
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr "Mittvärde för grönt"
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr "Väljer vilken strålglansnivå som skall tolkas som \"50% grön\"."
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr "Mittvärde för blått"
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr "Väljer vilken strålglansnivå som skall tolkas som \"50% blå\"."
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr "Röd färgbalans"
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr "Balanseringsfaktor för rött. 100% betyder ingen korrigering."
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr "Grön färgbalans"
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr "Balanseringsfaktor för grönt. 100% betyder ingen korrigering."
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr "Blå färgbalans"
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr "Balanseringsfaktor för blått. 100% betyder ingen korrigering."
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr "Färgbalans från fast programvara"
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr ""
 "Ställer in färgbalansvärdena till de värden som ges från den fasta "
 "programvaran."
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "LÃ¥ngsammast"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "LÃ¥ngsammare"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "Snabbare"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "Snabbast"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr "8x8 grovt"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr "8x8 normalt"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr "8x8 fint"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr "8x8 mycket fint"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr "6x6 normalt"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr "5x5 grovt"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr "5x5 fint"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr "4x4 grovt"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr "4x4 normalt"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr "4x4 fint"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr "3x3 normalt"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr "2x2 normalt"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr "8x8 användardefinierat"
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr "6x6 användardefinierat"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr "5x5 användardefinierat"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr "4x4 användardefinierat"
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr "3x3 användardefinierat"
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr "2x2 användardefinierat"
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr "Snabbt gråskaleläge"
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr "Läs in i snabbt gråskaleläge (lägre kvalitet)."
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
@@ -4336,117 +5047,117 @@ msgstr ""
 "(lågkvalitets-)läget. Detta kan vara en icke-färginläsning eller en "
 "lågupplösningsinläsning."
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr "Lampavstängningstid (minuter)"
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr "Ställer in tiden (i minuter) efter vilken lampan stängs av."
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, no-c-format
 msgid "Turn lamp off"
 msgstr "Stäng av lampan"
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr "Stänger av lampan omedelbart."
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr "Röd ljusstyrka"
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr "Bestämmer ljusstyrkan för den röda kanalen i den inlästa bilden."
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr "Grön ljusstyrka"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr "Bestämmer ljusstyrkan för den gröna kanalen i den inlästa bilden."
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr "Blå ljusstyrka"
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr "Bestämmer ljusstyrkan för den blå kanalen i den inlästa bilden."
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "Kontrast röd kanal"
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr "Bestämmer kontrasten för den röda kanalen i den inlästa bilden."
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "Kontrast grön kanal"
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr "Bestämmer kontrasten för den gröna kanalen i den inlästa bilden."
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "Kontrast blå kanal"
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr "Bestämmer kontrasten för den blå kanalen i den inlästa bilden."
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr "Färg 48"
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr "Färg 24"
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr "Grå 16"
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr "Grå 8"
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr "Speglande"
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, no-c-format
 msgid "Positive"
 msgstr "Positiv"
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -4455,27 +5166,27 @@ msgstr ""
 "Värm upp tills lampans ljusstyrka är konstant i stället för att "
 "insistera på 40 sekunders uppvärmningstid."
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, no-c-format
 msgid "Negative color"
 msgstr "Negativ färg"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, no-c-format
 msgid "Negative gray"
 msgstr "Negativ gråskala"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, no-c-format
 msgid "48 bits color"
 msgstr "48 bitars färg"
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr "16 bitars gråskala"
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
@@ -4484,12 +5195,12 @@ msgstr ""
 "Väljer inläsningskälla (som t.ex. dokumentmatare). Välj källa före läge "
 "och upplösning. Återställer läge och upplösning till förvalsvärden."
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr "Knappkontrollerad inläsning"
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4500,248 +5211,239 @@ msgstr ""
 "omedelbart. För att forsätta, tryck SCAN-knappen (för MP150) eller COLOR-"
 "knappen (för andra modeller). För att avbryta, tryck GRAY-knappen."
 
-#: ../backend/pixma_sane_options.c:143
-#, no-c-format
-msgid "Gamma function exponent"
-msgstr "Gammafunktionsexponent"
-
-#: ../backend/pixma_sane_options.c:144
-#, no-c-format
-msgid "Changes intensity of midtones"
-msgstr "Ändrar intensitet hos mellantoner"
-
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:232
 #, no-c-format
 msgid "Update button state"
 msgstr "Uppdatera knappläge"
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:244
 #, no-c-format
 msgid "Button 1"
 msgstr "Knapp 1"
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:258
 #, no-c-format
 msgid "Button 2"
 msgstr "Knapp 2"
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr ""
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr ""
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr ""
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr "Skrivfilm"
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr "Enhetsinställningar"
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr "Lampströmbrytare"
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr "Slår av/på lamp(an/orna) manuellt."
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "Stäng av lampan under mörkerkalibrering"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr "Stäng alltid av lampan när mörkerkalibrering görs"
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, no-c-format
 msgid "Calibration data cache"
 msgstr "Kalibreringsdatacache"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr "Aktiverar eller deaktiverar kaliberingsdatacache."
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, no-c-format
 msgid "Performs calibration"
 msgstr "Utför kalibrering"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr "Öka givarens hastighet"
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr "Aktiverar eller deaktiverar ökning av givarens rörelsehastighet."
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, no-c-format
 msgid "Warmup-time"
 msgstr "Uppvärmningstid"
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, no-c-format
 msgid "Warmup-time in seconds."
 msgstr "Uppvärmningstid i sekunder."
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, no-c-format
 msgid "Lampoff-time"
 msgstr "Lampavstängningstid"
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr "Lampavstängningstid i sekunder."
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, no-c-format
 msgid "Analog frontend"
 msgstr "Analogt framplan"
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr "Det analoga framplanets rödförstärkningsvärde"
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr "Röd offset"
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr "Det analoga framplanets rödoffsetvärde"
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr "Det analoga framplanets grönförstärkningsvärde"
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr "Grön offset"
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr "Det analoga framplanets grönoffsetvärde"
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr "Det analoga framplanets blåförstärkningsvärde"
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr "Blå offset"
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr "Det analoga framplanets blåoffsetsvärde"
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, no-c-format
 msgid "Red lamp off"
 msgstr "Röd lampa av"
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr "Definierar röd-lampa-av-parameter"
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, no-c-format
 msgid "Green lamp off"
 msgstr "Grön lampa av"
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr "Definierar grön-lampa-av-parameter"
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, no-c-format
 msgid "Blue lamp off"
 msgstr "Blå lampa av"
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr "Definierar blå-lampa-av-parameter"
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr "Denna inställing avspeglar status på bildläsarens knappar."
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr "Färg 36"
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr "Gitterkarta 1"
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr "Gitterkarta 2"
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr "Slumpvist"
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr "Val av bildkälla"
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr "Bildförbättring"
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr "Gör grå"
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr "Läs in bilden som gråskala"
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr "Trepassimulering"
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
@@ -4750,12 +5452,12 @@ msgstr ""
 "Simulera en trepassbildläsare genom att returnera 3 separata bildrutor. "
 "För att retas returnerar den först grönt, sedan blått och sist rött."
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr "Handbildläsarsimulering"
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4766,7 +5468,7 @@ msgstr ""
 "förväg. I stället returnerar de en höjd som är -1. Om denna inställning "
 "är vald kan man testa om ett framplan kan hantera detta på rätt sätt."
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid ""
 "Set default values for enhancement controls (brightness & contrast)."
@@ -4774,42 +5476,42 @@ msgstr ""
 "Använd standardvärden för förbättringsinställningar (ljusstyrka och "
 "kontrast)."
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr "Skrivskyddad testinställning"
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr "LÃ¥t oss se om framplan kan hantera detta"
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr "Gammatabeller"
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr "Statuskodsimulering"
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr "Framtvinga inte statuskod"
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr "Tvinga inte bakplanet att returnera en statuskod."
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr "Returnera SANE_STATUS_EOF"
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
@@ -4818,12 +5520,12 @@ msgstr ""
 "Tvinga bakplanet att returnera statuskoden SANE_STATUS_EOF efter det att "
 "sane_read() har anropats."
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr "Returnera SANE_STATUS_JAMMED"
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
@@ -4832,12 +5534,12 @@ msgstr ""
 "Tvinga bakplanet att returnera statuskoden SANE_STATUS_JAMMED efter det "
 "att sane_read() har anropats."
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr "Returnera SANE_STATUS_NO_DOCS"
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
@@ -4846,12 +5548,12 @@ msgstr ""
 "Tvinga bakplanet att returnera statuskoden SANE_STATUS_NO_DOCS efter det "
 "att sane_read() har anropats."
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr "Returnera SANE_STATUS_COVER_OPEN"
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
@@ -4860,12 +5562,12 @@ msgstr ""
 "Tvinga bakplanet att returnera statuskoden SANE_STATUS_COVER_OPEN efter "
 "det att sane_read() har anropats."
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr "Returnera SANE_STATUS_IO_ERROR"
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
@@ -4874,12 +5576,12 @@ msgstr ""
 "Tvinga bakplanet att returnera statuskoden SANE_STATUS_IO_ERROR efter "
 "det att sane_read() har anropats."
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr "Returnera SANE_STATUS_NO_MEM"
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
@@ -4888,12 +5590,12 @@ msgstr ""
 "Tvinga bakplanet att returnera statuskoden SANE_STATUS_NO_MEM efter det "
 "att sane_read() har anropats."
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr "Returnera SANE_STATUS_ACCESS_DENIED"
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
@@ -4902,85 +5604,82 @@ msgstr ""
 "Tvinga bakplanet att returnera statuskoden SANE_STATUS_ACCESS_DENIED "
 "efter det att sane_read() har anropats."
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr "Denna inställing avspeglar status på en av bildläsarens knappar."
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr "Lampa på"
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr "Slå på bildläsarlampan"
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr "Lampa av"
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr "Slå av bildläsarlampan"
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, no-c-format
 msgid "Lamp timeout"
 msgstr "Lampavstängningstid"
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr "Antal minuter innan lampan stängs av efter en inläsning"
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr "Tröskelvärde för streckteckningsläge"
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr "Dokumentmatare"
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr "6x4 (tum)"
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr "8x10 (tum)"
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr "8,5x11 (tum)"
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr "Rastrering stöds inte"
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr "Upplöst punkt 8x8"
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr "Upplöst punkt 16x16"
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -4996,27 +5695,27 @@ msgstr ""
 "den sätts för hög kan X-baserade framplan sluta svara på X-händelser och "
 "ditt system kan gå ned."
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr ""
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr ""
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, fuzzy, no-c-format
 msgid "Focus point for scanning."
 msgstr "Mata ut dokument efter inläsning"
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr "Förhandsgranskningsläge"
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
@@ -5025,12 +5724,12 @@ msgstr ""
 "Välj förhandsgranskningsläge. Gråskaleförhandsgranskningar ger oftast "
 "den bästa kombinationen av hastighet och detaljrikedom."
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr "Fördefinierade inställningar"
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
@@ -5038,97 +5737,97 @@ msgid ""
 msgstr ""
 "Ger standardinläsningsytor för fotografier, tryckta sidor och liknande."
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr ""
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, fuzzy, no-c-format
 msgid "Frame to be scanned"
 msgstr "flatbäddsbildläsare"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, fuzzy, no-c-format
 msgid "Focus-mode"
 msgstr "Fokus"
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, fuzzy, no-c-format
 msgid "Auto or manual focus"
 msgstr "Autofokus"
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, fuzzy, no-c-format
 msgid "Focus-point"
 msgstr "Fokuseringspunkt"
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, fuzzy, no-c-format
 msgid "Focus point"
 msgstr "Fokuseringspunkt"
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr "Färglinjer per inläsning"
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr "Gråskalelinjer per inläsning"
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr "webbkamera"
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr "Färg RAW"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr "Färg RGB"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr "Färg RGB TEXT"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr "Helsvart"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr "Helvit"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr "Färgmönster"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr "Rutnät"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr "Första punkten"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr "Andra punkten"
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
@@ -5137,12 +5836,12 @@ msgstr ""
 "Detta är den mycket långa tredje punkten. Kanske har framplanet någon "
 "idé om hur det skall visa den"
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr "Handbildläsarsimulering"
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5155,29 +5854,29 @@ msgstr ""
 "är vald kan man testa om ett framplan kan hantera detta på rätt sätt. "
 "Denna inställning ger också en fast bredd på 11 cm."
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr "Trepassimulering"
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
 "transmitted."
 msgstr "Simulera en trepassbildläsare. I färgläge överförs tre bildrutor."
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr "Ställ in ordningen för bildrutorna"
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr "Ställ in ordningen för bildrutorna i trepass-färgläge."
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
@@ -5186,17 +5885,17 @@ msgstr ""
 "Om Automatisk dokumentmatare valts kommer mataren att vara 'tom' efter "
 "10 inläsningar."
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr "Specialinställningar"
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr "Välj testbild"
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5213,12 +5912,12 @@ msgstr ""
 "Rutnät: ritar ett svart-vitt rutnät med en bredd och höjd på 10 mm per "
 "ruta."
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr "Invertera endianness"
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5229,56 +5928,56 @@ msgstr ""
 "inställning kan användas för att testa 16-bitarslägen på framplan, dvs "
 "om framplanet använder rätt endianness."
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr "Läsbegränsning"
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 "Begränsa mängden data som överförs vid varje anrop till sane_read()."
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr "Storlek på läsbegränsning"
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
 msgstr ""
 "Den (största) mängd data som överförs vid varje anrop till sane_read()."
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr "Läsfördröjning"
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr "Fördröj överföringen av data."
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr "Längd på läsfördröjning"
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
 msgstr "Längden på fördröjningen efter varje databuffer som överförts."
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr "Returvärde för sane_read"
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
@@ -5289,22 +5988,22 @@ msgstr ""
 "för inläsning. Alla andra statuskoder är till för att testa hur "
 "framplanet hanterar dem."
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr "Pixelförlust per rad"
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr "Antal pixlar som kastas i slutet av varje rad."
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr "Oklara parametrar"
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
@@ -5313,23 +6012,23 @@ msgstr ""
 "Returnera oklara lines och bytes_per_line när sane_parameters() anropas "
 "före sane_start()."
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr "Använd icke-blockerande IO"
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 "Använd icke-blockerande IO för sane_read() om det stöds av framplanet."
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr "Erbjud en select file descriptor"
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
@@ -5338,12 +6037,12 @@ msgstr ""
 "Erbjud en select file descriptor för att detektera om sane_read() kommer "
 "att returnera data."
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr "Aktivera testinställningar"
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
@@ -5352,27 +6051,27 @@ msgstr ""
 "Aktivera diverse testinställningar. Detta är till för att testa förmågan "
 "hos framplan att visa och ändra de olika typerna av SANE-inställningar."
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr "Skriv ut inställningar"
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr "Skriv ut en lista med alla inställningar."
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr "Booleska testinställningar"
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr "(1/6) Boolesk mjukvaruvald mjukvarudetekterad"
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
@@ -5381,12 +6080,12 @@ msgstr ""
 "(1/6) Boolesk testinställning som är mjukvaruvald och mjukvarudetekterad "
 "(och avancerad). Detta är en normal Boolesk inställning."
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr "(2/6) Boolesk hårdvaruvald mjukvarudetekterad"
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
@@ -5398,12 +6097,12 @@ msgstr ""
 "framplanet, men av användaren (t.ex. genom att trycka på en knapp på "
 "enheten)."
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr "(3/6) Boolesk hårdvaruvald"
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5415,12 +6114,12 @@ msgstr ""
 "användaren (t.ex. genom att trycka på en knapp på enheten) och att den "
 "inte kan läsas av framplanet."
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr "(4/6) Boolesk mjukvarudetekterad"
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
@@ -5429,12 +6128,12 @@ msgstr ""
 "(4/6) Boolesk testinställning som är mjukvarudetekterad (och avancerad). "
 "Detta betyder att inställningen är skrivskyddad."
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr "(5/6) Boolesk mjukvaruvald mjukvarudetekterad emulerad"
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
@@ -5443,12 +6142,12 @@ msgstr ""
 "(5/6) Boolesk testinställning som är mjukvaruvald, mjukvarudetekterad "
 "och emulerad (och avancerad)."
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr "(6/6) Boolesk mjukvaruvald mjukvarudetekterad automatisk"
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5459,27 +6158,27 @@ msgstr ""
 "och automatisk (och avancerad). Denna inställning kan ställas in "
 "automatiskt av bakplanet."
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr "Heltalsinställningar"
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr "(1/6) Heltal"
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr "(1/6) Heltalstestinställning utan enhet och utan villkor."
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr "(2/6) Heltal intervallvillkor"
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
@@ -5488,35 +6187,35 @@ msgstr ""
 "(2/6) Heltalstestinställning med enheten pixlar och ett "
 "intervallvillkor. Minimum är 4, maximum 192 och steglängden är 2."
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr "(3/6) Heltal listvillkor"
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 "(3/6) Heltalstestinställning med enheten bitar och ett listvillkor."
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr "(4/6) Heltalsvektor"
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
 "constraints."
 msgstr "(4/6) Heltalsvektorstestinställning med enheten mm utan villkor."
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr "(5/6) Heltalsvektor intervallvillkor"
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
@@ -5525,12 +6224,12 @@ msgstr ""
 "(5/6) Heltalsvektorstestinställning med enheten punkter per tum och "
 "intervallvillkor. Minimum är 4, maximum 192 och steglängden är 2."
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr "(6/6) Heltalsvektor listvillkor"
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
@@ -5538,27 +6237,27 @@ msgid ""
 msgstr ""
 "(6/6) Heltalsvektorstestinställning med enheten procent och listvillkor."
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr "Bråktalstestinställningar"
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr "(1/3) Bråktal"
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr "(1/3) Bråktalstestinställning utan enhet och utan villkor."
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr "(2/3) Bråktal intervallvillkor"
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
@@ -5568,47 +6267,47 @@ msgstr ""
 "intervallvillkor. Minimum är -42.17, maximum är 32767.9999 och "
 "steglängden är 2.0."
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr "(3/3) Bråktal listvillkor"
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr "(3/3) Bråktalstestinställning utan enhet med listvillkor."
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr "Strängtestinställningar"
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr "(1/3) Sträng"
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr "(1/3) Strängtestinställning utan villkor."
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr "(2/3) Sträng stränglistevillkor"
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr "(2/3) Strängtestinställning med stränglistevillkor."
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr "(3/3) Sträng stränglistevillkor (lång lista)"
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
@@ -5617,152 +6316,156 @@ msgstr ""
 "(3/3) Strängtestinställning med stränglistevillkor. Innehåller några "
 "fler punkter..."
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr "Knapptestinställningar"
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr "(1/1) Knapp"
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr "(1/1) Knapptestinställning. Skriver ut lite text..."
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, no-c-format
 msgid "Color 36"
 msgstr "Färg 36"
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr "Använd bildkomponering"
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr "Tvånivå-svart-vit (streckteckningsläge)"
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr "Gittrad/rastrerad svart-vit (rasterläge)"
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr "Flernivå-svart-vit (gråskaleläge)"
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr "Flernivå-RGB-färg (enpass-färg)"
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr "Ignorera kalibrering"
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr "Stäng av förfokusering"
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr "Kalibrera inte fokus"
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr "Manuell förfokusering"
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr "Fast fokuseringspunkt"
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr "Kalibrera linsen i dokumentets läge"
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr "Kalibrera linsens fokus i dokumentets läge"
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr "HÃ¥llarens fokuseringspunkt 0 mm"
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr "Använd 0 mm i stället för 0,6 mm för hållarens fokuseringspunkt"
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr "Kalibreringsläge"
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr "Definiera kalibreringsläge"
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr "Sätt på/av lampan"
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr "UTA på"
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr "Sätter på/av UTA"
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr "Offset"
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr "Inställningar för färgkanalernas offset"
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, no-c-format
 msgid "Gray offset"
 msgstr "Grå offset"
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr "Ställer in den grå kanalens offset"
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr "Ställer in den röda kanalens offset"
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr "Ställer in den gröna kanalens offset"
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr "Ställer in den blå kanalens offset"
+
+#, fuzzy
+#~ msgid "IPC mode"
+#~ msgstr "Förhandsgranskningsläge"
diff --git a/po/uk.gmo b/po/uk.gmo
new file mode 100644
index 0000000..b2d237b
--- /dev/null
+++ b/po/uk.gmo
diff --git a/po/uk.po b/po/uk.po
index 4b95ed7..6b4fe24 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,13 +1,13 @@
 # Copyright (C) 2009
 # This file is distributed under the same license as the sane-backends package.
 #
-# Yuri Chornoivan <yurchor@ukr.net>, 2009, 2010, 2011, 2012, 2013, 2015.
+# Yuri Chornoivan <yurchor@ukr.net>, 2009, 2010, 2011, 2012, 2013, 2015, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 21:21-0400\n"
-"PO-Revision-Date: 2015-09-10 09:45+0300\n"
+"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
+"POT-Creation-Date: 2017-05-22 11:18-0400\n"
+"PO-Revision-Date: 2017-04-28 19:32+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "Language: uk\n"
@@ -18,411 +18,405 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../include/sane/saneopts.h:154
+#: include/sane/saneopts.h:154
 #, no-c-format
 msgid "Number of options"
 msgstr "Кількі�ть параметрів"
 
-#: ../include/sane/saneopts.h:156
+#: include/sane/saneopts.h:156
 #, no-c-format
 msgid "Standard"
 msgstr "Типово"
 
-#: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884
-#: ../backend/epson.c:3298 ../backend/epson2.c:1291
-#: ../backend/genesys.c:5615 ../backend/gt68xx.c:703
-#: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297
-#: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284
-#: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823
-#: ../backend/lexmark.c:199 ../backend/ma1509.c:551
-#: ../backend/matsushita.c:1135 ../backend/microtek2.h:599
-#: ../backend/mustek.c:4363 ../backend/mustek_usb.c:305
-#: ../backend/mustek_usb2.c:465 ../backend/pixma_sane_options.c:158
-#: ../backend/plustek.c:808 ../backend/plustek_pp.c:747
-#: ../backend/sceptre.c:702 ../backend/snapscan-options.c:550
-#: ../backend/teco1.c:1095 ../backend/teco2.c:1914 ../backend/teco3.c:920
-#: ../backend/test.c:647 ../backend/u12.c:546 ../backend/umax.c:5176
-#: ../backend/umax_pp.c:580
+#: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
+#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
+#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
+#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
+#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
+#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
+#: backend/mustek.c:4361 backend/mustek_usb.c:305
+#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/snapscan-options.c:550 backend/teco1.c:1095
+#: backend/teco2.c:1914 backend/teco3.c:920 backend/test.c:647
+#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
 #, no-c-format
 msgid "Geometry"
 msgstr "Позиці� і розміри"
 
-#: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805
-#: ../backend/canon.c:1498 ../backend/genesys.c:5675
-#: ../backend/gt68xx.c:672 ../backend/hp-option.c:2953
-#: ../backend/kvs1025_opt.c:704 ../backend/leo.c:871
-#: ../backend/ma1509.c:599 ../backend/matsushita.c:1189
-#: ../backend/microtek2.h:600 ../backend/mustek.c:4411
-#: ../backend/mustek_usb.c:353 ../backend/mustek_usb2.c:431
-#: ../backend/niash.c:754 ../backend/plustek.c:854
-#: ../backend/plustek_pp.c:793 ../backend/sceptre.c:750
-#: ../backend/snapscan-options.c:617 ../backend/stv680.c:1067
-#: ../backend/teco1.c:1143 ../backend/teco2.c:1962 ../backend/teco3.c:968
-#: ../backend/u12.c:592 ../backend/umax.c:5226 ../backend/umax_pp.c:629
+#: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
+#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
+#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
+#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
+#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
 #, no-c-format
 msgid "Enhancement"
 msgstr "Покращенн�"
 
-#: ../include/sane/saneopts.h:159 ../backend/epson.c:3197
-#: ../backend/epson2.c:1216 ../backend/kvs20xx_opt.c:365
-#: ../backend/kvs40xx_opt.c:596 ../backend/rts8891.c:2831
-#: ../backend/snapscan-options.c:923 ../backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr "Додатково"
 
-#: ../include/sane/saneopts.h:160
+#: include/sane/saneopts.h:160
 #, no-c-format
 msgid "Sensors"
 msgstr "Датчики"
 
-#: ../include/sane/saneopts.h:162
+#: include/sane/saneopts.h:162
 #, no-c-format
 msgid "Preview"
 msgstr "Перегл�д"
 
-#: ../include/sane/saneopts.h:163
+#: include/sane/saneopts.h:163
 #, no-c-format
 msgid "Force monochrome preview"
 msgstr "Приму�овий чорно-білий перегл�д"
 
-#: ../include/sane/saneopts.h:164
+#: include/sane/saneopts.h:164
 #, no-c-format
 msgid "Bit depth"
 msgstr "Кількі�ть бітів на колір"
 
-#: ../include/sane/saneopts.h:165 ../backend/canon.c:1145
-#: ../backend/leo.c:781 ../backend/pixma_sane_options.c:45
+#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
+#: backend/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Режим �кануванн�"
 
-#: ../include/sane/saneopts.h:166
+#: include/sane/saneopts.h:166
 #, no-c-format
 msgid "Scan speed"
 msgstr "Швидкі�ть �кануванн�"
 
-#: ../include/sane/saneopts.h:167
+#: include/sane/saneopts.h:167
 #, no-c-format
 msgid "Scan source"
 msgstr "Джерело �кануванн�"
 
-#: ../include/sane/saneopts.h:168
+#: include/sane/saneopts.h:168
 #, no-c-format
 msgid "Force backtracking"
 msgstr "Приму�ове поверненн�"
 
-#: ../include/sane/saneopts.h:169
+#: include/sane/saneopts.h:169
 #, no-c-format
 msgid "Top-left x"
 msgstr "Верхн� ліва координата за X"
 
-#: ../include/sane/saneopts.h:170
+#: include/sane/saneopts.h:170
 #, no-c-format
 msgid "Top-left y"
 msgstr "Верхн� ліва координата за Y"
 
-#: ../include/sane/saneopts.h:171
+#: include/sane/saneopts.h:171
 #, no-c-format
 msgid "Bottom-right x"
 msgstr "�ижн� права координата за X"
 
-#: ../include/sane/saneopts.h:172
+#: include/sane/saneopts.h:172
 #, no-c-format
 msgid "Bottom-right y"
 msgstr "�ижн� права координата за Y"
 
-#: ../include/sane/saneopts.h:173 ../backend/canon.c:1221
-#: ../backend/pixma_sane_options.c:298
+#: include/sane/saneopts.h:173 backend/canon.c:1221
+#: backend/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Роздільна здатні�ть �кануванн�"
 
-#: ../include/sane/saneopts.h:174
+#: include/sane/saneopts.h:174
 #, no-c-format
 msgid "X-resolution"
 msgstr "Роздільна здатні�ть за X"
 
-#: ../include/sane/saneopts.h:175
+#: include/sane/saneopts.h:175
 #, no-c-format
 msgid "Y-resolution"
 msgstr "Роздільна здатні�ть за Y"
 
-#: ../include/sane/saneopts.h:176
+#: include/sane/saneopts.h:176
 #, no-c-format
 msgid "Page width"
 msgstr "Ширина �торінки"
 
-#: ../include/sane/saneopts.h:177
+#: include/sane/saneopts.h:177
 #, no-c-format
 msgid "Page height"
 msgstr "Ви�ота �торінки"
 
-#: ../include/sane/saneopts.h:178
+#: include/sane/saneopts.h:178
 #, no-c-format
 msgid "Use custom gamma table"
 msgstr "Викори�товувати не�тандартну таблицю гами"
 
-#: ../include/sane/saneopts.h:179
+#: include/sane/saneopts.h:179
 #, no-c-format
 msgid "Image intensity"
 msgstr "Інтен�ивні�ть зображенн�"
 
-#: ../include/sane/saneopts.h:180
+#: include/sane/saneopts.h:180
 #, no-c-format
 msgid "Red intensity"
 msgstr "Інтен�ивні�ть червоного"
 
-#: ../include/sane/saneopts.h:181
+#: include/sane/saneopts.h:181
 #, no-c-format
 msgid "Green intensity"
 msgstr "Інтен�ивні�ть зеленого"
 
-#: ../include/sane/saneopts.h:182
+#: include/sane/saneopts.h:182
 #, no-c-format
 msgid "Blue intensity"
 msgstr "Інтен�ивні�ть �инього"
 
-#: ../include/sane/saneopts.h:183
+#: include/sane/saneopts.h:183
 #, no-c-format
 msgid "Brightness"
 msgstr "Я�краві�ть"
 
-#: ../include/sane/saneopts.h:184
+#: include/sane/saneopts.h:184
 #, no-c-format
 msgid "Contrast"
 msgstr "Контра�тні�ть"
 
-#: ../include/sane/saneopts.h:185
+#: include/sane/saneopts.h:185
 #, no-c-format
 msgid "Grain size"
 msgstr "Розмір зерна"
 
-#: ../include/sane/saneopts.h:186
+#: include/sane/saneopts.h:186
 #, no-c-format
 msgid "Halftoning"
 msgstr "�апівтони"
 
-#: ../include/sane/saneopts.h:187
+#: include/sane/saneopts.h:187
 #, no-c-format
 msgid "Black level"
 msgstr "Рівень чорного"
 
-#: ../include/sane/saneopts.h:188
+#: include/sane/saneopts.h:188
 #, no-c-format
 msgid "White level"
 msgstr "Рівень білого"
 
-#: ../include/sane/saneopts.h:189
+#: include/sane/saneopts.h:189
 #, no-c-format
 msgid "White level for red"
 msgstr "Рівень білого дл� червоного"
 
-#: ../include/sane/saneopts.h:190
+#: include/sane/saneopts.h:190
 #, no-c-format
 msgid "White level for green"
 msgstr "Рівень білого дл� зеленого"
 
-#: ../include/sane/saneopts.h:191
+#: include/sane/saneopts.h:191
 #, no-c-format
 msgid "White level for blue"
 msgstr "Рівень білого дл� �инього"
 
-#: ../include/sane/saneopts.h:192
+#: include/sane/saneopts.h:192
 #, no-c-format
 msgid "Shadow"
 msgstr "Затінені�ть"
 
-#: ../include/sane/saneopts.h:193
+#: include/sane/saneopts.h:193
 #, no-c-format
 msgid "Shadow for red"
 msgstr "Затінені�ть дл� червоного"
 
-#: ../include/sane/saneopts.h:194
+#: include/sane/saneopts.h:194
 #, no-c-format
 msgid "Shadow for green"
 msgstr "Затінені�ть дл� зеленого"
 
-#: ../include/sane/saneopts.h:195
+#: include/sane/saneopts.h:195
 #, no-c-format
 msgid "Shadow for blue"
 msgstr "Затінені�ть дл� �инього"
 
-#: ../include/sane/saneopts.h:196
+#: include/sane/saneopts.h:196
 #, no-c-format
 msgid "Highlight"
 msgstr "Під�вічуванн�"
 
-#: ../include/sane/saneopts.h:197
+#: include/sane/saneopts.h:197
 #, no-c-format
 msgid "Highlight for red"
 msgstr "Під�вічуванн� дл� червоного"
 
-#: ../include/sane/saneopts.h:198
+#: include/sane/saneopts.h:198
 #, no-c-format
 msgid "Highlight for green"
 msgstr "Під�вічуванн� дл� зеленого"
 
-#: ../include/sane/saneopts.h:199
+#: include/sane/saneopts.h:199
 #, no-c-format
 msgid "Highlight for blue"
 msgstr "Під�вічуванн� дл� �инього"
 
-#: ../include/sane/saneopts.h:200
+#: include/sane/saneopts.h:200
 #, no-c-format
 msgid "Hue"
 msgstr "Відтінок"
 
-#: ../include/sane/saneopts.h:201
+#: include/sane/saneopts.h:201
 #, no-c-format
 msgid "Saturation"
 msgstr "�а�ичені�ть"
 
-#: ../include/sane/saneopts.h:202
+#: include/sane/saneopts.h:202
 #, no-c-format
 msgid "Filename"
 msgstr "�азва файла"
 
-#: ../include/sane/saneopts.h:203
+#: include/sane/saneopts.h:203
 #, no-c-format
 msgid "Halftone pattern size"
 msgstr "Розмір шаблону напівтонів"
 
-#: ../include/sane/saneopts.h:204
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "Шаблон напівтонів"
 
-#: ../include/sane/saneopts.h:205
+#: include/sane/saneopts.h:205
 #, no-c-format
 msgid "Bind X and Y resolution"
 msgstr "Пов’�зати роздільні здатно�ті за X і Y"
 
-#: ../include/sane/saneopts.h:206 ../backend/hp3900_sane.c:428
-#: ../backend/hp3900_sane.c:1021 ../backend/hp3900_sane.c:1421
-#: ../backend/hp-option.c:3235 ../backend/mustek_usb2.c:121
-#: ../backend/plustek.c:236 ../backend/plustek_pp.c:205
-#: ../backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
+#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
+#: backend/hp-option.c:3235 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "�егатив"
 
-#: ../include/sane/saneopts.h:207
+#: include/sane/saneopts.h:207
 #, no-c-format
 msgid "Quality calibration"
 msgstr "Які�не калібруванн�"
 
-#: ../include/sane/saneopts.h:208
+#: include/sane/saneopts.h:208
 #, no-c-format
 msgid "Double Optical Resolution"
 msgstr "Подвоїти оптичну роздільну здатні�ть"
 
-#: ../include/sane/saneopts.h:209
+#: include/sane/saneopts.h:209
 #, no-c-format
 msgid "Bind RGB"
 msgstr "Пов’�заний RGB"
 
-#: ../include/sane/saneopts.h:210 ../backend/sm3840.c:770
+#: include/sane/saneopts.h:210 backend/sm3840.c:770
 #, no-c-format
 msgid "Threshold"
 msgstr "Поріг"
 
-#: ../include/sane/saneopts.h:211
+#: include/sane/saneopts.h:211
 #, no-c-format
 msgid "Analog gamma correction"
 msgstr "�налогове виправленн� гами"
 
-#: ../include/sane/saneopts.h:212
+#: include/sane/saneopts.h:212
 #, no-c-format
 msgid "Analog gamma red"
 msgstr "�налогова гама червоного"
 
-#: ../include/sane/saneopts.h:213
+#: include/sane/saneopts.h:213
 #, no-c-format
 msgid "Analog gamma green"
 msgstr "�налогова гама зеленого"
 
-#: ../include/sane/saneopts.h:214
+#: include/sane/saneopts.h:214
 #, no-c-format
 msgid "Analog gamma blue"
 msgstr "�налогова гама �инього"
 
-#: ../include/sane/saneopts.h:215
+#: include/sane/saneopts.h:215
 #, no-c-format
 msgid "Bind analog gamma"
 msgstr "Пов’�зана аналогова гама"
 
-#: ../include/sane/saneopts.h:216
+#: include/sane/saneopts.h:216
 #, no-c-format
 msgid "Warmup lamp"
 msgstr "Розігрів лампи"
 
-#: ../include/sane/saneopts.h:217
+#: include/sane/saneopts.h:217
 #, no-c-format
 msgid "Cal. exposure-time"
 msgstr "Калібрувати ча� витримки"
 
-#: ../include/sane/saneopts.h:218
+#: include/sane/saneopts.h:218
 #, no-c-format
 msgid "Cal. exposure-time for red"
 msgstr "Калібрувати ча� витримки дл� червоного"
 
-#: ../include/sane/saneopts.h:219
+#: include/sane/saneopts.h:219
 #, no-c-format
 msgid "Cal. exposure-time for green"
 msgstr "Калібрувати ча� витримки дл� зеленого"
 
-#: ../include/sane/saneopts.h:221
+#: include/sane/saneopts.h:221
 #, no-c-format
 msgid "Cal. exposure-time for blue"
 msgstr "Калібрувати ча� витримки дл� �инього"
 
-#: ../include/sane/saneopts.h:222
+#: include/sane/saneopts.h:222
 #, no-c-format
 msgid "Scan exposure-time"
 msgstr "Ча� витримки �кануванн�"
 
-#: ../include/sane/saneopts.h:223
+#: include/sane/saneopts.h:223
 #, no-c-format
 msgid "Scan exposure-time for red"
 msgstr "Ча� витримки �кануванн� дл� червоного"
 
-#: ../include/sane/saneopts.h:224
+#: include/sane/saneopts.h:224
 #, no-c-format
 msgid "Scan exposure-time for green"
 msgstr "Ча� витримки �кануванн� дл� зеленого"
 
-#: ../include/sane/saneopts.h:226
+#: include/sane/saneopts.h:226
 #, no-c-format
 msgid "Scan exposure-time for blue"
 msgstr "Ча� витримки �кануванн� дл� �инього"
 
-#: ../include/sane/saneopts.h:227
+#: include/sane/saneopts.h:227
 #, no-c-format
 msgid "Set exposure-time"
 msgstr "В�тановити ча� витримки"
 
-#: ../include/sane/saneopts.h:228
+#: include/sane/saneopts.h:228
 #, no-c-format
 msgid "Cal. lamp density"
 msgstr "Калібрувати інтен�ивні�ть лампи"
 
-#: ../include/sane/saneopts.h:229
+#: include/sane/saneopts.h:229
 #, no-c-format
 msgid "Scan lamp density"
 msgstr "Інтен�ивні�ть лампи �кануванн�"
 
-#: ../include/sane/saneopts.h:230
+#: include/sane/saneopts.h:230
 #, no-c-format
 msgid "Set lamp density"
 msgstr "В�тановити інтен�ивні�ть лампи"
 
-#: ../include/sane/saneopts.h:231 ../backend/umax.c:5829
+#: include/sane/saneopts.h:231 backend/umax.c:5829
 #, no-c-format
 msgid "Lamp off at exit"
 msgstr "Вимикати лампу при виході"
 
-#: ../include/sane/saneopts.h:245
+#: include/sane/saneopts.h:245
 #, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific devices "
@@ -431,37 +425,37 @@ msgstr ""
 "Параметр лише дл� читанн�, �кий визначає кількі�ть параметрів, �кі "
 "підтримують певні при�трої."
 
-#: ../include/sane/saneopts.h:248
+#: include/sane/saneopts.h:248
 #, no-c-format
 msgid "Source, mode and resolution options"
 msgstr "Параметри джерела даних, режиму і роздільної здатно�ті"
 
-#: ../include/sane/saneopts.h:249
+#: include/sane/saneopts.h:249
 #, no-c-format
 msgid "Scan area and media size options"
 msgstr "Параметри обла�ті �кануванн� і розмірів но�і� даних"
 
-#: ../include/sane/saneopts.h:250
+#: include/sane/saneopts.h:250
 #, no-c-format
 msgid "Image modification options"
 msgstr "Параметри видозміни зображенн�"
 
-#: ../include/sane/saneopts.h:251
+#: include/sane/saneopts.h:251
 #, no-c-format
 msgid "Hardware specific options"
 msgstr "Параметри обладнанн�"
 
-#: ../include/sane/saneopts.h:252
+#: include/sane/saneopts.h:252
 #, no-c-format
 msgid "Scanner sensors and buttons"
 msgstr "Датчики і кнопки �канера"
 
-#: ../include/sane/saneopts.h:255
+#: include/sane/saneopts.h:255
 #, no-c-format
 msgid "Request a preview-quality scan."
 msgstr "Запитати �кануванн� попереднього перегл�ду."
 
-#: ../include/sane/saneopts.h:258
+#: include/sane/saneopts.h:258
 #, no-c-format
 msgid ""
 "Request that all previews are done in monochrome mode.  On a three-pass "
@@ -473,7 +467,7 @@ msgstr ""
 "зменшено до одного, а на �канерах з одним проходом зменшує навантаженн� "
 "на пам’�ть і ча� �кануванн� зображенн� попереднього перегл�ду."
 
-#: ../include/sane/saneopts.h:264
+#: include/sane/saneopts.h:264
 #, no-c-format
 msgid ""
 "Number of bits per sample, typical values are 1 for \"line-art\" and 8 "
@@ -482,65 +476,65 @@ msgstr ""
 "Кількі�ть бітів на колір, типовими значенн�ми є 1 дл� штрихового і 8 дл� "
 "напівтонового �кануванн�."
 
-#: ../include/sane/saneopts.h:268
+#: include/sane/saneopts.h:268
 #, no-c-format
 msgid "Selects the scan mode (e.g., lineart, monochrome, or color)."
 msgstr ""
 "Визначає режим �кануванн� (наприклад, штриховий, чорно-білий або "
 "кольоровий)."
 
-#: ../include/sane/saneopts.h:271
+#: include/sane/saneopts.h:271
 #, no-c-format
 msgid "Determines the speed at which the scan proceeds."
 msgstr "Визначає швидкі�ть, з �кою виконуєть�� �кануванн�."
 
-#: ../include/sane/saneopts.h:274
+#: include/sane/saneopts.h:274
 #, no-c-format
 msgid "Selects the scan source (such as a document-feeder)."
 msgstr "Визначає джерело �кануванн� (зокрема при�трій подачі документів)"
 
-#: ../include/sane/saneopts.h:277
+#: include/sane/saneopts.h:277
 #, no-c-format
 msgid "Controls whether backtracking is forced."
 msgstr "Визначає, чи буде виконувати�� приму�ове поверненн�."
 
-#: ../include/sane/saneopts.h:280
+#: include/sane/saneopts.h:280
 #, no-c-format
 msgid "Top-left x position of scan area."
 msgstr "Координата X правого верхнього лівого кута обла�ті �кануванн�."
 
-#: ../include/sane/saneopts.h:283
+#: include/sane/saneopts.h:283
 #, no-c-format
 msgid "Top-left y position of scan area."
 msgstr "Координата Y правого верхнього лівого кута обла�ті �кануванн�."
 
-#: ../include/sane/saneopts.h:286
+#: include/sane/saneopts.h:286
 #, no-c-format
 msgid "Bottom-right x position of scan area."
 msgstr "Координата X правого нижнього кута обла�ті �кануванн�."
 
-#: ../include/sane/saneopts.h:289
+#: include/sane/saneopts.h:289
 #, no-c-format
 msgid "Bottom-right y position of scan area."
 msgstr "Координата Y правого нижнього кута обла�ті �кануванн�."
 
-#: ../include/sane/saneopts.h:292
+#: include/sane/saneopts.h:292
 #, no-c-format
 msgid "Sets the resolution of the scanned image."
 msgstr "Визначає роздільну здатні�ть �канованого зображенн�."
 
-#: ../include/sane/saneopts.h:295
+#: include/sane/saneopts.h:295
 #, no-c-format
 msgid "Sets the horizontal resolution of the scanned image."
 msgstr ""
 "Визначає горизонтальну роздільну здатні�ть за�канованого зображенн�."
 
-#: ../include/sane/saneopts.h:298
+#: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
 msgstr "Визначає вертикальну роздільну здатні�ть за�канованого зображенн�."
 
-#: ../include/sane/saneopts.h:301
+#: include/sane/saneopts.h:301
 #, no-c-format
 msgid ""
 "Specifies the width of the media.  Required for automatic centering of "
@@ -549,18 +543,18 @@ msgstr ""
 "Визначає ширину но�і�. Це значенн� потрібне дл� автоматичного "
 "центруванн� ли�ткових друкованих джерел."
 
-#: ../include/sane/saneopts.h:305
+#: include/sane/saneopts.h:305
 #, no-c-format
 msgid "Specifies the height of the media."
 msgstr "Визначає ви�оту но�і�."
 
-#: ../include/sane/saneopts.h:308
+#: include/sane/saneopts.h:308
 #, no-c-format
 msgid ""
 "Determines whether a builtin or a custom gamma-table should be used."
 msgstr "Визначає буде викори�тано вбудовану чи нетипову таблицю гами."
 
-#: ../include/sane/saneopts.h:312
+#: include/sane/saneopts.h:312
 #, no-c-format
 msgid ""
 "Gamma-correction table.  In color mode this option equally affects the "
@@ -571,32 +565,32 @@ msgstr ""
 "змінює параметри червоного, зеленого та �инього каналів (тобто є "
 "таблицею інтен�ивно�ті гами)."
 
-#: ../include/sane/saneopts.h:317
+#: include/sane/saneopts.h:317
 #, no-c-format
 msgid "Gamma-correction table for the red band."
 msgstr "Таблиц� виправленн� гами дл� червоної �муги."
 
-#: ../include/sane/saneopts.h:320
+#: include/sane/saneopts.h:320
 #, no-c-format
 msgid "Gamma-correction table for the green band."
 msgstr "Таблиц� виправленн� гами дл� зеленої �муги."
 
-#: ../include/sane/saneopts.h:323
+#: include/sane/saneopts.h:323
 #, no-c-format
 msgid "Gamma-correction table for the blue band."
 msgstr "Таблиц� виправленн� гами дл� �иньої �муги."
 
-#: ../include/sane/saneopts.h:326
+#: include/sane/saneopts.h:326
 #, no-c-format
 msgid "Controls the brightness of the acquired image."
 msgstr "Керує ��краві�тю отриманого зображенн�."
 
-#: ../include/sane/saneopts.h:329
+#: include/sane/saneopts.h:329
 #, no-c-format
 msgid "Controls the contrast of the acquired image."
 msgstr "Керує контра�тні�тю отриманого зображенн�."
 
-#: ../include/sane/saneopts.h:332
+#: include/sane/saneopts.h:332
 #, no-c-format
 msgid ""
 "Selects the \"graininess\" of the acquired image.  Smaller values result "
@@ -605,78 +599,78 @@ msgstr ""
 "Визначає значенн� «зерни�то�ті» �канованого зображенн�. Менші значенн� "
 "призводитимуть до �творенн� чіткіших зображень."
 
-#: ../include/sane/saneopts.h:336
+#: include/sane/saneopts.h:336
 #, no-c-format
 msgid "Selects whether the acquired image should be halftoned (dithered)."
 msgstr ""
 "Визначає, чи має бути отримане зображенн� напівтоновим (з дизерингом)."
 
-#: ../include/sane/saneopts.h:339 ../include/sane/saneopts.h:354
+#: include/sane/saneopts.h:339 include/sane/saneopts.h:354
 #, no-c-format
 msgid "Selects what radiance level should be considered \"black\"."
 msgstr "Визначає рівень �вітно�ті, �кий �лід вважати «чорним»."
 
-#: ../include/sane/saneopts.h:342 ../include/sane/saneopts.h:363
+#: include/sane/saneopts.h:342 include/sane/saneopts.h:363
 #, no-c-format
 msgid "Selects what radiance level should be considered \"white\"."
 msgstr "Визначає рівень �вітно�ті, �кий �лід вважати «білим»."
 
-#: ../include/sane/saneopts.h:345
+#: include/sane/saneopts.h:345
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"white\"."
 msgstr "Визначає рівень �вітно�ті червоного, �кий �лід вважати «білим»."
 
-#: ../include/sane/saneopts.h:348
+#: include/sane/saneopts.h:348
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"white\"."
 msgstr "Визначає рівень �вітно�ті зеленого, �кий �лід вважати «білим»."
 
-#: ../include/sane/saneopts.h:351
+#: include/sane/saneopts.h:351
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"white\"."
 msgstr "Визначає рівень �вітно�ті �инього, �кий �лід вважати «білим»."
 
-#: ../include/sane/saneopts.h:356
+#: include/sane/saneopts.h:356
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"black\"."
 msgstr "Визначає рівень �вітно�ті червоного, �кий �лід вважати «чорним»."
 
-#: ../include/sane/saneopts.h:358
+#: include/sane/saneopts.h:358
 #, no-c-format
 msgid "Selects what green radiance level should be considered \"black\"."
 msgstr "Визначає рівень �вітно�ті зеленого, �кий �лід вважати «чорним»."
 
-#: ../include/sane/saneopts.h:360
+#: include/sane/saneopts.h:360
 #, no-c-format
 msgid "Selects what blue radiance level should be considered \"black\"."
 msgstr "Визначає рівень �вітно�ті �инього, �кий �лід вважати «чорним»."
 
-#: ../include/sane/saneopts.h:365
+#: include/sane/saneopts.h:365
 #, no-c-format
 msgid "Selects what red radiance level should be considered \"full red\"."
 msgstr ""
 "Визначає рівень �вітно�ті червоного, �кий �лід вважати «цілком червоним»."
 
-#: ../include/sane/saneopts.h:367
+#: include/sane/saneopts.h:367
 #, no-c-format
 msgid ""
 "Selects what green radiance level should be considered \"full green\"."
 msgstr ""
 "Визначає рівень �вітно�ті зеленого, �кий �лід вважати «цілком зеленим»."
 
-#: ../include/sane/saneopts.h:370
+#: include/sane/saneopts.h:370
 #, no-c-format
 msgid ""
 "Selects what blue radiance level should be considered \"full blue\"."
 msgstr ""
 "Визначає рівень �вітно�ті �инього, �кий �лід вважати «цілком �инім»."
 
-#: ../include/sane/saneopts.h:374
+#: include/sane/saneopts.h:374
 #, no-c-format
 msgid "Controls the \"hue\" (blue-level) of the acquired image."
 msgstr "Керує «відтінком» (рівнем �инього) отриманого зображенн�."
 
-#: ../include/sane/saneopts.h:377
+#: include/sane/saneopts.h:377
 #, no-c-format
 msgid ""
 "The saturation level controls the amount of \"blooming\" that occurs "
@@ -686,12 +680,12 @@ msgstr ""
 "ча� отриманн� зображенн� з фотоапарата. Більші значенн� додаватимуть "
 "більше вуалюванн�."
 
-#: ../include/sane/saneopts.h:382
+#: include/sane/saneopts.h:382
 #, no-c-format
 msgid "The filename of the image to be loaded."
 msgstr "�азва файла зображенн�, �ке буде завантажено."
 
-#: ../include/sane/saneopts.h:385
+#: include/sane/saneopts.h:385
 #, no-c-format
 msgid ""
 "Sets the size of the halftoning (dithering) pattern used when scanning "
@@ -700,7 +694,7 @@ msgstr ""
 "Визначає розмір напівтонового шаблону (дизерингу), що викори�товуєть�� "
 "під ча� �кануванн� напівтонових зображень."
 
-#: ../include/sane/saneopts.h:389
+#: include/sane/saneopts.h:389
 #, no-c-format
 msgid ""
 "Defines the halftoning (dithering) pattern for scanning halftoned images."
@@ -708,288 +702,288 @@ msgstr ""
 "Визначає напівтонового шаблон (дизеринг) дл� �кануванн� напівтонових "
 "зображень."
 
-#: ../include/sane/saneopts.h:393
+#: include/sane/saneopts.h:393
 #, no-c-format
 msgid "Use same values for X and Y resolution"
 msgstr ""
 "Викори�товувати однакові значенн� дл� роздільних здатно�тей за X та Y"
 
-#: ../include/sane/saneopts.h:395
+#: include/sane/saneopts.h:395
 #, no-c-format
 msgid "Swap black and white"
 msgstr "Обмін�ти мі�ц�ми чорний і білий"
 
-#: ../include/sane/saneopts.h:397
+#: include/sane/saneopts.h:397
 #, no-c-format
 msgid "Do a quality white-calibration"
 msgstr "Виконати �кі�не калібруванн� білого"
 
-#: ../include/sane/saneopts.h:399
+#: include/sane/saneopts.h:399
 #, no-c-format
 msgid "Use lens that doubles optical resolution"
 msgstr "Викори�товувати лінзу, �ка подвоює оптичну роздільні�ть"
 
-#: ../include/sane/saneopts.h:401 ../include/sane/saneopts.h:413
+#: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
 msgstr "У режимі RGB викори�товувати однакові значенн� дл� кожного кольору"
 
-#: ../include/sane/saneopts.h:403
+#: include/sane/saneopts.h:403
 #, no-c-format
 msgid "Select minimum-brightness to get a white point"
 msgstr "Оберіть мінімальну ��краві�ть дл� отриманн� точки білого"
 
-#: ../include/sane/saneopts.h:405
+#: include/sane/saneopts.h:405
 #, no-c-format
 msgid "Analog gamma-correction"
 msgstr "�налогове виправленн� гами"
 
-#: ../include/sane/saneopts.h:407
+#: include/sane/saneopts.h:407
 #, no-c-format
 msgid "Analog gamma-correction for red"
 msgstr "�налогове виправленн� гами дл� червоного"
 
-#: ../include/sane/saneopts.h:409
+#: include/sane/saneopts.h:409
 #, no-c-format
 msgid "Analog gamma-correction for green"
 msgstr "�налогове виправленн� гами дл� зеленого"
 
-#: ../include/sane/saneopts.h:411
+#: include/sane/saneopts.h:411
 #, no-c-format
 msgid "Analog gamma-correction for blue"
 msgstr "�налогове виправленн� гами дл� �инього"
 
-#: ../include/sane/saneopts.h:415
+#: include/sane/saneopts.h:415
 #, no-c-format
 msgid "Warmup lamp before scanning"
 msgstr "Розігрівати лампу перед �кануванн�м"
 
-#: ../include/sane/saneopts.h:417
+#: include/sane/saneopts.h:417
 #, no-c-format
 msgid "Define exposure-time for calibration"
 msgstr "Визначити ча� витримки дл� калібруванн�"
 
-#: ../include/sane/saneopts.h:419
+#: include/sane/saneopts.h:419
 #, no-c-format
 msgid "Define exposure-time for red calibration"
 msgstr "Визначити ча� витримки дл� калібруванн� червоного"
 
-#: ../include/sane/saneopts.h:421
+#: include/sane/saneopts.h:421
 #, no-c-format
 msgid "Define exposure-time for green calibration"
 msgstr "Визначити ча� витримки дл� калібруванн� дл� зеленого"
 
-#: ../include/sane/saneopts.h:423
+#: include/sane/saneopts.h:423
 #, no-c-format
 msgid "Define exposure-time for blue calibration"
 msgstr "Визначити ча� витримки дл� калібруванн� дл� �инього"
 
-#: ../include/sane/saneopts.h:425
+#: include/sane/saneopts.h:425
 #, no-c-format
 msgid "Define exposure-time for scan"
 msgstr "Визначити ча� витримки дл� �кануванн�"
 
-#: ../include/sane/saneopts.h:427
+#: include/sane/saneopts.h:427
 #, no-c-format
 msgid "Define exposure-time for red scan"
 msgstr "Визначити ча� витримки дл� �кануванн� червоного"
 
-#: ../include/sane/saneopts.h:429
+#: include/sane/saneopts.h:429
 #, no-c-format
 msgid "Define exposure-time for green scan"
 msgstr "Визначити ча� витримки дл� �кануванн� зеленого"
 
-#: ../include/sane/saneopts.h:431
+#: include/sane/saneopts.h:431
 #, no-c-format
 msgid "Define exposure-time for blue scan"
 msgstr "Визначити ча� витримки дл� �кануванн� зеленого"
 
-#: ../include/sane/saneopts.h:433
+#: include/sane/saneopts.h:433
 #, no-c-format
 msgid "Enable selection of exposure-time"
 msgstr "Увімкнути вибір ча�у витримки"
 
-#: ../include/sane/saneopts.h:435
+#: include/sane/saneopts.h:435
 #, no-c-format
 msgid "Define lamp density for calibration"
 msgstr "Визначити інтен�ивні�ть дл� калібруванн�"
 
-#: ../include/sane/saneopts.h:437
+#: include/sane/saneopts.h:437
 #, no-c-format
 msgid "Define lamp density for scan"
 msgstr "Визначити інтен�ивні�ть лампи дл� �кануванн�"
 
-#: ../include/sane/saneopts.h:439
+#: include/sane/saneopts.h:439
 #, no-c-format
 msgid "Enable selection of lamp density"
 msgstr "Увімкнути можливі�ть вибору інтен�ивно�ті лампи"
 
-#: ../include/sane/saneopts.h:441 ../backend/umax.c:5830
+#: include/sane/saneopts.h:441 backend/umax.c:5830
 #, no-c-format
 msgid "Turn off lamp when program exits"
 msgstr "Вимкнути лампу під ча� виходу з програми"
 
-#: ../include/sane/saneopts.h:444
+#: include/sane/saneopts.h:444
 #, no-c-format
 msgid "Scan button"
 msgstr "Кнопка «Scan»"
 
-#: ../include/sane/saneopts.h:445
+#: include/sane/saneopts.h:445
 #, no-c-format
 msgid "Email button"
 msgstr "Кнопка «Email»"
 
-#: ../include/sane/saneopts.h:446
+#: include/sane/saneopts.h:446
 #, no-c-format
 msgid "Fax button"
 msgstr "Кнопка «Fax»"
 
-#: ../include/sane/saneopts.h:447
+#: include/sane/saneopts.h:447
 #, no-c-format
 msgid "Copy button"
 msgstr "Кнопка «Copy»"
 
-#: ../include/sane/saneopts.h:448
+#: include/sane/saneopts.h:448
 #, no-c-format
 msgid "PDF button"
 msgstr "Кнопка «PDF»"
 
-#: ../include/sane/saneopts.h:449
+#: include/sane/saneopts.h:449
 #, no-c-format
 msgid "Cancel button"
 msgstr "Кнопка «Cancel»"
 
-#: ../include/sane/saneopts.h:450
+#: include/sane/saneopts.h:450
 #, no-c-format
 msgid "Page loaded"
 msgstr "Сторінку завантажено"
 
-#: ../include/sane/saneopts.h:451
+#: include/sane/saneopts.h:451
 #, no-c-format
 msgid "Cover open"
 msgstr "Кришку відчинено"
 
-#: ../include/sane/saneopts.h:454
+#: include/sane/saneopts.h:454
 #, no-c-format
 msgid "Color"
 msgstr "Кольоровий"
 
-#: ../include/sane/saneopts.h:455
+#: include/sane/saneopts.h:455
 #, no-c-format
 msgid "Color Lineart"
 msgstr "Кольоровий штриховий"
 
-#: ../include/sane/saneopts.h:456
+#: include/sane/saneopts.h:456
 #, no-c-format
 msgid "Color Halftone"
 msgstr "Кольоровий, напівтони"
 
-#: ../include/sane/saneopts.h:457
+#: include/sane/saneopts.h:457
 #, no-c-format
 msgid "Gray"
 msgstr "Сірий"
 
-#: ../include/sane/saneopts.h:458
+#: include/sane/saneopts.h:458
 #, no-c-format
 msgid "Halftone"
 msgstr "Півтони"
 
-#: ../include/sane/saneopts.h:459
+#: include/sane/saneopts.h:459
 #, no-c-format
 msgid "Lineart"
 msgstr "Штрихове"
 
-#: ../backend/sane_strstatus.c:59
+#: backend/sane_strstatus.c:59
 #, no-c-format
 msgid "Success"
 msgstr "У�піх"
 
-#: ../backend/sane_strstatus.c:62
+#: backend/sane_strstatus.c:62
 #, no-c-format
 msgid "Operation not supported"
 msgstr "Ді� не підтримуєть��"
 
-#: ../backend/sane_strstatus.c:65
+#: backend/sane_strstatus.c:65
 #, no-c-format
 msgid "Operation was cancelled"
 msgstr "Дію було �ка�овано"
 
-#: ../backend/sane_strstatus.c:68
+#: backend/sane_strstatus.c:68
 #, no-c-format
 msgid "Device busy"
 msgstr "При�трій зайн�то"
 
-#: ../backend/sane_strstatus.c:71
+#: backend/sane_strstatus.c:71
 #, no-c-format
 msgid "Invalid argument"
 msgstr "�екоректний аргумент"
 
-#: ../backend/sane_strstatus.c:74
+#: backend/sane_strstatus.c:74
 #, no-c-format
 msgid "End of file reached"
 msgstr "До��гнуто кінц� файла"
 
-#: ../backend/sane_strstatus.c:77
+#: backend/sane_strstatus.c:77
 #, no-c-format
 msgid "Document feeder jammed"
 msgstr "Заїданн� но�і� у при�трої подачі"
 
-#: ../backend/sane_strstatus.c:80
+#: backend/sane_strstatus.c:80
 #, no-c-format
 msgid "Document feeder out of documents"
 msgstr "У при�трої подачі немає но�іїв"
 
-#: ../backend/sane_strstatus.c:83
+#: backend/sane_strstatus.c:83
 #, no-c-format
 msgid "Scanner cover is open"
 msgstr "Відчинено кришку �канера"
 
-#: ../backend/sane_strstatus.c:86
+#: backend/sane_strstatus.c:86
 #, no-c-format
 msgid "Error during device I/O"
 msgstr "Помилка під ча� виконанн� дій з вводу-виводу"
 
-#: ../backend/sane_strstatus.c:89
+#: backend/sane_strstatus.c:89
 #, no-c-format
 msgid "Out of memory"
 msgstr "�е ви�тачає пам'�ті"
 
-#: ../backend/sane_strstatus.c:92
+#: backend/sane_strstatus.c:92
 #, no-c-format
 msgid "Access to resource has been denied"
 msgstr "До�туп до ре�ур�у заборонено"
 
-#: ../backend/sane_strstatus.c:96
+#: backend/sane_strstatus.c:96
 #, no-c-format
 msgid "Lamp not ready, please retry"
 msgstr "Лампа не готова, будь ла�ка, повторіть �пробу"
 
-#: ../backend/sane_strstatus.c:101
+#: backend/sane_strstatus.c:101
 #, no-c-format
 msgid "Scanner mechanism locked for transport"
 msgstr "Механізм �канера заблоковано"
 
-#: ../backend/artec_eplus48u.c:2874 ../backend/pnm.c:282
+#: backend/artec_eplus48u.c:2874 backend/pnm.c:282
 #, no-c-format
 msgid "Defaults"
 msgstr "Типові"
 
-#: ../backend/artec_eplus48u.c:2876
+#: backend/artec_eplus48u.c:2876
 #, no-c-format
 msgid "Set default values for enhancement controls."
 msgstr "В�тановити типові значенн� дл� регул�торів покращенн�."
 
-#: ../backend/artec_eplus48u.c:2932 ../backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
 #, no-c-format
 msgid "Calibration"
 msgstr "Калібруванн�"
 
-#: ../backend/artec_eplus48u.c:2941
+#: backend/artec_eplus48u.c:2941
 #, no-c-format
 msgid "Calibrate before next scan"
 msgstr "Калібрувати перед на�тупним �кануванн�м"
 
-#: ../backend/artec_eplus48u.c:2943
+#: backend/artec_eplus48u.c:2943
 #, no-c-format
 msgid ""
 "If enabled, the device will be calibrated before the next scan. "
@@ -999,12 +993,12 @@ msgstr ""
 "�кануванн�м. У іншому випадку калібруванн� виконуватиметь�� лише перед "
 "першим �кануванн�м."
 
-#: ../backend/artec_eplus48u.c:2954
+#: backend/artec_eplus48u.c:2954
 #, no-c-format
 msgid "Only perform shading-correction"
 msgstr "Виконати лише коригуванн� градації"
 
-#: ../backend/artec_eplus48u.c:2956
+#: backend/artec_eplus48u.c:2956
 #, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
@@ -1016,27 +1010,27 @@ msgstr ""
 "з файла налаштувань) значенн� дл� коефіцієнта під�иленн�, зміщенн� та "
 "ча�у ек�позиції."
 
-#: ../backend/artec_eplus48u.c:2967
+#: backend/artec_eplus48u.c:2967
 #, no-c-format
 msgid "Button state"
 msgstr "Стан кнопки"
 
-#: ../backend/avision.h:777
+#: backend/avision.h:778
 #, no-c-format
 msgid "Number of the frame to scan"
 msgstr "�омер кадру дл� �кануванн�"
 
-#: ../backend/avision.h:778
+#: backend/avision.h:779
 #, no-c-format
 msgid "Selects the number of the frame to scan"
 msgstr "Визначає кількі�ть кадрів дл� �кануванн�"
 
-#: ../backend/avision.h:781
+#: backend/avision.h:782
 #, no-c-format
 msgid "Duplex scan"
 msgstr "Двобічне �кануванн�"
 
-#: ../backend/avision.h:782
+#: backend/avision.h:783
 #, no-c-format
 msgid ""
 "Duplex scan provide a scan of the front and back side of the document"
@@ -1044,432 +1038,429 @@ msgstr ""
 "За викори�танн� двобічного �кануванн� ви отримаєте одразу зображенн� "
 "лицьового та зворотного боків документа"
 
-#: ../backend/canon630u.c:159
+#: backend/canon630u.c:159
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr "Калібрувати �канер"
 
-#: ../backend/canon630u.c:160
+#: backend/canon630u.c:160
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr "Виконувати приму�ове калібруванн� перед �кануванн�м"
 
-#: ../backend/canon630u.c:259 ../backend/umax1220u.c:208
+#: backend/canon630u.c:259 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr "Сканувати у відтінках �ірого"
 
-#: ../backend/canon630u.c:260 ../backend/umax1220u.c:209
+#: backend/canon630u.c:260 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr "Виконувати чорно-біле �кануванн� замі�ть кольорового"
 
-#: ../backend/canon630u.c:306
+#: backend/canon630u.c:306
 #, no-c-format
 msgid "Analog Gain"
 msgstr "�налогове під�иленн�"
 
-#: ../backend/canon630u.c:307
+#: backend/canon630u.c:307
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr "Збільшити або зменшити аналогове під�иленн� матриці ПЗЗ"
 
-#: ../backend/canon630u.c:347 ../backend/epson.h:68 ../backend/epson2.h:74
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr "Виправленн� гами"
 
-#: ../backend/canon630u.c:348
+#: backend/canon630u.c:348
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr "Визначити криву виправленн� гами"
 
-#: ../backend/canon.c:149 ../backend/canon-sane.c:1323
+#: backend/canon.c:149 backend/canon-sane.c:1318
 #, no-c-format
 msgid "Raw"
 msgstr "Без обробки"
 
-#: ../backend/canon.c:157 ../backend/canon-sane.c:732
-#: ../backend/canon-sane.c:940 ../backend/canon-sane.c:1076
-#: ../backend/canon-sane.c:1318 ../backend/canon-sane.c:1501
-#: ../backend/canon-sane.c:1650
+#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:1076 backend/canon-sane.c:1314
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
 #, no-c-format
 msgid "Fine color"
 msgstr "Чи�тий колір"
 
-#: ../backend/canon.c:169
+#: backend/canon.c:169
 #, no-c-format
 msgid "No transparency correction"
 msgstr "Без виправленн� прозоро�ті"
 
-#: ../backend/canon.c:170 ../backend/canon-sane.c:680
+#: backend/canon.c:170 backend/canon-sane.c:680
 #, no-c-format
 msgid "Correction according to film type"
 msgstr "Виправленн� відповідно до типу плівки"
 
-#: ../backend/canon.c:171 ../backend/canon-sane.c:674
+#: backend/canon.c:171 backend/canon-sane.c:674
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr "Виправленн� відповідно до �піввідношенн� прозоро�ті"
 
-#: ../backend/canon.c:176 ../backend/canon-sane.c:776
+#: backend/canon.c:176 backend/canon-sane.c:776
 #, no-c-format
 msgid "Negatives"
 msgstr "�егативи"
 
-#: ../backend/canon.c:176
+#: backend/canon.c:176
 #, no-c-format
 msgid "Slides"
 msgstr "Слайди"
 
-#: ../backend/canon.c:186 ../backend/kvs1025_opt.c:181
-#: ../backend/kvs40xx_opt.c:272 ../backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
 msgstr "�втоматично"
 
-#: ../backend/canon.c:186
+#: backend/canon.c:186
 #, no-c-format
 msgid "Normal speed"
 msgstr "Звичайна швидкі�ть"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/2 normal speed"
 msgstr "1/2 звичайної швидко�ті"
 
-#: ../backend/canon.c:187
+#: backend/canon.c:187
 #, no-c-format
 msgid "1/3 normal speed"
 msgstr "1/3 звичайної швидко�ті"
 
-#: ../backend/canon.c:365
+#: backend/canon.c:365
 #, no-c-format
 msgid "rounded parameter"
 msgstr "округлений параметр"
 
-#: ../backend/canon.c:368 ../backend/canon.c:384 ../backend/canon.c:419
-#: ../backend/canon.c:469 ../backend/canon.c:487 ../backend/canon.c:530
+#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
+#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
 #, no-c-format
 msgid "unknown"
 msgstr "невідома"
 
-#: ../backend/canon.c:378
+#: backend/canon.c:378
 #, no-c-format
 msgid "ADF jam"
 msgstr "Заїданн� у прот�жному механізмі"
 
-#: ../backend/canon.c:381
+#: backend/canon.c:381
 #, no-c-format
 msgid "ADF cover open"
 msgstr "Відкрито кришку прот�жного механізму"
 
-#: ../backend/canon.c:394
+#: backend/canon.c:394
 #, no-c-format
 msgid "lamp failure"
 msgstr "Лампа не працює"
 
-#: ../backend/canon.c:397
+#: backend/canon.c:397
 #, no-c-format
 msgid "scan head positioning error"
 msgstr "помилка позиціонуванн� голівки �кануванн�"
 
-#: ../backend/canon.c:400
+#: backend/canon.c:400
 #, no-c-format
 msgid "CPU check error"
 msgstr "Помилка під ча� перевірки проце�ора"
 
-#: ../backend/canon.c:403
+#: backend/canon.c:403
 #, no-c-format
 msgid "RAM check error"
 msgstr "Помилка під ча� перевірки пам’�ті"
 
-#: ../backend/canon.c:406
+#: backend/canon.c:406
 #, no-c-format
 msgid "ROM check error"
 msgstr "Помилка під ча� перевірки ROM"
 
-#: ../backend/canon.c:409
+#: backend/canon.c:409
 #, no-c-format
 msgid "hardware check error"
 msgstr "Помилка під ча� перевірки обладнанн�"
 
-#: ../backend/canon.c:412
+#: backend/canon.c:412
 #, no-c-format
 msgid "transparency unit lamp failure"
 msgstr "�е працює лампа модул� �лайдів"
 
-#: ../backend/canon.c:415
+#: backend/canon.c:415
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr "Помилка позиціонуванн� голівки �кануванн� модул� плівок"
 
-#: ../backend/canon.c:429
+#: backend/canon.c:429
 #, no-c-format
 msgid "parameter list length error"
 msgstr "Помилка, пов’�зана з довжиною �пи�ку параметрів"
 
-#: ../backend/canon.c:433
+#: backend/canon.c:433
 #, no-c-format
 msgid "invalid command operation code"
 msgstr "�екоректний код команди дії"
 
-#: ../backend/canon.c:437
+#: backend/canon.c:437
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr "�екоректне поле у CDB"
 
-#: ../backend/canon.c:441
+#: backend/canon.c:441
 #, no-c-format
 msgid "unsupported LUN"
 msgstr "�епідтримуване значенн� LUN"
 
-#: ../backend/canon.c:445
+#: backend/canon.c:445
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr "�екоректне поле у �пи�ку параметрів"
 
-#: ../backend/canon.c:449
+#: backend/canon.c:449
 #, no-c-format
 msgid "command sequence error"
 msgstr "Помилка під ча� виконанн� по�лідовно�ті команд"
 
-#: ../backend/canon.c:453
+#: backend/canon.c:453
 #, no-c-format
 msgid "too many windows specified"
 msgstr "Вказано забагато вікон"
 
-#: ../backend/canon.c:457
+#: backend/canon.c:457
 #, no-c-format
 msgid "medium not present"
 msgstr "Від�утній но�ій"
 
-#: ../backend/canon.c:461
+#: backend/canon.c:461
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr "Повідомленн� про некоректний біт IDENTIFY"
 
-#: ../backend/canon.c:465
+#: backend/canon.c:465
 #, no-c-format
 msgid "option not connect"
 msgstr "Додаткову функціональні�ть не з’єднано"
 
-#: ../backend/canon.c:479
+#: backend/canon.c:479
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr "�киданн� під ча� вмиканн� / з’єднанн� при�трою"
 
-#: ../backend/canon.c:483
+#: backend/canon.c:483
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr "Параметр змінено іншим ін�трументом ініціалізації"
 
-#: ../backend/canon.c:497
+#: backend/canon.c:497
 #, no-c-format
 msgid "no additional sense information"
 msgstr "від�утні додаткові дані"
 
-#: ../backend/canon.c:501
+#: backend/canon.c:501
 #, no-c-format
 msgid "reselect failure"
 msgstr "Помилка повторного вибору"
 
-#: ../backend/canon.c:505
+#: backend/canon.c:505
 #, no-c-format
 msgid "SCSI parity error"
 msgstr "Помилка парно�ті SCSI"
 
-#: ../backend/canon.c:509
+#: backend/canon.c:509
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr ""
 "Отримано повідомленн� про помилку ви�вленн� ін�трументу ініціалізації"
 
-#: ../backend/canon.c:514
+#: backend/canon.c:514
 #, no-c-format
 msgid "invalid message error"
 msgstr "�екоректне повідомленн�"
 
-#: ../backend/canon.c:518
+#: backend/canon.c:518
 #, no-c-format
 msgid "timeout error"
 msgstr "Перевищенн� ча�у очікуванн�"
 
-#: ../backend/canon.c:522
+#: backend/canon.c:522
 #, no-c-format
 msgid "transparency unit shading error"
 msgstr "Помилка під ча� градації у модулі �лайдів"
 
-#: ../backend/canon.c:526
+#: backend/canon.c:526
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr "Лампу не �табілізовано"
 
-#: ../backend/canon.c:852 ../backend/canon.c:867
+#: backend/canon.c:852 backend/canon.c:867
 #, no-c-format
 msgid "film scanner"
 msgstr "плівковий �канер"
 
-#: ../backend/canon.c:882 ../backend/canon.c:897 ../backend/canon.c:912
-#: ../backend/canon.c:927 ../backend/hp3900_sane.c:1683
-#: ../backend/plustek.c:1335 ../backend/plustek_pp.c:1014
-#: ../backend/sceptre.c:593 ../backend/teco2.c:1836 ../backend/u12.c:851
+#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
+#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr "планшетний �канер"
 
-#: ../backend/canon.c:1183 ../backend/epson.c:3386
-#: ../backend/epson2.c:1365
+#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
 #, no-c-format
 msgid "Film type"
 msgstr "Тип плівки"
 
-#: ../backend/canon.c:1184
+#: backend/canon.c:1184
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr "Визначає тип плівки, тобто негатив чи �лайд"
 
-#: ../backend/canon.c:1196
+#: backend/canon.c:1196
 #, no-c-format
 msgid "Negative film type"
 msgstr "Тип плівки негатива"
 
-#: ../backend/canon.c:1197
+#: backend/canon.c:1197
 #, no-c-format
 msgid "Selects the negative film type"
 msgstr "Оберіть те�тове зображенн�"
 
-#: ../backend/canon.c:1236
+#: backend/canon.c:1236
 #, no-c-format
 msgid "Hardware resolution"
 msgstr "�паратна роздільна здатні�ть"
 
-#: ../backend/canon.c:1237
+#: backend/canon.c:1237
 #, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "Викори�товувати лише апаратні значенн�"
 
-#: ../backend/canon.c:1318
+#: backend/canon.c:1318
 #, no-c-format
 msgid "Focus"
 msgstr "Фоку�уванн�"
 
-#: ../backend/canon.c:1328
+#: backend/canon.c:1328
 #, no-c-format
 msgid "Auto focus"
 msgstr "�втоматичне фоку�уванн�"
 
-#: ../backend/canon.c:1329
+#: backend/canon.c:1329
 #, no-c-format
 msgid "Enable/disable auto focus"
 msgstr "Увімкнути/Вимкнути автоматичне фоку�уванн�"
 
-#: ../backend/canon.c:1336
+#: backend/canon.c:1336
 #, no-c-format
 msgid "Auto focus only once"
 msgstr "Одноразове автофоку�уванн�"
 
-#: ../backend/canon.c:1337
+#: backend/canon.c:1337
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr "Виконувати автоматичне фоку�уванн� лише раз між виштовхуванн�ми"
 
-#: ../backend/canon.c:1345
+#: backend/canon.c:1345
 #, no-c-format
 msgid "Manual focus position"
 msgstr "Визначенн� позиції фоку�а вручну"
 
-#: ../backend/canon.c:1346
+#: backend/canon.c:1346
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr ""
 "В�тановити позицію фоку�уванн� оптичної �и�теми вручну (типове значенн�: "
 "128)."
 
-#: ../backend/canon.c:1356
+#: backend/canon.c:1356
 #, no-c-format
 msgid "Scan margins"
 msgstr "Пол� обла�ті �кануванн�"
 
-#: ../backend/canon.c:1403
+#: backend/canon.c:1403
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr "Додаткова корекці� кольорів"
 
-#: ../backend/canon.c:1538 ../backend/epson.c:3205
-#: ../backend/epson2.c:1255 ../backend/kvs1025.h:55
-#: ../backend/kvs40xx_opt.c:825
+#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "Віддзеркалити зображенн�"
 
-#: ../backend/canon.c:1539
+#: backend/canon.c:1539
 #, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "Віддзеркалити зображенн� горизонтально."
 
-#: ../backend/canon.c:1608
+#: backend/canon.c:1608
 #, no-c-format
 msgid "Auto exposure"
 msgstr "�втоек�позиці�"
 
-#: ../backend/canon.c:1609
+#: backend/canon.c:1609
 #, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr "Увімкнути/Вимкнути можливі�ть автоек�понуванн�"
 
-#: ../backend/canon.c:1625
+#: backend/canon.c:1625
 #, no-c-format
 msgid "Calibration now"
 msgstr "Калібруванн�"
 
-#: ../backend/canon.c:1626
+#: backend/canon.c:1626
 #, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Виконати калібруванн� негайно"
 
-#: ../backend/canon.c:1636
+#: backend/canon.c:1636
 #, no-c-format
 msgid "Self diagnosis"
 msgstr "Самодіагно�тика"
 
-#: ../backend/canon.c:1637
+#: backend/canon.c:1637
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr "Виконати �амодіагно�тику �канера"
 
-#: ../backend/canon.c:1648
+#: backend/canon.c:1648
 #, no-c-format
 msgid "Reset scanner"
 msgstr "Скинути параметри �канера"
 
-#: ../backend/canon.c:1649
+#: backend/canon.c:1649
 #, no-c-format
 msgid "Reset the scanner"
 msgstr "Скинути параметри �канера"
 
-#: ../backend/canon.c:1659
+#: backend/canon.c:1659
 #, no-c-format
 msgid "Medium handling"
 msgstr "Обробка но�іїв"
 
-#: ../backend/canon.c:1668
+#: backend/canon.c:1668
 #, no-c-format
 msgid "Eject film after each scan"
 msgstr "Виштовхувати плівку пі�л� кожного �кануванн�"
 
-#: ../backend/canon.c:1669
+#: backend/canon.c:1669
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr ""
 "�втоматично виштовхувати плівку з при�трою пі�л� кожного �кануванн�"
 
-#: ../backend/canon.c:1680
+#: backend/canon.c:1680
 #, no-c-format
 msgid "Eject film before exit"
 msgstr "Виштовхувати плівку перед завершенн�м роботи"
 
-#: ../backend/canon.c:1681
+#: backend/canon.c:1681
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
@@ -1477,608 +1468,604 @@ msgstr ""
 "�втоматично виштовхувати плівку з при�трою перед завершенн�м роботи "
 "програми"
 
-#: ../backend/canon.c:1690
+#: backend/canon.c:1690
 #, no-c-format
 msgid "Eject film now"
 msgstr "Виштовхнути плівку"
 
-#: ../backend/canon.c:1691
+#: backend/canon.c:1691
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr "Виштовхнути плівку *негайно*"
 
-#: ../backend/canon.c:1700
+#: backend/canon.c:1700
 #, no-c-format
 msgid "Document feeder extras"
 msgstr "Додаткові ін�трументи подачі"
 
-#: ../backend/canon.c:1707
+#: backend/canon.c:1707
 #, no-c-format
 msgid "Flatbed only"
 msgstr "Лише планшетний"
 
-#: ../backend/canon.c:1708
+#: backend/canon.c:1708
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr ""
 "Вимкнути автоматичну подачу, викори�товувати лише планшетний механізм"
 
-#: ../backend/canon.c:1718 ../backend/canon.c:1728
+#: backend/canon.c:1718 backend/canon.c:1728
 #, no-c-format
 msgid "Transparency unit"
 msgstr "Модуль дл� �лайдів"
 
-#: ../backend/canon.c:1729
+#: backend/canon.c:1729
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr "Увімкнути/Вимкнути модуль дл� �лайдів (FAU, film adapter unit)"
 
-#: ../backend/canon.c:1739
+#: backend/canon.c:1739
 #, no-c-format
 msgid "Negative film"
 msgstr "�егатив"
 
-#: ../backend/canon.c:1740
+#: backend/canon.c:1740
 #, no-c-format
 msgid "Positive or negative film"
 msgstr "Позитивною чи негативною є плівка"
 
-#: ../backend/canon.c:1749
+#: backend/canon.c:1749
 #, no-c-format
 msgid "Density control"
 msgstr "Керуванн� щільні�тю"
 
-#: ../backend/canon.c:1750
+#: backend/canon.c:1750
 #, no-c-format
 msgid "Set density control mode"
 msgstr "В�тановити режим керуванн� щільні�тю"
 
-#: ../backend/canon.c:1761
+#: backend/canon.c:1761
 #, no-c-format
 msgid "Transparency ratio"
 msgstr "Співвідношенн� прозоро�ті"
 
-#: ../backend/canon.c:1775
+#: backend/canon.c:1775
 #, no-c-format
 msgid "Select film type"
 msgstr "Оберіть тип плівки"
 
-#: ../backend/canon.c:1776
+#: backend/canon.c:1776
 #, no-c-format
 msgid "Select the film type"
 msgstr "Визначає тип плівки"
 
-#: ../backend/canon_dr.c:388 ../backend/epjitsu.c:227
-#: ../backend/epson.c:501 ../backend/epson2.c:115 ../backend/fujitsu.c:649
-#: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017
-#: ../backend/hp5590.c:82 ../backend/ma1509.c:108
-#: ../backend/magicolor.c:181 ../backend/mustek.c:156
-#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:891
-#: ../backend/pixma_sane_options.c:90 ../backend/snapscan-options.c:86
-#: ../backend/test.c:192 ../backend/umax.c:181
+#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
+#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
+#: backend/mustek.c:164 backend/pixma.c:901
+#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "Планшет"
 
-#: ../backend/canon_dr.c:389 ../backend/epjitsu.c:228
-#: ../backend/fujitsu.c:650 ../backend/kodak.c:135
+#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/kodak.c:140
 #, no-c-format
 msgid "ADF Front"
 msgstr "Перед прот�жного механізму"
 
-#: ../backend/canon_dr.c:390 ../backend/epjitsu.c:229
-#: ../backend/fujitsu.c:651 ../backend/kodak.c:136
+#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/kodak.c:141
 #, no-c-format
 msgid "ADF Back"
 msgstr "Зворот прот�жного механізму"
 
-#: ../backend/canon_dr.c:391 ../backend/epjitsu.c:230
-#: ../backend/fujitsu.c:652 ../backend/hp5590.c:84 ../backend/kodak.c:137
-#: ../backend/pixma.c:902
+#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
+#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
 #, no-c-format
 msgid "ADF Duplex"
 msgstr "Двобічна �ПД"
 
-#: ../backend/canon_dr.c:392
+#: backend/canon_dr.c:412
 #, no-c-format
 msgid "Card Front"
 msgstr "Картка (профіль)"
 
-#: ../backend/canon_dr.c:393
+#: backend/canon_dr.c:413
 #, no-c-format
 msgid "Card Back"
 msgstr "Картка (зворот)"
 
-#: ../backend/canon_dr.c:394
+#: backend/canon_dr.c:414
 #, no-c-format
 msgid "Card Duplex"
 msgstr "Картка (обидва боки)"
 
-#: ../backend/canon_dr.c:401 ../backend/epson.c:599
-#: ../backend/epson.c:3096 ../backend/epson2.c:201
-#: ../backend/fujitsu.c:669 ../backend/genesys.c:89
-#: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136
-#: ../backend/hp-option.c:3093
+#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
+#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
 #, no-c-format
 msgid "Red"
 msgstr "Червоний"
 
-#: ../backend/canon_dr.c:402 ../backend/epson.c:600
-#: ../backend/epson.c:3092 ../backend/epson2.c:202
-#: ../backend/fujitsu.c:670 ../backend/genesys.c:90
-#: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137
-#: ../backend/hp-option.c:3094
+#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
+#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
 #, no-c-format
 msgid "Green"
 msgstr "Зелений"
 
-#: ../backend/canon_dr.c:403 ../backend/epson.c:601
-#: ../backend/epson.c:3100 ../backend/epson2.c:203
-#: ../backend/fujitsu.c:671 ../backend/genesys.c:91
-#: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138
-#: ../backend/hp-option.c:3095
+#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
+#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
 #, no-c-format
 msgid "Blue"
 msgstr "Синій"
 
-#: ../backend/canon_dr.c:404
+#: backend/canon_dr.c:424
 #, no-c-format
 msgid "Enhance Red"
 msgstr "Покращити червоний"
 
-#: ../backend/canon_dr.c:405
+#: backend/canon_dr.c:425
 #, no-c-format
 msgid "Enhance Green"
 msgstr "Покращити зелений"
 
-#: ../backend/canon_dr.c:406
+#: backend/canon_dr.c:426
 #, no-c-format
 msgid "Enhance Blue"
 msgstr "Покращити �иній"
 
-#: ../backend/canon_dr.c:408 ../backend/epson.c:556 ../backend/epson.c:564
-#: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:165
-#: ../backend/epson2.c:173 ../backend/epson2.c:185 ../backend/epson2.c:200
-#: ../backend/epson2.c:214 ../backend/fujitsu.c:675
-#: ../backend/genesys.c:99 ../backend/leo.c:109
-#: ../backend/matsushita.c:138 ../backend/matsushita.c:159
-#: ../backend/matsushita.c:191 ../backend/matsushita.c:213
-#: ../backend/snapscan-options.c:91
+#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
+#: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
+#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
+#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr "�емає"
 
-#: ../backend/canon_dr.c:409 ../backend/fujitsu.c:676
+#: backend/canon_dr.c:429 backend/fujitsu.c:699
 #, no-c-format
 msgid "JPEG"
 msgstr "JPEG"
 
-#: ../backend/epson.c:491 ../backend/epson2.c:108
-#: ../backend/magicolor.c:174
+#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
+#: backend/kvs1025_opt.c:911
+#, no-c-format
+msgid "Software blank skip percentage"
+msgstr "Порогове значенн� порожніх �торінок дл� програмного відкиданн�"
+
+#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#, no-c-format
+msgid "Request driver to discard pages with low percentage of dark pixels"
+msgstr ""
+"Вимагати від драйвера відкиданн� �торінок з надто низькою питомою "
+"кількі�тю темних пік�елів"
+
+#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr "Однобічна"
 
-#: ../backend/epson.c:492 ../backend/epson2.c:109 ../backend/kvs1025.h:50
-#: ../backend/kvs20xx_opt.c:203 ../backend/kvs40xx_opt.c:352
-#: ../backend/magicolor.c:175 ../backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
+#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
+#: backend/magicolor.c:175 backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr "Двобічна"
 
-#: ../backend/epson.c:502 ../backend/epson2.c:116 ../backend/pixma.c:908
+#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
 #, no-c-format
 msgid "Transparency Unit"
 msgstr "Модуль дл� �лайдів"
 
-#: ../backend/epson.c:503 ../backend/epson2.c:118
-#: ../backend/magicolor.c:182 ../backend/mustek.c:160
-#: ../backend/pixma.c:896 ../backend/test.c:192 ../backend/umax.c:183
+#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
+#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
+#: backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr "�втоматична подача документів"
 
-#: ../backend/epson.c:523 ../backend/epson2.c:134
+#: backend/epson.c:523 backend/epson2.c:134
 #, no-c-format
 msgid "Positive Film"
 msgstr "Плівка-позитив"
 
-#: ../backend/epson.c:524 ../backend/epson2.c:135
+#: backend/epson.c:524 backend/epson2.c:135
 #, no-c-format
 msgid "Negative Film"
 msgstr "Плівка-негатив"
 
-#: ../backend/epson.c:529 ../backend/epson2.c:142
+#: backend/epson.c:529 backend/epson2.c:142
 #, no-c-format
 msgid "Focus on glass"
 msgstr "Фоку� на �клі"
 
-#: ../backend/epson.c:530 ../backend/epson2.c:143
+#: backend/epson.c:530 backend/epson2.c:143
 #, no-c-format
 msgid "Focus 2.5mm above glass"
 msgstr "Фоку� 2,5 мм над �клом"
 
-#: ../backend/epson.c:557 ../backend/epson.c:565 ../backend/epson.c:577
-#: ../backend/epson2.c:166 ../backend/epson2.c:174 ../backend/epson2.c:186
+#: backend/epson.c:557 backend/epson.c:565 backend/epson.c:577
+#: backend/epson2.c:166 backend/epson2.c:174 backend/epson2.c:186
 #, no-c-format
 msgid "Halftone A (Hard Tone)"
 msgstr "Півтони A (Різкі тони)"
 
-#: ../backend/epson.c:558 ../backend/epson.c:566 ../backend/epson.c:578
-#: ../backend/epson2.c:167 ../backend/epson2.c:175 ../backend/epson2.c:187
+#: backend/epson.c:558 backend/epson.c:566 backend/epson.c:578
+#: backend/epson2.c:167 backend/epson2.c:175 backend/epson2.c:187
 #, no-c-format
 msgid "Halftone B (Soft Tone)"
 msgstr "Півтони B (М’�кі тони)"
 
-#: ../backend/epson.c:559 ../backend/epson.c:567 ../backend/epson.c:579
-#: ../backend/epson2.c:168 ../backend/epson2.c:176 ../backend/epson2.c:188
+#: backend/epson.c:559 backend/epson.c:567 backend/epson.c:579
+#: backend/epson2.c:168 backend/epson2.c:176 backend/epson2.c:188
 #, no-c-format
 msgid "Halftone C (Net Screen)"
 msgstr "Півтони C (Net Screen)"
 
-#: ../backend/epson.c:568 ../backend/epson.c:580 ../backend/epson2.c:177
-#: ../backend/epson2.c:189
+#: backend/epson.c:568 backend/epson.c:580 backend/epson2.c:177
+#: backend/epson2.c:189
 #, no-c-format
 msgid "Dither A (4x4 Bayer)"
 msgstr "Дизеринг A (�екці� 4x4)"
 
-#: ../backend/epson.c:569 ../backend/epson.c:581 ../backend/epson2.c:178
-#: ../backend/epson2.c:190
+#: backend/epson.c:569 backend/epson.c:581 backend/epson2.c:178
+#: backend/epson2.c:190
 #, no-c-format
 msgid "Dither B (4x4 Spiral)"
 msgstr "Дизеринг B (�піраль 4x4)"
 
-#: ../backend/epson.c:570 ../backend/epson.c:582 ../backend/epson2.c:179
-#: ../backend/epson2.c:191
+#: backend/epson.c:570 backend/epson.c:582 backend/epson2.c:179
+#: backend/epson2.c:191
 #, no-c-format
 msgid "Dither C (4x4 Net Screen)"
 msgstr "Дизеринг C (4x4 Net Screen)"
 
-#: ../backend/epson.c:571 ../backend/epson.c:583 ../backend/epson2.c:180
-#: ../backend/epson2.c:192
+#: backend/epson.c:571 backend/epson.c:583 backend/epson2.c:180
+#: backend/epson2.c:192
 #, no-c-format
 msgid "Dither D (8x4 Net Screen)"
 msgstr "Дизеринг D (8x4 Net Screen)"
 
-#: ../backend/epson.c:584 ../backend/epson2.c:193
+#: backend/epson.c:584 backend/epson2.c:193
 #, no-c-format
 msgid "Text Enhanced Technology"
 msgstr "Технологі� покращенн� тек�ту"
 
-#: ../backend/epson.c:585 ../backend/epson2.c:194
+#: backend/epson.c:585 backend/epson2.c:194
 #, no-c-format
 msgid "Download pattern A"
 msgstr "Завантажити шаблон A"
 
-#: ../backend/epson.c:586 ../backend/epson2.c:195
+#: backend/epson.c:586 backend/epson2.c:195
 #, no-c-format
 msgid "Download pattern B"
 msgstr "Завантажити шаблон B"
 
-#: ../backend/epson.c:631
+#: backend/epson.c:631
 #, no-c-format
 msgid "No Correction"
 msgstr "Без виправленн�"
 
-#: ../backend/epson.c:632 ../backend/epson.c:657 ../backend/epson2.c:255
+#: backend/epson.c:632 backend/epson.c:657 backend/epson2.c:255
 #, no-c-format
 msgid "User defined"
 msgstr "Визначене кори�тувачем"
 
-#: ../backend/epson.c:633
+#: backend/epson.c:633
 #, no-c-format
 msgid "Impact-dot printers"
 msgstr "Матричні принтери"
 
-#: ../backend/epson.c:634
+#: backend/epson.c:634
 #, no-c-format
 msgid "Thermal printers"
 msgstr "Термічні принтери"
 
-#: ../backend/epson.c:635
+#: backend/epson.c:635
 #, no-c-format
 msgid "Ink-jet printers"
 msgstr "Струминні принтери"
 
-#: ../backend/epson.c:636
+#: backend/epson.c:636
 #, no-c-format
 msgid "CRT monitors"
 msgstr "Монітори з ЕПТ"
 
-#: ../backend/epson.c:656 ../backend/epson2.c:254 ../backend/fujitsu.c:659
-#: ../backend/hp-option.c:3226 ../backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
+#: backend/hp-option.c:3226 backend/test.c:143
 #, no-c-format
 msgid "Default"
 msgstr "Типовий"
 
-#: ../backend/epson.c:658 ../backend/epson2.c:256
+#: backend/epson.c:658 backend/epson2.c:256
 #, no-c-format
 msgid "High density printing"
 msgstr "Друк з ви�окою щільні�тю"
 
-#: ../backend/epson.c:659 ../backend/epson2.c:257
+#: backend/epson.c:659 backend/epson2.c:257
 #, no-c-format
 msgid "Low density printing"
 msgstr "Друк з низькою щільні�тю"
 
-#: ../backend/epson.c:660 ../backend/epson2.c:258
+#: backend/epson.c:660 backend/epson2.c:258
 #, no-c-format
 msgid "High contrast printing"
 msgstr "Друк з ви�окою контра�тні�тю"
 
-#: ../backend/epson.c:678 ../backend/epson2.c:276
+#: backend/epson.c:678 backend/epson2.c:276
 #, no-c-format
 msgid "User defined (Gamma=1.0)"
 msgstr "Визначене кори�тувачем (Gamma=1.0)"
 
-#: ../backend/epson.c:679 ../backend/epson2.c:277
+#: backend/epson.c:679 backend/epson2.c:277
 #, no-c-format
 msgid "User defined (Gamma=1.8)"
 msgstr "Визначена кори�тувачем (Gamma=1.8)"
 
-#: ../backend/epson.c:757
+#: backend/epson.c:757
 #, no-c-format
 msgid "CD"
 msgstr "КД"
 
-#: ../backend/epson.c:758
+#: backend/epson.c:758
 #, no-c-format
 msgid "A5 portrait"
 msgstr "A5 книжкова"
 
-#: ../backend/epson.c:759
+#: backend/epson.c:759
 #, no-c-format
 msgid "A5 landscape"
 msgstr "A5 альбомна"
 
-#: ../backend/epson.c:760 ../backend/kvs1025_opt.c:103
-#: ../backend/kvs20xx_opt.c:76 ../backend/kvs40xx_opt.c:130
-#: ../backend/kvs40xx_opt.c:147
+#: backend/epson.c:760 backend/kvs1025_opt.c:103 backend/kvs20xx_opt.c:77
+#: backend/kvs40xx_opt.c:131 backend/kvs40xx_opt.c:148
 #, no-c-format
 msgid "Letter"
 msgstr "Letter"
 
-#: ../backend/epson.c:761 ../backend/kvs1025_opt.c:100
-#: ../backend/kvs20xx_opt.c:73 ../backend/kvs20xx_opt.c:301
-#: ../backend/kvs40xx_opt.c:127 ../backend/kvs40xx_opt.c:144
-#: ../backend/kvs40xx_opt.c:525
+#: backend/epson.c:761 backend/kvs1025_opt.c:100 backend/kvs20xx_opt.c:74
+#: backend/kvs20xx_opt.c:302 backend/kvs40xx_opt.c:128
+#: backend/kvs40xx_opt.c:145 backend/kvs40xx_opt.c:526
 #, no-c-format
 msgid "A4"
 msgstr "A4"
 
-#: ../backend/epson.c:762
+#: backend/epson.c:762
 #, no-c-format
 msgid "Max"
 msgstr "Мак�"
 
-#: ../backend/epson.c:2813 ../backend/epson2.c:977
-#: ../backend/genesys.c:5532 ../backend/gt68xx.c:458
-#: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522
-#: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319
-#: ../backend/ma1509.c:501 ../backend/matsushita.c:1084
-#: ../backend/microtek2.h:598 ../backend/mustek.c:4205
-#: ../backend/mustek_usb.c:260 ../backend/mustek_usb2.c:344
-#: ../backend/niash.c:734 ../backend/plustek.c:721
-#: ../backend/plustek_pp.c:658 ../backend/sceptre.c:673
-#: ../backend/snapscan-options.c:354 ../backend/stv680.c:1030
-#: ../backend/teco2.c:1886 ../backend/test.c:306 ../backend/u12.c:473
-#: ../backend/umax.c:5054
+#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
+#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320
+#: backend/ma1509.c:501 backend/matsushita.c:1084 backend/microtek2.h:598
+#: backend/mustek.c:4203 backend/mustek_usb.c:260
+#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
+#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: backend/snapscan-options.c:354 backend/stv680.c:1030
+#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr "Режим �кануванн�"
 
-#: ../backend/epson.c:2845 ../backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1012
 #, no-c-format
 msgid "Selects the halftone."
 msgstr "Визначає півтон."
 
-#: ../backend/epson.c:2867 ../backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1033
 #, no-c-format
 msgid "Dropout"
 msgstr "Ма�ка"
 
-#: ../backend/epson.c:2868 ../backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1034
 #, no-c-format
 msgid "Selects the dropout."
 msgstr "Визначає ма�ку."
 
-#: ../backend/epson.c:2880 ../backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1046
 #, no-c-format
 msgid "Selects the brightness."
 msgstr "Визначає ��краві�ть."
 
-#: ../backend/epson.c:2895 ../backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1059
 #, no-c-format
 msgid "Sharpness"
 msgstr "Різкі�ть"
 
-#: ../backend/epson.c:3031 ../backend/epson2.c:1175
-#: ../backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
 #, no-c-format
 msgid "Color correction"
 msgstr "Кольорова компен�аці�"
 
-#: ../backend/epson.c:3034 ../backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1177
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr ""
 "Визначає таблицю виправленн� кольорів дл� вибраного при�трою виведенн� "
 "даних."
 
-#: ../backend/epson.c:3075
+#: backend/epson.c:3075
 #, no-c-format
 msgid "Color correction coefficients"
 msgstr "Коефіцієнти виправленн� кольорів"
 
-#: ../backend/epson.c:3076
+#: backend/epson.c:3076
 #, no-c-format
 msgid "Matrix multiplication of RGB"
 msgstr "Матричний множник RGB"
 
-#: ../backend/epson.c:3093
+#: backend/epson.c:3093
 #, no-c-format
 msgid "Shift green to red"
 msgstr "З�ув зеленого до червоного"
 
-#: ../backend/epson.c:3094
+#: backend/epson.c:3094
 #, no-c-format
 msgid "Shift green to blue"
 msgstr "З�ув зеленого до �инього"
 
-#: ../backend/epson.c:3095
+#: backend/epson.c:3095
 #, no-c-format
 msgid "Shift red to green"
 msgstr "З�ув червоного до зеленого"
 
-#: ../backend/epson.c:3097
+#: backend/epson.c:3097
 #, no-c-format
 msgid "Shift red to blue"
 msgstr "З�ув червоного до �инього"
 
-#: ../backend/epson.c:3098
+#: backend/epson.c:3098
 #, no-c-format
 msgid "Shift blue to green"
 msgstr "З�ув �инього до зеленого"
 
-#: ../backend/epson.c:3099
+#: backend/epson.c:3099
 #, no-c-format
 msgid "Shift blue to red"
 msgstr "З�ув �инього до червоного"
 
-#: ../backend/epson.c:3102
+#: backend/epson.c:3102
 #, no-c-format
 msgid "Controls green level"
 msgstr "Керує рівнем зеленого"
 
-#: ../backend/epson.c:3103
+#: backend/epson.c:3103
 #, no-c-format
 msgid "Adds to red based on green level"
 msgstr "Додаток до червоного на о�нові рівн� зеленого"
 
-#: ../backend/epson.c:3104
+#: backend/epson.c:3104
 #, no-c-format
 msgid "Adds to blue based on green level"
 msgstr "Додаток до �инього на о�нові рівн� зеленого"
 
-#: ../backend/epson.c:3105
+#: backend/epson.c:3105
 #, no-c-format
 msgid "Adds to green based on red level"
 msgstr "Додаток до зеленого на о�нові рівн� червоного"
 
-#: ../backend/epson.c:3106
+#: backend/epson.c:3106
 #, no-c-format
 msgid "Controls red level"
 msgstr "Керує рівнем червоного"
 
-#: ../backend/epson.c:3107
+#: backend/epson.c:3107
 #, no-c-format
 msgid "Adds to blue based on red level"
 msgstr "Додаток до �инього на о�нові рівн� червоного"
 
-#: ../backend/epson.c:3108
+#: backend/epson.c:3108
 #, no-c-format
 msgid "Adds to green based on blue level"
 msgstr "Додаток до зеленого на о�нові рівн� �инього"
 
-#: ../backend/epson.c:3109
+#: backend/epson.c:3109
 #, no-c-format
 msgid "Adds to red based on blue level"
 msgstr "Додаток до червоного на о�нові рівн� �инього"
 
-#: ../backend/epson.c:3110
+#: backend/epson.c:3110
 #, no-c-format
 msgid "Controls blue level"
 msgstr "Визначає рівень �инього"
 
-#: ../backend/epson.c:3206 ../backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1256
 #, no-c-format
 msgid "Mirror the image."
 msgstr "Віддзеркалити зображенн�."
 
-#: ../backend/epson.c:3232 ../backend/mustek.c:4334
+#: backend/epson.c:3232 backend/mustek.c:4332
 #, no-c-format
 msgid "Fast preview"
 msgstr "Швидкий перегл�д"
 
-#: ../backend/epson.c:3245 ../backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1266
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr "�втоматичний поділ на обла�ті"
 
-#: ../backend/epson.c:3258
+#: backend/epson.c:3258
 #, no-c-format
 msgid "Short resolution list"
 msgstr "Короткий �пи�ок роздільних здатно�тей"
 
-#: ../backend/epson.c:3260
+#: backend/epson.c:3260
 #, no-c-format
 msgid "Display short resolution list"
 msgstr "Показати короткий �пи�ок роздільних здатно�тей"
 
-#: ../backend/epson.c:3267
+#: backend/epson.c:3267
 #, no-c-format
 msgid "Zoom"
 msgstr "Ма�штаб"
 
-#: ../backend/epson.c:3269
+#: backend/epson.c:3269
 #, no-c-format
 msgid "Defines the zoom factor the scanner will use"
 msgstr "Визначає ма�штаб, �кий буде викори�тано �канером"
 
-#: ../backend/epson.c:3349
+#: backend/epson.c:3349
 #, no-c-format
 msgid "Quick format"
 msgstr "Швидке форматуванн�"
 
-#: ../backend/epson.c:3360 ../backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1341
 #, no-c-format
 msgid "Optional equipment"
 msgstr "Додаткове у�таткуванн�"
 
-#: ../backend/epson.c:3431 ../backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1394
 #, no-c-format
 msgid "Eject"
 msgstr "Виштовхнути"
 
-#: ../backend/epson.c:3432 ../backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1395
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr "Виштовхнути аркуш з прот�жного при�трою"
 
-#: ../backend/epson.c:3444 ../backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1405
 #, no-c-format
 msgid "Auto eject"
 msgstr "�втовиштовхуванн�"
 
-#: ../backend/epson.c:3445 ../backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1407
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr "Виштовхнути документ пі�л� �кануванн�"
 
-#: ../backend/epson.c:3457 ../backend/epson2.c:1417
-#: ../backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
 #, no-c-format
 msgid "ADF Mode"
-msgstr "Режим автоподаванн�"
+msgstr "Режим прот�жного при�трою"
 
-#: ../backend/epson.c:3459 ../backend/epson2.c:1419
-#: ../backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
-msgstr "Визначає режим автоподаванн� (однобічний/двобічний)"
+msgstr "Визначає режим прот�жного при�трою (однобічний/двобічний)"
 
-#: ../backend/epson.c:3473 ../backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1431
 #, no-c-format
 msgid "Bay"
 msgstr "Секці�"
 
-#: ../backend/epson.c:3474 ../backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1432
 #, no-c-format
 msgid "Select bay to scan"
 msgstr "Визначає �екцію, �ку буде �кановано"
 
-#: ../backend/epson.h:69 ../backend/epson2.h:75
+#: backend/epson.h:69 backend/epson2.h:68
 #, no-c-format
 msgid ""
 "Selects the gamma correction value from a list of pre-defined devices or "
@@ -2088,12 +2075,12 @@ msgstr ""
 "попереднього визначених при�троїв або визначеної кори�тувачем таблиці, "
 "�ку можна завантажити у �канер"
 
-#: ../backend/epson.h:72 ../backend/epson2.h:78
+#: backend/epson.h:72 backend/epson2.h:71
 #, no-c-format
 msgid "Focus Position"
 msgstr "Позиці� фоку�уванн�"
 
-#: ../backend/epson.h:73 ../backend/epson2.h:79
+#: backend/epson.h:73 backend/epson2.h:72
 #, no-c-format
 msgid ""
 "Sets the focus position to either the glass or 2.5mm above the glass"
@@ -2101,12 +2088,12 @@ msgstr ""
 "Визначає позицію фоку�уванн� на рівень від поверхні �кла до ви�оти 2,5 "
 "мм над �клом"
 
-#: ../backend/epson.h:75 ../backend/epson2.h:81
+#: backend/epson.h:75 backend/epson2.h:74
 #, no-c-format
 msgid "Wait for Button"
 msgstr "Очікувати нати�канн� кнопки"
 
-#: ../backend/epson.h:76 ../backend/epson2.h:82
+#: backend/epson.h:76 backend/epson2.h:75
 #, no-c-format
 msgid ""
 "After sending the scan command, wait until the button on the scanner is "
@@ -2115,217 +2102,1013 @@ msgstr ""
 "Пі�л� над�иланн� команди �кануванн� не розпочинати �кануванн� до "
 "нати�канн� кнопки на �канері."
 
-#: ../backend/epson2.c:102 ../backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma.c:390
 #, no-c-format
 msgid "Infrared"
 msgstr "Інфрачервоне"
 
-#: ../backend/epson2.c:117
+#: backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr "TPU8x10"
 
-#: ../backend/epson2.c:136
+#: backend/epson2.c:136
 #, no-c-format
 msgid "Positive Slide"
 msgstr "Слайд-позитив"
 
-#: ../backend/epson2.c:137
+#: backend/epson2.c:137
 #, no-c-format
 msgid "Negative Slide"
 msgstr "Слайд-негатив"
 
-#: ../backend/epson2.c:215
+#: backend/epson2.c:215
 #, no-c-format
 msgid "Built in CCT profile"
 msgstr "Вбудований профіль CCT"
 
-#: ../backend/epson2.c:216
+#: backend/epson2.c:216
 #, no-c-format
 msgid "User defined CCT profile"
 msgstr "Визначений кори�тувачем профіль CCT"
 
-#: ../backend/fujitsu.c:660 ../backend/hp-option.c:3327
-#: ../backend/hp-option.c:3340
+#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
 #, no-c-format
 msgid "On"
 msgstr "Увімкнути"
 
-#: ../backend/fujitsu.c:661 ../backend/hp-option.c:3159
-#: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339
+#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
+#: backend/hp-option.c:3339
 #, no-c-format
 msgid "Off"
 msgstr "Вимкнути"
 
-#: ../backend/fujitsu.c:663
+#: backend/fujitsu.c:686
 #, no-c-format
 msgid "DTC"
 msgstr "DTC"
 
-#: ../backend/fujitsu.c:664
+#: backend/fujitsu.c:687
 #, no-c-format
 msgid "SDTC"
 msgstr "SDTC"
 
-#: ../backend/fujitsu.c:666 ../backend/teco1.c:1152
-#: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972
-#: ../backend/teco3.c:977 ../backend/teco3.c:978
+#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr "Дизеринг"
 
-#: ../backend/fujitsu.c:667
+#: backend/fujitsu.c:690
 #, no-c-format
 msgid "Diffusion"
 msgstr "Дифузі�"
 
-#: ../backend/fujitsu.c:672
+#: backend/fujitsu.c:695
 #, no-c-format
 msgid "White"
 msgstr "Білий"
 
-#: ../backend/fujitsu.c:673
+#: backend/fujitsu.c:696
 #, no-c-format
 msgid "Black"
 msgstr "Чорний"
 
-#: ../backend/fujitsu.c:678
+#: backend/fujitsu.c:701
 #, no-c-format
 msgid "Continue"
 msgstr "Продовжити"
 
-#: ../backend/fujitsu.c:679
+#: backend/fujitsu.c:702
 #, no-c-format
 msgid "Stop"
 msgstr "Зупинити"
 
-#: ../backend/fujitsu.c:681
+#: backend/fujitsu.c:704
 #, no-c-format
 msgid "10mm"
 msgstr "10мм"
 
-#: ../backend/fujitsu.c:682
+#: backend/fujitsu.c:705
 #, no-c-format
 msgid "15mm"
 msgstr "15мм"
 
-#: ../backend/fujitsu.c:683
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "20mm"
 msgstr "20мм"
 
-#: ../backend/fujitsu.c:685 ../backend/hp-option.c:3045
+#: backend/fujitsu.c:708 backend/hp-option.c:3045
 #, no-c-format
 msgid "Horizontal"
 msgstr "По горизонталі"
 
-#: ../backend/fujitsu.c:686
+#: backend/fujitsu.c:709
 #, no-c-format
 msgid "Horizontal bold"
 msgstr "Жирний по горизонталі"
 
-#: ../backend/fujitsu.c:687
+#: backend/fujitsu.c:710
 #, no-c-format
 msgid "Horizontal narrow"
 msgstr "Вузький по горизонталі"
 
-#: ../backend/fujitsu.c:688 ../backend/hp-option.c:3044
+#: backend/fujitsu.c:711 backend/hp-option.c:3044
 #, no-c-format
 msgid "Vertical"
 msgstr "По вертикалі"
 
-#: ../backend/fujitsu.c:689
+#: backend/fujitsu.c:712
 #, no-c-format
 msgid "Vertical bold"
 msgstr "Жирний по вертикалі"
 
-#: ../backend/fujitsu.c:691
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Top to bottom"
 msgstr "Згори вниз"
 
-#: ../backend/fujitsu.c:692
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Bottom to top"
 msgstr "Знизу догори"
 
-#: ../backend/fujitsu.c:694
+#: backend/fujitsu.c:717
 #, no-c-format
 msgid "Front"
 msgstr "Перед"
 
-#: ../backend/fujitsu.c:695
+#: backend/fujitsu.c:718
 #, no-c-format
 msgid "Back"
 msgstr "Зворот"
 
-#: ../backend/fujitsu.c:4055 ../backend/genesys.c:5766
-#: ../backend/kvs1025_opt.c:911
+#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
 #, no-c-format
-msgid "Software blank skip percentage"
-msgstr "Порогове значенн� порожніх �торінок дл� програмного відкиданн�"
+msgid "Gamma function exponent"
+msgstr "Показник функції гами"
 
-#: ../backend/fujitsu.c:4056
+#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
 #, no-c-format
-msgid "Request driver to discard pages with low percentage of dark pixels"
+msgid "Changes intensity of midtones"
+msgstr "Змінює інтен�ивні�ть напівтонів"
+
+#: backend/fujitsu.c:3147
+#, no-c-format
+msgid "RIF"
+msgstr "RIF"
+
+#: backend/fujitsu.c:3148
+#, no-c-format
+msgid "Reverse image format"
+msgstr "Інвер�ивний формат зображенн�"
+
+#: backend/fujitsu.c:3165
+#, no-c-format
+msgid "Halftone type"
+msgstr "Тип півтонів"
+
+#: backend/fujitsu.c:3166
+#, no-c-format
+msgid "Control type of halftone filter"
+msgstr "Керуванн� типом фільтра півтонів"
+
+#: backend/fujitsu.c:3187
+#, no-c-format
+msgid "Control pattern of halftone filter"
+msgstr "Керуванн� взірцем фільтра півтонів"
+
+#: backend/fujitsu.c:3209
+#, no-c-format
+msgid "Outline"
+msgstr "Контур"
+
+#: backend/fujitsu.c:3210
+#, no-c-format
+msgid "Perform outline extraction"
+msgstr "Виконати видобуванн� контуру"
+
+#: backend/fujitsu.c:3221
+#, no-c-format
+msgid "Emphasis"
+msgstr "Виокремленн�"
+
+#: backend/fujitsu.c:3222
+#, no-c-format
+msgid "Negative to smooth or positive to sharpen image"
 msgstr ""
-"Вимагати від драйвера відкиданн� �торінок з надто низькою питомою "
-"кількі�тю темних пік�елів"
+"�егатив дл� згладжуванн� або позитив дл� збільшенн� різко�ті зображенн�"
+
+#: backend/fujitsu.c:3240
+#, no-c-format
+msgid "Separation"
+msgstr "Розділенн�"
+
+#: backend/fujitsu.c:3241
+#, no-c-format
+msgid "Enable automatic separation of image and text"
+msgstr "Увімкнути автоматичне відокремленн� зображень і тек�ту"
+
+#: backend/fujitsu.c:3252
+#, no-c-format
+msgid "Mirroring"
+msgstr "Віддзеркаленн�"
+
+#: backend/fujitsu.c:3253
+#, no-c-format
+msgid "Reflect output image horizontally"
+msgstr "Віддзеркалити отримане зображенн� по горизонталі"
+
+#: backend/fujitsu.c:3270
+#, no-c-format
+msgid "White level follower"
+msgstr "Відповідник рівн� білого"
+
+#: backend/fujitsu.c:3271
+#, no-c-format
+msgid "Control white level follower"
+msgstr "Керує відповідником рівн� білого"
+
+#: backend/fujitsu.c:3289
+#, no-c-format
+msgid "BP filter"
+msgstr "Фільтр СП"
+
+#: backend/fujitsu.c:3290
+#, no-c-format
+msgid "Improves quality of high resolution ball-point pen text"
+msgstr "Поліпшує �кі�ть тек�ту, напи�аного кульковою ручкою"
+
+#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#, no-c-format
+msgid "Smoothing"
+msgstr "Згладжуванн�"
+
+#: backend/fujitsu.c:3307
+#, no-c-format
+msgid "Enable smoothing for improved OCR"
+msgstr "Увімкнути згладжуванн� дл� поліпшенн� ОРТ"
+
+#: backend/fujitsu.c:3323
+#, no-c-format
+msgid "Gamma curve"
+msgstr "Крива гами"
+
+#: backend/fujitsu.c:3324
+#, no-c-format
+msgid "Gamma curve, from light to dark, but upper two may not work"
+msgstr ""
+"Крива гами, від �вітлого до темного, але верхні дві можуть не працювати"
+
+#: backend/fujitsu.c:3346 backend/genesys.c:5832
+#: backend/pixma_sane_options.c:335
+#, no-c-format
+msgid "Threshold curve"
+msgstr "Порогова крива"
+
+#: backend/fujitsu.c:3347
+#, no-c-format
+msgid ""
+"Threshold curve, from light to dark, but upper two may not be linear"
+msgstr ""
+"Порогова крива, від �вітлого до темного, але верхні дві не можуть бути "
+"лінійними"
+
+#: backend/fujitsu.c:3369
+#, no-c-format
+msgid "Threshold white"
+msgstr "Білий поріг"
+
+#: backend/fujitsu.c:3370
+#, no-c-format
+msgid "Set pixels equal to threshold to white instead of black"
+msgstr "В�тановити дл� порогових пік�елів білий колір, а не чорний"
+
+#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#, no-c-format
+msgid "Noise removal"
+msgstr "Вилученн� шуму"
+
+#: backend/fujitsu.c:3403
+#, no-c-format
+msgid "Matrix 5x5"
+msgstr "Матриц� 5x5"
+
+#: backend/fujitsu.c:3404
+#, no-c-format
+msgid "Remove 5 pixel square noise"
+msgstr "Вилучати пік�ельний шум розміром до 5 пік�елів"
+
+#: backend/fujitsu.c:3420
+#, no-c-format
+msgid "Matrix 4x4"
+msgstr "Матриц� 4x4"
+
+#: backend/fujitsu.c:3421
+#, no-c-format
+msgid "Remove 4 pixel square noise"
+msgstr "Вилучати пік�ельний шум розміром до 4 пік�елів"
+
+#: backend/fujitsu.c:3437
+#, no-c-format
+msgid "Matrix 3x3"
+msgstr "Матриц� 3x3"
+
+#: backend/fujitsu.c:3438
+#, no-c-format
+msgid "Remove 3 pixel square noise"
+msgstr "Вилучати пік�ельний шум розміром до 3 пік�елів"
+
+#: backend/fujitsu.c:3454
+#, no-c-format
+msgid "Matrix 2x2"
+msgstr "Матриц� 2x2"
+
+#: backend/fujitsu.c:3455
+#, no-c-format
+msgid "Remove 2 pixel square noise"
+msgstr "Вилучати пік�ельний шум розміром до 2 пік�елів"
+
+#: backend/fujitsu.c:3474
+#, no-c-format
+msgid "Variance"
+msgstr "Ди�пер�і�"
+
+#: backend/fujitsu.c:3475
+#, no-c-format
+msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
+msgstr "В�тановити величину ди�пер�ії SDTC (чутливі�ть), 0 відповідає 127"
+
+#: backend/fujitsu.c:3508
+#, no-c-format
+msgid "Auto width detection"
+msgstr "�втови�вленн� ширини"
+
+#: backend/fujitsu.c:3509
+#, no-c-format
+msgid "Scanner detects paper sides. May reduce scanning speed."
+msgstr "Сканер визначає краї паперу. Може уповільнити �кануванн�."
+
+#: backend/fujitsu.c:3526
+#, no-c-format
+msgid "Auto length detection"
+msgstr "�втови�вленн� довжини"
+
+#: backend/fujitsu.c:3527
+#, no-c-format
+msgid "Scanner detects paper lower edge. May confuse some frontends."
+msgstr ""
+"Сканер ви�вл�є нижній край паперу. Може призве�ти до помилкової роботи "
+"де�ких програмних оболонок."
+
+#: backend/fujitsu.c:3553
+#, no-c-format
+msgid "Compression"
+msgstr "Сти�ненн�"
+
+#: backend/fujitsu.c:3554
+#, no-c-format
+msgid "Enable compressed data. May crash your front-end program"
+msgstr ""
+"Увімкнути �ти�канн� даних. Може призве�ти до аварійного завершенн� "
+"роботи програмних оболонок."
+
+#: backend/fujitsu.c:3574
+#, no-c-format
+msgid "Compression argument"
+msgstr "�ргумент �ти�канн�"
+
+#: backend/fujitsu.c:3575
+#, no-c-format
+msgid ""
+"Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
+"is same as 4"
+msgstr ""
+"Рівень �ти�канн� JPEG. 1 — малий файл, 7 — великий файл. 0 (типовий) — "
+"те �аме, що і 4."
+
+#: backend/fujitsu.c:3605
+#, no-c-format
+msgid "DF action"
+msgstr "Ді� ПП"
+
+#: backend/fujitsu.c:3606
+#, no-c-format
+msgid "Action following double feed error"
+msgstr "Ді�, �ку буде виконано у відповідь на помилку подвійного подаванн�"
+
+#: backend/fujitsu.c:3622
+#, no-c-format
+msgid "DF skew"
+msgstr "ПП дл� перекошуванн�"
+
+#: backend/fujitsu.c:3623
+#, no-c-format
+msgid "Enable double feed error due to skew"
+msgstr "Увімкнути помилку подвійного подаванн� через перекошуванн�"
+
+#: backend/fujitsu.c:3641
+#, no-c-format
+msgid "DF thickness"
+msgstr "ПП дл� товщини"
+
+#: backend/fujitsu.c:3642
+#, no-c-format
+msgid "Enable double feed error due to paper thickness"
+msgstr "Увімкнути помилку подвійного подаванн� через товщину паперу"
+
+#: backend/fujitsu.c:3660
+#, no-c-format
+msgid "DF length"
+msgstr "ПП дл� довжини"
+
+#: backend/fujitsu.c:3661
+#, no-c-format
+msgid "Enable double feed error due to paper length"
+msgstr "Увімкнути помилку подвійного подаванн� через довжину паперу"
+
+#: backend/fujitsu.c:3684
+#, no-c-format
+msgid "DF length difference"
+msgstr "Різниц� довжини дл� ПП"
+
+#: backend/fujitsu.c:3685
+#, no-c-format
+msgid "Difference in page length to trigger double feed error"
+msgstr ""
+"Різниц� у довжинах аркушів паперу, �ка призводитиме до помилки "
+"подвійного подаванн�"
+
+#: backend/fujitsu.c:3708
+#, no-c-format
+msgid "DF recovery mode"
+msgstr "Режим відновленн� дл� ПП"
+
+#: backend/fujitsu.c:3709
+#, no-c-format
+msgid "Request scanner to reverse feed on paper jam"
+msgstr "Вимагати від �канера зворотного подаванн�, �кщо папір зам’�то"
+
+#: backend/fujitsu.c:3728
+#, no-c-format
+msgid "Paper protection"
+msgstr "Захи�т паперу"
+
+#: backend/fujitsu.c:3729
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF"
+msgstr "Вимагати від �канера передбачати зам’�тт� у прот�жному при�трої"
+
+#: backend/fujitsu.c:3748
+#, no-c-format
+msgid "Advanced paper protection"
+msgstr "Додатковий захи�т паперу"
+
+#: backend/fujitsu.c:3749
+#, no-c-format
+msgid "Request scanner to predict jams in the ADF using improved sensors"
+msgstr ""
+"Вимагати від �канера передбачати зам’�тт� у прот�жному при�трої за "
+"допомогою поліпшених датчиків"
+
+#: backend/fujitsu.c:3768
+#, no-c-format
+msgid "Staple detection"
+msgstr "Ви�вленн� �коб"
+
+#: backend/fujitsu.c:3769
+#, no-c-format
+msgid "Request scanner to detect jams in the ADF caused by staples"
+msgstr ""
+"Вимагати від �канера ви�вл�ти зам’�тт� у прот�жному при�трої через �коби"
+
+#: backend/fujitsu.c:3788
+#, no-c-format
+msgid "Background color"
+msgstr "Колір тла"
+
+#: backend/fujitsu.c:3789
+#, no-c-format
+msgid ""
+"Set color of background for scans. May conflict with overscan option"
+msgstr ""
+"В�тановити колір дл� тла �канованих зображень. Може конфліктувати із "
+"параметром полів."
+
+#: backend/fujitsu.c:3809
+#, no-c-format
+msgid "Dropout color"
+msgstr "Колір дл� викиданн�"
+
+#: backend/fujitsu.c:3810
+#, no-c-format
+msgid ""
+"One-pass scanners use only one color during gray or binary scanning, "
+"useful for colored paper or ink"
+msgstr ""
+"Однопрохідні �канери викори�товують лише один колір під ча� �кануванн� у "
+"відтінках �ірого або чорно-білого �кануванн�, кори�но дл� кольорового "
+"паперу або чорнильних запи�ів"
+
+#: backend/fujitsu.c:3833
+#, no-c-format
+msgid "Buffer mode"
+msgstr "Режим буферизації"
+
+#: backend/fujitsu.c:3834
+#, no-c-format
+msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgstr ""
+"�аказати �канеру швидко читати �торінки з прот�жного при�трою до "
+"внутрішньої пам’�ті"
+
+#: backend/fujitsu.c:3853
+#, no-c-format
+msgid "Prepick"
+msgstr "Попереднє захопленн�"
+
+#: backend/fujitsu.c:3854
+#, no-c-format
+msgid "Request scanner to grab next page from ADF"
+msgstr "�аказати �канеру захопити на�тупну �торінку із прот�жного при�трою"
+
+#: backend/fujitsu.c:3873
+#, no-c-format
+msgid "Overscan"
+msgstr "Пол�"
+
+#: backend/fujitsu.c:3874
+#, no-c-format
+msgid ""
+"Collect a few mm of background on top side of scan, before paper enters "
+"ADF, and increase maximum scan area beyond paper size, to allow "
+"collection on remaining sides. May conflict with bgcolor option"
+msgstr ""
+"Зібрати дані щодо декількох міліметрів у верхній ча�тині �канованого "
+"зображенн�, перш ніж аркуш потрапить до прот�жного при�трою, і збільшити "
+"мак�имальну обла�ть �кануванн� за межі в�тановленого розміру паперу, а "
+"також дозволити збиранн� решти даних з бічних полів. Може конфліктувати "
+"з параметром кольору тла."
+
+#: backend/fujitsu.c:3892
+#, no-c-format
+msgid "Sleep timer"
+msgstr "Таймер при�ипл�нн�"
+
+#: backend/fujitsu.c:3893
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches to sleep mode"
+msgstr ""
+"Ча� у хвилинах, по завершенню �кого внутрішнє живленн� буде переведено у "
+"режим �ну"
+
+#: backend/fujitsu.c:3911
+#, no-c-format
+msgid "Off timer"
+msgstr "Таймер вимиканн�"
+
+#: backend/fujitsu.c:3912
+#, no-c-format
+msgid ""
+"Time in minutes until the internal power supply switches the scanner "
+"off. Will be rounded to nearest 15 minutes. Zero means never power off."
+msgstr ""
+"Ча� у хвилинах, по завершенню �кого внутрішнє живленн� буде вимкнено. "
+"Буде округлено до найближчого кратного до 15 хвилин. �ульове значенн� "
+"означає, що живленн� не вимикатиметь��."
+
+#: backend/fujitsu.c:3930
+#, no-c-format
+msgid "Duplex offset"
+msgstr "Зміщенн� двобічного"
+
+#: backend/fujitsu.c:3931
+#, no-c-format
+msgid "Adjust front/back offset"
+msgstr "Коригуванн� зміщенн� між переднім і зворотним боком"
 
-#: ../backend/genesys.c:5757
+#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#, no-c-format
+msgid "Green offset"
+msgstr "Зміщенн� зеленого"
+
+#: backend/fujitsu.c:3949
+#, no-c-format
+msgid "Adjust green/red offset"
+msgstr "Коригуванн� зміщенн� між зеленим і червоним каналами"
+
+#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#, no-c-format
+msgid "Blue offset"
+msgstr "Зміщенн� �инього"
+
+#: backend/fujitsu.c:3967
+#, no-c-format
+msgid "Adjust blue/red offset"
+msgstr "Коригуванн� зміщенн� між �инім і червоним каналами"
+
+#: backend/fujitsu.c:3980
+#, no-c-format
+msgid "Low Memory"
+msgstr "Обмеженн� пам’�ті"
+
+#: backend/fujitsu.c:3981
+#, no-c-format
+msgid ""
+"Limit driver memory usage for use in embedded systems. Causes some "
+"duplex transfers to alternate sides on each call to sane_read. Value of "
+"option 'side' can be used to determine correct image. This option should "
+"only be used with custom front-end software."
+msgstr ""
+"Обмежити викори�танн� пам’�ті драйвером на вбудованих �и�темах. "
+"Призводить до передаванн� окремих боків аркуша у відповідь на кожен "
+"виклик sane_read. Відповідне зображенн� можна визначити за параметром "
+"«side». Цим параметром �лід кори�тувати�� лише дл� нетипового "
+"зовнішнього інтерфей�у програмного забезпеченн�."
+
+#: backend/fujitsu.c:3996
+#, no-c-format
+msgid "Duplex side"
+msgstr "Бік дл� двобічного"
+
+#: backend/fujitsu.c:3997
+#, no-c-format
+msgid ""
+"Tells which side (0=front, 1=back) of a duplex scan the next call to "
+"sane_read will return."
+msgstr ""
+"Визначає, �кий бік (0=передній, 1=зворотний) двобічного �канованого "
+"зображенн� буде повернуто під ча� на�тупного виклику sane_read."
+
+#: backend/fujitsu.c:4008
+#, no-c-format
+msgid "Hardware deskew and crop"
+msgstr "�паратне виправленн� нахилу і обрізанн�"
+
+#: backend/fujitsu.c:4009
+#, no-c-format
+msgid "Request scanner to rotate and crop pages digitally."
+msgstr ""
+"Вимагати від �канера обертанн� та обрізанн� �торінок у цифровому режимі."
+
+#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#, no-c-format
+msgid "Software deskew"
+msgstr "Програмне у�уванн� обертанн�"
+
+#: backend/fujitsu.c:4021
+#, no-c-format
+msgid "Request driver to rotate skewed pages digitally."
+msgstr ""
+"Вимагати від драйвера у�уванн� обертанн� �торінок у автоматичному режимі."
+
+#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#, no-c-format
+msgid "Software despeckle diameter"
+msgstr "Діаметр пл�м дл� програмного у�уванн�"
+
+#: backend/fujitsu.c:4034
+#, no-c-format
+msgid "Maximum diameter of lone dots to remove from scan."
+msgstr ""
+"Мінімальний діаметр окремих пл�м, �кі �лід у�унути зі �канованого "
+"зображенн�."
+
+#: backend/fujitsu.c:4053 backend/genesys.c:5760
 #, no-c-format
 msgid "Software crop"
 msgstr "Програмне обрізанн�"
 
-#: ../backend/genesys.c:5758
+#: backend/fujitsu.c:4054
+#, no-c-format
+msgid "Request driver to remove border from pages digitally."
+msgstr ""
+"Вимагати від драйвера вилученн� границі зі �торінок у автоматичному "
+"режимі."
+
+#: backend/fujitsu.c:4083
+#, no-c-format
+msgid "Halt on Cancel"
+msgstr "Перервати при �ка�уванні"
+
+#: backend/fujitsu.c:4084
+#, no-c-format
+msgid ""
+"Request driver to halt the paper feed instead of eject during a cancel."
+msgstr ""
+"�аказати драйверу перервати подаванн� паперу, замі�ть його "
+"виштовхуванн�, �кщо �кануванн� �ка�овано."
+
+#: backend/fujitsu.c:4095
+#, no-c-format
+msgid "Endorser Options"
+msgstr "Параметри наддруку"
+
+#: backend/fujitsu.c:4096
+#, no-c-format
+msgid "Controls for endorser unit"
+msgstr "Керуванн� модулем наддруку"
+
+#: backend/fujitsu.c:4107
+#, no-c-format
+msgid "Endorser"
+msgstr "�аддрук"
+
+#: backend/fujitsu.c:4108
+#, no-c-format
+msgid "Enable endorser unit"
+msgstr "Увімкнути модуль наддруку"
+
+#: backend/fujitsu.c:4123
+#, no-c-format
+msgid "Endorser bits"
+msgstr "Біти наддруку"
+
+#: backend/fujitsu.c:4124
+#, no-c-format
+msgid "Determines maximum endorser counter value."
+msgstr "Визначає мак�имальне значенн� лічильника наддруку."
+
+#: backend/fujitsu.c:4149
+#, no-c-format
+msgid "Endorser value"
+msgstr "Значенн� наддруку"
+
+#: backend/fujitsu.c:4150
+#, no-c-format
+msgid "Initial endorser counter value."
+msgstr "Початкове значенн� лічильника наддруку."
+
+#: backend/fujitsu.c:4173
+#, no-c-format
+msgid "Endorser step"
+msgstr "Крок наддруку"
+
+#: backend/fujitsu.c:4174
+#, no-c-format
+msgid "Change endorser counter value by this much for each page."
+msgstr ""
+"Змінювати значенн� лічильника наддруку на вказане чи�ло дл� кожної "
+"на�тупної �торінки."
+
+#: backend/fujitsu.c:4197
+#, no-c-format
+msgid "Endorser Y"
+msgstr "Y наддруку"
+
+#: backend/fujitsu.c:4198
+#, no-c-format
+msgid "Endorser print offset from top of paper."
+msgstr "З�ув мітки наддруку від верхнього краю паперу."
+
+#: backend/fujitsu.c:4223
+#, no-c-format
+msgid "Endorser font"
+msgstr "Шрифт наддруку"
+
+#: backend/fujitsu.c:4224
+#, no-c-format
+msgid "Endorser printing font."
+msgstr "Шрифт наддруку."
+
+#: backend/fujitsu.c:4253
+#, no-c-format
+msgid "Endorser direction"
+msgstr "�апр�мок наддруку"
+
+#: backend/fujitsu.c:4254
+#, no-c-format
+msgid "Endorser printing direction."
+msgstr "�апр�мок друку."
+
+#: backend/fujitsu.c:4278
+#, no-c-format
+msgid "Endorser side"
+msgstr "Бік наддруку"
+
+#: backend/fujitsu.c:4279
+#, no-c-format
+msgid "Endorser printing side, requires hardware support to change"
+msgstr ""
+"Бік, з �кого буде друкувати�� мітка. Потребує апаратної підтримки дл� "
+"зміни."
+
+#: backend/fujitsu.c:4304
+#, no-c-format
+msgid "Endorser string"
+msgstr "Р�док наддруку"
+
+#: backend/fujitsu.c:4305
+#, no-c-format
+msgid ""
+"Endorser alphanumeric print format. %05ud or %08ud at the end will be "
+"replaced by counter value."
+msgstr ""
+"Буквенно-цифровий формат наддруку. %05ud або %08ud наприкінці буде "
+"замінено на значенн� лічильника."
+
+#: backend/fujitsu.c:4332
+#, no-c-format
+msgid "Top edge"
+msgstr "Верхній край"
+
+#: backend/fujitsu.c:4333
+#, no-c-format
+msgid "Paper is pulled partly into adf"
+msgstr "Папір ча�тково вт�гнуто до прот�жного при�трою"
+
+#: backend/fujitsu.c:4344
+#, no-c-format
+msgid "A3 paper"
+msgstr "Папір A3"
+
+#: backend/fujitsu.c:4345
+#, no-c-format
+msgid "A3 paper detected"
+msgstr "Ви�влено папір A3"
+
+#: backend/fujitsu.c:4356
+#, no-c-format
+msgid "B4 paper"
+msgstr "Папір B4"
+
+#: backend/fujitsu.c:4357
+#, no-c-format
+msgid "B4 paper detected"
+msgstr "Ви�влено папір B4"
+
+#: backend/fujitsu.c:4368
+#, no-c-format
+msgid "A4 paper"
+msgstr "Папір A4"
+
+#: backend/fujitsu.c:4369
+#, no-c-format
+msgid "A4 paper detected"
+msgstr "Ви�влено папір A4"
+
+#: backend/fujitsu.c:4380
+#, no-c-format
+msgid "B5 paper"
+msgstr "Папір B5"
+
+#: backend/fujitsu.c:4381
+#, no-c-format
+msgid "B5 paper detected"
+msgstr "Ви�влено папір B5"
+
+#: backend/fujitsu.c:4404
+#, no-c-format
+msgid "OMR or DF"
+msgstr "OMR або ПП"
+
+#: backend/fujitsu.c:4405
+#, no-c-format
+msgid "OMR or double feed detected"
+msgstr "Ви�влено OMR або подвійне подаванн�"
+
+#: backend/fujitsu.c:4428
+#, no-c-format
+msgid "Power saving"
+msgstr "Заощадженн� енергії"
+
+#: backend/fujitsu.c:4429
+#, no-c-format
+msgid "Scanner in power saving mode"
+msgstr "Сканер перебуває у режимі заощадженн� енергії"
+
+#: backend/fujitsu.c:4452
+#, no-c-format
+msgid "Manual feed"
+msgstr "Подаванн� вручну"
+
+#: backend/fujitsu.c:4453
+#, no-c-format
+msgid "Manual feed selected"
+msgstr "Вибрано режим подаванн� вручну"
+
+#: backend/fujitsu.c:4476
+#, no-c-format
+msgid "Function"
+msgstr "Функці�"
+
+#: backend/fujitsu.c:4477
+#, no-c-format
+msgid "Function character on screen"
+msgstr "Функціональний �имвол на екрані"
+
+#: backend/fujitsu.c:4488
+#, no-c-format
+msgid "Ink low"
+msgstr "Закінчують�� чорнила"
+
+#: backend/fujitsu.c:4489
+#, no-c-format
+msgid "Imprinter ink running low"
+msgstr "Лишило�� мало чорнила дл� наддруку"
+
+#: backend/fujitsu.c:4500
+#, no-c-format
+msgid "Double feed"
+msgstr "Подвійне подаванн�"
+
+#: backend/fujitsu.c:4501
+#, no-c-format
+msgid "Double feed detected"
+msgstr "Ви�влено подвійне подаванн�"
+
+#: backend/fujitsu.c:4512
+#, no-c-format
+msgid "Error code"
+msgstr "Код помилки"
+
+#: backend/fujitsu.c:4513
+#, no-c-format
+msgid "Hardware error code"
+msgstr "Код апаратної помилки"
+
+#: backend/fujitsu.c:4524
+#, no-c-format
+msgid "Skew angle"
+msgstr "Кут перекошуванн�"
+
+#: backend/fujitsu.c:4525
+#, no-c-format
+msgid "Requires black background for scanning"
+msgstr "Потребує чорного тла дл� �кануванн�"
+
+#: backend/fujitsu.c:4536
+#, no-c-format
+msgid "Ink remaining"
+msgstr "Лишило�� чорнила"
+
+#: backend/fujitsu.c:4537
+#, no-c-format
+msgid "Imprinter ink level"
+msgstr "Рівень чорнила дл� наддруку"
+
+#: backend/fujitsu.c:4548
+#, no-c-format
+msgid "Density"
+msgstr "Щільні�ть"
+
+#: backend/fujitsu.c:4549
+#, no-c-format
+msgid "Density dial"
+msgstr "�абирач щільно�ті"
+
+#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#, no-c-format
+msgid "Duplex switch"
+msgstr "Перемикач двобічного"
+
+#: backend/genesys.c:5761
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 "Вимагати від програмного модул� вилученн� границі зі �торінок у "
 "автоматичному режимі"
 
-#: ../backend/genesys.c:5767 ../backend/kvs1025_opt.c:913
+#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 "Вимагати від драйвера відкиданн� �торінок з надто низькою кількі�тю "
 "темних пік�елів"
 
-#: ../backend/genesys.c:5778 ../backend/kvs1025_opt.c:893
+#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
 #, no-c-format
 msgid "Software derotate"
 msgstr "Програмне у�уванн� обертанн�"
 
-#: ../backend/genesys.c:5779 ../backend/kvs1025_opt.c:895
+#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 "Вимагати від драйвера ви�вленн� і виправленн� обертанн� зображенн� на 90 "
 "граду�ів"
 
-#: ../backend/genesys.c:5810 ../backend/pixma_sane_options.c:312
+#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
 #, no-c-format
 msgid "Extras"
 msgstr "Додаткові"
 
-#: ../backend/genesys.c:5829 ../backend/pixma_sane_options.c:333
-#, no-c-format
-msgid "Threshold curve"
-msgstr "Порогова крива"
-
-#: ../backend/genesys.c:5830 ../backend/pixma_sane_options.c:334
+#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
 "Крива динамічного порогового значенн�, від �вітлого до темного, типово "
 "50-65"
 
-#: ../backend/genesys.c:5839
+#: backend/genesys.c:5842
 #, no-c-format
 msgid "Disable dynamic lineart"
 msgstr "Вимкнути динамічне штрихуванн�"
 
-#: ../backend/genesys.c:5841
+#: backend/genesys.c:5844
 #, no-c-format
 msgid ""
 "Disable use of a software adaptive algorithm to generate lineart relying "
@@ -2334,12 +3117,12 @@ msgstr ""
 "Вимкнути викори�танн� адаптивного програмного алгоритму дл� �творенн� "
 "штрихуванн� замі�ть апаратного алгоритму штрихуванн�."
 
-#: ../backend/genesys.c:5857
+#: backend/genesys.c:5860
 #, no-c-format
 msgid "Disable interpolation"
 msgstr "Вимкнути інтерпол�цію"
 
-#: ../backend/genesys.c:5860
+#: backend/genesys.c:5863
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
@@ -2349,34 +3132,34 @@ msgstr ""
 "роздільна здатні�ть менша за вертикальну, вимикає горизонтальну "
 "інтерпол�цію."
 
-#: ../backend/genesys.c:5869
+#: backend/genesys.c:5872
 #, no-c-format
 msgid "Color filter"
 msgstr "Фільтр кольору"
 
-#: ../backend/genesys.c:5872
+#: backend/genesys.c:5875
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 "За викори�танн� друку у півтонах або штрихового друку за допомогою цього "
 "пункту можна обрати колір друку."
 
-#: ../backend/genesys.c:5898
+#: backend/genesys.c:5901
 #, no-c-format
 msgid "Calibration file"
 msgstr "Файл калібруванн�"
 
-#: ../backend/genesys.c:5899
+#: backend/genesys.c:5902
 #, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Вкажіть файл даних калібруванн�, �кі буде викори�тано"
 
-#: ../backend/genesys.c:5916
+#: backend/genesys.c:5919
 #, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Строк дії кешу калібруванн�"
 
-#: ../backend/genesys.c:5917
+#: backend/genesys.c:5920
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
@@ -2387,12 +3170,12 @@ msgstr ""
 "Від’ємні значенн� означають, що обмежень на �трок дії кешу не "
 "накладатиметь��."
 
-#: ../backend/genesys.c:5927
+#: backend/genesys.c:5930
 #, no-c-format
 msgid "Lamp off time"
 msgstr "Ча� вимиканн� лампи"
 
-#: ../backend/genesys.c:5930
+#: backend/genesys.c:5933
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
@@ -2401,105 +3184,103 @@ msgstr ""
 "Лампу буде вимкнено, коли �пливе вказаний ча� (у хвилинах). Значенн� "
 "рівне 0 означатиме, що лампа не вимикатиметь��."
 
-#: ../backend/genesys.c:5940
+#: backend/genesys.c:5943
 #, no-c-format
 msgid "Lamp off during scan"
 msgstr "Вимиканн� лампи під ча� �кануванн�"
 
-#: ../backend/genesys.c:5941
+#: backend/genesys.c:5944
 #, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr "Лампу буде вимкнено під ча� �кануванн�. "
 
-#: ../backend/genesys.c:5969 ../backend/genesys.c:5970
+#: backend/genesys.c:5972 backend/genesys.c:5973
 #, no-c-format
 msgid "File button"
 msgstr "Кнопка «File»"
 
-#: ../backend/genesys.c:6022 ../backend/genesys.c:6023
+#: backend/genesys.c:6025 backend/genesys.c:6026
 #, no-c-format
 msgid "OCR button"
 msgstr "Кнопка «OCR»"
 
-#: ../backend/genesys.c:6036 ../backend/genesys.c:6037
+#: backend/genesys.c:6039 backend/genesys.c:6040
 #, no-c-format
 msgid "Power button"
 msgstr "Кнопка «Power»"
 
-#: ../backend/genesys.c:6050 ../backend/genesys.c:6051
+#: backend/genesys.c:6053 backend/genesys.c:6054
 #, no-c-format
 msgid "Extra button"
 msgstr "Додаткова кнопка"
 
-#: ../backend/genesys.c:6064 ../backend/gt68xx.c:762
+#: backend/genesys.c:6067 backend/gt68xx.c:762
 #, no-c-format
 msgid "Need calibration"
 msgstr "Потребує калібруванн�"
 
-#: ../backend/genesys.c:6065 ../backend/gt68xx.c:763
+#: backend/genesys.c:6068 backend/gt68xx.c:763
 #, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr "Дл� за�то�уванн� поточних параметрів потрібне калібруванн�"
 
-#: ../backend/genesys.c:6077 ../backend/gt68xx.c:787
-#: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:224
-#: ../backend/plustek.c:1080
+#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
+#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
 #, no-c-format
 msgid "Buttons"
 msgstr "Кнопки"
 
-#: ../backend/genesys.c:6086 ../backend/gt68xx.c:794
-#: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97
-#: ../backend/niash.c:726 ../backend/plustek.c:941
+#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
+#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr "Відкалібрувати"
 
-#: ../backend/genesys.c:6088 ../backend/gt68xx.c:796
+#: backend/genesys.c:6091 backend/gt68xx.c:796
 #, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "Почати калібруванн� за допомогою �пеціального аркуша"
 
-#: ../backend/genesys.c:6102 ../backend/gt68xx.c:809
+#: backend/genesys.c:6105 backend/gt68xx.c:809
 #, no-c-format
 msgid "Clear calibration"
 msgstr "Спорожнити дані калібруванн�"
 
-#: ../backend/genesys.c:6103 ../backend/gt68xx.c:810
+#: backend/genesys.c:6106 backend/gt68xx.c:810
 #, no-c-format
 msgid "Clear calibration cache"
 msgstr "Спорожнити кеш калібруванн�"
 
-#: ../backend/gt68xx.c:149 ../backend/ma1509.c:108 ../backend/mustek.c:164
-#: ../backend/snapscan-options.c:87 ../backend/umax.c:182
+#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
+#: backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr "�даптер плівок"
 
-#: ../backend/gt68xx.c:477
+#: backend/gt68xx.c:477
 #, no-c-format
 msgid "Gray mode color"
 msgstr "Режим відтінків �ірого"
 
-#: ../backend/gt68xx.c:479
+#: backend/gt68xx.c:479
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 "Визначає, �кий колір �кануванн� буде викори�тано у режимі напівтонів "
 "�ірого (типово — зелений)."
 
-#: ../backend/gt68xx.c:560 ../backend/hp3900_sane.c:1392
-#: ../backend/mustek_usb2.c:410
+#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr "Параметри зневаджуванн�"
 
-#: ../backend/gt68xx.c:571 ../backend/mustek_usb2.c:419
+#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "�втоматичний розігрів"
 
-#: ../backend/gt68xx.c:573
+#: backend/gt68xx.c:573
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -2508,12 +3289,12 @@ msgstr ""
 "Розігрівати, до �талої ��краво�ті лампи, не напол�гати на 60-ти "
 "�екундному розігріві."
 
-#: ../backend/gt68xx.c:585
+#: backend/gt68xx.c:585
 #, no-c-format
 msgid "Full scan"
 msgstr "Повне �кануванн�"
 
-#: ../backend/gt68xx.c:587
+#: backend/gt68xx.c:587
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
@@ -2522,12 +3303,12 @@ msgstr ""
 "Сканувати в�ю обла�ть �кануванн�, зокрема �мугу калібруванн�. Будьте "
 "обережні. �е вказуйте повну ви�оту. Лише дл� перевірки."
 
-#: ../backend/gt68xx.c:598
+#: backend/gt68xx.c:598
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Грубе калібруванн�"
 
-#: ../backend/gt68xx.c:600
+#: backend/gt68xx.c:600
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -2538,12 +3319,12 @@ msgstr ""
 "пункт не буде позначено, ви зможете вказати параметри аналогової "
 "оболонки вручну. Типово цей пункт позначено. Лише дл� перевірки."
 
-#: ../backend/gt68xx.c:619
+#: backend/gt68xx.c:619
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "Грубе калібруванн� лише дл� початкового �кануванн�"
 
-#: ../backend/gt68xx.c:621
+#: backend/gt68xx.c:621
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -2555,12 +3336,12 @@ msgstr ""
 "��краві�ть �канованих зображень значно змінюєть��, зніміть позначку з "
 "цього пункту. Лише дл� перевірки."
 
-#: ../backend/gt68xx.c:654
+#: backend/gt68xx.c:654
 #, no-c-format
 msgid "Backtrack lines"
 msgstr "Ліній поверненн�"
 
-#: ../backend/gt68xx.c:656
+#: backend/gt68xx.c:656
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -2574,85 +3355,85 @@ msgstr ""
 "значенн� пришвидшать �кануванн�, але збільшать ймовірні�ть пропу�ку "
 "ліній."
 
-#: ../backend/gt68xx.c:681 ../backend/mustek_usb2.c:452
+#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Значенн� коефіцієнта контра�тно�ті"
 
-#: ../backend/gt68xx.c:683 ../backend/mustek_usb2.c:454
+#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr "Визначає значенн� коефіцієнта контра�тно�ті дл� в�іх каналів."
 
-#: ../backend/hp3500.c:1004
+#: backend/hp3500.c:1020
 #, no-c-format
 msgid "Geometry Group"
 msgstr "Група розташуванн�"
 
-#: ../backend/hp3500.c:1057 ../backend/hp3500.c:1058
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
 #, no-c-format
 msgid "Scan Mode Group"
 msgstr "Група режимів �кануванн�"
 
-#: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1019
-#: ../backend/hp-option.c:3174
+#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
+#: backend/hp-option.c:3174
 #, no-c-format
 msgid "Slide"
 msgstr "Слайд"
 
-#: ../backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1405
 #, no-c-format
 msgid "Scanner model"
 msgstr "Модель �канера"
 
-#: ../backend/hp3900_sane.c:1408
+#: backend/hp3900_sane.c:1408
 #, no-c-format
 msgid "Allows one to test device behaviour with other supported models"
 msgstr ""
 "�адає змогу перевірити поведінку при�трою з викори�танн�м інших "
 "підтримуваних моделей"
 
-#: ../backend/hp3900_sane.c:1422
+#: backend/hp3900_sane.c:1422
 #, no-c-format
 msgid "Image colours will be inverted"
 msgstr "Кольори зображенн� буде інвертовано"
 
-#: ../backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1436
 #, no-c-format
 msgid "Disable gamma correction"
 msgstr "Вимкнути виправленн� гами"
 
-#: ../backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1437
 #, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr "Виправленн� гами буде вимкнено"
 
-#: ../backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1451
 #, no-c-format
 msgid "Disable white shading correction"
 msgstr "Вимкнути виправленн� відтінків білого"
 
-#: ../backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1453
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr "Виправленн� градації білого буде вимкнено"
 
-#: ../backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1467
 #, no-c-format
 msgid "Skip warmup process"
 msgstr "Пропу�тити процедуру розігріву"
 
-#: ../backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1468
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr "Проце� розігріванн� буде вимкнено"
 
-#: ../backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1482
 #, no-c-format
 msgid "Force real depth"
 msgstr "Вказати �правжню глибину"
 
-#: ../backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1485
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve "
@@ -2664,12 +3445,12 @@ msgstr ""
 "перетворюватиметь�� до обраної глибини кольорів. За допомогою цього "
 "пункту можна уникнути такої емул�ції."
 
-#: ../backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1499
 #, no-c-format
 msgid "Emulate Grayscale"
 msgstr "Імітаці� чорно-білого"
 
-#: ../backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1502
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
@@ -2680,12 +3461,12 @@ msgstr ""
 "режимі, а вже потім програмно перетворено на зображенн� у тонах �ірого. "
 "Викори�танн� подібного підходу іноді може покращити �кі�ть зображенн�."
 
-#: ../backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1516
 #, no-c-format
 msgid "Save debugging images"
 msgstr "Зберегти зневаджувальні зображенн�"
 
-#: ../backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1519
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to "
@@ -2694,358 +3475,352 @@ msgstr ""
 "Якщо буде позначено цей пункт, де�кі з зображень з проце�у �кануванн� "
 "буде збережено дл� подальшого аналізу."
 
-#: ../backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1533
 #, no-c-format
 msgid "Reset chipset"
 msgstr "Відновити дані мікроконтролера"
 
-#: ../backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1534
 #, no-c-format
 msgid "Resets chipset data"
 msgstr "Відновити початкові дані мікроконтролера"
 
-#: ../backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1547
 #, no-c-format
 msgid "Information"
 msgstr "Інформаці�"
 
-#: ../backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1560
 #, no-c-format
 msgid "Chipset name"
 msgstr "�азва мікроконтролера"
 
-#: ../backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1561
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr "Показує назву мікро�хеми, викори�таної у при�трої."
 
-#: ../backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Unknown"
 msgstr "�евідома"
 
-#: ../backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1571
 #, no-c-format
 msgid "Chipset ID"
 msgstr "Ідентифікатор мікро�хеми"
 
-#: ../backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1572
 #, no-c-format
 msgid "Shows the chipset ID"
 msgstr "Показує ідентифікатор мікро�хеми"
 
-#: ../backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1582
 #, no-c-format
 msgid "Scan counter"
 msgstr "Лічильник �кануванн�"
 
-#: ../backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1584
 #, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr "Показує кількі�ть �канувань, виконаних за допомогою �канера"
 
-#: ../backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1594
 #, no-c-format
 msgid "Update information"
 msgstr "Оновити дані"
 
-#: ../backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1595
 #, no-c-format
 msgid "Updates information about device"
 msgstr "Оновлює дані щодо при�трою"
 
-#: ../backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1635
 #, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr "Цей пункт відповідає кнопці передньої панелі �канера"
 
-#: ../backend/hp5400_sane.c:313 ../backend/niash.c:678
+#: backend/hp5400_sane.c:313 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr "Зображенн�"
 
-#: ../backend/hp5400_sane.c:352 ../backend/niash.c:709
+#: backend/hp5400_sane.c:352 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr "Різне"
 
-#: ../backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:358
 #, no-c-format
 msgid "offset X"
 msgstr "З�ув за X"
 
-#: ../backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:359
 #, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr "�паратна внутрішн� позиці� за X обла�ті �кануванн�."
 
-#: ../backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:368
 #, no-c-format
 msgid "offset Y"
 msgstr "З�ув за Y"
 
-#: ../backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:369
 #, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr "�паратна внутрішн� позиці� за Y обла�ті �кануванн�."
 
-#: ../backend/hp5400_sane.c:381 ../backend/niash.c:716
+#: backend/hp5400_sane.c:381 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr "Стан лампи"
 
-#: ../backend/hp5400_sane.c:382 ../backend/niash.c:717
+#: backend/hp5400_sane.c:382 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr "Вмикає або вимикає лампу."
 
-#: ../backend/hp5400_sane.c:393 ../backend/niash.c:727
+#: backend/hp5400_sane.c:393 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr "Калібрує дл� визначенн� рівн� чорного и білого."
 
-#: ../backend/hp5590.c:83 ../backend/hp-option.c:3253
+#: backend/hp5590.c:86 backend/hp-option.c:3253
 #, no-c-format
 msgid "ADF"
 msgstr "�ПД"
 
-#: ../backend/hp5590.c:85
+#: backend/hp5590.c:88
 #, no-c-format
 msgid "TMA Slides"
 msgstr "Слайди TMA"
 
-#: ../backend/hp5590.c:86
+#: backend/hp5590.c:89
 #, no-c-format
 msgid "TMA Negatives"
 msgstr "�егативи TMA"
 
-#: ../backend/hp5590.c:89
+#: backend/hp5590.c:92
 #, no-c-format
 msgid "Color (48 bits)"
 msgstr "Кольоровий (48-бітовий)"
 
-#: ../backend/hp5590.c:92
+#: backend/hp5590.c:95
 #, no-c-format
 msgid "Extend lamp timeout"
 msgstr "Збільшений ча� очікуванн� лампи"
 
-#: ../backend/hp5590.c:93
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr "Збільшує ча� очікуванн� лампи (з 15 хвилин до 1 години)"
 
-#: ../backend/hp5590.c:95
+#: backend/hp5590.c:98
 #, no-c-format
 msgid "Wait for button"
 msgstr "Очікувати нати�канн� кнопки"
 
-#: ../backend/hp5590.c:96
+#: backend/hp5590.c:99
 #, no-c-format
 msgid "Waits for button before scanning"
 msgstr "Очікувати на нати�канн� кнопки, перш ніж почати �кануванн�"
 
-#: ../backend/hp-option.c:2984
+#: backend/hp-option.c:2984
 #, no-c-format
 msgid "Advanced Options"
 msgstr "Додаткові параметри"
 
-#: ../backend/hp-option.c:3041
+#: backend/hp-option.c:3041
 #, no-c-format
 msgid "Coarse"
 msgstr "Грубе"
 
-#: ../backend/hp-option.c:3042
+#: backend/hp-option.c:3042
 #, no-c-format
 msgid "Fine"
 msgstr "Ви�окої �ко�ті"
 
-#: ../backend/hp-option.c:3043
+#: backend/hp-option.c:3043
 #, no-c-format
 msgid "Bayer"
 msgstr "Секці�"
 
-#: ../backend/hp-option.c:3046 ../backend/hp-option.c:3097
+#: backend/hp-option.c:3046 backend/hp-option.c:3097
 #, no-c-format
 msgid "Custom"
 msgstr "�етипова"
 
-#: ../backend/hp-option.c:3087 ../backend/hp-option.c:3143
-#: ../backend/hp-option.c:3158
+#: backend/hp-option.c:3087 backend/hp-option.c:3143
+#: backend/hp-option.c:3158
 #, no-c-format
 msgid "Auto"
 msgstr "�вто"
 
-#: ../backend/hp-option.c:3088
+#: backend/hp-option.c:3088
 #, no-c-format
 msgid "NTSC RGB"
 msgstr "NTSC RGB"
 
-#: ../backend/hp-option.c:3089
+#: backend/hp-option.c:3089
 #, no-c-format
 msgid "XPA RGB"
 msgstr "XPA RGB"
 
-#: ../backend/hp-option.c:3090
+#: backend/hp-option.c:3090
 #, no-c-format
 msgid "Pass-through"
 msgstr "Пропу�кати"
 
-#: ../backend/hp-option.c:3091
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "Чорно-біле NTSC"
 
-#: ../backend/hp-option.c:3092
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA Gray"
 msgstr "Чорно-біле XPA"
 
-#: ../backend/hp-option.c:3144
+#: backend/hp-option.c:3144
 #, no-c-format
 msgid "Slow"
 msgstr "Повільно"
 
-#: ../backend/hp-option.c:3145 ../backend/hp-option.c:3252
-#: ../backend/kvs40xx_opt.c:229 ../backend/matsushita.c:244
-#: ../backend/mustek.c:149 ../backend/plustek.c:234
-#: ../backend/plustek_pp.c:203 ../backend/u12.c:155
+#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr "Звичайна"
 
-#: ../backend/hp-option.c:3146
+#: backend/hp-option.c:3146
 #, no-c-format
 msgid "Fast"
 msgstr "Швидко"
 
-#: ../backend/hp-option.c:3147
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Extra Fast"
 msgstr "Дуже швидко"
 
-#: ../backend/hp-option.c:3160
+#: backend/hp-option.c:3160
 #, no-c-format
 msgid "2-pixel"
 msgstr "Двоточкове"
 
-#: ../backend/hp-option.c:3161
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "4-pixel"
 msgstr "Чотириточкове"
 
-#: ../backend/hp-option.c:3162
+#: backend/hp-option.c:3162
 #, no-c-format
 msgid "8-pixel"
 msgstr "Во�ьмиточкове"
 
-#: ../backend/hp-option.c:3173
+#: backend/hp-option.c:3173
 #, no-c-format
 msgid "Print"
 msgstr "Друк"
 
-#: ../backend/hp-option.c:3175
+#: backend/hp-option.c:3175
 #, no-c-format
 msgid "Film-strip"
 msgstr "Плівка"
 
-#: ../backend/hp-option.c:3254
+#: backend/hp-option.c:3254
 #, no-c-format
 msgid "XPA"
 msgstr "XPA"
 
-#: ../backend/hp-option.c:3328 ../backend/hp-option.c:3341
+#: backend/hp-option.c:3328 backend/hp-option.c:3341
 #, no-c-format
 msgid "Conditional"
 msgstr "Умовно"
 
-#: ../backend/hp-option.c:3414
+#: backend/hp-option.c:3414
 #, no-c-format
 msgid "Experiment"
 msgstr "Ек�перимент"
 
-#: ../backend/hp-option.h:60
+#: backend/hp-option.h:60
 #, no-c-format
 msgid "Sharpening"
 msgstr "Збільшенні різко�ті"
 
-#: ../backend/hp-option.h:61
+#: backend/hp-option.h:61
 #, no-c-format
 msgid "Set sharpening value."
 msgstr "Визначає величину збільшенн� різко�ті."
 
-#: ../backend/hp-option.h:66
+#: backend/hp-option.h:66
 #, no-c-format
 msgid "Auto Threshold"
 msgstr "�втоматичне порогове значенн�"
 
-#: ../backend/hp-option.h:68
+#: backend/hp-option.h:68
 #, no-c-format
 msgid "Enable automatic determination of threshold for line-art scans."
 msgstr ""
 "Увімкнути автоматичне визначенн� порогового значенн� дл� �кануванн� "
 "штрихових зображень."
 
-#: ../backend/hp-option.h:73
-#, no-c-format
-msgid "Smoothing"
-msgstr "Згладжуванн�"
-
-#: ../backend/hp-option.h:74
+#: backend/hp-option.h:74
 #, no-c-format
 msgid "Select smoothing filter."
 msgstr "Визначити фільтр згладжуванн�."
 
-#: ../backend/hp-option.h:79
+#: backend/hp-option.h:79
 #, no-c-format
 msgid "Unload media after scan"
 msgstr "Вивантажувати но�ій пі�л� �кануванн�"
 
-#: ../backend/hp-option.h:80
+#: backend/hp-option.h:80
 #, no-c-format
 msgid "Unloads the media after a scan."
 msgstr "Вивантажує но�ій пі�л� �кануванн�."
 
-#: ../backend/hp-option.h:85
+#: backend/hp-option.h:85
 #, no-c-format
 msgid "Change document"
 msgstr "Змінити документ"
 
-#: ../backend/hp-option.h:86
+#: backend/hp-option.h:86
 #, no-c-format
 msgid "Change Document."
 msgstr "Змінити документ."
 
-#: ../backend/hp-option.h:91
+#: backend/hp-option.h:91
 #, no-c-format
 msgid "Unload"
 msgstr "Вивантажити"
 
-#: ../backend/hp-option.h:92
+#: backend/hp-option.h:92
 #, no-c-format
 msgid "Unload Document."
 msgstr "Вивантажити документ."
 
-#: ../backend/hp-option.h:98
+#: backend/hp-option.h:98
 #, no-c-format
 msgid "Start calibration process."
 msgstr "Почати процедуру калібруванн�."
 
-#: ../backend/hp-option.h:103
+#: backend/hp-option.h:103
 #, no-c-format
 msgid "Media"
 msgstr "�о�ій"
 
-#: ../backend/hp-option.h:104
+#: backend/hp-option.h:104
 #, no-c-format
 msgid "Set type of media."
 msgstr "Визначити тип но�і�."
 
-#: ../backend/hp-option.h:109
+#: backend/hp-option.h:109
 #, no-c-format
 msgid "Exposure time"
 msgstr "Ча� ек�позиції"
 
-#: ../backend/hp-option.h:111
+#: backend/hp-option.h:111
 #, no-c-format
 msgid ""
 "A longer exposure time lets the scanner collect more light. Suggested "
@@ -3058,463 +3833,462 @@ msgstr ""
 "150% дл� звичайних �лайдів та «�егатив» дл� негативів. Дл� темних "
 "(недоек�понованих) зображень ви можете збільшити це значенн�."
 
-#: ../backend/hp-option.h:119 ../backend/hp-option.h:126
+#: backend/hp-option.h:119 backend/hp-option.h:126
 #, no-c-format
 msgid "Color Matrix"
 msgstr "Матриц� кольорів"
 
-#: ../backend/hp-option.h:121
+#: backend/hp-option.h:121
 #, no-c-format
 msgid "Set the scanners color matrix."
 msgstr "Визначити матрицю кольорів �канера."
 
-#: ../backend/hp-option.h:127
+#: backend/hp-option.h:127
 #, no-c-format
 msgid "Custom color matrix."
 msgstr "�етипова матриц� кольорів."
 
-#: ../backend/hp-option.h:132
+#: backend/hp-option.h:132
 #, no-c-format
 msgid "Mono Color Matrix"
 msgstr "Чорно-біла матриц� кольорів"
 
-#: ../backend/hp-option.h:133
+#: backend/hp-option.h:133
 #, no-c-format
 msgid "Custom color matrix for grayscale scans."
 msgstr "�етипова матриц� кольорів дл� чорно-білих зображень."
 
-#: ../backend/hp-option.h:138
+#: backend/hp-option.h:138
 #, no-c-format
 msgid "Mirror horizontal"
 msgstr "Віддзеркалити горизонтально"
 
-#: ../backend/hp-option.h:139
+#: backend/hp-option.h:139
 #, no-c-format
 msgid "Mirror image horizontally."
 msgstr "Віддзеркалити зображенн� по горизонталі."
 
-#: ../backend/hp-option.h:144
+#: backend/hp-option.h:144
 #, no-c-format
 msgid "Mirror vertical"
 msgstr "Віддзеркалити вертикально"
 
-#: ../backend/hp-option.h:145
+#: backend/hp-option.h:145
 #, no-c-format
 msgid "Mirror image vertically."
 msgstr "Віддзеркалити зображенн� по вертикалі."
 
-#: ../backend/hp-option.h:150
+#: backend/hp-option.h:150
 #, no-c-format
 msgid "Update options"
 msgstr "Оновити параметри"
 
-#: ../backend/hp-option.h:151
+#: backend/hp-option.h:151
 #, no-c-format
 msgid "Update options."
 msgstr "Оновити параметри."
 
-#: ../backend/hp-option.h:156
+#: backend/hp-option.h:156
 #, no-c-format
 msgid "8 bit output"
 msgstr "8-бітовий вивід"
 
-#: ../backend/hp-option.h:158
+#: backend/hp-option.h:158
 #, no-c-format
 msgid "Use bit depth greater eight internally, but output only eight bits."
 msgstr ""
 "Дл� внутрішньої обробки викори�товувати глибини кольорів, більші за 8-"
 "бітові, але виводити дані лише у 8-бітовому форматі."
 
-#: ../backend/hp-option.h:164
+#: backend/hp-option.h:164
 #, no-c-format
 msgid "Front button wait"
 msgstr "Очікувати нати�канн� кнопки у передній ча�тині"
 
-#: ../backend/hp-option.h:165
+#: backend/hp-option.h:165
 #, no-c-format
 msgid "Wait to scan for front-panel button push."
 msgstr ""
 "�е починати �кануванн� до нати�канн� кнопки на передній панелі �канера."
 
-#: ../backend/hp-option.h:172
+#: backend/hp-option.h:172
 #, no-c-format
 msgid "Shut off lamp"
 msgstr "Вимкнути лампу"
 
-#: ../backend/hp-option.h:173
+#: backend/hp-option.h:173
 #, no-c-format
 msgid "Shut off scanner lamp."
 msgstr "Вимкнути лампу �канера."
 
-#: ../backend/kvs1025.h:51 ../backend/kvs20xx_opt.c:294
-#: ../backend/kvs40xx_opt.c:515 ../backend/matsushita.h:219
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295
+#: backend/kvs40xx_opt.c:516 backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "Розмір паперу"
 
-#: ../backend/kvs1025.h:52 ../backend/kvs1025.h:67
-#: ../backend/matsushita.h:220 ../backend/matsushita.h:227
+#: backend/kvs1025.h:52 backend/kvs1025.h:67 backend/matsushita.h:220
+#: backend/matsushita.h:227
 #, no-c-format
 msgid "Automatic separation"
 msgstr "�втоматичне відокремленн�"
 
-#: ../backend/kvs1025.h:53 ../backend/kvs20xx_opt.c:306
-#: ../backend/kvs40xx_opt.c:530
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
+#: backend/kvs40xx_opt.c:531
 #, no-c-format
 msgid "Landscape"
 msgstr "�льбомна"
 
-#: ../backend/kvs1025.h:54 ../backend/kvs40xx_opt.c:692
+#: backend/kvs1025.h:54 backend/kvs40xx_opt.c:693
 #, no-c-format
 msgid "Inverse Image"
 msgstr "Інвер�ивне зображенн�"
 
-#: ../backend/kvs1025.h:56 ../backend/kvs40xx_opt.c:403
+#: backend/kvs1025.h:56 backend/kvs40xx_opt.c:404
 #, no-c-format
 msgid "Long paper mode"
 msgstr "Режим довгого паперу"
 
-#: ../backend/kvs1025.h:57 ../backend/kvs20xx_opt.c:229
-#: ../backend/kvs40xx_opt.c:392
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
+#: backend/kvs40xx_opt.c:393
 #, no-c-format
 msgid "Length control mode"
 msgstr "Режим керуванн� довжиною"
 
-#: ../backend/kvs1025.h:58 ../backend/kvs20xx_opt.c:241
-#: ../backend/kvs40xx_opt.c:415
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
+#: backend/kvs40xx_opt.c:416
 #, no-c-format
 msgid "Manual feed mode"
 msgstr "Режим подаванн� вручну"
 
-#: ../backend/kvs1025.h:59 ../backend/kvs20xx_opt.c:253
-#: ../backend/kvs40xx_opt.c:427
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
+#: backend/kvs40xx_opt.c:428
 #, no-c-format
 msgid "Manual feed timeout"
 msgstr "Ча� очікуванн� на подачу вручну"
 
-#: ../backend/kvs1025.h:60 ../backend/kvs20xx_opt.c:266
-#: ../backend/kvs40xx_opt.c:440
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
+#: backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr "Ви�вленн� двобічного подаванн�"
 
-#: ../backend/kvs1025.h:63 ../backend/kvs20xx_opt.c:204
-#: ../backend/kvs40xx_opt.c:353 ../backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
+#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr "Увімкнути двобічне �кануванн�"
 
-#: ../backend/kvs1025.h:65 ../backend/kvs20xx_opt.c:295
-#: ../backend/kvs40xx_opt.c:516 ../backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
+#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr "Фізичний розмір паперу у при�трої автоматичної подачі"
 
-#: ../backend/kvs1025_opt.c:39
+#: backend/kvs1025_opt.c:39
 #, no-c-format
 msgid "bw"
 msgstr "чб"
 
-#: ../backend/kvs1025_opt.c:40
+#: backend/kvs1025_opt.c:40
 #, no-c-format
 msgid "halftone"
 msgstr "півтони"
 
-#: ../backend/kvs1025_opt.c:41
+#: backend/kvs1025_opt.c:41
 #, no-c-format
 msgid "gray"
 msgstr "�ірий"
 
-#: ../backend/kvs1025_opt.c:42
+#: backend/kvs1025_opt.c:42
 #, no-c-format
 msgid "color"
 msgstr "кольорове"
 
-#: ../backend/kvs1025_opt.c:61 ../backend/kvs40xx_opt.c:107
-#: ../backend/kvs40xx_opt.c:1046
+#: backend/kvs1025_opt.c:61 backend/kvs40xx_opt.c:108
+#: backend/kvs40xx_opt.c:1047
 #, no-c-format
 msgid "adf"
 msgstr "�ПД"
 
-#: ../backend/kvs1025_opt.c:62 ../backend/kvs40xx_opt.c:49
-#: ../backend/kvs40xx_opt.c:108
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr "планшет"
 
-#: ../backend/kvs1025_opt.c:72 ../backend/kvs20xx_opt.c:54
-#: ../backend/kvs40xx_opt.c:100
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr "однобічний"
 
-#: ../backend/kvs1025_opt.c:73 ../backend/kvs20xx.c:455
-#: ../backend/kvs20xx_opt.c:55 ../backend/kvs40xx.c:704
-#: ../backend/kvs40xx.c:722 ../backend/kvs40xx_opt.c:101
-#: ../backend/kvs40xx_opt.c:1086
+#: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
+#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx_opt.c:1087
 #, no-c-format
 msgid "continuous"
 msgstr "безперервне"
 
-#: ../backend/kvs1025_opt.c:83 ../backend/kvs20xx_opt.c:61
-#: ../backend/kvs40xx_opt.c:114
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, no-c-format
 msgid "off"
 msgstr "вимкнено"
 
-#: ../backend/kvs1025_opt.c:84 ../backend/kvs20xx_opt.c:62
-#: ../backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr "очік_документа"
 
-#: ../backend/kvs1025_opt.c:85 ../backend/kvs20xx_opt.c:63
-#: ../backend/kvs40xx_opt.c:117
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr "очік_клавіші"
 
-#: ../backend/kvs1025_opt.c:96 ../backend/kvs20xx_opt.c:69
-#: ../backend/kvs40xx_opt.c:123 ../backend/kvs40xx_opt.c:140
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr "визн_кори�тувачем"
 
-#: ../backend/kvs1025_opt.c:97 ../backend/kvs20xx_opt.c:70
-#: ../backend/kvs40xx_opt.c:124 ../backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr "бізне�_картка"
 
-#: ../backend/kvs1025_opt.c:98 ../backend/kvs40xx_opt.c:125
-#: ../backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:98 backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:143
 #, no-c-format
 msgid "Check"
 msgstr "Чек"
 
-#: ../backend/kvs1025_opt.c:101 ../backend/kvs20xx_opt.c:74
-#: ../backend/kvs40xx_opt.c:128 ../backend/kvs40xx_opt.c:145
+#: backend/kvs1025_opt.c:101 backend/kvs20xx_opt.c:75
+#: backend/kvs40xx_opt.c:129 backend/kvs40xx_opt.c:146
 #, no-c-format
 msgid "A5"
 msgstr "A5"
 
-#: ../backend/kvs1025_opt.c:102 ../backend/kvs20xx_opt.c:75
-#: ../backend/kvs40xx_opt.c:129 ../backend/kvs40xx_opt.c:146
+#: backend/kvs1025_opt.c:102 backend/kvs20xx_opt.c:76
+#: backend/kvs40xx_opt.c:130 backend/kvs40xx_opt.c:147
 #, no-c-format
 msgid "A6"
 msgstr "A6"
 
-#: ../backend/kvs1025_opt.c:106 ../backend/kvs20xx_opt.c:79
-#: ../backend/kvs40xx_opt.c:133 ../backend/kvs40xx_opt.c:150
+#: backend/kvs1025_opt.c:106 backend/kvs20xx_opt.c:80
+#: backend/kvs40xx_opt.c:134 backend/kvs40xx_opt.c:151
 #, no-c-format
 msgid "B5"
 msgstr "B5"
 
-#: ../backend/kvs1025_opt.c:107 ../backend/kvs20xx_opt.c:80
-#: ../backend/kvs40xx_opt.c:134 ../backend/kvs40xx_opt.c:151
+#: backend/kvs1025_opt.c:107 backend/kvs20xx_opt.c:81
+#: backend/kvs40xx_opt.c:135 backend/kvs40xx_opt.c:152
 #, no-c-format
 msgid "B6"
 msgstr "B6"
 
-#: ../backend/kvs1025_opt.c:108 ../backend/kvs20xx_opt.c:81
-#: ../backend/kvs40xx_opt.c:135 ../backend/kvs40xx_opt.c:152
+#: backend/kvs1025_opt.c:108 backend/kvs20xx_opt.c:82
+#: backend/kvs40xx_opt.c:136 backend/kvs40xx_opt.c:153
 #, no-c-format
 msgid "Legal"
 msgstr "Легал"
 
-#: ../backend/kvs1025_opt.c:149 ../backend/kvs40xx_opt.c:238
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
 #, no-c-format
 msgid "bayer_64"
 msgstr "баєр_64"
 
-#: ../backend/kvs1025_opt.c:150 ../backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
 #, no-c-format
 msgid "bayer_16"
 msgstr "баєр_16"
 
-#: ../backend/kvs1025_opt.c:151 ../backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
 #, no-c-format
 msgid "halftone_32"
 msgstr "напівтони_32"
 
-#: ../backend/kvs1025_opt.c:152 ../backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
 #, no-c-format
 msgid "halftone_64"
 msgstr "напівтони_64"
 
-#: ../backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:153
 #, no-c-format
 msgid "diffusion"
 msgstr "роз�і�не"
 
-#: ../backend/kvs1025_opt.c:166 ../backend/kvs1025_opt.c:228
-#: ../backend/kvs1025_opt.c:241 ../backend/kvs20xx_opt.c:128
-#: ../backend/kvs20xx_opt.c:136 ../backend/kvs40xx_opt.c:214
-#: ../backend/kvs40xx_opt.c:222 ../backend/kvs40xx_opt.c:257
+#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
+#: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, no-c-format
 msgid "normal"
 msgstr "звичайне"
 
-#: ../backend/kvs1025_opt.c:167 ../backend/kvs40xx_opt.c:258
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
 #, no-c-format
 msgid "light"
 msgstr "�вітле"
 
-#: ../backend/kvs1025_opt.c:168 ../backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr "темне"
 
-#: ../backend/kvs1025_opt.c:179 ../backend/kvs40xx_opt.c:270
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
 #, no-c-format
 msgid "From scanner"
 msgstr "Зі �канера"
 
-#: ../backend/kvs1025_opt.c:180 ../backend/kvs40xx_opt.c:271
-#: ../backend/matsushita.c:177
+#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr "Від паперу"
 
-#: ../backend/kvs1025_opt.c:192 ../backend/kvs40xx_opt.c:283
+#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
 #, no-c-format
 msgid "default"
 msgstr "типове"
 
-#: ../backend/kvs1025_opt.c:211 ../backend/kvs20xx_opt.c:122
-#: ../backend/kvs40xx_opt.c:208
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs40xx_opt.c:209
 #, no-c-format
 msgid "smooth"
 msgstr "гладке"
 
-#: ../backend/kvs1025_opt.c:212 ../backend/kvs20xx_opt.c:118
-#: ../backend/kvs40xx_opt.c:204
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr "немає"
 
-#: ../backend/kvs1025_opt.c:213 ../backend/kvs20xx_opt.c:119
-#: ../backend/kvs40xx_opt.c:205
+#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs40xx_opt.c:206
 #, no-c-format
 msgid "low"
 msgstr "низьке"
 
-#: ../backend/kvs1025_opt.c:214 ../backend/kvs1025_opt.c:804
-#: ../backend/kvs20xx_opt.c:120 ../backend/kvs40xx_opt.c:206
+#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, no-c-format
 msgid "medium"
 msgstr "�ереднє"
 
-#: ../backend/kvs1025_opt.c:215 ../backend/kvs20xx_opt.c:121
-#: ../backend/kvs40xx_opt.c:207
+#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr "ви�оке"
 
-#: ../backend/kvs1025_opt.c:229 ../backend/kvs20xx_opt.c:129
-#: ../backend/kvs40xx_opt.c:215
+#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr "ЕПТ"
 
-#: ../backend/kvs1025_opt.c:230
+#: backend/kvs1025_opt.c:230
 #, no-c-format
 msgid "linier"
 msgstr "лінійна"
 
-#: ../backend/kvs1025_opt.c:242 ../backend/kvs20xx_opt.c:137
-#: ../backend/kvs40xx_opt.c:223
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs40xx_opt.c:224
 #, no-c-format
 msgid "red"
 msgstr "червоний"
 
-#: ../backend/kvs1025_opt.c:243 ../backend/kvs20xx_opt.c:138
-#: ../backend/kvs40xx_opt.c:224
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs40xx_opt.c:225
 #, no-c-format
 msgid "green"
 msgstr "зелений"
 
-#: ../backend/kvs1025_opt.c:244 ../backend/kvs20xx_opt.c:139
-#: ../backend/kvs40xx_opt.c:225
+#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr "�иній"
 
-#: ../backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:562
 #, no-c-format
 msgid "Sets the scan source"
 msgstr "В�тановлює джерело �кануванн�"
 
-#: ../backend/kvs1025_opt.c:573 ../backend/kvs20xx_opt.c:217
-#: ../backend/kvs40xx_opt.c:366 ../backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr "Режим подачі"
 
-#: ../backend/kvs1025_opt.c:574 ../backend/kvs20xx_opt.c:218
-#: ../backend/kvs40xx_opt.c:367 ../backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr "Визначити режим подачі"
 
-#: ../backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:584
 #, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr "Увімкнути/Вимкнути режим довгого паперу"
 
-#: ../backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:593
 #, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr "Увімкнути/Вимкнути режим керуванн� довжиною"
 
-#: ../backend/kvs1025_opt.c:601 ../backend/kvs20xx_opt.c:242
-#: ../backend/kvs40xx_opt.c:416
+#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs40xx_opt.c:417
 #, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "В�тановлює режим подаванн� вручну"
 
-#: ../backend/kvs1025_opt.c:612 ../backend/kvs20xx_opt.c:254
-#: ../backend/kvs40xx_opt.c:428
+#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs40xx_opt.c:429
 #, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr "В�тановлює ча� очікуванн� на подаванн� вручну"
 
-#: ../backend/kvs1025_opt.c:625 ../backend/kvs20xx_opt.c:267
-#: ../backend/kvs40xx_opt.c:441
+#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr "Увімкнути або вимкнути ви�вленн� подвійного подаванн�"
 
-#: ../backend/kvs1025_opt.c:631 ../backend/kvs20xx_opt.c:275
-#: ../backend/kvs40xx_opt.c:496
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr "за аркушем"
 
-#: ../backend/kvs1025_opt.c:632 ../backend/kvs20xx_opt.c:276
-#: ../backend/kvs40xx_opt.c:497
+#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr "За аркушем"
 
-#: ../backend/kvs1025_opt.c:634 ../backend/kvs20xx_opt.c:277
-#: ../backend/kvs40xx_opt.c:498
+#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr "Сканер �ти�кає зображенн� відповідно до розмірів аркуша"
 
-#: ../backend/kvs1025_opt.c:661 ../backend/kvs20xx_opt.c:308
-#: ../backend/kvs40xx_opt.c:532
+#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr "В�тановлює розташуванн� аркуша: true — альбомне, false — книжкове"
 
-#: ../backend/kvs1025_opt.c:735 ../backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr "�втоматичне визначенн�"
 
-#: ../backend/kvs1025_opt.c:738 ../backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
@@ -3523,116 +4297,106 @@ msgstr ""
 "В�тановлювати ��краві�ть, контра�тні�ть, рівень білого, гаму, зменшенн� "
 "шумно�ті і виразні�ть зображенн� автоматично"
 
-#: ../backend/kvs1025_opt.c:783 ../backend/kvs40xx_opt.c:763
-#: ../backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "Зменшенн� шумно�ті"
 
-#: ../backend/kvs1025_opt.c:785 ../backend/kvs40xx_opt.c:764
-#: ../backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr "Зменшити шум від ізольованих точок"
 
-#: ../backend/kvs1025_opt.c:796 ../backend/kvs20xx_opt.c:411
-#: ../backend/kvs40xx_opt.c:654 ../backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr "Виразні�ть зображенн�"
 
-#: ../backend/kvs1025_opt.c:797 ../backend/kvs20xx_opt.c:412
-#: ../backend/kvs40xx_opt.c:655 ../backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr "Визначає виразні�ть зображенн�"
 
-#: ../backend/kvs1025_opt.c:808 ../backend/kvs1025_opt.c:809
-#: ../backend/matsushita.c:1300 ../backend/matsushita.c:1301
-#: ../backend/pixma_sane_options.c:110
+#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: backend/matsushita.c:1300 backend/matsushita.c:1301
+#: backend/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr "Гама"
 
-#: ../backend/kvs1025_opt.c:818 ../backend/kvs20xx_opt.c:435
-#: ../backend/kvs40xx_opt.c:680
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs40xx_opt.c:681
 #, no-c-format
 msgid "Lamp color"
 msgstr "Колір лампи"
 
-#: ../backend/kvs1025_opt.c:819 ../backend/kvs20xx_opt.c:436
-#: ../backend/kvs40xx_opt.c:681
+#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs40xx_opt.c:682
 #, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr "В�тановлює колір лампи (відкиданн� кольорів)"
 
-#: ../backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:832
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr "Інвер�ивне зображенн� у чорно-білому або півтоновому режимі"
 
-#: ../backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:840
 #, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "Віддзеркалити зображенн� (перевертанн� через лівий/правий край)"
 
-#: ../backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:847
 #, no-c-format
 msgid "jpeg compression"
 msgstr "�ти�канн� jpeg"
 
-#: ../backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:850
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr "Сти�канн� зображень JPEG з параметром Q, «0» — не �ти�кати"
 
-#: ../backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:860
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr "Обернути зображенн� за год. �трілкою"
 
-#: ../backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:862
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 "Вимагати від драйвера обертанн� �торінок на фік�ований вказаний кут"
 
-#: ../backend/kvs1025_opt.c:872
-#, no-c-format
-msgid "Software deskew"
-msgstr "Програмне у�уванн� обертанн�"
-
-#: ../backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:874
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 "Вимагати від драйвера у�уванн� обертанн� �торінок у автоматичному режимі"
 
-#: ../backend/kvs1025_opt.c:881
-#, no-c-format
-msgid "Software despeckle diameter"
-msgstr "Діаметр пл�м дл� програмного у�уванн�"
-
-#: ../backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:883
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 "Мінімальний діаметр окремих пл�м, �кі �лід у�унути зі �канованого "
 "зображенн�"
 
-#: ../backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:902
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr "Програмне автоматичне обрізанн�"
 
-#: ../backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:904
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
 "Вимагати від драйвера вилученн� границі зі �торінок у автоматичному "
 "режимі"
 
-#: ../backend/kvs20xx_opt.c:232 ../backend/kvs40xx_opt.c:395
+#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
 #, no-c-format
 msgid ""
 "Length Control Mode is a mode that the scanner reads up to the shorter "
@@ -3641,64 +4405,64 @@ msgstr ""
 "У режимі керуванн� довжиною �канер читає дані до найкоротшої з таких "
 "довжин: дій�ної довжини аркуша паперу або логічної довжини документа."
 
-#: ../backend/kvs20xx_opt.c:423 ../backend/kvs20xx_opt.c:424
-#: ../backend/kvs40xx_opt.c:667 ../backend/kvs40xx_opt.c:668
-#: ../backend/microtek2.h:640
+#: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr "Виправленн� гами"
 
-#: ../backend/kvs40xx_opt.c:116
+#: backend/kvs40xx_opt.c:117
 #, no-c-format
 msgid "wait_doc_hopper_up"
 msgstr "очік_документа_з_бункера"
 
-#: ../backend/kvs40xx_opt.c:126
+#: backend/kvs40xx_opt.c:127
 #, no-c-format
 msgid "A3"
 msgstr "A3"
 
-#: ../backend/kvs40xx_opt.c:131
+#: backend/kvs40xx_opt.c:132
 #, no-c-format
 msgid "Double letter 11x17 in"
 msgstr "Подвійний ли�т 11x17 дюймів"
 
-#: ../backend/kvs40xx_opt.c:132
+#: backend/kvs40xx_opt.c:133
 #, no-c-format
 msgid "B4"
 msgstr "B4"
 
-#: ../backend/kvs40xx_opt.c:230
+#: backend/kvs40xx_opt.c:231
 #, no-c-format
 msgid "High sensivity"
 msgstr "Ви�ока чутливі�ть"
 
-#: ../backend/kvs40xx_opt.c:231
+#: backend/kvs40xx_opt.c:232
 #, no-c-format
 msgid "Low sensivity"
 msgstr "�изька чутливі�ть"
 
-#: ../backend/kvs40xx_opt.c:242
+#: backend/kvs40xx_opt.c:243
 #, no-c-format
 msgid "err_diffusion"
 msgstr "помилка_роз�"
 
-#: ../backend/kvs40xx_opt.c:248
+#: backend/kvs40xx_opt.c:249
 #, no-c-format
 msgid "No detection"
 msgstr "Без ви�вленн�"
 
-#: ../backend/kvs40xx_opt.c:249
+#: backend/kvs40xx_opt.c:250
 #, no-c-format
 msgid "Normal mode"
 msgstr "Звичайний режим"
 
-#: ../backend/kvs40xx_opt.c:250
+#: backend/kvs40xx_opt.c:251
 #, no-c-format
 msgid "Enhanced mode"
 msgstr "Розширений режим"
 
-#: ../backend/kvs40xx_opt.c:404
+#: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
 "Long Paper Mode is a mode that the scanner reads the image after it "
@@ -3708,341 +4472,338 @@ msgstr ""
 "довгого ли�та паперу на відрізки довжини, в�тановлені за допомогою "
 "параметра «Розмір документа»"
 
-#: ../backend/kvs40xx_opt.c:448
+#: backend/kvs40xx_opt.c:449
 #, no-c-format
 msgid "Double feed detector sensitivity"
 msgstr "Значенн� чутливо�ті датчика подвійного подаванн�"
 
-#: ../backend/kvs40xx_opt.c:449
+#: backend/kvs40xx_opt.c:450
 #, no-c-format
 msgid "Set the double feed detector sensitivity"
 msgstr "В�тановити значенн� чутливо�ті датчика подвійного подаванн�"
 
-#: ../backend/kvs40xx_opt.c:460 ../backend/kvs40xx_opt.c:461
+#: backend/kvs40xx_opt.c:461 backend/kvs40xx_opt.c:462
 #, no-c-format
 msgid "Do not stop after double feed detection"
 msgstr "�е зупин�ти�� пі�л� ви�вленн� подвійного подаванн�"
 
-#: ../backend/kvs40xx_opt.c:469 ../backend/kvs40xx_opt.c:470
+#: backend/kvs40xx_opt.c:470 backend/kvs40xx_opt.c:471
 #, no-c-format
 msgid "Ignore left double feed sensor"
 msgstr "Ігнорувати лівий датчик подвійного подаванн�"
 
-#: ../backend/kvs40xx_opt.c:478 ../backend/kvs40xx_opt.c:479
+#: backend/kvs40xx_opt.c:479 backend/kvs40xx_opt.c:480
 #, no-c-format
 msgid "Ignore center double feed sensor"
 msgstr "Ігнорувати центральний датчик подвійного подаванн�"
 
-#: ../backend/kvs40xx_opt.c:487 ../backend/kvs40xx_opt.c:488
+#: backend/kvs40xx_opt.c:488 backend/kvs40xx_opt.c:489
 #, no-c-format
 msgid "Ignore right double feed sensor"
 msgstr "Ігнорувати правий датчик подвійного подаванн�"
 
-#: ../backend/kvs40xx_opt.c:641
+#: backend/kvs40xx_opt.c:642
 #, no-c-format
 msgid "Automatic threshold mode"
 msgstr "Режим автоматичного порогового значенн�"
 
-#: ../backend/kvs40xx_opt.c:642
+#: backend/kvs40xx_opt.c:643
 #, no-c-format
 msgid "Sets the automatic threshold mode"
 msgstr "В�тановлює режим автоматичного порогового значенн�"
 
-#: ../backend/kvs40xx_opt.c:693
+#: backend/kvs40xx_opt.c:694
 #, no-c-format
 msgid "Inverse image in B/W mode"
 msgstr "Інвер�ивне зображенн� у чорно-білому режимі"
 
-#: ../backend/kvs40xx_opt.c:714
+#: backend/kvs40xx_opt.c:715
 #, no-c-format
 msgid "JPEG compression"
 msgstr "Сти�канн� JPEG"
 
-#: ../backend/kvs40xx_opt.c:717
+#: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (yours application must be able to uncompress)"
 msgstr "Сти�канн� JPEG (ваша програма повинна мати змогу розпакувати дані)"
 
-#: ../backend/kvs40xx_opt.c:736 ../backend/kvs40xx_opt.c:737
+#: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
 msgid "Detect stapled document"
 msgstr "Ви�вл�ти підшиті документи"
 
-#: ../backend/kvs40xx_opt.c:775
+#: backend/kvs40xx_opt.c:776
 #, no-c-format
 msgid "chroma of red"
 msgstr "інтен�ивні�ть червоного"
 
-#: ../backend/kvs40xx_opt.c:776
+#: backend/kvs40xx_opt.c:777
 #, no-c-format
 msgid "Set chroma of red"
 msgstr "В�тановити інтен�ивні�ть червоного"
 
-#: ../backend/kvs40xx_opt.c:786
+#: backend/kvs40xx_opt.c:787
 #, no-c-format
 msgid "chroma of blue"
 msgstr "інтен�ивні�ть �инього"
 
-#: ../backend/kvs40xx_opt.c:787
+#: backend/kvs40xx_opt.c:788
 #, no-c-format
 msgid "Set chroma of blue"
 msgstr "В�тановити інтен�ивні�ть �инього"
 
-#: ../backend/kvs40xx_opt.c:797 ../backend/kvs40xx_opt.c:798
+#: backend/kvs40xx_opt.c:798 backend/kvs40xx_opt.c:799
 #, no-c-format
 msgid "Skew adjustment"
 msgstr "Коригуванн� перекошуванн�"
 
-#: ../backend/kvs40xx_opt.c:807
+#: backend/kvs40xx_opt.c:808
 #, no-c-format
 msgid "Stop scanner when a paper have been skewed"
 msgstr "Зупинити �кануванн�, �кщо папір було перекошено"
 
-#: ../backend/kvs40xx_opt.c:808
+#: backend/kvs40xx_opt.c:809
 #, no-c-format
 msgid "Scanner will be stop  when a paper have been skewed"
 msgstr "Скануванн� буде зупинено, �кщо папір було в�тавлено з нахилом"
 
-#: ../backend/kvs40xx_opt.c:815
+#: backend/kvs40xx_opt.c:816
 #, no-c-format
 msgid "Crop actual image area"
 msgstr "Обрізати до �правжньої обла�ті зображенн�"
 
-#: ../backend/kvs40xx_opt.c:816
+#: backend/kvs40xx_opt.c:817
 #, no-c-format
 msgid "Scanner automatically detect image area and crop it"
 msgstr "Сканер автоматично визначає обла�ть зображенн� і обрізає його"
 
-#: ../backend/kvs40xx_opt.c:826
+#: backend/kvs40xx_opt.c:827
 #, no-c-format
 msgid "It is right and left reversing"
 msgstr "Перевертанн� ліворуч і праворуч"
 
-#: ../backend/kvs40xx_opt.c:833 ../backend/kvs40xx_opt.c:834
+#: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
 msgid "Addition of space in top position"
 msgstr "Додаванн� про�тору у верхній ча�тині"
 
-#: ../backend/kvs40xx_opt.c:841 ../backend/kvs40xx_opt.c:842
+#: backend/kvs40xx_opt.c:842 backend/kvs40xx_opt.c:843
 #, no-c-format
 msgid "Addition of space in bottom position"
 msgstr "Додаванн� про�тору у нижній ча�тині"
 
-#: ../backend/leo.c:110
+#: backend/leo.c:110
 #, no-c-format
 msgid "Diamond"
 msgstr "Діамант"
 
-#: ../backend/leo.c:111
+#: backend/leo.c:111
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr "8x8 Значна жирні�ть"
 
-#: ../backend/leo.c:112
+#: backend/leo.c:112
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr "8x8 Помірна жирні�ть"
 
-#: ../backend/leo.c:113
+#: backend/leo.c:113
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr "Секці� 8x8"
 
-#: ../backend/leo.c:114
+#: backend/leo.c:114
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr "8x8 Вертикальна ліні�"
 
-#: ../backend/lexmark.c:273 ../backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:715
 #, no-c-format
 msgid "Gain"
 msgstr "Під�иленн�"
 
-#: ../backend/lexmark.c:274 ../backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:716
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr "Параметри під�иленн� каналів кольорів"
 
-#: ../backend/lexmark.c:283 ../backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:723
 #, no-c-format
 msgid "Gray gain"
 msgstr "Під�иленн� �ірого"
 
-#: ../backend/lexmark.c:284 ../backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:724
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr "Визначає під�иленн� �ірого каналу"
 
-#: ../backend/lexmark.c:297 ../backend/plustek.c:1001
-#: ../backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
 #, no-c-format
 msgid "Red gain"
 msgstr "Під�иленн� червоного"
 
-#: ../backend/lexmark.c:298 ../backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:736
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr "Визначає під�иленн� каналу червоного"
 
-#: ../backend/lexmark.c:311 ../backend/plustek.c:1017
-#: ../backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
 #, no-c-format
 msgid "Green gain"
 msgstr "Під�иленн� зеленого"
 
-#: ../backend/lexmark.c:312 ../backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:748
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr "Визначає під�иленн� каналу зеленого"
 
-#: ../backend/lexmark.c:325 ../backend/plustek.c:1033
-#: ../backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
 #, no-c-format
 msgid "Blue gain"
 msgstr "Під�иленн� �инього"
 
-#: ../backend/lexmark.c:326 ../backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:760
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr "Визначає під�иленн� каналу �инього"
 
-#: ../backend/matsushita.c:139
+#: backend/matsushita.c:139
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr "Секційний дизеринг 16"
 
-#: ../backend/matsushita.c:140
+#: backend/matsushita.c:140
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr "Секційний дизеринг 64"
 
-#: ../backend/matsushita.c:141
+#: backend/matsushita.c:141
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr "�апівтонова точка 32"
 
-#: ../backend/matsushita.c:142
+#: backend/matsushita.c:142
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr "�апівтонова точка 64"
 
-#: ../backend/matsushita.c:143
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Error Diffusion"
 msgstr "Поширенн� помилок"
 
-#: ../backend/matsushita.c:160
+#: backend/matsushita.c:160
 #, no-c-format
 msgid "Mode 1"
 msgstr "Режим 1"
 
-#: ../backend/matsushita.c:161
+#: backend/matsushita.c:161
 #, no-c-format
 msgid "Mode 2"
 msgstr "Режим 2"
 
-#: ../backend/matsushita.c:162
+#: backend/matsushita.c:162
 #, no-c-format
 msgid "Mode 3"
 msgstr "Режим 3"
 
-#: ../backend/matsushita.c:176
+#: backend/matsushita.c:176
 #, no-c-format
 msgid "From white stick"
 msgstr "Від білої палички"
 
-#: ../backend/matsushita.c:212
+#: backend/matsushita.c:212
 #, no-c-format
 msgid "Smooth"
 msgstr "Плавний"
 
-#: ../backend/matsushita.c:214 ../backend/matsushita.c:229
+#: backend/matsushita.c:214 backend/matsushita.c:229
 #, no-c-format
 msgid "Low"
 msgstr "�изький"
 
-#: ../backend/matsushita.c:215 ../backend/matsushita.c:230
-#: ../backend/matsushita.c:1296
+#: backend/matsushita.c:215 backend/matsushita.c:230
+#: backend/matsushita.c:1296
 #, no-c-format
 msgid "Medium"
 msgstr "Середній"
 
-#: ../backend/matsushita.c:216 ../backend/matsushita.c:231
+#: backend/matsushita.c:216 backend/matsushita.c:231
 #, no-c-format
 msgid "High"
 msgstr "Ви�окий"
 
-#: ../backend/matsushita.c:245
+#: backend/matsushita.c:245
 #, no-c-format
 msgid "CRT"
 msgstr "ЕПТ"
 
-#: ../backend/matsushita.c:257
+#: backend/matsushita.c:257
 #, no-c-format
 msgid "One page"
 msgstr "Одна �торінка"
 
-#: ../backend/matsushita.c:258
+#: backend/matsushita.c:258
 #, no-c-format
 msgid "All pages"
 msgstr "В�і �торінки"
 
-#: ../backend/matsushita.c:1034 ../backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr "�канер з подачею аркушів"
 
-#: ../backend/matsushita.h:209
+#: backend/matsushita.h:209
 #, no-c-format
 msgid "Grayscale 4 bits"
 msgstr "Відтінки �ірого, 4-бітова"
 
-#: ../backend/matsushita.h:210
+#: backend/matsushita.h:210
 #, no-c-format
 msgid "Grayscale 8 bits"
 msgstr "Відтінки �ірого, 8-бітова"
 
-#: ../backend/microtek2.h:601
+#: backend/microtek2.h:601
 #, no-c-format
 msgid "Shadow, midtone, highlight, exposure time"
 msgstr "Затінені�ть, напівтон, під�вічуванн�, ча� витримки"
 
-#: ../backend/microtek2.h:603
+#: backend/microtek2.h:603
 #, no-c-format
 msgid "Special options"
 msgstr "Спеціальні параметри"
 
-#: ../backend/microtek2.h:604
+#: backend/microtek2.h:604
 #, no-c-format
 msgid "Color balance"
 msgstr "Балан� кольорів"
 
-#: ../backend/microtek2.h:607
+#: backend/microtek2.h:607
 #, no-c-format
 msgid "Disable backtracking"
 msgstr "Вимкнути зворотне �теженн�"
 
-#: ../backend/microtek2.h:608
+#: backend/microtek2.h:608
 #, no-c-format
 msgid "If checked the scanner does not perform backtracking"
 msgstr "Якщо буде позначено цей пункт, �канер не виконуватиме поверненн�"
 
-#: ../backend/microtek2.h:612
+#: backend/microtek2.h:612
 #, no-c-format
 msgid "Toggle lamp of flatbed"
 msgstr "Перемкнути лампу планшетного �канера"
 
-#: ../backend/microtek2.h:613
+#: backend/microtek2.h:613
 #, no-c-format
 msgid "Toggles the lamp of the flatbed"
 msgstr "Перемикає лампу планшетного �канера"
 
-#: ../backend/microtek2.h:616
+#: backend/microtek2.h:616
 #, no-c-format
 msgid "Calibration by backend"
 msgstr "Калібруванн� програмою обробки"
 
-#: ../backend/microtek2.h:617
+#: backend/microtek2.h:617
 #, no-c-format
 msgid ""
 "If checked the color calibration before a scan is done by the backend"
@@ -4050,44 +4811,44 @@ msgstr ""
 "Якщо позначено цей пункт, калібруванн� кольорів перед �кануванн�м "
 "виконуєть�� програмою обробки"
 
-#: ../backend/microtek2.h:621
+#: backend/microtek2.h:621
 #, no-c-format
 msgid "Use the lightlid-35mm adapter"
 msgstr "Викори�товувати 35 мм адаптер lightlid"
 
-#: ../backend/microtek2.h:622
+#: backend/microtek2.h:622
 #, no-c-format
 msgid "This option turns off the lamp of the flatbed during a scan"
 msgstr ""
 "Якщо позначити цей пункт, лампу планшетного �канера на ча� �кануванн� "
 "буде вимкнено"
 
-#: ../backend/microtek2.h:626 ../backend/snapscan-options.c:421
+#: backend/microtek2.h:626 backend/snapscan-options.c:421
 #, no-c-format
 msgid "Quality scan"
 msgstr "Які�не �кануванн�"
 
-#: ../backend/microtek2.h:627 ../backend/snapscan-options.c:422
+#: backend/microtek2.h:627 backend/snapscan-options.c:422
 #, no-c-format
 msgid "Highest quality but lower speed"
 msgstr "�айкраща �кі�ть, але повільно"
 
-#: ../backend/microtek2.h:630
+#: backend/microtek2.h:630
 #, no-c-format
 msgid "Fast scan"
 msgstr "Швидке �кануванн�"
 
-#: ../backend/microtek2.h:631
+#: backend/microtek2.h:631
 #, no-c-format
 msgid "Highest speed but lower quality"
 msgstr "�айшвидше, але низька �кі�ть"
 
-#: ../backend/microtek2.h:634
+#: backend/microtek2.h:634
 #, no-c-format
 msgid "Automatic adjustment of threshold"
 msgstr "�втоматичне визначенн� порогового значенн�"
 
-#: ../backend/microtek2.h:635
+#: backend/microtek2.h:635
 #, no-c-format
 msgid ""
 "If checked the backend automatically tries to determine an optimal value "
@@ -4096,282 +4857,282 @@ msgstr ""
 "Якщо буде позначено цей пункт, програма обробки �пробує визначити "
 "оптимальне порогове значенн� у автоматичному режимі."
 
-#: ../backend/microtek2.h:641
+#: backend/microtek2.h:641
 #, no-c-format
 msgid "Selects the gamma correction mode."
 msgstr "Визначає режим виправленн� гами (�тупен� контра�тно�ті)."
 
-#: ../backend/microtek2.h:644
+#: backend/microtek2.h:644
 #, no-c-format
 msgid "Bind gamma"
 msgstr "Пов’�зана гама"
 
-#: ../backend/microtek2.h:645
+#: backend/microtek2.h:645
 #, no-c-format
 msgid "Use same gamma values for all colour channels."
 msgstr "Викори�товувати однакові значенн� гами дл� в�іх каналів кольорів."
 
-#: ../backend/microtek2.h:649
+#: backend/microtek2.h:649
 #, no-c-format
 msgid "Scalar gamma"
 msgstr "Скал�рна гама"
 
-#: ../backend/microtek2.h:650
+#: backend/microtek2.h:650
 #, no-c-format
 msgid "Selects a value for scalar gamma correction."
 msgstr "Визначає значенн� дл� �кал�рного виправленн� гами."
 
-#: ../backend/microtek2.h:654
+#: backend/microtek2.h:654
 #, no-c-format
 msgid "Scalar gamma red"
 msgstr "Скал�рна гама червоного"
 
-#: ../backend/microtek2.h:655
+#: backend/microtek2.h:655
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (red channel)"
 msgstr ""
 "Визначає значенн� дл� �кал�рного виправленн� гами (канал червоного)."
 
-#: ../backend/microtek2.h:659
+#: backend/microtek2.h:659
 #, no-c-format
 msgid "Scalar gamma green"
 msgstr "Скал�рна гама зеленого"
 
-#: ../backend/microtek2.h:660
+#: backend/microtek2.h:660
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (green channel)"
 msgstr ""
 "Визначає значенн� дл� �кал�рного виправленн� гами (канал зеленого)."
 
-#: ../backend/microtek2.h:664
+#: backend/microtek2.h:664
 #, no-c-format
 msgid "Scalar gamma blue"
 msgstr "Скал�рна гама �инього"
 
-#: ../backend/microtek2.h:665
+#: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
 msgstr "Визначає значенн� дл� �кал�рного виправленн� гами (канал �инього)."
 
-#: ../backend/microtek2.h:669
+#: backend/microtek2.h:669
 #, no-c-format
 msgid "Channel"
 msgstr "Канал"
 
-#: ../backend/microtek2.h:670
+#: backend/microtek2.h:670
 #, no-c-format
 msgid ""
 "Selects the colour band, \"Master\" means that all colours are affected."
 msgstr ""
 "Визначає зв’�зок кольорів. «О�новний» визначає зв’�зок в�іх кольорів."
 
-#: ../backend/microtek2.h:674
+#: backend/microtek2.h:674
 #, no-c-format
 msgid "Midtone"
 msgstr "�апівтон"
 
-#: ../backend/microtek2.h:675
+#: backend/microtek2.h:675
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % gray\"."
 msgstr "Визначає рівень �вітно�ті, �кий вважатиметь�� «50 % �ірим»."
 
-#: ../backend/microtek2.h:679
+#: backend/microtek2.h:679
 #, no-c-format
 msgid "Midtone for red"
 msgstr "�апівтон дл� червоного"
 
-#: ../backend/microtek2.h:680
+#: backend/microtek2.h:680
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % red\"."
 msgstr "Визначає рівень �вітно�ті, �кий є «50 % червоним»."
 
-#: ../backend/microtek2.h:684
+#: backend/microtek2.h:684
 #, no-c-format
 msgid "Midtone for green"
 msgstr "�апівтон дл� зеленого"
 
-#: ../backend/microtek2.h:685
+#: backend/microtek2.h:685
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % green\"."
 msgstr "Визначає рівень �вітно�ті, �кий є «50 % зеленим»."
 
-#: ../backend/microtek2.h:689
+#: backend/microtek2.h:689
 #, no-c-format
 msgid "Midtone for blue"
 msgstr "�апівтон дл� �инього"
 
-#: ../backend/microtek2.h:690
+#: backend/microtek2.h:690
 #, no-c-format
 msgid "Selects which radiance level should be considered \"50 % blue\"."
 msgstr "Визначає рівень �вітно�ті, �кий є «50 % �инім»."
 
-#: ../backend/microtek2.h:694
+#: backend/microtek2.h:694
 #, no-c-format
 msgid "Red balance"
 msgstr "Балан� червоного"
 
-#: ../backend/microtek2.h:695
+#: backend/microtek2.h:695
 #, no-c-format
 msgid "Balance factor for red. A value of 100% means no correction."
 msgstr ""
 "Коефіцієнт балан�у дл� червоного. Значенн� у 100% означає «без "
 "виправленн�»."
 
-#: ../backend/microtek2.h:699
+#: backend/microtek2.h:699
 #, no-c-format
 msgid "Green balance"
 msgstr "Балан� зеленого"
 
-#: ../backend/microtek2.h:700
+#: backend/microtek2.h:700
 #, no-c-format
 msgid "Balance factor for green. A value of 100% means no correction."
 msgstr ""
 "Коефіцієнт балан�у дл� зеленого. Значенн� у 100% означає «без "
 "виправленн�»."
 
-#: ../backend/microtek2.h:704
+#: backend/microtek2.h:704
 #, no-c-format
 msgid "Blue balance"
 msgstr "Балан� �инього"
 
-#: ../backend/microtek2.h:705
+#: backend/microtek2.h:705
 #, no-c-format
 msgid "Balance factor for blue. A value of 100% means no correction."
 msgstr ""
 "Коефіцієнт балан�у дл� �инього. Значенн� у 100% означає «без "
 "виправленн�»."
 
-#: ../backend/microtek2.h:709
+#: backend/microtek2.h:709
 #, no-c-format
 msgid "Firmware balance"
 msgstr "Балан� мікрокоду"
 
-#: ../backend/microtek2.h:710
+#: backend/microtek2.h:710
 #, no-c-format
 msgid "Sets the color balance values to the firmware provided values."
 msgstr "В�тановлює значенн� балан�у кольорів на о�нові даних з мікрокоду."
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slowest"
 msgstr "�айповільніша"
 
-#: ../backend/mustek.c:149
+#: backend/mustek.c:149
 #, no-c-format
 msgid "Slower"
 msgstr "Повільна"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Faster"
 msgstr "Швидша"
 
-#: ../backend/mustek.c:150
+#: backend/mustek.c:150
 #, no-c-format
 msgid "Fastest"
 msgstr "�айшвидша"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 coarse"
 msgstr "8x8 грубе"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 normal"
 msgstr "8x8 звичайне"
 
-#: ../backend/mustek.c:177
+#: backend/mustek.c:177
 #, no-c-format
 msgid "8x8 fine"
 msgstr "8x8 добре"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "8x8 very fine"
 msgstr "8x8 дуже добре"
 
-#: ../backend/mustek.c:178
+#: backend/mustek.c:178
 #, no-c-format
 msgid "6x6 normal"
 msgstr "6x6 звичайне"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 coarse"
 msgstr "5x5 грубе"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "5x5 fine"
 msgstr "5x5 добре"
 
-#: ../backend/mustek.c:179
+#: backend/mustek.c:179
 #, no-c-format
 msgid "4x4 coarse"
 msgstr "4x4 грубе"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 normal"
 msgstr "4x4 звичайне"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "4x4 fine"
 msgstr "4x4 добре"
 
-#: ../backend/mustek.c:180
+#: backend/mustek.c:180
 #, no-c-format
 msgid "3x3 normal"
 msgstr "3x3 звичайне"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "2x2 normal"
 msgstr "2x2 звичайне"
 
-#: ../backend/mustek.c:181
+#: backend/mustek.c:181
 #, no-c-format
 msgid "8x8 custom"
 msgstr "8x8 нетипове"
 
-#: ../backend/mustek.c:182
+#: backend/mustek.c:182
 #, no-c-format
 msgid "6x6 custom"
 msgstr "6x6 нетипове"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "5x5 custom"
 msgstr "5x5 нетипове"
 
-#: ../backend/mustek.c:183
+#: backend/mustek.c:183
 #, no-c-format
 msgid "4x4 custom"
 msgstr "4x4 нетипове"
 
-#: ../backend/mustek.c:184
+#: backend/mustek.c:184
 #, no-c-format
 msgid "3x3 custom"
 msgstr "3x3 нетипове"
 
-#: ../backend/mustek.c:185
+#: backend/mustek.c:185
 #, no-c-format
 msgid "2x2 custom"
 msgstr "2x2 нетипове"
 
-#: ../backend/mustek.c:4237
+#: backend/mustek.c:4235
 #, no-c-format
 msgid "Fast gray mode"
 msgstr "Швидкий чорно-білий режим"
 
-#: ../backend/mustek.c:4238
+#: backend/mustek.c:4236
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr "Сканувати у швидкому чорно-білому режимі (погана �кі�ть)."
 
-#: ../backend/mustek.c:4335
+#: backend/mustek.c:4333
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
@@ -4381,117 +5142,117 @@ msgstr ""
 "(низько�кі�ному) режимі. Цим режимом може бути чорно-білий режим або "
 "режим з низькою роздільною здатні�тю."
 
-#: ../backend/mustek.c:4343
+#: backend/mustek.c:4341
 #, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr "Ча� вимиканн� лампи (у хвилинах)"
 
-#: ../backend/mustek.c:4344
+#: backend/mustek.c:4342
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr "Визначає ча� (у хвилинах), через �кий лампу буде вимкнено."
 
-#: ../backend/mustek.c:4355
+#: backend/mustek.c:4353
 #, no-c-format
 msgid "Turn lamp off"
 msgstr "Вимкнути лампу"
 
-#: ../backend/mustek.c:4356
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr "�егайно вимикає лампу."
 
-#: ../backend/mustek.c:4433
+#: backend/mustek.c:4431
 #, no-c-format
 msgid "Red brightness"
 msgstr "Я�краві�ть червоного"
 
-#: ../backend/mustek.c:4434
+#: backend/mustek.c:4432
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr "Керує ��краві�тю каналу червоного у отриманому зображенні."
 
-#: ../backend/mustek.c:4446
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Green brightness"
 msgstr "Я�краві�ть зеленого"
 
-#: ../backend/mustek.c:4447
+#: backend/mustek.c:4445
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr "Керує ��краві�тю каналу зеленого у отриманому зображенні."
 
-#: ../backend/mustek.c:4459
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Blue brightness"
 msgstr "Я�краві�ть �инього"
 
-#: ../backend/mustek.c:4460
+#: backend/mustek.c:4458
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr "Керує ��краві�тю каналу �инього у отриманому зображенні."
 
-#: ../backend/mustek.c:4485
+#: backend/mustek.c:4483
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "Контра�тні�ть червоного каналу"
 
-#: ../backend/mustek.c:4486
+#: backend/mustek.c:4484
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr "Керує контра�тні�тю каналу червоного у отриманому зображенні."
 
-#: ../backend/mustek.c:4498
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "Контра�тні�ть зеленого каналу"
 
-#: ../backend/mustek.c:4499
+#: backend/mustek.c:4497
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr "Керує контра�тні�тю каналу зеленого у отриманому зображенні."
 
-#: ../backend/mustek.c:4511
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "Контра�тні�ть �инього каналу"
 
-#: ../backend/mustek.c:4512
+#: backend/mustek.c:4510
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr "Керує контра�тні�тю каналу �инього у отриманому зображенні."
 
-#: ../backend/mustek_usb2.c:105
+#: backend/mustek_usb2.c:105
 #, no-c-format
 msgid "Color48"
 msgstr "Кольоровий 48"
 
-#: ../backend/mustek_usb2.c:106 ../backend/mustek_usb2.c:114
+#: backend/mustek_usb2.c:106 backend/mustek_usb2.c:114
 #, no-c-format
 msgid "Color24"
 msgstr "Кольоровий 24"
 
-#: ../backend/mustek_usb2.c:107
+#: backend/mustek_usb2.c:107
 #, no-c-format
 msgid "Gray16"
 msgstr "Чорно-білий 16"
 
-#: ../backend/mustek_usb2.c:108
+#: backend/mustek_usb2.c:108
 #, no-c-format
 msgid "Gray8"
 msgstr "Чорно-білий 8"
 
-#: ../backend/mustek_usb2.c:119
+#: backend/mustek_usb2.c:119
 #, no-c-format
 msgid "Reflective"
 msgstr "Відбиток"
 
-#: ../backend/mustek_usb2.c:120
+#: backend/mustek_usb2.c:120
 #, no-c-format
 msgid "Positive"
 msgstr "Позитив"
 
-#: ../backend/mustek_usb2.c:421
+#: backend/mustek_usb2.c:421
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -4500,27 +5261,27 @@ msgstr ""
 "Розігрівати, до �талої ��краво�ті лампи, не напол�гати на 40-ти "
 "�екундному розігріві."
 
-#: ../backend/pixma.c:378
+#: backend/pixma.c:378
 #, no-c-format
 msgid "Negative color"
 msgstr "Кольоровий негатив"
 
-#: ../backend/pixma.c:383
+#: backend/pixma.c:383
 #, no-c-format
 msgid "Negative gray"
 msgstr "Чорно-білий негатив"
 
-#: ../backend/pixma.c:396
+#: backend/pixma.c:396
 #, no-c-format
 msgid "48 bits color"
 msgstr "48-бітовий колір"
 
-#: ../backend/pixma.c:401
+#: backend/pixma.c:401
 #, no-c-format
 msgid "16 bits gray"
 msgstr "16-бітовий �ірий"
 
-#: ../backend/pixma_sane_options.c:82
+#: backend/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
@@ -4530,12 +5291,12 @@ msgstr ""
 "В�тановіть джерело перед режимом і роздільною здатні�тю. Відновлює "
 "автоматично визначені значенн� режиму та роздільної здатно�ті."
 
-#: ../backend/pixma_sane_options.c:96
+#: backend/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr "Кероване кнопкою �кануванн�"
 
-#: ../backend/pixma_sane_options.c:97
+#: backend/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -4546,248 +5307,241 @@ msgstr ""
 "негайно. Дл� продовженн�, нати�ніть кнопку «SCAN» (MP150) або "
 "«COLOR» (дл� інших моделей). Дл� �ка�уванн� нати�ніть кнопку «GRAY»."
 
-#: ../backend/pixma_sane_options.c:143
-#, no-c-format
-msgid "Gamma function exponent"
-msgstr "Показник функції гами"
-
-#: ../backend/pixma_sane_options.c:144
-#, no-c-format
-msgid "Changes intensity of midtones"
-msgstr "Змінює інтен�ивні�ть напівтонів"
-
-#: ../backend/pixma_sane_options.c:230
+#: backend/pixma_sane_options.c:232
 #, no-c-format
 msgid "Update button state"
 msgstr "Оновити �тан кнопки"
 
-#: ../backend/pixma_sane_options.c:242
+#: backend/pixma_sane_options.c:244
 #, no-c-format
 msgid "Button 1"
 msgstr "Кнопка 1"
 
-#: ../backend/pixma_sane_options.c:256
+#: backend/pixma_sane_options.c:258
 #, no-c-format
 msgid "Button 2"
 msgstr "Кнопка 2"
 
-#: ../backend/pixma_sane_options.c:270
+#: backend/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr "Тип оригіналу дл� �кануванн�"
 
-#: ../backend/pixma_sane_options.c:284
+#: backend/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr "Тип дії дл� отриманн� результату"
 
-#: ../backend/plustek.c:235 ../backend/plustek_pp.c:204
-#: ../backend/u12.c:156
+#: backend/pixma_sane_options.c:348
+#, no-c-format
+msgid "ADF Waiting Time"
+msgstr "Ча� очікуванн� �ПД"
+
+#: backend/pixma_sane_options.c:349
+#, no-c-format
+msgid ""
+"When set, the scanner searches the waiting time in seconds for a new "
+"document inserted into the automatic document feeder."
+msgstr ""
+"Якщо визначено, �канер шукатиме новий документ, в�тавлений до при�трою "
+"автоматичної подачі документів, прот�гом вказаної кілько�ті �екунд."
+
+#: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
 msgid "Transparency"
 msgstr "Прозорі�ть"
 
-#: ../backend/plustek.c:913
+#: backend/plustek.c:913
 #, no-c-format
 msgid "Device-Settings"
 msgstr "Параметри при�трою"
 
-#: ../backend/plustek.c:920
+#: backend/plustek.c:920
 #, no-c-format
 msgid "Lampswitch"
 msgstr "Перемикач лампи"
 
-#: ../backend/plustek.c:921
+#: backend/plustek.c:921
 #, no-c-format
 msgid "Manually switching the lamp(s)."
 msgstr "Перемиканн� ламп вручну."
 
-#: ../backend/plustek.c:926
+#: backend/plustek.c:926
 #, no-c-format
 msgid "Lamp off during dark calibration"
 msgstr "Вимиканн� лампи під ча� калібруванн� темного"
 
-#: ../backend/plustek.c:927
+#: backend/plustek.c:927
 #, no-c-format
 msgid "Always switches lamp off when doing dark calibration."
 msgstr "Завжди вимикати лампу під ча� виконанн� калібруванн� темної зони"
 
-#: ../backend/plustek.c:935
+#: backend/plustek.c:935
 #, no-c-format
 msgid "Calibration data cache"
 msgstr "Кешуванн� даних калібруванн�"
 
-#: ../backend/plustek.c:936
+#: backend/plustek.c:936
 #, no-c-format
 msgid "Enables or disables calibration data cache."
 msgstr "Вмикає або вимикає кешуванн� даних калібруванн�."
 
-#: ../backend/plustek.c:942
+#: backend/plustek.c:942
 #, no-c-format
 msgid "Performs calibration"
 msgstr "Виконує калібруванн�"
 
-#: ../backend/plustek.c:959
+#: backend/plustek.c:959
 #, no-c-format
 msgid "Speedup sensor"
 msgstr "Пришвидшити датчик"
 
-#: ../backend/plustek.c:960
+#: backend/plustek.c:960
 #, no-c-format
 msgid "Enables or disables speeding up sensor movement."
 msgstr "Вмикає або вимикає пришвидшенн� руху датчика."
 
-#: ../backend/plustek.c:974
+#: backend/plustek.c:974
 #, no-c-format
 msgid "Warmup-time"
 msgstr "Ча� розігріву"
 
-#: ../backend/plustek.c:975
+#: backend/plustek.c:975
 #, no-c-format
 msgid "Warmup-time in seconds."
 msgstr "Ча� розігріву у �екундах."
 
-#: ../backend/plustek.c:987
+#: backend/plustek.c:987
 #, no-c-format
 msgid "Lampoff-time"
 msgstr "Ча� вимиканн�"
 
-#: ../backend/plustek.c:988
+#: backend/plustek.c:988
 #, no-c-format
 msgid "Lampoff-time in seconds."
 msgstr "Ча� вимиканн� лампи у �екундах."
 
-#: ../backend/plustek.c:995
+#: backend/plustek.c:995
 #, no-c-format
 msgid "Analog frontend"
 msgstr "�налогова оболонка"
 
-#: ../backend/plustek.c:1002
+#: backend/plustek.c:1002
 #, no-c-format
 msgid "Red gain value of the AFE"
 msgstr "Значенн� під�иленн� червоного AFE"
 
-#: ../backend/plustek.c:1009 ../backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:792
 #, no-c-format
 msgid "Red offset"
 msgstr "Зміщенн� червоного"
 
-#: ../backend/plustek.c:1010
+#: backend/plustek.c:1010
 #, no-c-format
 msgid "Red offset value of the AFE"
 msgstr "Значенн� зміщенн� червоного AFE"
 
-#: ../backend/plustek.c:1018
+#: backend/plustek.c:1018
 #, no-c-format
 msgid "Green gain value of the AFE"
 msgstr "Значенн� під�иленн� зеленого AFE"
 
-#: ../backend/plustek.c:1025 ../backend/umax_pp.c:804
-#, no-c-format
-msgid "Green offset"
-msgstr "Зміщенн� зеленого"
-
-#: ../backend/plustek.c:1026
+#: backend/plustek.c:1026
 #, no-c-format
 msgid "Green offset value of the AFE"
 msgstr "Значенн� зміщенн� зеленого AFE"
 
-#: ../backend/plustek.c:1034
+#: backend/plustek.c:1034
 #, no-c-format
 msgid "Blue gain value of the AFE"
 msgstr "Значенн� під�иленн� �инього AFE"
 
-#: ../backend/plustek.c:1041 ../backend/umax_pp.c:816
-#, no-c-format
-msgid "Blue offset"
-msgstr "Зміщенн� �инього"
-
-#: ../backend/plustek.c:1042
+#: backend/plustek.c:1042
 #, no-c-format
 msgid "Blue offset value of the AFE"
 msgstr "Значенн� зміщенн� �инього AFE"
 
-#: ../backend/plustek.c:1049
+#: backend/plustek.c:1049
 #, no-c-format
 msgid "Red lamp off"
 msgstr "Вимиканн� лампи червоного"
 
-#: ../backend/plustek.c:1050
+#: backend/plustek.c:1050
 #, no-c-format
 msgid "Defines red lamp off parameter"
 msgstr "Визначає параметр вимиканн� лампи червоного"
 
-#: ../backend/plustek.c:1057
+#: backend/plustek.c:1057
 #, no-c-format
 msgid "Green lamp off"
 msgstr "Вимиканн� лампи зеленого"
 
-#: ../backend/plustek.c:1058
+#: backend/plustek.c:1058
 #, no-c-format
 msgid "Defines green lamp off parameter"
 msgstr "Визначає параметр вимиканн� лампи зеленого"
 
-#: ../backend/plustek.c:1065
+#: backend/plustek.c:1065
 #, no-c-format
 msgid "Blue lamp off"
 msgstr "Вимиканн� лампи �инього"
 
-#: ../backend/plustek.c:1066
+#: backend/plustek.c:1066
 #, no-c-format
 msgid "Defines blue lamp off parameter"
 msgstr "Визначає параметр вимиканн� лампи �инього"
 
-#: ../backend/plustek.c:1096
+#: backend/plustek.c:1096
 #, no-c-format
 msgid "This option reflects the status of the scanner buttons."
 msgstr "Цей параметр відповідає �тану кнопок �канера."
 
-#: ../backend/plustek_pp.c:197
+#: backend/plustek_pp.c:197
 #, no-c-format
 msgid "Color36"
 msgstr "Кольоровий 36"
 
-#: ../backend/plustek_pp.c:211
+#: backend/plustek_pp.c:211
 #, no-c-format
 msgid "Dithermap 1"
 msgstr "Карта дизерингу 1"
 
-#: ../backend/plustek_pp.c:212
+#: backend/plustek_pp.c:212
 #, no-c-format
 msgid "Dithermap 2"
 msgstr "Карта дизерингу 2"
 
-#: ../backend/plustek_pp.c:213
+#: backend/plustek_pp.c:213
 #, no-c-format
 msgid "Randomize"
 msgstr "Випадково"
 
-#: ../backend/pnm.c:168
+#: backend/pnm.c:168
 #, no-c-format
 msgid "Source Selection"
 msgstr "Вибір джерела"
 
-#: ../backend/pnm.c:205
+#: backend/pnm.c:205
 #, no-c-format
 msgid "Image Enhancement"
 msgstr "Покращенн� зображенн�"
 
-#: ../backend/pnm.c:241
+#: backend/pnm.c:241
 #, no-c-format
 msgid "Grayify"
 msgstr "Зробити чорно-білим"
 
-#: ../backend/pnm.c:242
+#: backend/pnm.c:242
 #, no-c-format
 msgid "Load the image as grayscale."
 msgstr "Завантажити зображенн� �к чорно-біле"
 
-#: ../backend/pnm.c:253
+#: backend/pnm.c:253
 #, no-c-format
 msgid "Three-Pass Simulation"
 msgstr "Імітаці� режиму трьох проходів"
 
-#: ../backend/pnm.c:255
+#: backend/pnm.c:255
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner by returning 3 separate frames.  For "
@@ -4796,12 +5550,12 @@ msgstr ""
 "Імітувати �кануванн� у три проходи поверненн�м 3 окремих кадрів. Буде "
 "повернено кадри дл� зеленого, �инього, а потім червоного кольору."
 
-#: ../backend/pnm.c:267
+#: backend/pnm.c:267
 #, no-c-format
 msgid "Hand-Scanner Simulation"
 msgstr "Імітаці� ручного �канера"
 
-#: ../backend/pnm.c:268
+#: backend/pnm.c:268
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners often do not know the image "
@@ -4813,7 +5567,7 @@ msgstr ""
 "В�тановленн� цього параметра надає змогу перевірити, чи може оболонка "
 "правильно обробити такі дані."
 
-#: ../backend/pnm.c:283
+#: backend/pnm.c:283
 #, no-c-format
 msgid ""
 "Set default values for enhancement controls (brightness & contrast)."
@@ -4821,42 +5575,42 @@ msgstr ""
 "В�тановити типові значенн� керуванн� покращенн�м (��краві�тю і "
 "контра�тні�тю)."
 
-#: ../backend/pnm.c:295
+#: backend/pnm.c:295
 #, no-c-format
 msgid "Read only test-option"
 msgstr "Те�товий параметр лише дл� читанн�"
 
-#: ../backend/pnm.c:296
+#: backend/pnm.c:296
 #, no-c-format
 msgid "Let's see whether frontends can treat this right"
 msgstr "Давайте переконаємо�� у правильно�ті обробки даних оболонкою"
 
-#: ../backend/pnm.c:307
+#: backend/pnm.c:307
 #, no-c-format
 msgid "Gamma Tables"
 msgstr "Таблиці гамми"
 
-#: ../backend/pnm.c:379
+#: backend/pnm.c:379
 #, no-c-format
 msgid "Status Code Simulation"
 msgstr "Імітаці� коду �тану"
 
-#: ../backend/pnm.c:391
+#: backend/pnm.c:391
 #, no-c-format
 msgid "Do not force status code"
 msgstr "�е в�тановлювати код �тану приму�ово"
 
-#: ../backend/pnm.c:392
+#: backend/pnm.c:392
 #, no-c-format
 msgid "Do not force the backend to return a status code."
 msgstr "�е примушувати ін�трумент обробки повертати код �тану."
 
-#: ../backend/pnm.c:403
+#: backend/pnm.c:403
 #, no-c-format
 msgid "Return SANE_STATUS_EOF"
 msgstr "Повернути SANE_STATUS_EOF"
 
-#: ../backend/pnm.c:404
+#: backend/pnm.c:404
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_EOF after "
@@ -4865,12 +5619,12 @@ msgstr ""
 "�аказати �ерверу повертати код �тану SANE_STATUS_EOF пі�л� виклику "
 "sane_read()."
 
-#: ../backend/pnm.c:416
+#: backend/pnm.c:416
 #, no-c-format
 msgid "Return SANE_STATUS_JAMMED"
 msgstr "Повернути SANE_STATUS_JAMMED"
 
-#: ../backend/pnm.c:418
+#: backend/pnm.c:418
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_JAMMED after "
@@ -4879,12 +5633,12 @@ msgstr ""
 "�аказати �ерверу повертати код �тану SANE_STATUS_JAMMED пі�л� виклику "
 "sane_read()."
 
-#: ../backend/pnm.c:430
+#: backend/pnm.c:430
 #, no-c-format
 msgid "Return SANE_STATUS_NO_DOCS"
 msgstr "Повернути SANE_STATUS_NO_DOCS"
 
-#: ../backend/pnm.c:431
+#: backend/pnm.c:431
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_DOCS after "
@@ -4893,12 +5647,12 @@ msgstr ""
 "�аказати �ерверу повертати код �тану SANE_STATUS_NO_DOCS пі�л� виклику "
 "sane_read()."
 
-#: ../backend/pnm.c:443
+#: backend/pnm.c:443
 #, no-c-format
 msgid "Return SANE_STATUS_COVER_OPEN"
 msgstr "Повернути SANE_STATUS_COVER_OPEN"
 
-#: ../backend/pnm.c:444
+#: backend/pnm.c:444
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_COVER_OPEN after "
@@ -4907,12 +5661,12 @@ msgstr ""
 "�аказати �ерверу повертати код �тану SANE_STATUS_COVER_OPEN пі�л� "
 "виклику sane_read()."
 
-#: ../backend/pnm.c:456
+#: backend/pnm.c:456
 #, no-c-format
 msgid "Return SANE_STATUS_IO_ERROR"
 msgstr "Повернути SANE_STATUS_IO_ERROR"
 
-#: ../backend/pnm.c:457
+#: backend/pnm.c:457
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_IO_ERROR after "
@@ -4921,12 +5675,12 @@ msgstr ""
 "�аказати �ерверу повертати код �тану SANE_STATUS_IO_ERROR пі�л� виклику "
 "sane_read()."
 
-#: ../backend/pnm.c:469
+#: backend/pnm.c:469
 #, no-c-format
 msgid "Return SANE_STATUS_NO_MEM"
 msgstr "Повернути SANE_STATUS_NO_MEM"
 
-#: ../backend/pnm.c:471
+#: backend/pnm.c:471
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_NO_MEM after "
@@ -4935,12 +5689,12 @@ msgstr ""
 "�аказати �ерверу повертати код �тану SANE_STATUS_NO_MEM пі�л� виклику "
 "sane_read()."
 
-#: ../backend/pnm.c:483
+#: backend/pnm.c:483
 #, no-c-format
 msgid "Return SANE_STATUS_ACCESS_DENIED"
 msgstr "Повернути SANE_STATUS_ACCESS_DENIED"
 
-#: ../backend/pnm.c:484
+#: backend/pnm.c:484
 #, no-c-format
 msgid ""
 "Force the backend to return the status code SANE_STATUS_ACCESS_DENIED "
@@ -4949,86 +5703,83 @@ msgstr ""
 "�аказати �ерверу повертати код �тану SANE_STATUS_ACCESS_DENIED пі�л� "
 "виклику sane_read()."
 
-#: ../backend/rts8891.c:2809
+#: backend/rts8891.c:2809
 #, no-c-format
 msgid "This option reflects the status of a scanner button."
 msgstr "Цей пункт відповідає �тану кнопки �кануванн�."
 
-#: ../backend/rts8891.c:2840 ../backend/umax.c:5795
-#: ../backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
 #, no-c-format
 msgid "Lamp on"
 msgstr "Увімкнути лампу"
 
-#: ../backend/rts8891.c:2841 ../backend/umax.c:5796
+#: backend/rts8891.c:2841 backend/umax.c:5796
 #, no-c-format
 msgid "Turn on scanner lamp"
 msgstr "Увімкнути лампу �канера"
 
-#: ../backend/rts8891.c:2851 ../backend/umax1220u.c:248
-#: ../backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
 #, no-c-format
 msgid "Lamp off"
 msgstr "Вимкнути лампу"
 
-#: ../backend/rts8891.c:2852 ../backend/umax1220u.c:249
-#: ../backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr "Вимкнути лампу �канера"
 
-#: ../backend/sm3840.c:760
+#: backend/sm3840.c:760
 #, no-c-format
 msgid "Lamp timeout"
 msgstr "Ча� очікуванн� лампи"
 
-#: ../backend/sm3840.c:762
+#: backend/sm3840.c:762
 #, no-c-format
 msgid "Minutes until lamp is turned off after scan"
 msgstr ""
 "Кількі�ть хвилин, за �кі лампу буде вимкнено пі�л� виконанн� �кануванн�"
 
-#: ../backend/sm3840.c:772
+#: backend/sm3840.c:772
 #, no-c-format
 msgid "Threshold value for lineart mode"
 msgstr "Порогове значенн� дл� штрихового режиму"
 
-#: ../backend/snapscan-options.c:88
+#: backend/snapscan-options.c:88
 #, no-c-format
 msgid "Document Feeder"
 msgstr "Подача документів"
 
-#: ../backend/snapscan-options.c:92
+#: backend/snapscan-options.c:92
 #, no-c-format
 msgid "6x4 (inch)"
 msgstr "6x4 (дюймів)"
 
-#: ../backend/snapscan-options.c:93
+#: backend/snapscan-options.c:93
 #, no-c-format
 msgid "8x10 (inch)"
 msgstr "8x10 (дюймів)"
 
-#: ../backend/snapscan-options.c:94
+#: backend/snapscan-options.c:94
 #, no-c-format
 msgid "8.5x11 (inch)"
 msgstr "8.5x11 (дюймів)"
 
-#: ../backend/snapscan-options.c:97
+#: backend/snapscan-options.c:97
 #, no-c-format
 msgid "Halftoning Unsupported"
 msgstr "�апівтонове �кануванн� не підтримуєть��"
 
-#: ../backend/snapscan-options.c:98
+#: backend/snapscan-options.c:98
 #, no-c-format
 msgid "DispersedDot8x8"
 msgstr "DispersedDot8x8"
 
-#: ../backend/snapscan-options.c:99
+#: backend/snapscan-options.c:99
 #, no-c-format
 msgid "DispersedDot16x16"
 msgstr "DispersedDot16x16"
 
-#: ../backend/snapscan-options.c:103
+#: backend/snapscan-options.c:103
 #, no-c-format
 msgid ""
 "Number of scan lines to request in a SCSI read. Changing this parameter "
@@ -5044,27 +5795,27 @@ msgstr ""
 "Якщо ж значенн� буде завеликим, за�новані на �ервері X оболонки не "
 "відповідатимуть на події X, а �и�тема значно уповільнить��."
 
-#: ../backend/snapscan-options.c:111
+#: backend/snapscan-options.c:111
 #, no-c-format
 msgid "Frame number of media holder that should be scanned."
 msgstr "Кількі�ть кадрів на шаблоні, �кий має бути �кановано."
 
-#: ../backend/snapscan-options.c:114
+#: backend/snapscan-options.c:114
 #, no-c-format
 msgid "Use manual or automatic selection of focus point."
 msgstr "Викори�товувати ручний або автоматичний вибір точки фоку�уванн�."
 
-#: ../backend/snapscan-options.c:117
+#: backend/snapscan-options.c:117
 #, no-c-format
 msgid "Focus point for scanning."
 msgstr "Точка фоку�уванн� дл� �кануванн�."
 
-#: ../backend/snapscan-options.c:482
+#: backend/snapscan-options.c:482
 #, no-c-format
 msgid "Preview mode"
 msgstr "Режим попереднього перегл�ду"
 
-#: ../backend/snapscan-options.c:484
+#: backend/snapscan-options.c:484
 #, no-c-format
 msgid ""
 "Select the mode for previews. Greyscale previews usually give the best "
@@ -5073,12 +5824,12 @@ msgstr ""
 "Оберіть режим попереднього перегл�ду. Чорно-білий режим, зазвичай, дає "
 "найкращу комбінацію швидко�ті і деталізації."
 
-#: ../backend/snapscan-options.c:601
+#: backend/snapscan-options.c:601
 #, no-c-format
 msgid "Predefined settings"
 msgstr "Попередньо визначені параметри"
 
-#: ../backend/snapscan-options.c:603
+#: backend/snapscan-options.c:603
 #, no-c-format
 msgid ""
 "Provides standard scanning areas for photographs, printed pages and the "
@@ -5087,97 +5838,97 @@ msgstr ""
 "Визначає �тандартні обла�ті �кануванн� дл� фотографій, друкованих "
 "�торінок та подібних документів."
 
-#: ../backend/snapscan-options.c:884
+#: backend/snapscan-options.c:884
 #, no-c-format
 msgid "Frame"
 msgstr "Кадр"
 
-#: ../backend/snapscan-options.c:885
+#: backend/snapscan-options.c:885
 #, no-c-format
 msgid "Frame to be scanned"
 msgstr "Кадр, �кий буде �кановано"
 
-#: ../backend/snapscan-options.c:897
+#: backend/snapscan-options.c:897
 #, no-c-format
 msgid "Focus-mode"
 msgstr "Режим фоку�уванн�"
 
-#: ../backend/snapscan-options.c:898
+#: backend/snapscan-options.c:898
 #, no-c-format
 msgid "Auto or manual focus"
 msgstr "�втоматичне або ручне фоку�уванн�"
 
-#: ../backend/snapscan-options.c:911
+#: backend/snapscan-options.c:911
 #, no-c-format
 msgid "Focus-point"
 msgstr "Точка фоку�уванн�"
 
-#: ../backend/snapscan-options.c:912
+#: backend/snapscan-options.c:912
 #, no-c-format
 msgid "Focus point"
 msgstr "Точка фоку�уванн�"
 
-#: ../backend/snapscan-options.c:930
+#: backend/snapscan-options.c:930
 #, no-c-format
 msgid "Colour lines per read"
 msgstr "Кольорових ліній на �еан� читанн�"
 
-#: ../backend/snapscan-options.c:942
+#: backend/snapscan-options.c:942
 #, no-c-format
 msgid "Greyscale lines per read"
 msgstr "Чорно-білих ліній на �еан� читанн�"
 
-#: ../backend/stv680.c:974
+#: backend/stv680.c:974
 #, no-c-format
 msgid "webcam"
 msgstr "Веб-камера"
 
-#: ../backend/stv680.h:115
+#: backend/stv680.h:115
 #, no-c-format
 msgid "Color RAW"
 msgstr "Кольоровий RAW"
 
-#: ../backend/stv680.h:116
+#: backend/stv680.h:116
 #, no-c-format
 msgid "Color RGB"
 msgstr "Кольоровий RGB"
 
-#: ../backend/stv680.h:117
+#: backend/stv680.h:117
 #, no-c-format
 msgid "Color RGB TEXT"
 msgstr "Кольоровий RGB TEXT"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid black"
 msgstr "Суцільний чорний"
 
-#: ../backend/test.c:137
+#: backend/test.c:137
 #, no-c-format
 msgid "Solid white"
 msgstr "Суцільний білий"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Color pattern"
 msgstr "Кольоровий візерунок"
 
-#: ../backend/test.c:138
+#: backend/test.c:138
 #, no-c-format
 msgid "Grid"
 msgstr "�ратка"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "First entry"
 msgstr "Перший запи�"
 
-#: ../backend/test.c:163 ../backend/test.c:171
+#: backend/test.c:163 backend/test.c:171
 #, no-c-format
 msgid "Second entry"
 msgstr "Другий запи�"
 
-#: ../backend/test.c:165
+#: backend/test.c:165
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
@@ -5185,12 +5936,12 @@ msgid ""
 msgstr ""
 "Третій запи� є затримуєть��. Можливо, оболонка не може його показати."
 
-#: ../backend/test.c:348
+#: backend/test.c:348
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr "Імітаці� ручного �канера"
 
-#: ../backend/test.c:349
+#: backend/test.c:349
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5204,12 +5955,12 @@ msgstr ""
 "правильно обробити такі дані. Позначенн� цього пункту також увімкне "
 "фік�овану ширину у 11 �м."
 
-#: ../backend/test.c:366
+#: backend/test.c:366
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr "Імітаці� режиму трьох проходів"
 
-#: ../backend/test.c:367
+#: backend/test.c:367
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are "
@@ -5218,17 +5969,17 @@ msgstr ""
 "Імітувати �кануванн� з трьома проходами. У кольоровому режимі буде "
 "повернуто три кадри."
 
-#: ../backend/test.c:382
+#: backend/test.c:382
 #, no-c-format
 msgid "Set the order of frames"
 msgstr "Визначити пор�док кадрів"
 
-#: ../backend/test.c:383
+#: backend/test.c:383
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr "Визначити пор�док кадрів у кольоровому режимі трьох проходів."
 
-#: ../backend/test.c:416
+#: backend/test.c:416
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' "
@@ -5237,17 +5988,17 @@ msgstr ""
 "Якщо обрано режим автоматичної подачі документів, при�трій подачі буде "
 "«�порожнено» пі�л� 10 �канувань."
 
-#: ../backend/test.c:431
+#: backend/test.c:431
 #, no-c-format
 msgid "Special Options"
 msgstr "О�обливі параметри"
 
-#: ../backend/test.c:444
+#: backend/test.c:444
 #, no-c-format
 msgid "Select the test picture"
 msgstr "Оберіть те�тове зображенн�"
 
-#: ../backend/test.c:446
+#: backend/test.c:446
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5264,12 +6015,12 @@ msgstr ""
 "від режиму.\n"
 "�ратка: намалює чорно-білу ґратку з шириною і ви�отою 10 мм на квадрат."
 
-#: ../backend/test.c:467
+#: backend/test.c:467
 #, no-c-format
 msgid "Invert endianness"
 msgstr "Інвертувати пор�док байтів"
 
-#: ../backend/test.c:468
+#: backend/test.c:468
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option "
@@ -5281,23 +6032,23 @@ msgstr ""
 "режимів оболонок, наприклад, перевірки правильно�ті пор�дку байтів у "
 "оболонці."
 
-#: ../backend/test.c:484
+#: backend/test.c:484
 #, no-c-format
 msgid "Read limit"
 msgstr "Границ� читанн�"
 
-#: ../backend/test.c:485
+#: backend/test.c:485
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 "Обмежити об’єм даних, що передають�� під ча� кожного виклику sane_read()."
 
-#: ../backend/test.c:498
+#: backend/test.c:498
 #, no-c-format
 msgid "Size of read-limit"
 msgstr "Розмір границі читанн�"
 
-#: ../backend/test.c:499
+#: backend/test.c:499
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
@@ -5305,33 +6056,33 @@ msgstr ""
 "Об’єм (мак�имальний) даних, �кі буде передано під ча� кожного з викликів "
 "sane_read()."
 
-#: ../backend/test.c:514
+#: backend/test.c:514
 #, no-c-format
 msgid "Read delay"
 msgstr "Затримка читанн�"
 
-#: ../backend/test.c:515
+#: backend/test.c:515
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr "Затримка передаванн� даних до каналу."
 
-#: ../backend/test.c:527
+#: backend/test.c:527
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr "Тривалі�ть затримки читанн�"
 
-#: ../backend/test.c:528
+#: backend/test.c:528
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
 msgstr "Ча� очікуванн� пі�л� передаванн� кожного з буферів даних каналом."
 
-#: ../backend/test.c:543
+#: backend/test.c:543
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr "Повернуте значенн� sane_read"
 
-#: ../backend/test.c:545
+#: backend/test.c:545
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal "
@@ -5342,22 +6093,22 @@ msgstr ""
 "обробку �кануванн�. В�і інші коди �тану призначено дл� перевірки "
 "�по�обів їх обробки оболонкою."
 
-#: ../backend/test.c:562
+#: backend/test.c:562
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr "Втрата точок на лінію"
 
-#: ../backend/test.c:564
+#: backend/test.c:564
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr "Кількі�ть точок, �кі було втрачено наприкінці кожної з ліній."
 
-#: ../backend/test.c:577
+#: backend/test.c:577
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr "Параметри нечітко�ті"
 
-#: ../backend/test.c:578
+#: backend/test.c:578
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
@@ -5366,24 +6117,24 @@ msgstr ""
 "Кількі�ть повернутих неточних р�дків і байтів, �кщо sane_parameters() "
 "викликаєть�� до sane_start()."
 
-#: ../backend/test.c:591
+#: backend/test.c:591
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr "Викори�товувати ввід-вивід без блокуванн�"
 
-#: ../backend/test.c:592
+#: backend/test.c:592
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 "Викори�товувати режим вводу-виводу без блокуванн� дл� sane_read(), �кщо "
 "підтримуєть�� оболонкою."
 
-#: ../backend/test.c:605
+#: backend/test.c:605
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr "Пропонувати обрати де�криптор файла"
 
-#: ../backend/test.c:606
+#: backend/test.c:606
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return "
@@ -5392,12 +6143,12 @@ msgstr ""
 "Пропонувати обрати де�криптор файла дл� визначенн� того, чи повертатиме "
 "sane_read() дані."
 
-#: ../backend/test.c:619
+#: backend/test.c:619
 #, no-c-format
 msgid "Enable test options"
 msgstr "Увімкнути параметри перевірки"
 
-#: ../backend/test.c:620
+#: backend/test.c:620
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of "
@@ -5406,27 +6157,27 @@ msgstr ""
 "Увімкнути різноманітні параметри перевірки. Призначено дл� перевірки "
 "можливо�тей оболонки перегл�дати і змінювати в�і параметри SANE."
 
-#: ../backend/test.c:634
+#: backend/test.c:634
 #, no-c-format
 msgid "Print options"
 msgstr "Параметри друку"
 
-#: ../backend/test.c:635
+#: backend/test.c:635
 #, no-c-format
 msgid "Print a list of all options."
 msgstr "�адрукувати �пи�ок в�іх параметрів."
 
-#: ../backend/test.c:712
+#: backend/test.c:712
 #, no-c-format
 msgid "Bool test options"
 msgstr "Двійкові параметри перевірки"
 
-#: ../backend/test.c:725
+#: backend/test.c:725
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr "(1/6) Булевий програмний вибір програмне визначенн�"
 
-#: ../backend/test.c:727
+#: backend/test.c:727
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and "
@@ -5436,12 +6187,12 @@ msgstr ""
 "програмного вибору і програмного визначенн� (та додаткових). Це "
 "звичайний булевий параметр."
 
-#: ../backend/test.c:743
+#: backend/test.c:743
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr "(2/6) Булевий апаратний вибір програмне визначенн�"
 
-#: ../backend/test.c:745
+#: backend/test.c:745
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and "
@@ -5453,12 +6204,12 @@ msgstr ""
 "що параметр не може бути в�тановлено оболонкою, лише кори�тувачем "
 "(наприклад, нати�канн�м кнопки на при�трої)."
 
-#: ../backend/test.c:762
+#: backend/test.c:762
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr "(3/6) Булевий апаратний вибір"
 
-#: ../backend/test.c:763
+#: backend/test.c:763
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5470,12 +6221,12 @@ msgstr ""
 "в�тановлено оболонкою, лише кори�тувачем (наприклад, нати�канн�м кнопки "
 "на при�трої), оболонка не може читати дані за такої конфігурації."
 
-#: ../backend/test.c:781
+#: backend/test.c:781
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr "(4/6) М’�ке булів�ьке ви�вленн�"
 
-#: ../backend/test.c:782
+#: backend/test.c:782
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
@@ -5485,12 +6236,12 @@ msgstr ""
 "програмного визначенн� (та додаткових). Це означає, що параметр "
 "призначено лише дл� читанн�."
 
-#: ../backend/test.c:798
+#: backend/test.c:798
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr "(5/6) Булева емул�ці� програмного вибору і програмного визначенн�"
 
-#: ../backend/test.c:799
+#: backend/test.c:799
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated "
@@ -5499,12 +6250,12 @@ msgstr ""
 "(5/6) Булевий параметр перевірки, �кий визначає на�вні�ть можливо�тей "
 "програмного вибору, програмного визначенн� та емул�ції (та додаткових)."
 
-#: ../backend/test.c:815
+#: backend/test.c:815
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr "(6/6) Булевий автоматичний програмний вибір, програмне визначенн�"
 
-#: ../backend/test.c:816
+#: backend/test.c:816
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic "
@@ -5516,29 +6267,29 @@ msgstr ""
 "додаткових) можливо�тей. Цей параметри може автоматично в�тановлювати�� "
 "�ервером."
 
-#: ../backend/test.c:833
+#: backend/test.c:833
 #, no-c-format
 msgid "Int test options"
 msgstr "Цілочи�ельні параметри перевірки"
 
-#: ../backend/test.c:846
+#: backend/test.c:846
 #, no-c-format
 msgid "(1/6) Int"
 msgstr "(1/6) Цілочи�ельний"
 
-#: ../backend/test.c:847
+#: backend/test.c:847
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr ""
 "(1/6) Цілочи�ельний параметр перевірки без одиниці виміру і набору "
 "обмежень."
 
-#: ../backend/test.c:862
+#: backend/test.c:862
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr "(2/6) Цілочи�ельний діапазон обмеженн�"
 
-#: ../backend/test.c:863
+#: backend/test.c:863
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum "
@@ -5548,24 +6299,24 @@ msgstr ""
 "обмежень. Мінімальним значенн�м може бути 4, мак�имальним — 192, крок — "
 "2."
 
-#: ../backend/test.c:879
+#: backend/test.c:879
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr "(3/6) Цілочи�ельний �пи�ок обмежень �лів"
 
-#: ../backend/test.c:880
+#: backend/test.c:880
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 "(3/6) Цілочи�ельний параметр перевірки з одиницею виміру біт і набором "
 "обмежень �пи�ку �лів."
 
-#: ../backend/test.c:895
+#: backend/test.c:895
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr "(4/6) Цілочи�ельний ма�ив"
 
-#: ../backend/test.c:896
+#: backend/test.c:896
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without "
@@ -5574,12 +6325,12 @@ msgstr ""
 "(4/6) Цілочи�ельний параметр перевірки з одиницею виміру міліметри і "
 "викори�танн�м ма�иву без обмежень."
 
-#: ../backend/test.c:911
+#: backend/test.c:911
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr "(2/6) Цілочи�ельний ма�ив з діапазоном обмеженн�"
 
-#: ../backend/test.c:912
+#: backend/test.c:912
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
@@ -5589,12 +6340,12 @@ msgstr ""
 "викори�танн�м ма�иву обмежень діапазону. Мінімальним значенн�м може бути "
 "4, мак�имальним — 192, крок — 2."
 
-#: ../backend/test.c:929
+#: backend/test.c:929
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr "(6/6) Цілочи�ельний ма�ив зі �пи�ком обмежень �лів"
 
-#: ../backend/test.c:930
+#: backend/test.c:930
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word "
@@ -5603,29 +6354,29 @@ msgstr ""
 "(6/6) Цілочи�ельний параметр з розмірні�тю у від�отках з викори�танн�м "
 "ма�иву обмежень �пи�ку �лів."
 
-#: ../backend/test.c:946
+#: backend/test.c:946
 #, no-c-format
 msgid "Fixed test options"
 msgstr "Дробовочи�лові параметри перевірки"
 
-#: ../backend/test.c:959
+#: backend/test.c:959
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr "(1/3) Дробовочи�ловий"
 
-#: ../backend/test.c:960
+#: backend/test.c:960
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr ""
 "(1/3) Дробовочи�ловий параметр перевірки без одиниці виміру і без набору "
 "обмежень."
 
-#: ../backend/test.c:975
+#: backend/test.c:975
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr "(2/3) Фік�ований обмежений діапазон"
 
-#: ../backend/test.c:976
+#: backend/test.c:976
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
@@ -5635,49 +6386,49 @@ msgstr ""
 "обмежень. Мінімальним значенн�м може бути -42.17, мак�имальним — "
 "32767.9999, крок — 2.0."
 
-#: ../backend/test.c:992
+#: backend/test.c:992
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr "(3/3) Фік�ований обмежений �пи�ок �лів"
 
-#: ../backend/test.c:993
+#: backend/test.c:993
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 "(3/3) Дробовочи�ловий параметр перевірки без одиниці виміру і набором "
 "обмежень �пи�ку �лів."
 
-#: ../backend/test.c:1008
+#: backend/test.c:1008
 #, no-c-format
 msgid "String test options"
 msgstr "Р�дкові параметри перевірки"
 
-#: ../backend/test.c:1021
+#: backend/test.c:1021
 #, no-c-format
 msgid "(1/3) String"
 msgstr "(1/3) Р�док"
 
-#: ../backend/test.c:1022
+#: backend/test.c:1022
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr "(1/3) Варіант перевірки р�дків без обмежень."
 
-#: ../backend/test.c:1039
+#: backend/test.c:1039
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr "(2/3) Р�дкова з обмеженим �пи�ком р�дків"
 
-#: ../backend/test.c:1040
+#: backend/test.c:1040
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr "(2/3) Варіант перевірки р�дків з обмеженн�м на �пи�ок р�дків."
 
-#: ../backend/test.c:1059
+#: backend/test.c:1059
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr "(3/3) Р�дкова з обмеженим довгим �пи�ком р�дків"
 
-#: ../backend/test.c:1060
+#: backend/test.c:1060
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
@@ -5686,155 +6437,159 @@ msgstr ""
 "(3/3) Варіант перевірки р�дків з обмеженн�м на �пи�ок р�дків. Мі�тить "
 "дещо більше запи�ів..."
 
-#: ../backend/test.c:1080
+#: backend/test.c:1080
 #, no-c-format
 msgid "Button test options"
 msgstr "Параметри перевірки кнопок"
 
-#: ../backend/test.c:1093
+#: backend/test.c:1093
 #, no-c-format
 msgid "(1/1) Button"
 msgstr "(1/1) Кнопка"
 
-#: ../backend/test.c:1094
+#: backend/test.c:1094
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr "(1/1) Варіант перевірки кнопок. Друкує тек�т..."
 
-#: ../backend/u12.c:149
+#: backend/u12.c:149
 #, no-c-format
 msgid "Color 36"
 msgstr "Кольоровий 36"
 
-#: ../backend/umax.c:235
+#: backend/umax.c:235
 #, no-c-format
 msgid "Use Image Composition"
 msgstr "Викори�товувати компонуванн� зображенн�"
 
-#: ../backend/umax.c:236
+#: backend/umax.c:236
 #, no-c-format
 msgid "Bi-level black and white (lineart mode)"
 msgstr "Дворівневий чорно-білий (штриховий режим)"
 
-#: ../backend/umax.c:237
+#: backend/umax.c:237
 #, no-c-format
 msgid "Dithered/halftone black & white (halftone mode)"
 msgstr "Дизеринг/�апівтони чорно-білого (напівтоновий режим)"
 
-#: ../backend/umax.c:238
+#: backend/umax.c:238
 #, no-c-format
 msgid "Multi-level black & white (grayscale mode)"
 msgstr "Багаторівневий чорно-білий (режим відтінків �ірого)"
 
-#: ../backend/umax.c:239
+#: backend/umax.c:239
 #, no-c-format
 msgid "Multi-level RGB color (one pass color)"
 msgstr "Багаторівневий колір RGB (колір з одним проходом)"
 
-#: ../backend/umax.c:240
+#: backend/umax.c:240
 #, no-c-format
 msgid "Ignore calibration"
 msgstr "Ігнорувати калібруванн�"
 
-#: ../backend/umax.c:5733
+#: backend/umax.c:5733
 #, no-c-format
 msgid "Disable pre focus"
 msgstr "Вимкнути попереднє фоку�уванн�"
 
-#: ../backend/umax.c:5734
+#: backend/umax.c:5734
 #, no-c-format
 msgid "Do not calibrate focus"
 msgstr "�е калібрувати фоку�уванн�"
 
-#: ../backend/umax.c:5745
+#: backend/umax.c:5745
 #, no-c-format
 msgid "Manual pre focus"
 msgstr "Попереднє фоку�уванн� вручну"
 
-#: ../backend/umax.c:5757
+#: backend/umax.c:5757
 #, no-c-format
 msgid "Fix focus position"
 msgstr "Зафік�увати позицію фоку�уванн�"
 
-#: ../backend/umax.c:5769
+#: backend/umax.c:5769
 #, no-c-format
 msgid "Lens calibration in doc position"
 msgstr "Калібруванн� лінз у обла�ті документа"
 
-#: ../backend/umax.c:5770
+#: backend/umax.c:5770
 #, no-c-format
 msgid "Calibrate lens focus in document position"
 msgstr "Калібрувати фоку�уванн� лінз у обла�ті документа"
 
-#: ../backend/umax.c:5781
+#: backend/umax.c:5781
 #, no-c-format
 msgid "Holder focus position 0mm"
 msgstr "Позиці� фоку�уванн� держака 0 мм"
 
-#: ../backend/umax.c:5782
+#: backend/umax.c:5782
 #, no-c-format
 msgid "Use 0mm holder focus position instead of 0.6mm"
 msgstr "Позиці� фоку�уванн� держака 0 мм замі�ть 0,6 мм"
 
-#: ../backend/umax.c:5885
+#: backend/umax.c:5885
 #, no-c-format
 msgid "Calibration mode"
 msgstr "Режим калібруванн�"
 
-#: ../backend/umax.c:5886
+#: backend/umax.c:5886
 #, no-c-format
 msgid "Define calibration mode"
 msgstr "Визначає режим калібруванн�"
 
-#: ../backend/umax_pp.c:640
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr "Визначає �тан вмиканн�/вимиканн� лампи"
 
-#: ../backend/umax_pp.c:649
+#: backend/umax_pp.c:649
 #, no-c-format
 msgid "UTA on"
 msgstr "Увімкнути UTA"
 
-#: ../backend/umax_pp.c:650
+#: backend/umax_pp.c:650
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr "Увімкнути/Вимкнути UTA"
 
-#: ../backend/umax_pp.c:771
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Offset"
 msgstr "З�ув"
 
-#: ../backend/umax_pp.c:773
+#: backend/umax_pp.c:773
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr "Параметри з�уву каналів кольорів"
 
-#: ../backend/umax_pp.c:780
+#: backend/umax_pp.c:780
 #, no-c-format
 msgid "Gray offset"
 msgstr "З�ув �ірого"
 
-#: ../backend/umax_pp.c:781
+#: backend/umax_pp.c:781
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr "Визначає з�ув каналу �ірого"
 
-#: ../backend/umax_pp.c:793
+#: backend/umax_pp.c:793
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr "Визначає з�ув каналу червоного"
 
-#: ../backend/umax_pp.c:805
+#: backend/umax_pp.c:805
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr "Визначає з�ув каналу зеленого"
 
-#: ../backend/umax_pp.c:817
+#: backend/umax_pp.c:817
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr "Визначає з�ув каналу �инього"
 
+#, fuzzy
+#~ msgid "IPC mode"
+#~ msgstr "Режим попереднього перегл�ду"
+
 #~ msgid "problem not analyzed (unknown SCSI class)"
 #~ msgstr "Проблема не піддаєть�� аналізу (невідомий кла� SCSI)"
diff --git a/sanei/Makefile.am b/sanei/Makefile.am
index c1106ae..a197343 100644
--- a/sanei/Makefile.am
+++ b/sanei/Makefile.am
@@ -4,8 +4,8 @@
 ##  This file is part of the "Sane" build infra-structure.  See
 ##  included LICENSE file for license information.
 
-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include \
- -I$(top_srcdir)/include
+AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include \
+ -I$(top_srcdir)/include $(USB_CFLAGS)
 
 noinst_LTLIBRARIES = libsanei.la
 
diff --git a/sanei/Makefile.in b/sanei/Makefile.in
index 1fba44d..c6fa654 100644
--- a/sanei/Makefile.in
+++ b/sanei/Makefile.in
@@ -83,11 +83,16 @@ subdir = sanei
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ltoptions.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/byteorder.m4 \
-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/byteorder.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -180,7 +185,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \
+	-I$(top_srcdir)/include $(USB_CFLAGS)
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -201,7 +210,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISTCLEAN_FILES = @DISTCLEAN_FILES@
+DLH = @DLH@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
@@ -214,34 +223,42 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FIG2DEV = @FIG2DEV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
 GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
+GS = @GS@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
 IEEE1284_LIBS = @IEEE1284_LIBS@
-INCLUDES = @INCLUDES@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LOCKPATH = @INSTALL_LOCKPATH@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JPEG_LIBS = @JPEG_LIBS@
 LATEX = @LATEX@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
-LINKER_RPATH = @LINKER_RPATH@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCKPATH_GROUP = @LOCKPATH_GROUP@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINDEX = @MAKEINDEX@
@@ -250,10 +267,10 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MATH_LIB = @MATH_LIB@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
-NUMBER_VERSION = @NUMBER_VERSION@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -266,10 +283,13 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PNG_LIBS = @PNG_LIBS@
+POSUB = @POSUB@
+PPMTOGIF = @PPMTOGIF@
 PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@
 PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -291,12 +311,16 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 V_MAJOR = @V_MAJOR@
 V_MINOR = @V_MINOR@
 V_REV = @V_REV@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -352,9 +376,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include \
- -I$(top_srcdir)/include
-
 noinst_LTLIBRARIES = libsanei.la
 libsanei_la_SOURCES = sanei_ab306.c sanei_constrain_value.c \
 	sanei_init_debug.c sanei_net.c sanei_wire.c \
@@ -445,22 +466,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sanei_wire.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/sanei/sanei_DomainOS.c b/sanei/sanei_DomainOS.c
index 5473151..5473151 100755..100644
--- a/sanei/sanei_DomainOS.c
+++ b/sanei/sanei_DomainOS.c
diff --git a/sanei/sanei_DomainOS.h b/sanei/sanei_DomainOS.h
index ff93503..ff93503 100755..100644
--- a/sanei/sanei_DomainOS.h
+++ b/sanei/sanei_DomainOS.h
diff --git a/sanei/sanei_ab306.c b/sanei/sanei_ab306.c
index c663d38..898acf6 100644
--- a/sanei/sanei_ab306.c
+++ b/sanei/sanei_ab306.c
@@ -81,7 +81,7 @@ inb (u_long port)
 #include "../include/sane/sanei.h"
 #include "../include/sane/sanei_ab306.h"
 
-#if (defined(HAVE_IOPERM) || defined(__FreeBSD__)) && !defined(IO_SUPPORT_MISSING)
+#if (defined(HAVE_IOPERM) || defined(__FreeBSD__) || defined(__DragonFly__)) && !defined(IO_SUPPORT_MISSING)
 
 #include <errno.h>
 #include <fcntl.h>
@@ -102,7 +102,7 @@ inb (u_long port)
 #define PORT_DEV	"/dev/port"
 #define AB306_CIO	0x379		/* control i/o port */
 
-#if defined(__FreeBSD__)	
+#if defined(__FreeBSD__) || defined(__DragonFly__)
 static int dev_io_fd = 0;
 #endif
 
@@ -290,7 +290,7 @@ sanei_ab306_open (const char *dev, int *fdp)
 
   status = sanei_ab306_get_io_privilege (i);
 
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
   status = sanei_ab306_get_io_privilege (i);
   if (status != SANE_STATUS_GOOD)
     return status;
@@ -369,7 +369,7 @@ sanei_ab306_get_io_privilege (int fd)
 {
   if (port[fd].port_fd < 0)
     {
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
       if (dev_io_fd == 0)
 	dev_io_fd = open ("/dev/io", O_RDONLY);
       if (dev_io_fd < 0)
@@ -461,7 +461,6 @@ sanei_ab306_rdata (int fd, int planes, SANE_Byte * buf, int lines, int bpl)
 {
   Port *p = port + fd;
   int lcnt, pcnt, bcnt, xmax;
-  SANE_Byte *lsave_bp;
   int nstat;
 
   DBG(2, "sanei_ab306_rdata: start\n");
@@ -471,7 +470,6 @@ sanei_ab306_rdata (int fd, int planes, SANE_Byte * buf, int lines, int bpl)
   /* the lines-loop: */
   for (lcnt = 0; lcnt < lines; ++lcnt)
     {
-      lsave_bp = buf;
       /* the planes-loop: */
       for (pcnt = 0; pcnt < planes; ++pcnt)
 	{
@@ -520,7 +518,7 @@ sanei_ab306_exit (void)
 	/* power off the scanner: */
 	ab306_outb (port + i, port[i].base + 1, 0x00);
       }
-#if defined(__FreeBSD)
+#if defined(__FreeBSD) || defined(__DragonFly__)
   if (dev_io_fd >0)
     close (dev_io_fd);
 #endif /* defined(__FreeBSD__) */
diff --git a/sanei/sanei_init_debug.c b/sanei/sanei_init_debug.c
index bb5b755..0abb891 100644
--- a/sanei/sanei_init_debug.c
+++ b/sanei/sanei_init_debug.c
@@ -72,7 +72,7 @@
  * instead, so the debugging env var name matches the docs.
  * This is a particular problem in Turkish, where 'i' does
  * not capitalize to 'I' */
-char
+static char
 toupper_ascii (int c)
 {
   if(c > 0x60 && c < 0x7b)
diff --git a/sanei/sanei_ir.c b/sanei/sanei_ir.c
index 42e82ba..47e1e6e 100644
--- a/sanei/sanei_ir.c
+++ b/sanei/sanei_ir.c
@@ -29,7 +29,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <values.h>
+#include <float.h>
+#include <limits.h>
 #include <math.h>
 
 #define BACKEND_NAME sanei_ir	/* name of this module for debugging */
diff --git a/sanei/sanei_magic.c b/sanei/sanei_magic.c
index 167d7dd..bfd56cc 100644
--- a/sanei/sanei_magic.c
+++ b/sanei/sanei_magic.c
@@ -710,7 +710,7 @@ sanei_magic_rotate (SANE_Parameters * params, SANE_Byte * buffer,
 
   DBG(10,"sanei_magic_rotate: finish\n");
 
-  return 0;
+  return ret;
 }
 
 SANE_Status
diff --git a/sanei/sanei_pa4s2.c b/sanei/sanei_pa4s2.c
index c15dd5a..d1be0c0 100644
--- a/sanei/sanei_pa4s2.c
+++ b/sanei/sanei_pa4s2.c
@@ -142,7 +142,7 @@ static int sanei_pa4s2_dbg_init_called = SANE_FALSE;
                           {                                              \
                             DBG_INIT();                                  \
                             DBG(6, "%s: interface called for"            \
-                              " the first time\n", __PRETTY_FUNCTION__); \
+                              " the first time\n", __func__); \
                             sanei_pa4s2_dbg_init_called = SANE_TRUE;     \
                           }
 
@@ -309,7 +309,7 @@ pa4s2_init (SANE_Status *status)
 
   if (first_time == SANE_FALSE)
     {
-      DBG (5, "pa4s2_init: sanei already initalized\n");
+      DBG (5, "pa4s2_init: sanei already initialized\n");
       status = SANE_STATUS_GOOD;
       return 0;
     }
diff --git a/sanei/sanei_pp.c b/sanei/sanei_pp.c
index 6146d1e..dec84ee 100644
--- a/sanei/sanei_pp.c
+++ b/sanei/sanei_pp.c
@@ -126,9 +126,7 @@ inb( u_long port )
 #elif defined(HAVE_LIBIEEE1284)
 # include <ieee1284.h>
 #else
-# if defined(__GNUC__)
-#  warning "No I/O support for this architecture!"
-# endif
+# pragma message "No I/O support for this architecture!"
 # define IO_SUPPORT_MISSING
 #endif
 
@@ -697,7 +695,7 @@ pp_init( void )
 #endif
 
 	if( first_time == SANE_FALSE ) {
-		DBG( 5, "pp_init: already initalized\n" );
+		DBG( 5, "pp_init: already initialized\n" );
 		return SANE_STATUS_GOOD;
     }
 
diff --git a/sanei/sanei_scsi.c b/sanei/sanei_scsi.c
index 6d171d3..2413d8f 100644
--- a/sanei/sanei_scsi.c
+++ b/sanei/sanei_scsi.c
@@ -96,7 +96,7 @@
 #elif defined (HAVE__USR_SRC_LINUX_INCLUDE_SCSI_SG_H)
 # define USE LINUX_INTERFACE
 # include "/usr/src/linux/include/scsi/sg.h"
-#elif defined (HAVE_SYS_SCSICMD)
+#elif defined (HAVE_SYS_SCSICMD_H)
 # define USE SCSO_OS5_INTERFACE
 # include <sys/scsi.h>
 # include <sys/scsicmd.h>
@@ -2719,7 +2719,7 @@ sanei_proc_scsi_find_devices (const char *findvendor, const char *findmodel,
 
     int number, i, j, definedd;
     char line[256], dev_name[128], *c1, *c2, ctmp;
-    const char *string;
+    char *string;
     FILE *proc_fp;
     char *end;
     struct
@@ -2818,7 +2818,7 @@ sanei_proc_scsi_find_devices (const char *findvendor, const char *findmodel,
     while (!feof (proc_fp))
       {
 	fgets (line, sizeof (line), proc_fp);
-	string = sanei_config_skip_whitespace (line);
+	string = (char *) sanei_config_skip_whitespace (line);
 
 	while (*string)
 	  {
@@ -2839,7 +2839,7 @@ sanei_proc_scsi_find_devices (const char *findvendor, const char *findmodel,
 		      }
 		    ctmp = *c2;
 		    *c2 = 0;
-		    string = sanei_config_skip_whitespace (string);
+		    string = (char *) sanei_config_skip_whitespace (string);
 
 		    if (param[i].is_int)
 		      {
diff --git a/sanei/sanei_tcp.c b/sanei/sanei_tcp.c
index a57d7c7..87a73d1 100644
--- a/sanei/sanei_tcp.c
+++ b/sanei/sanei_tcp.c
@@ -70,7 +70,7 @@ sanei_tcp_open(const char *host, int port, int *fdp)
 #endif
 
 	DBG_INIT();
-	DBG(1, "%s: host = %s, port = %d\n", __FUNCTION__, host, port);
+	DBG(1, "%s: host = %s, port = %d\n", __func__, host, port);
 
 #ifdef HAVE_WINSOCK2_H
 	err = WSAStartup(MAKEWORD(2, 2), &wsaData);
diff --git a/sanei/sanei_thread.c b/sanei/sanei_thread.c
index 8db4a21..fcf52c1 100644
--- a/sanei/sanei_thread.c
+++ b/sanei/sanei_thread.c
@@ -71,9 +71,6 @@
 #if !defined USE_PTHREAD && !defined HAVE_OS2_H && !defined __BEOS__
 # include <sys/wait.h>
 #endif
-#if defined USE_PTHREAD
-# include <pthread.h>
-#endif
 
 #define BACKEND_NAME sanei_thread      /**< name of this module for debugging */
 
@@ -135,9 +132,9 @@ sanei_thread_set_invalid( SANE_Pid *pid )
 
 /* Return if PID is a valid PID or not. */
 SANE_Bool
-sanei_thread_is_invalid( SANE_Pid pid )
+sanei_thread_is_valid( SANE_Pid pid )
 {
-	SANE_Bool rc = SANE_FALSE;
+	SANE_Bool rc = SANE_TRUE;
 
 #ifdef WIN32
 #ifdef WINPTHREAD_API
@@ -145,10 +142,10 @@ sanei_thread_is_invalid( SANE_Pid pid )
 #else
 	if (pid.p == 0)
 #endif
-	    rc = SANE_TRUE;
+	    rc = SANE_FALSE;
 #else
-	if (pid == -1)
-	    rc = SANE_TRUE;
+	if (pid == (SANE_Pid) -1)
+	    rc = SANE_FALSE;
 #endif
 
 	return rc;
@@ -491,7 +488,7 @@ sanei_thread_waitpid( SANE_Pid pid, int *status )
 #else
 	int ls;
 #endif
-	SANE_Pid result;
+	SANE_Pid result = pid;
 	int stat;
 
 	stat = 0;
diff --git a/sanei/sanei_usb.c b/sanei/sanei_usb.c
index f210d4f..e4b23dc 100644
--- a/sanei/sanei_usb.c
+++ b/sanei/sanei_usb.c
@@ -62,31 +62,22 @@
 #include <dirent.h>
 #include <time.h>
 
-/* for debug messages */
-#if __STDC_VERSION__ < 199901L
-# if __GNUC__ >= 2
-#  define __func__ __FUNCTION__
-# else
-#  define __func__ "<unknown>"
-# endif
-#endif
-
 
 #ifdef HAVE_RESMGR
 #include <resmgr.h>
 #endif
 
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
 #ifdef HAVE_LUSB0_USB_H
 #include <lusb0_usb.h>
 #else
 #include <usb.h>
 #endif
-#endif /* HAVE_LIBUSB */
+#endif /* HAVE_LIBUSB_LEGACY */
 
-#ifdef HAVE_LIBUSB_1_0
+#ifdef HAVE_LIBUSB
 #include <libusb.h>
-#endif /* HAVE_LIBUSB_1_0 */
+#endif /* HAVE_LIBUSB */
 
 #ifdef HAVE_USBCALLS
 #include <usb.h>
@@ -156,14 +147,14 @@ typedef struct
   SANE_Int interface_nr;
   SANE_Int alt_setting;
   SANE_Int missing;
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
   usb_dev_handle *libusb_handle;
   struct usb_device *libusb_device;
-#endif /* HAVE_LIBUSB */
-#ifdef HAVE_LIBUSB_1_0
+#endif /* HAVE_LIBUSB_LEGACY */
+#ifdef HAVE_LIBUSB
   libusb_device *lu_device;
   libusb_device_handle *lu_handle;
-#endif /* HAVE_LIBUSB_1_0 */
+#endif /* HAVE_LIBUSB */
 }
 device_list_type;
 
@@ -183,13 +174,13 @@ static int device_number=0;
  * count number of time sanei_usb has been initialized */
 static int initialized=0;
 
-#if defined(HAVE_LIBUSB) || defined(HAVE_LIBUSB_1_0)
+#if defined(HAVE_LIBUSB_LEGACY) || defined(HAVE_LIBUSB)
 static int libusb_timeout = 30 * 1000;	/* 30 seconds */
-#endif /* HAVE_LIBUSB */
+#endif /* HAVE_LIBUSB_LEGACY */
 
-#ifdef HAVE_LIBUSB_1_0
+#ifdef HAVE_LIBUSB
 static libusb_context *sanei_usb_ctx;
-#endif /* HAVE_LIBUSB_1_0 */
+#endif /* HAVE_LIBUSB */
 
 #if defined (__linux__)
 /* From /usr/src/linux/driver/usb/scanner.h */
@@ -266,7 +257,7 @@ print_buffer (const SANE_Byte * buffer, SANE_Int size)
     }
 }
 
-#if !defined(HAVE_LIBUSB) && !defined(HAVE_LIBUSB_1_0)
+#if !defined(HAVE_LIBUSB_LEGACY) && !defined(HAVE_LIBUSB)
 static void
 kernel_get_vendor_product (int fd, const char *name, int *vendorID, int *productID)
 {
@@ -340,7 +331,7 @@ kernel_get_vendor_product (int fd, const char *name, int *vendorID, int *product
 #endif /* defined (__linux__), defined(__BEOS__), ... */
   /* put more os-dependant stuff ... */
 }
-#endif /* !defined(HAVE_LIBUSB) && !defined(HAVE_LIBUSB_1_0) */
+#endif /* !defined(HAVE_LIBUSB_LEGACY) && !defined(HAVE_LIBUSB) */
 
 /**
  * store the given device in device list if it isn't already
@@ -366,10 +357,10 @@ store_device (device_list_type device)
           * Need to update the LibUSB device pointer, since it might
           * have changed after the latest USB scan.
           */
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
           devices[i].libusb_device = device.libusb_device;
 #endif
-#ifdef HAVE_LIBUSB_1_0
+#ifdef HAVE_LIBUSB
           devices[i].lu_device = device.lu_device;
 #endif
 
@@ -408,7 +399,7 @@ store_device (device_list_type device)
   devices[pos].open = SANE_FALSE;
 }
 
-#ifdef HAVE_LIBUSB_1_0
+#ifdef HAVE_LIBUSB
 static char *
 sanei_libusb_strerror (int errcode)
 {
@@ -462,14 +453,14 @@ sanei_libusb_strerror (int errcode)
 	return "Unknown libusb-1.0 error code";
     }
 }
-#endif /* HAVE_LIBUSB_1_0 */
+#endif /* HAVE_LIBUSB */
 
 void
 sanei_usb_init (void)
 {
-#ifdef HAVE_LIBUSB_1_0
+#ifdef HAVE_LIBUSB
   int ret;
-#endif /* HAVE_LIBUSB_1_0 */
+#endif /* HAVE_LIBUSB */
 
   DBG_INIT ();
 #ifdef DBG_LEVEL
@@ -483,18 +474,18 @@ sanei_usb_init (void)
     memset (devices, 0, sizeof (devices));
 
   /* initialize USB with old libusb library */
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
   DBG (4, "%s: Looking for libusb devices\n", __func__);
   usb_init ();
 #ifdef DBG_LEVEL
   if (DBG_LEVEL > 4)
     usb_set_debug (255);
 #endif /* DBG_LEVEL */
-#endif /* HAVE_LIBUSB */
+#endif /* HAVE_LIBUSB_LEGACY */
 
 
   /* initialize USB using libusb-1.0 */
-#ifdef HAVE_LIBUSB_1_0
+#ifdef HAVE_LIBUSB
   if (!sanei_usb_ctx)
     {
       DBG (4, "%s: initializing libusb-1.0\n", __func__);
@@ -511,9 +502,9 @@ sanei_usb_init (void)
 	libusb_set_debug (sanei_usb_ctx, 3);
 #endif /* DBG_LEVEL */
     }
-#endif /* HAVE_LIBUSB_1_0 */
+#endif /* HAVE_LIBUSB */
 
-#if !defined(HAVE_LIBUSB) && !defined(HAVE_LIBUSB_1_0)
+#if !defined(HAVE_LIBUSB_LEGACY) && !defined(HAVE_LIBUSB)
   DBG (4, "%s: SANE is built without support for libusb\n", __func__);
 #endif
 
@@ -553,7 +544,7 @@ int i;
               devices[i].devname=NULL;
             }
         }
-#ifdef HAVE_LIBUSB_1_0
+#ifdef HAVE_LIBUSB
       if (sanei_usb_ctx)
         {
           libusb_exit (sanei_usb_ctx);
@@ -643,7 +634,7 @@ static void usbcall_scan_devices(void)
 }
 #endif /* HAVE_USBCALLS */
 
-#if !defined(HAVE_LIBUSB) && !defined(HAVE_LIBUSB_1_0)
+#if !defined(HAVE_LIBUSB_LEGACY) && !defined(HAVE_LIBUSB)
 /** scan for devices using kernel device.
  * Check for devices using kernel device
  */
@@ -742,9 +733,9 @@ static void kernel_scan_devices(void)
       closedir (dir);
     }
 }
-#endif /* !defined(HAVE_LIBUSB) && !defined(HAVE_LIBUSB_1_0) */
+#endif /* !defined(HAVE_LIBUSB_LEGACY) && !defined(HAVE_LIBUSB) */
 
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
 /** scan for devices using old libusb
  * Check for devices using 0.1.x libusb
  */
@@ -855,9 +846,9 @@ static void libusb_scan_devices(void)
 	}
     }
 }
-#endif /* HAVE_LIBUSB */
+#endif /* HAVE_LIBUSB_LEGACY */
 
-#ifdef HAVE_LIBUSB_1_0
+#ifdef HAVE_LIBUSB
 /** scan for devices using libusb
  * Check for devices using libusb-1.0
  */
@@ -1031,7 +1022,7 @@ static void libusb_scan_devices(void)
   libusb_free_device_list (devlist, 1);
 
 }
-#endif /* HAVE_LIBUSB_1_0 */
+#endif /* HAVE_LIBUSB */
 
 
 void
@@ -1057,11 +1048,11 @@ sanei_usb_scan_devices (void)
     }
 
   /* Check for devices using the kernel scanner driver */
-#if !defined(HAVE_LIBUSB) && !defined(HAVE_LIBUSB_1_0)
+#if !defined(HAVE_LIBUSB_LEGACY) && !defined(HAVE_LIBUSB)
   kernel_scan_devices();
 #endif
 
-#if defined(HAVE_LIBUSB) || defined(HAVE_LIBUSB_1_0)
+#if defined(HAVE_LIBUSB_LEGACY) || defined(HAVE_LIBUSB)
   /* Check for devices using libusb (old or new)*/
   libusb_scan_devices();
 #endif
@@ -1308,7 +1299,6 @@ sanei_usb_open (SANE_String_Const devname, SANE_Int * dn)
 {
   int devcount;
   SANE_Bool found = SANE_FALSE;
-  int c, i, a;
 
   DBG (5, "sanei_usb_open: trying to open device `%s'\n", devname);
   if (!dn)
@@ -1341,10 +1331,11 @@ sanei_usb_open (SANE_String_Const devname, SANE_Int * dn)
 
   if (devices[devcount].method == sanei_usb_method_libusb)
     {
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
       struct usb_device *dev;
       struct usb_interface_descriptor *interface;
       int result, num;
+      int c, i, a;
 
       devices[devcount].libusb_handle =
 	usb_open (devices[devcount].libusb_device);
@@ -1600,13 +1591,14 @@ sanei_usb_open (SANE_String_Const devname, SANE_Int * dn)
 	    }
 	}
 
-#elif defined(HAVE_LIBUSB_1_0) /* libusb-1.0 */
+#elif defined(HAVE_LIBUSB) /* libusb-1.0 */
 
       int config;
       libusb_device *dev;
       struct libusb_device_descriptor desc;
       struct libusb_config_descriptor *config0;
       int result, num;
+      int c, i, a;
 
       dev = devices[devcount].lu_device;
 
@@ -1902,11 +1894,11 @@ sanei_usb_open (SANE_String_Const devname, SANE_Int * dn)
 	  libusb_free_config_descriptor (config);
 	}
 
-#else /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#else /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
       DBG (1, "sanei_usb_open: can't open device `%s': "
 	   "libusb support missing\n", devname);
       return SANE_STATUS_UNSUPPORTED;
-#endif /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#endif /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
     }
   else if (devices[devcount].method == sanei_usb_method_scanner_driver)
     {
@@ -2108,6 +2100,17 @@ sanei_usb_open (SANE_String_Const devname, SANE_Int * dn)
 void
 sanei_usb_close (SANE_Int dn)
 {
+  char *env;
+  int workaround = 0;
+
+  DBG (5, "sanei_usb_close: evaluating environment variable SANE_USB_WORKAROUND\n");
+  env = getenv ("SANE_USB_WORKAROUND");
+  if (env)
+    {
+      workaround = atoi(env);
+      DBG (5, "sanei_usb_close: workaround: %d\n", workaround);
+    }
+
   DBG (5, "sanei_usb_close: closing device %d\n", dn);
   if (dn >= device_number || dn < 0)
     {
@@ -2133,31 +2136,37 @@ sanei_usb_close (SANE_Int dn)
 #endif
     }
   else
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
     {
       /* This call seems to be required by Linux xhci driver
        * even though it should be a no-op. Without it, the
        * host or driver does not reset it's data toggle bit.
        * We intentionally ignore the return val */
-      sanei_usb_set_altinterface (dn, devices[dn].alt_setting);
+      if (workaround)
+        {
+          sanei_usb_set_altinterface (dn, devices[dn].alt_setting);
+        }
 
       usb_release_interface (devices[dn].libusb_handle,
 			     devices[dn].interface_nr);
       usb_close (devices[dn].libusb_handle);
     }
-#elif defined(HAVE_LIBUSB_1_0)
+#elif defined(HAVE_LIBUSB)
     {
       /* This call seems to be required by Linux xhci driver
        * even though it should be a no-op. Without it, the
        * host or driver does not reset it's data toggle bit.
        * We intentionally ignore the return val */
-      sanei_usb_set_altinterface (dn, devices[dn].alt_setting);
+      if (workaround)
+        {
+          sanei_usb_set_altinterface (dn, devices[dn].alt_setting);
+        }
 
       libusb_release_interface (devices[dn].lu_handle,
 				devices[dn].interface_nr);
       libusb_close (devices[dn].lu_handle);
     }
-#else /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#else /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
     DBG (1, "sanei_usb_close: libusb support missing\n");
 #endif
   devices[dn].open = SANE_FALSE;
@@ -2165,19 +2174,28 @@ sanei_usb_close (SANE_Int dn)
 }
 
 void
-sanei_usb_set_timeout (SANE_Int timeout)
+sanei_usb_set_timeout (SANE_Int __sane_unused__ timeout)
 {
-#if defined(HAVE_LIBUSB) || defined(HAVE_LIBUSB_1_0)
+#if defined(HAVE_LIBUSB_LEGACY) || defined(HAVE_LIBUSB)
   libusb_timeout = timeout;
 #else
   DBG (1, "sanei_usb_set_timeout: libusb support missing\n");
-#endif /* HAVE_LIBUSB || HAVE_LIBUSB_1_0 */
+#endif /* HAVE_LIBUSB_LEGACY || HAVE_LIBUSB */
 }
 
 SANE_Status
 sanei_usb_clear_halt (SANE_Int dn)
 {
-  int ret;
+  char *env;
+  int workaround = 0;
+
+  DBG (5, "sanei_usb_clear_halt: evaluating environment variable SANE_USB_WORKAROUND\n");
+  env = getenv ("SANE_USB_WORKAROUND");
+  if (env)
+    {
+      workaround = atoi(env);
+      DBG (5, "sanei_usb_clear_halt: workaround: %d\n", workaround);
+    }
 
   if (dn >= device_number || dn < 0)
     {
@@ -2185,13 +2203,17 @@ sanei_usb_clear_halt (SANE_Int dn)
       return SANE_STATUS_INVAL;
     }
 
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
+  int ret;
 
   /* This call seems to be required by Linux xhci driver
    * even though it should be a no-op. Without it, the
    * host or driver does not send the clear to the device.
    * We intentionally ignore the return val */
-  sanei_usb_set_altinterface (dn, devices[dn].alt_setting);
+  if (workaround)
+    {
+      sanei_usb_set_altinterface (dn, devices[dn].alt_setting);
+    }
 
   ret = usb_clear_halt (devices[dn].libusb_handle, devices[dn].bulk_in_ep);
   if (ret){
@@ -2205,13 +2227,17 @@ sanei_usb_clear_halt (SANE_Int dn)
     return SANE_STATUS_INVAL;
   }
 
-#elif defined(HAVE_LIBUSB_1_0)
+#elif defined(HAVE_LIBUSB)
+  int ret;
 
   /* This call seems to be required by Linux xhci driver
    * even though it should be a no-op. Without it, the
    * host or driver does not send the clear to the device.
    * We intentionally ignore the return val */
-  sanei_usb_set_altinterface (dn, devices[dn].alt_setting);
+  if (workaround)
+    {
+      sanei_usb_set_altinterface (dn, devices[dn].alt_setting);
+    }
 
   ret = libusb_clear_halt (devices[dn].lu_handle, devices[dn].bulk_in_ep);
   if (ret){
@@ -2224,17 +2250,17 @@ sanei_usb_clear_halt (SANE_Int dn)
     DBG (1, "sanei_usb_clear_halt: BULK_OUT ret=%d\n", ret);
     return SANE_STATUS_INVAL;
   }
-#else /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#else /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
   DBG (1, "sanei_usb_clear_halt: libusb support missing\n");
-#endif /* HAVE_LIBUSB || HAVE_LIBUSB_1_0 */
+#endif /* HAVE_LIBUSB_LEGACY || HAVE_LIBUSB */
 
   return SANE_STATUS_GOOD;
 }
 
 SANE_Status
-sanei_usb_reset (SANE_Int dn)
+sanei_usb_reset (SANE_Int __sane_unused__ dn)
 {
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
   int ret;
 
   ret = usb_reset (devices[dn].libusb_handle);
@@ -2243,7 +2269,7 @@ sanei_usb_reset (SANE_Int dn)
     return SANE_STATUS_INVAL;
   }
 
-#elif defined(HAVE_LIBUSB_1_0)
+#elif defined(HAVE_LIBUSB)
   int ret;
 
   ret = libusb_reset_device (devices[dn].lu_handle);
@@ -2252,9 +2278,9 @@ sanei_usb_reset (SANE_Int dn)
     return SANE_STATUS_INVAL;
   }
 
-#else /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#else /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
   DBG (1, "sanei_usb_reset: libusb support missing\n");
-#endif /* HAVE_LIBUSB || HAVE_LIBUSB_1_0 */
+#endif /* HAVE_LIBUSB_LEGACY || HAVE_LIBUSB */
 
   return SANE_STATUS_GOOD;
 }
@@ -2287,7 +2313,7 @@ sanei_usb_read_bulk (SANE_Int dn, SANE_Byte * buffer, size_t * size)
 	     strerror (errno));
     }
   else if (devices[dn].method == sanei_usb_method_libusb)
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
     {
       if (devices[dn].bulk_in_ep)
 	{
@@ -2306,14 +2332,14 @@ sanei_usb_read_bulk (SANE_Int dn, SANE_Byte * buffer, size_t * size)
 	  return SANE_STATUS_INVAL;
 	}
     }
-#elif defined(HAVE_LIBUSB_1_0)
+#elif defined(HAVE_LIBUSB)
     {
       if (devices[dn].bulk_in_ep)
 	{
-	  int ret;
+	  int ret, rsize;
 	  ret = libusb_bulk_transfer (devices[dn].lu_handle,
 				      devices[dn].bulk_in_ep, buffer,
-				      (int) *size, (int *) &read_size,
+				      (int) *size, &rsize,
 				      libusb_timeout);
 
 	  if (ret < 0)
@@ -2323,6 +2349,10 @@ sanei_usb_read_bulk (SANE_Int dn, SANE_Byte * buffer, size_t * size)
 
 	      read_size = -1;
 	    }
+	  else
+	    {
+	      read_size = rsize;
+	    }
 	}
       else
 	{
@@ -2331,12 +2361,12 @@ sanei_usb_read_bulk (SANE_Int dn, SANE_Byte * buffer, size_t * size)
 	  return SANE_STATUS_INVAL;
 	}
     }
-#else /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#else /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
     {
       DBG (1, "sanei_usb_read_bulk: libusb support missing\n");
       return SANE_STATUS_UNSUPPORTED;
     }
-#endif /* not HAVE_LIBUSB */
+#endif /* not HAVE_LIBUSB_LEGACY */
   else if (devices[dn].method == sanei_usb_method_usbcalls)
   {
 #ifdef HAVE_USBCALLS
@@ -2382,10 +2412,10 @@ sanei_usb_read_bulk (SANE_Int dn, SANE_Byte * buffer, size_t * size)
 
   if (read_size < 0)
     {
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
       if (devices[dn].method == sanei_usb_method_libusb)
 	usb_clear_halt (devices[dn].libusb_handle, devices[dn].bulk_in_ep);
-#elif defined(HAVE_LIBUSB_1_0)
+#elif defined(HAVE_LIBUSB)
       if (devices[dn].method == sanei_usb_method_libusb)
 	libusb_clear_halt (devices[dn].lu_handle, devices[dn].bulk_in_ep);
 #endif
@@ -2437,7 +2467,7 @@ sanei_usb_write_bulk (SANE_Int dn, const SANE_Byte * buffer, size_t * size)
 	     strerror (errno));
     }
   else if (devices[dn].method == sanei_usb_method_libusb)
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
     {
       if (devices[dn].bulk_out_ep)
 	{
@@ -2456,7 +2486,7 @@ sanei_usb_write_bulk (SANE_Int dn, const SANE_Byte * buffer, size_t * size)
 	  return SANE_STATUS_INVAL;
 	}
     }
-#elif defined(HAVE_LIBUSB_1_0)
+#elif defined(HAVE_LIBUSB)
     {
       if (devices[dn].bulk_out_ep)
 	{
@@ -2464,7 +2494,7 @@ sanei_usb_write_bulk (SANE_Int dn, const SANE_Byte * buffer, size_t * size)
 	  int trans_bytes;
 	  ret = libusb_bulk_transfer (devices[dn].lu_handle,
 				      devices[dn].bulk_out_ep,
-				      buffer,
+				      (unsigned char *) buffer,
 				      (int) *size, &trans_bytes,
 				      libusb_timeout);
 	  if (ret < 0)
@@ -2484,12 +2514,12 @@ sanei_usb_write_bulk (SANE_Int dn, const SANE_Byte * buffer, size_t * size)
 	  return SANE_STATUS_INVAL;
 	}
     }
-#else /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#else /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
     {
       DBG (1, "sanei_usb_write_bulk: libusb support missing\n");
       return SANE_STATUS_UNSUPPORTED;
     }
-#endif /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#endif /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
   else if (devices[dn].method == sanei_usb_method_usbcalls)
   {
 #ifdef HAVE_USBCALLS
@@ -2537,10 +2567,10 @@ sanei_usb_write_bulk (SANE_Int dn, const SANE_Byte * buffer, size_t * size)
   if (write_size < 0)
     {
       *size = 0;
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
       if (devices[dn].method == sanei_usb_method_libusb)
 	usb_clear_halt (devices[dn].libusb_handle, devices[dn].bulk_out_ep);
-#elif defined(HAVE_LIBUSB_1_0)
+#elif defined(HAVE_LIBUSB)
       if (devices[dn].method == sanei_usb_method_libusb)
 	libusb_clear_halt (devices[dn].lu_handle, devices[dn].bulk_out_ep);
 #endif
@@ -2616,7 +2646,7 @@ sanei_usb_control_msg (SANE_Int dn, SANE_Int rtype, SANE_Int req,
 #endif /* not __linux__ */
     }
   else if (devices[dn].method == sanei_usb_method_libusb)
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
     {
       int result;
 
@@ -2633,7 +2663,7 @@ sanei_usb_control_msg (SANE_Int dn, SANE_Int rtype, SANE_Int req,
 	print_buffer (data, len);
       return SANE_STATUS_GOOD;
     }
-#elif defined(HAVE_LIBUSB_1_0)
+#elif defined(HAVE_LIBUSB)
     {
       int result;
 
@@ -2650,12 +2680,12 @@ sanei_usb_control_msg (SANE_Int dn, SANE_Int rtype, SANE_Int req,
 	print_buffer (data, len);
       return SANE_STATUS_GOOD;
     }
-#else /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0*/
+#else /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB*/
     {
       DBG (1, "sanei_usb_control_msg: libusb support missing\n");
       return SANE_STATUS_UNSUPPORTED;
     }
-#endif /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#endif /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
   else if (devices[dn].method == sanei_usb_method_usbcalls)
      {
 #ifdef HAVE_USBCALLS
@@ -2692,7 +2722,7 @@ SANE_Status
 sanei_usb_read_int (SANE_Int dn, SANE_Byte * buffer, size_t * size)
 {
   ssize_t read_size = 0;
-#if defined(HAVE_LIBUSB) || defined(HAVE_LIBUSB_1_0)
+#if defined(HAVE_LIBUSB_LEGACY) || defined(HAVE_LIBUSB)
   SANE_Bool stalled = SANE_FALSE;
 #endif
 
@@ -2717,7 +2747,7 @@ sanei_usb_read_int (SANE_Int dn, SANE_Byte * buffer, size_t * size)
       return SANE_STATUS_INVAL;
     }
   else if (devices[dn].method == sanei_usb_method_libusb)
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
     {
       if (devices[dn].int_in_ep)
 	{
@@ -2739,7 +2769,7 @@ sanei_usb_read_int (SANE_Int dn, SANE_Byte * buffer, size_t * size)
 	  return SANE_STATUS_INVAL;
 	}
     }
-#elif defined(HAVE_LIBUSB_1_0)
+#elif defined(HAVE_LIBUSB)
     {
       if (devices[dn].int_in_ep)
 	{
@@ -2764,12 +2794,12 @@ sanei_usb_read_int (SANE_Int dn, SANE_Byte * buffer, size_t * size)
 	  return SANE_STATUS_INVAL;
 	}
     }
-#else /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#else /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
     {
       DBG (1, "sanei_usb_read_int: libusb support missing\n");
       return SANE_STATUS_UNSUPPORTED;
     }
-#endif /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#endif /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
   else if (devices[dn].method == sanei_usb_method_usbcalls)
     {
 #ifdef HAVE_USBCALLS
@@ -2808,11 +2838,11 @@ sanei_usb_read_int (SANE_Int dn, SANE_Byte * buffer, size_t * size)
 
   if (read_size < 0)
     {
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
       if (devices[dn].method == sanei_usb_method_libusb)
         if (stalled)
 	  usb_clear_halt (devices[dn].libusb_handle, devices[dn].int_in_ep);
-#elif defined(HAVE_LIBUSB_1_0)
+#elif defined(HAVE_LIBUSB)
       if (devices[dn].method == sanei_usb_method_libusb)
         if (stalled)
 	  libusb_clear_halt (devices[dn].lu_handle, devices[dn].int_in_ep);
@@ -2858,7 +2888,7 @@ sanei_usb_set_configuration (SANE_Int dn, SANE_Int configuration)
 #endif /* not __linux__ */
     }
   else if (devices[dn].method == sanei_usb_method_libusb)
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
     {
       int result;
 
@@ -2872,7 +2902,7 @@ sanei_usb_set_configuration (SANE_Int dn, SANE_Int configuration)
 	}
       return SANE_STATUS_GOOD;
     }
-#elif defined(HAVE_LIBUSB_1_0)
+#elif defined(HAVE_LIBUSB)
     {
       int result;
 
@@ -2885,12 +2915,12 @@ sanei_usb_set_configuration (SANE_Int dn, SANE_Int configuration)
 	}
       return SANE_STATUS_GOOD;
     }
-#else /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#else /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
     {
       DBG (1, "sanei_usb_set_configuration: libusb support missing\n");
       return SANE_STATUS_UNSUPPORTED;
     }
-#endif /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#endif /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
   else
     {
       DBG (1,
@@ -2928,7 +2958,7 @@ sanei_usb_claim_interface (SANE_Int dn, SANE_Int interface_number)
 #endif /* not __linux__ */
     }
   else if (devices[dn].method == sanei_usb_method_libusb)
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
     {
       int result;
 
@@ -2941,7 +2971,7 @@ sanei_usb_claim_interface (SANE_Int dn, SANE_Int interface_number)
 	}
       return SANE_STATUS_GOOD;
     }
-#elif defined(HAVE_LIBUSB_1_0)
+#elif defined(HAVE_LIBUSB)
     {
       int result;
 
@@ -2954,12 +2984,12 @@ sanei_usb_claim_interface (SANE_Int dn, SANE_Int interface_number)
 	}
       return SANE_STATUS_GOOD;
     }
-#else /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#else /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
     {
       DBG (1, "sanei_usb_claim_interface: libusb support missing\n");
       return SANE_STATUS_UNSUPPORTED;
     }
-#endif /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#endif /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
   else
     {
       DBG (1, "sanei_usb_claim_interface: access method %d not implemented\n",
@@ -2995,7 +3025,7 @@ sanei_usb_release_interface (SANE_Int dn, SANE_Int interface_number)
 #endif /* not __linux__ */
     }
   else if (devices[dn].method == sanei_usb_method_libusb)
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
     {
       int result;
 
@@ -3008,7 +3038,7 @@ sanei_usb_release_interface (SANE_Int dn, SANE_Int interface_number)
 	}
       return SANE_STATUS_GOOD;
     }
-#elif defined(HAVE_LIBUSB_1_0)
+#elif defined(HAVE_LIBUSB)
     {
       int result;
 
@@ -3021,12 +3051,12 @@ sanei_usb_release_interface (SANE_Int dn, SANE_Int interface_number)
 	}
       return SANE_STATUS_GOOD;
     }
-#else /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#else /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
     {
       DBG (1, "sanei_usb_release_interface: libusb support missing\n");
       return SANE_STATUS_UNSUPPORTED;
     }
-#endif /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#endif /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
   else
     {
       DBG (1,
@@ -3061,7 +3091,7 @@ sanei_usb_set_altinterface (SANE_Int dn, SANE_Int alternate)
 #endif /* not __linux__ */
     }
   else if (devices[dn].method == sanei_usb_method_libusb)
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
     {
       int result;
 
@@ -3074,7 +3104,7 @@ sanei_usb_set_altinterface (SANE_Int dn, SANE_Int alternate)
 	}
       return SANE_STATUS_GOOD;
     }
-#elif defined(HAVE_LIBUSB_1_0)
+#elif defined(HAVE_LIBUSB)
     {
       int result;
 
@@ -3088,12 +3118,12 @@ sanei_usb_set_altinterface (SANE_Int dn, SANE_Int alternate)
 	}
       return SANE_STATUS_GOOD;
     }
-#else /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#else /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
     {
       DBG (1, "sanei_set_altinterface: libusb support missing\n");
       return SANE_STATUS_UNSUPPORTED;
     }
-#endif /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#endif /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
   else
     {
       DBG (1,
@@ -3104,7 +3134,9 @@ sanei_usb_set_altinterface (SANE_Int dn, SANE_Int alternate)
 }
 
 extern SANE_Status
-sanei_usb_get_descriptor( SANE_Int dn, struct sanei_usb_dev_descriptor *desc )
+sanei_usb_get_descriptor( SANE_Int dn,
+                          struct sanei_usb_dev_descriptor __sane_unused__
+                          *desc )
 {
   if (dn >= device_number || dn < 0)
     {
@@ -3115,7 +3147,7 @@ sanei_usb_get_descriptor( SANE_Int dn, struct sanei_usb_dev_descriptor *desc )
     }
 
   DBG (5, "sanei_usb_get_descriptor\n");
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
     {
 	  struct usb_device_descriptor *usb_descr;
 
@@ -3130,7 +3162,7 @@ sanei_usb_get_descriptor( SANE_Int dn, struct sanei_usb_dev_descriptor *desc )
 	  desc->max_packet_size = usb_descr->bMaxPacketSize0;
 	  return SANE_STATUS_GOOD;
     }
-#elif defined(HAVE_LIBUSB_1_0)
+#elif defined(HAVE_LIBUSB)
     {
       struct libusb_device_descriptor lu_desc;
       int ret;
@@ -3155,10 +3187,10 @@ sanei_usb_get_descriptor( SANE_Int dn, struct sanei_usb_dev_descriptor *desc )
       desc->max_packet_size = lu_desc.bMaxPacketSize0;
       return SANE_STATUS_GOOD;
     }
-#else /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#else /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
     {
       DBG (1, "sanei_usb_get_descriptor: libusb support missing\n");
       return SANE_STATUS_UNSUPPORTED;
     }
-#endif /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#endif /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
 }
diff --git a/test-driver b/test-driver
index 32bf39e..d306056 100755
--- a/test-driver
+++ b/test-driver
@@ -1,7 +1,7 @@
 #! /bin/sh
 # test-driver - basic testsuite driver script.
 
-scriptversion=2012-06-27.10; # UTC
+scriptversion=2013-07-13.22; # UTC
 
 # Copyright (C) 2011-2013 Free Software Foundation, Inc.
 #
@@ -44,13 +44,12 @@ print_usage ()
 Usage:
   test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
               [--expect-failure={yes|no}] [--color-tests={yes|no}]
-              [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
+              [--enable-hard-errors={yes|no}] [--]
+              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
 The '--test-name', '--log-file' and '--trs-file' options are mandatory.
 END
 }
 
-# TODO: better error handling in option parsing (in particular, ensure
-# TODO: $log_file, $trs_file and $test_name are defined).
 test_name= # Used for reporting.
 log_file=  # Where to save the output of the test script.
 trs_file=  # Where to save the metadata of the test run.
@@ -69,10 +68,23 @@ while test $# -gt 0; do
   --enable-hard-errors) enable_hard_errors=$2; shift;;
   --) shift; break;;
   -*) usage_error "invalid option: '$1'";;
+   *) break;;
   esac
   shift
 done
 
+missing_opts=
+test x"$test_name" = x && missing_opts="$missing_opts --test-name"
+test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
+test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
+if test x"$missing_opts" != x; then
+  usage_error "the following mandatory options are missing:$missing_opts"
+fi
+
+if test $# -eq 0; then
+  usage_error "missing argument"
+fi
+
 if test $color_tests = yes; then
   # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
   red='' # Red.
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index d63597f..c3c4f3c 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -81,11 +81,16 @@ subdir = testsuite
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs README
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ltoptions.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/byteorder.m4 \
-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/byteorder.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -176,7 +181,10 @@ am__relativize = \
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -197,7 +205,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISTCLEAN_FILES = @DISTCLEAN_FILES@
+DLH = @DLH@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
@@ -210,34 +218,42 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FIG2DEV = @FIG2DEV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
 GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
+GS = @GS@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
 IEEE1284_LIBS = @IEEE1284_LIBS@
-INCLUDES = @INCLUDES@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LOCKPATH = @INSTALL_LOCKPATH@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JPEG_LIBS = @JPEG_LIBS@
 LATEX = @LATEX@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
-LINKER_RPATH = @LINKER_RPATH@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCKPATH_GROUP = @LOCKPATH_GROUP@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINDEX = @MAKEINDEX@
@@ -246,10 +262,10 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MATH_LIB = @MATH_LIB@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
-NUMBER_VERSION = @NUMBER_VERSION@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -262,10 +278,13 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PNG_LIBS = @PNG_LIBS@
+POSUB = @POSUB@
+PPMTOGIF = @PPMTOGIF@
 PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@
 PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -287,12 +306,16 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 V_MAJOR = @V_MAJOR@
 V_MINOR = @V_MINOR@
 V_REV = @V_REV@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/testsuite/sanei/Makefile.am b/testsuite/sanei/Makefile.am
index 74cde52..0116987 100644
--- a/testsuite/sanei/Makefile.am
+++ b/testsuite/sanei/Makefile.am
@@ -10,15 +10,12 @@ EXTRA_DIST = data/boolean.conf data/empty.conf data/fixed.conf data/int.conf \
 	     data/wrong-fixed.conf data/wrong-range.conf \
 	     data/wrong-string-list.conf
 
-MATH_LIB = @MATH_LIB@
-USB_LIBS = @USB_LIBS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-TEST_LDADD = ../../sanei/libsanei.la ../../lib/liblib.la ../../lib/libfelib.la $(MATH_LIB) $(USB_LIBS) $(PTHREAD_LIBS)
+TEST_LDADD = ../../sanei/libsanei.la ../../lib/liblib.la $(MATH_LIB) $(USB_LIBS) $(PTHREAD_LIBS)
 
 check_PROGRAMS = sanei_usb_test test_wire sanei_check_test sanei_config_test sanei_constrain_test
 TESTS = $(check_PROGRAMS)
 
-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include $(USB_CFLAGS)
 
 sanei_constrain_test_SOURCES = sanei_constrain_test.c
 sanei_constrain_test_LDADD = $(TEST_LDADD)
diff --git a/testsuite/sanei/Makefile.in b/testsuite/sanei/Makefile.in
index 08aba0b..aa531db 100644
--- a/testsuite/sanei/Makefile.in
+++ b/testsuite/sanei/Makefile.in
@@ -85,11 +85,16 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp \
 	$(top_srcdir)/test-driver README
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ltoptions.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/byteorder.m4 \
-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/byteorder.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -100,8 +105,8 @@ am_sanei_check_test_OBJECTS = sanei_check_test.$(OBJEXT)
 sanei_check_test_OBJECTS = $(am_sanei_check_test_OBJECTS)
 am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = ../../sanei/libsanei.la ../../lib/liblib.la \
-	../../lib/libfelib.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 sanei_check_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -392,7 +397,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \
+	-I$(top_srcdir)/include $(USB_CFLAGS)
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -413,7 +422,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISTCLEAN_FILES = @DISTCLEAN_FILES@
+DLH = @DLH@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
@@ -426,34 +435,42 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FIG2DEV = @FIG2DEV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
 GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
+GS = @GS@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
 IEEE1284_LIBS = @IEEE1284_LIBS@
-INCLUDES = @INCLUDES@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LOCKPATH = @INSTALL_LOCKPATH@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JPEG_LIBS = @JPEG_LIBS@
 LATEX = @LATEX@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
-LINKER_RPATH = @LINKER_RPATH@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCKPATH_GROUP = @LOCKPATH_GROUP@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINDEX = @MAKEINDEX@
@@ -462,10 +479,10 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MATH_LIB = @MATH_LIB@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
-NUMBER_VERSION = @NUMBER_VERSION@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -478,10 +495,13 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PNG_LIBS = @PNG_LIBS@
+POSUB = @POSUB@
+PPMTOGIF = @PPMTOGIF@
 PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@
 PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -503,12 +523,16 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 V_MAJOR = @V_MAJOR@
 V_MINOR = @V_MINOR@
 V_REV = @V_REV@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -570,9 +594,8 @@ EXTRA_DIST = data/boolean.conf data/empty.conf data/fixed.conf data/int.conf \
 	     data/wrong-fixed.conf data/wrong-range.conf \
 	     data/wrong-string-list.conf
 
-TEST_LDADD = ../../sanei/libsanei.la ../../lib/liblib.la ../../lib/libfelib.la $(MATH_LIB) $(USB_LIBS) $(PTHREAD_LIBS)
+TEST_LDADD = ../../sanei/libsanei.la ../../lib/liblib.la $(MATH_LIB) $(USB_LIBS) $(PTHREAD_LIBS)
 TESTS = $(check_PROGRAMS)
-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
 sanei_constrain_test_SOURCES = sanei_constrain_test.c
 sanei_constrain_test_LDADD = $(TEST_LDADD)
 sanei_config_test_SOURCES = sanei_config_test.c
@@ -661,22 +684,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_wire.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
diff --git a/testsuite/sanei/sanei_usb_test.c b/testsuite/sanei/sanei_usb_test.c
index 4c5240e..c2cc0c3 100644
--- a/testsuite/sanei/sanei_usb_test.c
+++ b/testsuite/sanei/sanei_usb_test.c
@@ -48,7 +48,7 @@ static int
 test_init (int expected)
 {
   /* initialize USB */
-  printf ("%s starting ...\n", __FUNCTION__);
+  printf ("%s starting ...\n", __func__);
   sanei_usb_init ();
   if (initialized == 0)
     {
@@ -63,7 +63,7 @@ test_init (int expected)
     }
 
   printf ("sanei_usb initialized, use count is %d ...\n", initialized);
-  printf ("%s success\n\n", __FUNCTION__);
+  printf ("%s success\n\n", __func__);
   return 1;
 }
 
@@ -75,7 +75,7 @@ test_init (int expected)
 static int
 test_exit (int expected)
 {
-  printf ("%s starting ...\n", __FUNCTION__);
+  printf ("%s starting ...\n", __func__);
 
   /* end of USB use test */
   sanei_usb_exit ();
@@ -86,7 +86,7 @@ test_exit (int expected)
       return 0;
     }
 
-  printf ("%s success\n\n", __FUNCTION__);
+  printf ("%s success\n\n", __func__);
   return 1;
 }
 
@@ -130,13 +130,13 @@ create_mock_device (char *devname, device_list_type * device)
   device->devname = strdup (devname);
   device->vendor = 0xdead;
   device->product = 0xbeef;
-#if defined(HAVE_LIBUSB) || defined(HAVE_LIBUSB_1_0)
+#if defined(HAVE_LIBUSB_LEGACY) || defined(HAVE_LIBUSB)
   device->method = sanei_usb_method_libusb;
 #endif
 #ifdef HAVE_USBCALLS
   device->method = sanei_usb_method_usbcalls;
 #endif
-#if !defined(HAVE_LIBUSB) && !defined(HAVE_LIBUSB_1_0) && !defined(HAVE_USBCALLS)
+#if !defined(HAVE_LIBUSB_LEGACY) && !defined(HAVE_LIBUSB) && !defined(HAVE_USBCALLS)
   device->method == sanei_usb_method_scanner_driver;
 #endif
 }
@@ -689,7 +689,7 @@ test_vendor_by_id (void)
 static int
 test_timeout (void)
 {
-#if defined(HAVE_LIBUSB) || defined(HAVE_LIBUSB_1_0)
+#if defined(HAVE_LIBUSB_LEGACY) || defined(HAVE_LIBUSB)
   int timeout = libusb_timeout;
 
   sanei_usb_set_timeout (5000);
@@ -827,21 +827,21 @@ test_attach (void)
 }
 
 int
-main (int argc, char **argv)
+main (int __sane_unused__ argc, char **argv)
 {
   int detected, opened, i;
   SANE_Int dn[MAX_DEVICES];
 
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
   printf ("\n%s built with old libusb\n\n", argv[0]);
 #endif
-#ifdef HAVE_LIBUSB_1_0
+#ifdef HAVE_LIBUSB
   printf ("\n%s built with libusb-1.0\n\n", argv[0]);
 #endif
 #ifdef HAVE_USBCALLS
   printf ("\n%s built with usbcalls\n\n", argv[0]);
 #endif
-#if !defined(HAVE_LIBUSB) && !defined(HAVE_LIBUSB_1_0) && !defined(HAVE_USBCALLS)
+#if !defined(HAVE_LIBUSB_LEGACY) && !defined(HAVE_LIBUSB) && !defined(HAVE_USBCALLS)
   printf ("\n%s relying on deprecated scanner kernel module\n", argv[0]);
 #endif
 
diff --git a/testsuite/sanei/test_wire.c b/testsuite/sanei/test_wire.c
index e8388c4..48f464a 100644
--- a/testsuite/sanei/test_wire.c
+++ b/testsuite/sanei/test_wire.c
@@ -54,7 +54,7 @@ Valid CODECs are: `ascii' `bin'\n", program_name, default_codec, default_outfile
 
 
 int
-main (int argc, char **argv)
+main (int __sane_unused__ arg, char **argv)
 {
   SANE_Option_Descriptor desc[2], *desc_ptr;
   SANE_Word len;
diff --git a/testsuite/tools/Makefile.am b/testsuite/tools/Makefile.am
index 1664ecb..71188d2 100644
--- a/testsuite/tools/Makefile.am
+++ b/testsuite/tools/Makefile.am
@@ -30,11 +30,14 @@ check.local:
 	@echo "**** Testing $(SANEDESC) with $(TESTFILE)"
 	@for mode in ascii html-backends-split html-mfgs xml statistics usermap db udev udev+acl udev+hwdb hwdb plist hal hal-new; \
 	do \
-	echo "PASS: sane-desc -m $$mode -s $(srcdir)/data"; \
 	  $(SANEDESC) -m $$mode -s $(srcdir)/data >$$mode.res ;\
-	  if ! diff --ignore-matching-lines="..:..:.. 20[0-9][0-9]" --ignore-matching-lines="sane-backends 1.0...git" $(srcdir)/data/$$mode.ref $$mode.res ; \
+	  if diff -I "[ 012][0-9]:[0-5][0-9]:[0-6][0-9] 20[0-9][0-9]" \
+	          -I "sane-backends 1\.0\.[0-9]\+\(git\)\?$$" \
+	       $(srcdir)/data/$$mode.ref $$mode.res ; \
 	  then \
-		echo "**** File generated for $$mode mode is different from reference" ;\
+		echo "PASS: sane-desc -m $$mode -s $(srcdir)/data"; \
+	  else \
+		echo "FAIL: sane-desc -m $$mode -s $(srcdir)/data"; \
 		exit 1 ;\
 	  fi; \
 	done ;\
diff --git a/testsuite/tools/Makefile.in b/testsuite/tools/Makefile.in
index 45f79e9..0850607 100644
--- a/testsuite/tools/Makefile.in
+++ b/testsuite/tools/Makefile.in
@@ -81,11 +81,16 @@ subdir = testsuite/tools
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs README
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ltoptions.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/byteorder.m4 \
-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/byteorder.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -116,7 +121,10 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -137,7 +145,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISTCLEAN_FILES = @DISTCLEAN_FILES@
+DLH = @DLH@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
@@ -150,34 +158,42 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FIG2DEV = @FIG2DEV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
 GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
+GS = @GS@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
 IEEE1284_LIBS = @IEEE1284_LIBS@
-INCLUDES = @INCLUDES@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LOCKPATH = @INSTALL_LOCKPATH@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JPEG_LIBS = @JPEG_LIBS@
 LATEX = @LATEX@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
-LINKER_RPATH = @LINKER_RPATH@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCKPATH_GROUP = @LOCKPATH_GROUP@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINDEX = @MAKEINDEX@
@@ -186,10 +202,10 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MATH_LIB = @MATH_LIB@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
-NUMBER_VERSION = @NUMBER_VERSION@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -202,10 +218,13 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PNG_LIBS = @PNG_LIBS@
+POSUB = @POSUB@
+PPMTOGIF = @PPMTOGIF@
 PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@
 PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -227,12 +246,16 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 V_MAJOR = @V_MAJOR@
 V_MINOR = @V_MINOR@
 V_REV = @V_REV@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -505,11 +528,14 @@ check.local:
 	@echo "**** Testing $(SANEDESC) with $(TESTFILE)"
 	@for mode in ascii html-backends-split html-mfgs xml statistics usermap db udev udev+acl udev+hwdb hwdb plist hal hal-new; \
 	do \
-	echo "PASS: sane-desc -m $$mode -s $(srcdir)/data"; \
 	  $(SANEDESC) -m $$mode -s $(srcdir)/data >$$mode.res ;\
-	  if ! diff --ignore-matching-lines="..:..:.. 20[0-9][0-9]" --ignore-matching-lines="sane-backends 1.0...git" $(srcdir)/data/$$mode.ref $$mode.res ; \
+	  if diff -I "[ 012][0-9]:[0-5][0-9]:[0-6][0-9] 20[0-9][0-9]" \
+	          -I "sane-backends 1\.0\.[0-9]\+\(git\)\?$$" \
+	       $(srcdir)/data/$$mode.ref $$mode.res ; \
 	  then \
-		echo "**** File generated for $$mode mode is different from reference" ;\
+		echo "PASS: sane-desc -m $$mode -s $(srcdir)/data"; \
+	  else \
+		echo "FAIL: sane-desc -m $$mode -s $(srcdir)/data"; \
 		exit 1 ;\
 	  fi; \
 	done ;\
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 2024180..70c87ee 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -4,15 +4,15 @@
 ##  This file is part of the "Sane" build infra-structure.  See
 ##  included LICENSE file for license information.
 
-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include \
- -I$(top_srcdir)/include
+AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include \
+ -I$(top_srcdir)/include $(USB_CFLAGS)
 
 bin_PROGRAMS = sane-find-scanner gamma4scanimage
 noinst_PROGRAMS = sane-desc
 if INSTALL_UMAX_PP_TOOLS
-bin_PROGRAMS = umax_pp
+bin_PROGRAMS += umax_pp
 else
-noinst_PROGRAMS = umax_pp
+noinst_PROGRAMS += umax_pp
 endif
 
 if CROSS_COMPILING
@@ -34,17 +34,20 @@ CLEANFILES = $(bin_SCRIPTS) $(dist_noinst_SCRIPTS)
 EXTRA_DIST = check-po.awk libtool-get-dll-ext mustek600iin-off.c \
 	     RenSaneDlls.cmd README xerox
 
-sane_find_scanner_SOURCES = sane-find-scanner.c check-usb-chip.c \
-			    ../backend/sane_strstatus.c
+sane_find_scanner_SOURCES = sane-find-scanner.c
+if have_usblib
+sane_find_scanner_SOURCES += check-usb-chip.c
+endif
 sane_find_scanner_LDADD = ../sanei/libsanei.la ../lib/liblib.la \
-			  @USB_LIBS@ @IEEE1284_LIBS@ @SCSI_LIBS@
+			  $(USB_LIBS) $(IEEE1284_LIBS) $(SCSI_LIBS) \
+			  ../backend/sane_strstatus.lo
 
 gamma4scanimage_SOURCES = gamma4scanimage.c
-gamma4scanimage_LDADD = @MATH_LIB@
+gamma4scanimage_LDADD = $(MATH_LIB)
 
-umax_pp_SOURCES = umax_pp.c ../backend/umax_pp_low.c
-umax_pp_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=umax_pp_low
-umax_pp_LDADD = ../sanei/libsanei.la ../lib/liblib.la @MATH_LIB@
+umax_pp_SOURCES = umax_pp.c
+umax_pp_LDADD = ../sanei/libsanei.la ../lib/liblib.la $(MATH_LIB) \
+	        ../backend/umax_pp_low.lo
 
 sane_desc_SOURCES = sane-desc.c
 sane_desc_LDADD = ../sanei/libsanei.la ../lib/liblib.la
@@ -64,19 +67,21 @@ dirs:
 	  $(MKDIR_P) $$subdir || exit 1; \
 	  done
 
-hotplug/libsane.usermap: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc
+descriptions = ${top_srcdir}/doc/descriptions/*.desc ${top_srcdir}/doc/descriptions-external/*.desc
+
+hotplug/libsane.usermap: sane-desc $(descriptions)
 	@./sane-desc -m usermap -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
 	   -d 1 > $@
 
-hotplug-ng/libsane.db: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc
+hotplug-ng/libsane.db: sane-desc $(descriptions)
 	@./sane-desc -m db -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
 	   -d 0 > $@
 
-udev/libsane.rules: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc
+udev/libsane.rules: sane-desc $(descriptions)
 	@./sane-desc -m udev -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
 	   -d 0 > $@
 
-hal/libsane.fdi: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc
+hal/libsane.fdi: sane-desc $(descriptions)
 	@./sane-desc -m hal -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
 	   -d 0 > $@
 
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 49d5953..77e9d72 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -80,37 +80,42 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@INSTALL_UMAX_PP_TOOLS_FALSE@bin_PROGRAMS =  \
-@INSTALL_UMAX_PP_TOOLS_FALSE@	sane-find-scanner$(EXEEXT) \
-@INSTALL_UMAX_PP_TOOLS_FALSE@	gamma4scanimage$(EXEEXT)
-@INSTALL_UMAX_PP_TOOLS_TRUE@bin_PROGRAMS = umax_pp$(EXEEXT) \
-@INSTALL_UMAX_PP_TOOLS_TRUE@	sane-find-scanner$(EXEEXT) \
-@INSTALL_UMAX_PP_TOOLS_TRUE@	gamma4scanimage$(EXEEXT)
-@INSTALL_UMAX_PP_TOOLS_FALSE@noinst_PROGRAMS = umax_pp$(EXEEXT) \
-@INSTALL_UMAX_PP_TOOLS_FALSE@	sane-desc$(EXEEXT)
-@INSTALL_UMAX_PP_TOOLS_TRUE@noinst_PROGRAMS = sane-desc$(EXEEXT)
+bin_PROGRAMS = sane-find-scanner$(EXEEXT) gamma4scanimage$(EXEEXT) \
+	$(am__EXEEXT_1)
+noinst_PROGRAMS = sane-desc$(EXEEXT) $(am__EXEEXT_2)
+@INSTALL_UMAX_PP_TOOLS_TRUE@am__append_1 = umax_pp
+@INSTALL_UMAX_PP_TOOLS_FALSE@am__append_2 = umax_pp
+@have_usblib_TRUE@am__append_3 = check-usb-chip.c
 subdir = tools
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs $(srcdir)/sane-config.in \
 	$(srcdir)/sane-backends.pc.in $(top_srcdir)/depcomp README
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ltoptions.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/byteorder.m4 \
-	$(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/byteorder.m4 $(top_srcdir)/m4/stdint.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/include/sane/config.h
 CONFIG_CLEAN_FILES = sane-config sane-backends.pc
 CONFIG_CLEAN_VPATH_FILES =
+@INSTALL_UMAX_PP_TOOLS_TRUE@am__EXEEXT_1 = umax_pp$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(pkgconfigdir)"
+@INSTALL_UMAX_PP_TOOLS_FALSE@am__EXEEXT_2 = umax_pp$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am_gamma4scanimage_OBJECTS = gamma4scanimage.$(OBJEXT)
 gamma4scanimage_OBJECTS = $(am_gamma4scanimage_OBJECTS)
-gamma4scanimage_DEPENDENCIES =
+am__DEPENDENCIES_1 =
+gamma4scanimage_DEPENDENCIES = $(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -118,14 +123,19 @@ am__v_lt_1 =
 am_sane_desc_OBJECTS = sane-desc.$(OBJEXT)
 sane_desc_OBJECTS = $(am_sane_desc_OBJECTS)
 sane_desc_DEPENDENCIES = ../sanei/libsanei.la ../lib/liblib.la
+am__sane_find_scanner_SOURCES_DIST = sane-find-scanner.c \
+	check-usb-chip.c
+@have_usblib_TRUE@am__objects_1 = check-usb-chip.$(OBJEXT)
 am_sane_find_scanner_OBJECTS = sane-find-scanner.$(OBJEXT) \
-	check-usb-chip.$(OBJEXT) sane_strstatus.$(OBJEXT)
+	$(am__objects_1)
 sane_find_scanner_OBJECTS = $(am_sane_find_scanner_OBJECTS)
-sane_find_scanner_DEPENDENCIES = ../sanei/libsanei.la ../lib/liblib.la
-am_umax_pp_OBJECTS = umax_pp-umax_pp.$(OBJEXT) \
-	umax_pp-umax_pp_low.$(OBJEXT)
+sane_find_scanner_DEPENDENCIES = ../sanei/libsanei.la ../lib/liblib.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) ../backend/sane_strstatus.lo
+am_umax_pp_OBJECTS = umax_pp.$(OBJEXT)
 umax_pp_OBJECTS = $(am_umax_pp_OBJECTS)
-umax_pp_DEPENDENCIES = ../sanei/libsanei.la ../lib/liblib.la
+umax_pp_DEPENDENCIES = ../sanei/libsanei.la ../lib/liblib.la \
+	$(am__DEPENDENCIES_1) ../backend/umax_pp_low.lo
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -191,7 +201,7 @@ am__v_CCLD_1 =
 SOURCES = $(gamma4scanimage_SOURCES) $(sane_desc_SOURCES) \
 	$(sane_find_scanner_SOURCES) $(umax_pp_SOURCES)
 DIST_SOURCES = $(gamma4scanimage_SOURCES) $(sane_desc_SOURCES) \
-	$(sane_find_scanner_SOURCES) $(umax_pp_SOURCES)
+	$(am__sane_find_scanner_SOURCES_DIST) $(umax_pp_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -221,7 +231,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \
+	-I$(top_srcdir)/include $(USB_CFLAGS)
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -242,7 +256,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISTCLEAN_FILES = @DISTCLEAN_FILES@
+DLH = @DLH@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
@@ -255,34 +269,42 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+FIG2DEV = @FIG2DEV@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
 GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
 GPHOTO2_LIBS = @GPHOTO2_LIBS@
 GREP = @GREP@
+GS = @GS@
 HAVE_GPHOTO2 = @HAVE_GPHOTO2@
 IEEE1284_LIBS = @IEEE1284_LIBS@
-INCLUDES = @INCLUDES@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_LOCKPATH = @INSTALL_LOCKPATH@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 JPEG_LIBS = @JPEG_LIBS@
 LATEX = @LATEX@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
-LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
 LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
 LIBV4L_LIBS = @LIBV4L_LIBS@
-LINKER_RPATH = @LINKER_RPATH@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCKPATH_GROUP = @LOCKPATH_GROUP@
+LTALLOCA = @LTALLOCA@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINDEX = @MAKEINDEX@
@@ -291,10 +313,10 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MATH_LIB = @MATH_LIB@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
-NUMBER_VERSION = @NUMBER_VERSION@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -307,10 +329,13 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PNG_LIBS = @PNG_LIBS@
+POSUB = @POSUB@
+PPMTOGIF = @PPMTOGIF@
 PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@
 PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -332,12 +357,16 @@ SYSLOG_LIBS = @SYSLOG_LIBS@
 SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
 SYSTEMD_LIBS = @SYSTEMD_LIBS@
 TIFF_LIBS = @TIFF_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
 USB_LIBS = @USB_LIBS@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 V_MAJOR = @V_MAJOR@
 V_MINOR = @V_MINOR@
 V_REV = @V_REV@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -393,9 +422,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include \
- -I$(top_srcdir)/include
-
 @CROSS_COMPILING_FALSE@HOTPLUG = hal/libsane.fdi hotplug/libsane.usermap hotplug-ng/libsane.db \
 @CROSS_COMPILING_FALSE@	  udev/libsane.rules
 
@@ -412,21 +438,22 @@ EXTRA_DIST = check-po.awk libtool-get-dll-ext mustek600iin-off.c \
 	RenSaneDlls.cmd README xerox hotplug/README \
 	hotplug/libusbscanner hotplug-ng/README \
 	hotplug-ng/libsane.hotplug openbsd/attach openbsd/detach
-sane_find_scanner_SOURCES = sane-find-scanner.c check-usb-chip.c \
-			    ../backend/sane_strstatus.c
-
+sane_find_scanner_SOURCES = sane-find-scanner.c $(am__append_3)
 sane_find_scanner_LDADD = ../sanei/libsanei.la ../lib/liblib.la \
-			  @USB_LIBS@ @IEEE1284_LIBS@ @SCSI_LIBS@
+			  $(USB_LIBS) $(IEEE1284_LIBS) $(SCSI_LIBS) \
+			  ../backend/sane_strstatus.lo
 
 gamma4scanimage_SOURCES = gamma4scanimage.c
-gamma4scanimage_LDADD = @MATH_LIB@
-umax_pp_SOURCES = umax_pp.c ../backend/umax_pp_low.c
-umax_pp_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=umax_pp_low
-umax_pp_LDADD = ../sanei/libsanei.la ../lib/liblib.la @MATH_LIB@
+gamma4scanimage_LDADD = $(MATH_LIB)
+umax_pp_SOURCES = umax_pp.c
+umax_pp_LDADD = ../sanei/libsanei.la ../lib/liblib.la $(MATH_LIB) \
+	        ../backend/umax_pp_low.lo
+
 sane_desc_SOURCES = sane-desc.c
 sane_desc_LDADD = ../sanei/libsanei.la ../lib/liblib.la
 pkgconfigdir = @libdir@/pkgconfig
 pkgconfig_DATA = sane-backends.pc
+descriptions = ${top_srcdir}/doc/descriptions/*.desc ${top_srcdir}/doc/descriptions-external/*.desc
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -586,73 +613,32 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gamma4scanimage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sane-desc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sane-find-scanner.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sane_strstatus.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umax_pp-umax_pp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umax_pp-umax_pp_low.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umax_pp.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-sane_strstatus.o: ../backend/sane_strstatus.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sane_strstatus.o -MD -MP -MF $(DEPDIR)/sane_strstatus.Tpo -c -o sane_strstatus.o `test -f '../backend/sane_strstatus.c' || echo '$(srcdir)/'`../backend/sane_strstatus.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sane_strstatus.Tpo $(DEPDIR)/sane_strstatus.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../backend/sane_strstatus.c' object='sane_strstatus.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sane_strstatus.o `test -f '../backend/sane_strstatus.c' || echo '$(srcdir)/'`../backend/sane_strstatus.c
-
-sane_strstatus.obj: ../backend/sane_strstatus.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sane_strstatus.obj -MD -MP -MF $(DEPDIR)/sane_strstatus.Tpo -c -o sane_strstatus.obj `if test -f '../backend/sane_strstatus.c'; then $(CYGPATH_W) '../backend/sane_strstatus.c'; else $(CYGPATH_W) '$(srcdir)/../backend/sane_strstatus.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sane_strstatus.Tpo $(DEPDIR)/sane_strstatus.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../backend/sane_strstatus.c' object='sane_strstatus.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sane_strstatus.obj `if test -f '../backend/sane_strstatus.c'; then $(CYGPATH_W) '../backend/sane_strstatus.c'; else $(CYGPATH_W) '$(srcdir)/../backend/sane_strstatus.c'; fi`
-
-umax_pp-umax_pp.o: umax_pp.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(umax_pp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT umax_pp-umax_pp.o -MD -MP -MF $(DEPDIR)/umax_pp-umax_pp.Tpo -c -o umax_pp-umax_pp.o `test -f 'umax_pp.c' || echo '$(srcdir)/'`umax_pp.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/umax_pp-umax_pp.Tpo $(DEPDIR)/umax_pp-umax_pp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='umax_pp.c' object='umax_pp-umax_pp.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(umax_pp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o umax_pp-umax_pp.o `test -f 'umax_pp.c' || echo '$(srcdir)/'`umax_pp.c
-
-umax_pp-umax_pp.obj: umax_pp.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(umax_pp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT umax_pp-umax_pp.obj -MD -MP -MF $(DEPDIR)/umax_pp-umax_pp.Tpo -c -o umax_pp-umax_pp.obj `if test -f 'umax_pp.c'; then $(CYGPATH_W) 'umax_pp.c'; else $(CYGPATH_W) '$(srcdir)/umax_pp.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/umax_pp-umax_pp.Tpo $(DEPDIR)/umax_pp-umax_pp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='umax_pp.c' object='umax_pp-umax_pp.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(umax_pp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o umax_pp-umax_pp.obj `if test -f 'umax_pp.c'; then $(CYGPATH_W) 'umax_pp.c'; else $(CYGPATH_W) '$(srcdir)/umax_pp.c'; fi`
-
-umax_pp-umax_pp_low.o: ../backend/umax_pp_low.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(umax_pp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT umax_pp-umax_pp_low.o -MD -MP -MF $(DEPDIR)/umax_pp-umax_pp_low.Tpo -c -o umax_pp-umax_pp_low.o `test -f '../backend/umax_pp_low.c' || echo '$(srcdir)/'`../backend/umax_pp_low.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/umax_pp-umax_pp_low.Tpo $(DEPDIR)/umax_pp-umax_pp_low.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../backend/umax_pp_low.c' object='umax_pp-umax_pp_low.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(umax_pp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o umax_pp-umax_pp_low.o `test -f '../backend/umax_pp_low.c' || echo '$(srcdir)/'`../backend/umax_pp_low.c
-
-umax_pp-umax_pp_low.obj: ../backend/umax_pp_low.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(umax_pp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT umax_pp-umax_pp_low.obj -MD -MP -MF $(DEPDIR)/umax_pp-umax_pp_low.Tpo -c -o umax_pp-umax_pp_low.obj `if test -f '../backend/umax_pp_low.c'; then $(CYGPATH_W) '../backend/umax_pp_low.c'; else $(CYGPATH_W) '$(srcdir)/../backend/umax_pp_low.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/umax_pp-umax_pp_low.Tpo $(DEPDIR)/umax_pp-umax_pp_low.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../backend/umax_pp_low.c' object='umax_pp-umax_pp_low.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(umax_pp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o umax_pp-umax_pp_low.obj `if test -f '../backend/umax_pp_low.c'; then $(CYGPATH_W) '../backend/umax_pp_low.c'; else $(CYGPATH_W) '$(srcdir)/../backend/umax_pp_low.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -903,19 +889,19 @@ dirs:
 	  $(MKDIR_P) $$subdir || exit 1; \
 	  done
 
-hotplug/libsane.usermap: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc
+hotplug/libsane.usermap: sane-desc $(descriptions)
 	@./sane-desc -m usermap -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
 	   -d 1 > $@
 
-hotplug-ng/libsane.db: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc
+hotplug-ng/libsane.db: sane-desc $(descriptions)
 	@./sane-desc -m db -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
 	   -d 0 > $@
 
-udev/libsane.rules: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc
+udev/libsane.rules: sane-desc $(descriptions)
 	@./sane-desc -m udev -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
 	   -d 0 > $@
 
-hal/libsane.fdi: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc
+hal/libsane.fdi: sane-desc $(descriptions)
 	@./sane-desc -m hal -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
 	   -d 0 > $@
 
diff --git a/tools/README b/tools/README
index 6002113..10d0d95 100644
--- a/tools/README
+++ b/tools/README
@@ -68,7 +68,9 @@ Maybe useful for SANE developers:
  check-po.awk:
         Print untranslated and fuzzy messages and their line numbers in the
         source code and po file. Example:
-           cd po/ ; ../tools/check-po.awk sane-backends.de.po
-        You may need to adjust the path of awk in the first line of the
-        script. More documentation is in the script itself.
+           tools/check-po.awk po/de.po
+        You may need to adjust the path of gawk in the first line of the
+        script. Alternatively, run it via gawk's -f option, like so:
+           gawk -f tools/check-po.awk po/de.po
+        More documentation is in the script itself.
 
diff --git a/tools/check-po.awk b/tools/check-po.awk
index 25e0728..09e4d15 100755
--- a/tools/check-po.awk
+++ b/tools/check-po.awk
@@ -1,4 +1,4 @@
-#!/bin/awk -f 
+#!/usr/bin/gawk -f
 
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License as
diff --git a/tools/check-usb-chip.c b/tools/check-usb-chip.c
index e851855..50b3e88 100644
--- a/tools/check-usb-chip.c
+++ b/tools/check-usb-chip.c
@@ -28,7 +28,7 @@
 
 #include "../include/sane/config.h"
 
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
 
 #include "../include/sane/sane.h"
 #include <stdio.h>
@@ -1408,7 +1408,7 @@ check_gl646 (struct usb_device *dev)
   return "GL646";
 }
 
-/* Same as check_gl646, except that sanity check are different. */
+/* Same as check_gl646, except that sanity checks are different. */
 static char *
 check_gl646_hp (struct usb_device *dev)
 {
@@ -3430,9 +3430,9 @@ check_usb_chip (struct usb_device *dev, int verbosity, SANE_Bool from_file)
   return chip_name;
 }
 
-#endif /* HAVE_LIBUSB */
+#endif /* HAVE_LIBUSB_LEGACY */
 
-#ifdef HAVE_LIBUSB_1_0
+#ifdef HAVE_LIBUSB
 
 #include <libusb.h>
 
@@ -4335,4 +4335,4 @@ check_usb_chip (int verbosity,
   libusb_release_interface (hdl, 0);
   return chip_name;
 }
-#endif /* HAVE_LIBUSB_1_0 */
+#endif /* HAVE_LIBUSB */
diff --git a/tools/sane-config.in b/tools/sane-config.in
index 8e4b52a..6b7cd30 100644
--- a/tools/sane-config.in
+++ b/tools/sane-config.in
@@ -37,7 +37,7 @@ fi
 if test $# -gt 0; then
   case $1 in
     --version)
-      echo @NUMBER_VERSION@
+      echo @V_MAJOR@.@V_MINOR@.@V_REV@
       ;;
     --help)
       if test $# -eq 1; then
diff --git a/tools/sane-find-scanner.c b/tools/sane-find-scanner.c
index ae0e116..04f19d9 100644
--- a/tools/sane-find-scanner.c
+++ b/tools/sane-find-scanner.c
@@ -46,7 +46,7 @@
 #include "../include/sane/sanei_pa4s2.h"
 #include "../include/sane/sanei_config.h"
 
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
 #ifdef HAVE_LUSB0_USB_H
 #include <lusb0_usb.h>
 #else
@@ -55,7 +55,7 @@
 extern char * check_usb_chip (struct usb_device *dev, int verbosity, SANE_Bool from_file);
 #endif
 
-#ifdef HAVE_LIBUSB_1_0
+#ifdef HAVE_LIBUSB
 #include <libusb.h>
 extern char * check_usb_chip (int verbosity,
 			      struct libusb_device_descriptor desc,
@@ -76,7 +76,7 @@ static SANE_Bool device_found = SANE_FALSE;
 static SANE_Bool libusb_device_found = SANE_FALSE;
 static SANE_Bool unknown_found = SANE_FALSE;
 
-#ifdef HAVE_LIBUSB_1_0
+#ifdef HAVE_LIBUSB
 libusb_context *sfs_usb_ctx;
 #endif
 
@@ -115,7 +115,7 @@ usage (char *msg)
   fprintf (stderr, "\t-f: force opening devname as SCSI even if it looks "
 	   "like USB\n");
   fprintf (stderr, "\t-p: enable scanning for parallel port devices\n");
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
   fprintf (stderr, "\t-F file: try to detect chipset from given "
 	   "/proc/bus/usb/devices file\n");
 #endif
@@ -403,7 +403,7 @@ check_usb_file (char *file_name)
     }
 }
 
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
 
 static char *
 get_libusb_string_descriptor (struct usb_device *dev, int index)
@@ -701,10 +701,10 @@ check_libusb_device (struct usb_device *dev, SANE_Bool from_file)
   if (product)
     free (product);
 }
-#endif /* HAVE_LIBUSB */
+#endif /* HAVE_LIBUSB_LEGACY */
 
 
-#ifdef HAVE_LIBUSB_1_0
+#ifdef HAVE_LIBUSB
 static char *
 sfs_libusb_strerror (int errcode)
 {
@@ -1095,7 +1095,7 @@ check_libusb_device (libusb_device *dev, SANE_Bool from_file)
   if (product)
     free (product);
 }
-#endif /* HAVE_LIBUSB_1_0 */
+#endif /* HAVE_LIBUSB */
 
 
 static DIR *
@@ -1355,7 +1355,7 @@ check_mustek_pp_device (void)
   return (found > 0 || scsi > 0);
 }
 
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
 static SANE_Bool
 parse_num (char* search, const char* line, int base, long int * number)
 {
@@ -1596,9 +1596,9 @@ main (int argc, char **argv)
 	  break;
 
 	case 'F':
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
 	  parse_file ((char *) (*(++ap)));
-#elif defined(HAVE_LIBUSB_1_0)
+#elif defined(HAVE_LIBUSB)
 	  printf ("option -F not implemented with libusb-1.0\n");
 #else
 	  printf ("libusb not available: option -F can't be used\n");
@@ -1797,7 +1797,7 @@ main (int argc, char **argv)
 	"/dev/scanner", "/dev/scanner0", "/dev/scanner1",
 	"/dev/pass0", "/dev/pass1", "/dev/pass2", "/dev/pass3",
 	"/dev/pass4", "/dev/pass5", "/dev/pass6", "/dev/pass7",
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
 	"/dev/uk0", "/dev/uk1", "/dev/uk2", "/dev/uk3", "/dev/uk4",
 	"/dev/uk5", "/dev/uk6",
 #elif defined(__NetBSD__)
@@ -1948,7 +1948,7 @@ main (int argc, char **argv)
 	  check_usb_file (dev_name);
 	}
     }
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
   /* Now the libusb devices */
   {
     struct usb_bus *bus;
@@ -1973,7 +1973,7 @@ main (int argc, char **argv)
 	  }			/* for (bus) */
       }
   }
-#elif defined(HAVE_LIBUSB_1_0)
+#elif defined(HAVE_LIBUSB)
   /* Now the libusb-1.0 devices */
   {
     if (ap < argv + argc)
@@ -2026,10 +2026,10 @@ main (int argc, char **argv)
 	; /* init failed, jumping here */
       }
   }
-#else /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#else /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
   if (verbose > 1)
     printf ("libusb not available\n");
-#endif /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#endif /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
 
   if (device_found)
     {
@@ -2062,7 +2062,7 @@ main (int argc, char **argv)
 	   "make sure that\n  # you have loaded a kernel driver for your USB host "
 	   "controller and have setup\n  # the USB system correctly. "
 	   "See man sane-usb for details.\n");
-#if !defined(HAVE_LIBUSB) && !defined(HAVE_LIBUSB_1_0)
+#if !defined(HAVE_LIBUSB_LEGACY) && !defined(HAVE_LIBUSB)
       if (verbose > 0)
 	printf ("  # SANE has been built without libusb support. This may be a "
 		"reason\n  # for not detecting USB scanners. Read README for "
@@ -2074,7 +2074,7 @@ main (int argc, char **argv)
       if (!check_mustek_pp_device() && verbose > 0)
         printf ("\n  # No Mustek parallel port scanners found. If you expected"
                 " something\n  # different, make sure the scanner is correctly"
-	        " connected to your computer\n  # and you have apropriate"
+	        " connected to your computer\n  # and you have appropriate"
 	        " access rights.\n");
     }
   else if (verbose > 0)